From aca7b60855df8121a33e12717d812133bd2bb039 Mon Sep 17 00:00:00 2001
From: Marty Oehme <contact@martyoeh.me>
Date: Mon, 24 Feb 2025 15:43:45 +0100
Subject: [PATCH] services: Disable systemd service linking

I have not used (most) of these services in a long time. This makes the
unlinking more official. Also paves the way for setting up simple
runit-managed user services.
---
 .dotter/global.toml                                             | 2 ++
 services/{ => systemd}/.config/systemd/user/dirmngr.service     | 0
 services/{ => systemd}/.config/systemd/user/dirmngr.socket      | 0
 .../{ => systemd}/.config/systemd/user/gpg-agent-browser.socket | 0
 .../{ => systemd}/.config/systemd/user/gpg-agent-extra.socket   | 0
 .../{ => systemd}/.config/systemd/user/gpg-agent-ssh.socket     | 0
 services/{ => systemd}/.config/systemd/user/gpg-agent.service   | 0
 services/{ => systemd}/.config/systemd/user/gpg-agent.socket    | 0
 services/{ => systemd}/.config/systemd/user/mbsync.service      | 0
 services/{ => systemd}/.config/systemd/user/mbsync.timer        | 0
 .../.config/systemd/user/sockets.target.wants/dirmngr.socket    | 0
 .../systemd/user/sockets.target.wants/gpg-agent-browser.socket  | 0
 .../systemd/user/sockets.target.wants/gpg-agent-extra.socket    | 0
 .../systemd/user/sockets.target.wants/gpg-agent-ssh.socket      | 0
 .../.config/systemd/user/sockets.target.wants/gpg-agent.socket  | 0
 .../.config/systemd/user/timers.target.wants/mbsync.timer       | 0
 services/{ => systemd}/.local/share/services/git-sync           | 0
 .../{ => systemd}/.local/share/services/x-started-confirm.sh    | 0
 18 files changed, 2 insertions(+)
 rename services/{ => systemd}/.config/systemd/user/dirmngr.service (100%)
 rename services/{ => systemd}/.config/systemd/user/dirmngr.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/gpg-agent-browser.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/gpg-agent-extra.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/gpg-agent-ssh.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/gpg-agent.service (100%)
 rename services/{ => systemd}/.config/systemd/user/gpg-agent.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/mbsync.service (100%)
 rename services/{ => systemd}/.config/systemd/user/mbsync.timer (100%)
 rename services/{ => systemd}/.config/systemd/user/sockets.target.wants/dirmngr.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/sockets.target.wants/gpg-agent-browser.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/sockets.target.wants/gpg-agent-extra.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/sockets.target.wants/gpg-agent-ssh.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/sockets.target.wants/gpg-agent.socket (100%)
 rename services/{ => systemd}/.config/systemd/user/timers.target.wants/mbsync.timer (100%)
 rename services/{ => systemd}/.local/share/services/git-sync (100%)
 rename services/{ => systemd}/.local/share/services/x-started-confirm.sh (100%)

diff --git a/.dotter/global.toml b/.dotter/global.toml
index 8018d82..4223c0f 100644
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@@ -64,6 +64,8 @@ office = "~"
 
 [services.files]
 "services/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" }
+# FIXME: Disabling existing systemd services for the moment
+"services/systemd" = { target = "~/NOWHERE", type = "symbolic", if = "false" }
 services = "~"
 
 [social.files]
