From 51319ae556cafafc272d302c57bd1ac9caf8339c Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Mon, 30 Sep 2024 12:54:12 +0400 Subject: [PATCH] Remove tmpfiles dependencies Signed-off-by: Nikolaos Karaolidis --- hosts/common/user/configs/console/gpg-agent/default.nix | 4 ---- .../common/user/configs/console/gpg-agent/import-gpg-keys.sh | 2 ++ hosts/common/user/configs/gui/gaming/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hosts/common/user/configs/console/gpg-agent/default.nix b/hosts/common/user/configs/console/gpg-agent/default.nix index 8291f0f..53e66f9 100644 --- a/hosts/common/user/configs/console/gpg-agent/default.nix +++ b/hosts/common/user/configs/console/gpg-agent/default.nix @@ -45,12 +45,10 @@ Description = "Auto-import GPG keys"; Requires = [ "sops-nix.service" - "systemd-tmpfiles-setup.service" "gpg-agent.socket" ]; After = [ "sops-nix.service" - "systemd-tmpfiles-setup.service" "gpg-agent.socket" ]; }; @@ -62,8 +60,6 @@ Install.WantedBy = [ "default.target" ]; }; - - tmpfiles.rules = [ "d ${home}/.local/share/gnupg 0700 ${user} users -" ]; }; sops.secrets = { diff --git a/hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh b/hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh index cd7e2b7..5ff16a8 100644 --- a/hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh +++ b/hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh @@ -1,3 +1,5 @@ +install -d -m 700 "${GNUPGHOME}" + for dir in "${HOME}"/.config/sops-nix/secrets/gpg-agent/*; do keyfile="${dir}/key" passfile="${dir}/pass" diff --git a/hosts/common/user/configs/gui/gaming/default.nix b/hosts/common/user/configs/gui/gaming/default.nix index 32ffa9c..15fb6aa 100644 --- a/hosts/common/user/configs/gui/gaming/default.nix +++ b/hosts/common/user/configs/gui/gaming/default.nix @@ -35,8 +35,6 @@ home-manager.users.${user} = { systemd.user = { - tmpfiles.rules = [ "d ${home}/.local/share/Steam/steamapps/common 0755 ${user} users -" ]; - services.steam-ln = let steamLn = lib.meta.getExe ( @@ -61,6 +59,8 @@ ExecStart = steamLn; Type = "oneshot"; }; + + Install.WantedBy = [ "graphical-session.target" ]; }; paths.steam-ln = {