diff --git a/gnupg/.config/systemd/user/README-gpg b/gnupg/.config/systemd/user/README-gpg new file mode 100644 index 00000000..73caf316 --- /dev/null +++ b/gnupg/.config/systemd/user/README-gpg @@ -0,0 +1,3 @@ +Use this: + + systemctl --user enable dirmngr.socket gpg-agent.socket gpg-agent-ssh.socket diff --git a/systemd/.config/systemd/user/dirmngr.service b/gnupg/.config/systemd/user/dirmngr.service similarity index 100% rename from systemd/.config/systemd/user/dirmngr.service rename to gnupg/.config/systemd/user/dirmngr.service diff --git a/systemd/.config/systemd/user/dirmngr.socket b/gnupg/.config/systemd/user/dirmngr.socket similarity index 100% rename from systemd/.config/systemd/user/dirmngr.socket rename to gnupg/.config/systemd/user/dirmngr.socket diff --git a/systemd/.config/systemd/user/gpg-agent-browser.socket b/gnupg/.config/systemd/user/gpg-agent-browser.socket similarity index 100% rename from systemd/.config/systemd/user/gpg-agent-browser.socket rename to gnupg/.config/systemd/user/gpg-agent-browser.socket diff --git a/systemd/.config/systemd/user/gpg-agent-extra.socket b/gnupg/.config/systemd/user/gpg-agent-extra.socket similarity index 100% rename from systemd/.config/systemd/user/gpg-agent-extra.socket rename to gnupg/.config/systemd/user/gpg-agent-extra.socket diff --git a/systemd/.config/systemd/user/gpg-agent-ssh.socket b/gnupg/.config/systemd/user/gpg-agent-ssh.socket similarity index 100% rename from systemd/.config/systemd/user/gpg-agent-ssh.socket rename to gnupg/.config/systemd/user/gpg-agent-ssh.socket diff --git a/systemd/.config/systemd/user/gpg-agent.service b/gnupg/.config/systemd/user/gpg-agent.service similarity index 100% rename from systemd/.config/systemd/user/gpg-agent.service rename to gnupg/.config/systemd/user/gpg-agent.service diff --git a/systemd/.config/systemd/user/gpg-agent.socket b/gnupg/.config/systemd/user/gpg-agent.socket similarity index 100% rename from systemd/.config/systemd/user/gpg-agent.socket rename to gnupg/.config/systemd/user/gpg-agent.socket diff --git a/mbsync/.config/systemd/user/README-mbsync b/mbsync/.config/systemd/user/README-mbsync new file mode 100644 index 00000000..fe9d8cd7 --- /dev/null +++ b/mbsync/.config/systemd/user/README-mbsync @@ -0,0 +1,3 @@ +To enable mbsync with notmuch integration, do the following: + + systemctl --user enable mbsync.timer diff --git a/systemd/.config/systemd/user/mbsync.service b/mbsync/.config/systemd/user/mbsync.service similarity index 100% rename from systemd/.config/systemd/user/mbsync.service rename to mbsync/.config/systemd/user/mbsync.service diff --git a/systemd/.config/systemd/user/mbsync.timer b/mbsync/.config/systemd/user/mbsync.timer similarity index 100% rename from systemd/.config/systemd/user/mbsync.timer rename to mbsync/.config/systemd/user/mbsync.timer diff --git a/systemd/.config/systemd/user/README-gpg-related b/systemd/.config/systemd/user/README-gpg-related deleted file mode 100644 index 43122f56..00000000 --- a/systemd/.config/systemd/user/README-gpg-related +++ /dev/null @@ -1,66 +0,0 @@ -Socket-activated dirmngr and gpg-agent with systemd -=================================================== - -When used on a GNU/Linux system supervised by systemd, you can ensure -that the GnuPG daemons dirmngr and gpg-agent are launched -automatically the first time they're needed, and shut down cleanly at -session logout. This is done by enabling user services via -socket-activation. - -System distributors -------------------- - -The *.service and *.socket files (from this directory) should be -placed in /usr/lib/systemd/user/ alongside other user-session services -and sockets. - -To enable socket-activated dirmngr for all accounts on the system, -use: - - systemctl --user --global enable dirmngr.socket - -To enable socket-activated gpg-agent for all accounts on the system, -use: - - systemctl --user --global enable gpg-agent.socket - -Additionally, you can enable socket-activated gpg-agent ssh-agent -emulation for all accounts on the system with: - - systemctl --user --global enable gpg-agent-ssh.socket - -You can also enable restricted ("--extra-socket"-style) gpg-agent -sockets for all accounts on the system with: - - systemctl --user --global enable gpg-agent-extra.socket - -Individual users ----------------- - -A user on a system with systemd where this has not been installed -system-wide can place these files in ~/.config/systemd/user/ to make -them available. - -If a given service isn't installed system-wide, or if it's installed -system-wide but not globally enabled, individual users will still need -to enable them. For example, to enable socket-activated dirmngr for -all future sessions: - - systemctl --user enable dirmngr.socket - -To enable socket-activated gpg-agent with ssh support, do: - - systemctl --user enable gpg-agent.socket gpg-agent-ssh.socket - -These changes won't take effect until your next login after you've -fully logged out (be sure to terminate any running daemons before -logging out). - -If you'd rather try a socket-activated GnuPG daemon in an -already-running session without logging out (with or without enabling -it for all future sessions), kill any existing daemon and start the -user socket directly. For example, to set up socket-activated dirmgnr -in the current session: - - gpgconf --kill dirmngr - systemctl --user start dirmngr.socket diff --git a/systemd/.config/systemd/user/sockets.target.wants/dirmngr.socket b/systemd/.config/systemd/user/sockets.target.wants/dirmngr.socket deleted file mode 120000 index 9f549b35..00000000 --- a/systemd/.config/systemd/user/sockets.target.wants/dirmngr.socket +++ /dev/null @@ -1 +0,0 @@ -/home/prot/.config/systemd/user/dirmngr.socket \ No newline at end of file diff --git a/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-browser.socket b/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-browser.socket deleted file mode 120000 index 020d2204..00000000 --- a/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-browser.socket +++ /dev/null @@ -1 +0,0 @@ -/home/prot/.config/systemd/user/gpg-agent-browser.socket \ No newline at end of file diff --git a/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-extra.socket b/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-extra.socket deleted file mode 120000 index cf9068e4..00000000 --- a/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-extra.socket +++ /dev/null @@ -1 +0,0 @@ -/home/prot/.config/systemd/user/gpg-agent-extra.socket \ No newline at end of file diff --git a/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-ssh.socket b/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-ssh.socket deleted file mode 120000 index c8c5a019..00000000 --- a/systemd/.config/systemd/user/sockets.target.wants/gpg-agent-ssh.socket +++ /dev/null @@ -1 +0,0 @@ -/home/prot/.config/systemd/user/gpg-agent-ssh.socket \ No newline at end of file diff --git a/systemd/.config/systemd/user/sockets.target.wants/gpg-agent.socket b/systemd/.config/systemd/user/sockets.target.wants/gpg-agent.socket deleted file mode 120000 index 680ef4a0..00000000 --- a/systemd/.config/systemd/user/sockets.target.wants/gpg-agent.socket +++ /dev/null @@ -1 +0,0 @@ -/home/prot/.config/systemd/user/gpg-agent.socket \ No newline at end of file diff --git a/systemd/.config/systemd/user/timers.target.wants/mbsync.timer b/systemd/.config/systemd/user/timers.target.wants/mbsync.timer deleted file mode 120000 index bf97abb7..00000000 --- a/systemd/.config/systemd/user/timers.target.wants/mbsync.timer +++ /dev/null @@ -1 +0,0 @@ -/home/prot/.config/systemd/user/mbsync.timer \ No newline at end of file