diff --git a/services/.config/systemd/user/dirmngr.service b/services/systemd/.config/systemd/user/dirmngr.service
similarity index 100%
rename from services/.config/systemd/user/dirmngr.service
rename to services/systemd/.config/systemd/user/dirmngr.service
diff --git a/services/.config/systemd/user/dirmngr.socket b/services/systemd/.config/systemd/user/dirmngr.socket
similarity index 100%
rename from services/.config/systemd/user/dirmngr.socket
rename to services/systemd/.config/systemd/user/dirmngr.socket
diff --git a/services/.config/systemd/user/gpg-agent-browser.socket b/services/systemd/.config/systemd/user/gpg-agent-browser.socket
similarity index 100%
rename from services/.config/systemd/user/gpg-agent-browser.socket
rename to services/systemd/.config/systemd/user/gpg-agent-browser.socket
diff --git a/services/.config/systemd/user/gpg-agent-extra.socket b/services/systemd/.config/systemd/user/gpg-agent-extra.socket
similarity index 100%
rename from services/.config/systemd/user/gpg-agent-extra.socket
rename to services/systemd/.config/systemd/user/gpg-agent-extra.socket
diff --git a/services/.config/systemd/user/gpg-agent-ssh.socket b/services/systemd/.config/systemd/user/gpg-agent-ssh.socket
similarity index 100%
rename from services/.config/systemd/user/gpg-agent-ssh.socket
rename to services/systemd/.config/systemd/user/gpg-agent-ssh.socket
diff --git a/services/.config/systemd/user/gpg-agent.service b/services/systemd/.config/systemd/user/gpg-agent.service
similarity index 100%
rename from services/.config/systemd/user/gpg-agent.service
rename to services/systemd/.config/systemd/user/gpg-agent.service
diff --git a/services/.config/systemd/user/gpg-agent.socket b/services/systemd/.config/systemd/user/gpg-agent.socket
similarity index 100%
rename from services/.config/systemd/user/gpg-agent.socket
rename to services/systemd/.config/systemd/user/gpg-agent.socket
diff --git a/services/.config/systemd/user/mbsync.service b/services/systemd/.config/systemd/user/mbsync.service
similarity index 100%
rename from services/.config/systemd/user/mbsync.service
rename to services/systemd/.config/systemd/user/mbsync.service
diff --git a/services/.config/systemd/user/mbsync.timer b/services/systemd/.config/systemd/user/mbsync.timer
similarity index 100%
rename from services/.config/systemd/user/mbsync.timer
rename to services/systemd/.config/systemd/user/mbsync.timer
diff --git a/services/.config/systemd/user/sockets.target.wants/dirmngr.socket b/services/systemd/.config/systemd/user/sockets.target.wants/dirmngr.socket
similarity index 100%
rename from services/.config/systemd/user/sockets.target.wants/dirmngr.socket
rename to services/systemd/.config/systemd/user/sockets.target.wants/dirmngr.socket
diff --git a/services/.config/systemd/user/sockets.target.wants/gpg-agent-browser.socket b/services/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-browser.socket
similarity index 100%
rename from services/.config/systemd/user/sockets.target.wants/gpg-agent-browser.socket
rename to services/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-browser.socket
diff --git a/services/.config/systemd/user/sockets.target.wants/gpg-agent-extra.socket b/services/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-extra.socket
similarity index 100%
rename from services/.config/systemd/user/sockets.target.wants/gpg-agent-extra.socket
rename to services/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-extra.socket
diff --git a/services/.config/systemd/user/sockets.target.wants/gpg-agent-ssh.socket b/services/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-ssh.socket
similarity index 100%
rename from services/.config/systemd/user/sockets.target.wants/gpg-agent-ssh.socket
rename to services/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-ssh.socket
diff --git a/services/.config/systemd/user/sockets.target.wants/gpg-agent.socket b/services/systemd/.config/systemd/user/sockets.target.wants/gpg-agent.socket
similarity index 100%
rename from services/.config/systemd/user/sockets.target.wants/gpg-agent.socket
rename to services/systemd/.config/systemd/user/sockets.target.wants/gpg-agent.socket
diff --git a/services/.config/systemd/user/timers.target.wants/mbsync.timer b/services/systemd/.config/systemd/user/timers.target.wants/mbsync.timer
similarity index 100%
rename from services/.config/systemd/user/timers.target.wants/mbsync.timer
rename to services/systemd/.config/systemd/user/timers.target.wants/mbsync.timer
diff --git a/services/.local/share/services/git-sync b/services/systemd/.local/share/services/git-sync
similarity index 100%
rename from services/.local/share/services/git-sync
rename to services/systemd/.local/share/services/git-sync
diff --git a/services/.local/share/services/x-started-confirm.sh b/services/systemd/.local/share/services/x-started-confirm.sh
similarity index 100%
rename from services/.local/share/services/x-started-confirm.sh
rename to services/systemd/.local/share/services/x-started-confirm.sh