From 8f6c8bc3384bfafd44ede9dfd6e0c02a51fb0ebd Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 27 May 2025 12:11:21 +0200 Subject: [PATCH] common/gnome-keyring: move to session.slice --- home/services/gnome-keyring.nix | 9 +++++++-- hosts/common/default.nix | 3 +-- hosts/common/services/gnome-keyring.nix | 9 +++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 hosts/common/services/gnome-keyring.nix diff --git a/home/services/gnome-keyring.nix b/home/services/gnome-keyring.nix index e11bdee..1492ddf 100644 --- a/home/services/gnome-keyring.nix +++ b/home/services/gnome-keyring.nix @@ -1,4 +1,9 @@ -{ machineVars, ... }: +{ config, lib, machineVars, ... }: +let + cfg = config.services.gnome-keyring; +in { services.gnome-keyring.enable = !machineVars.headless; -} \ No newline at end of file + + systemd.user.services.gnome-keyring.Service.Slice = lib.mkIf cfg.enable "session.slice"; +} diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 87b9040..955a907 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -19,6 +19,7 @@ in { ./services/display-manager.nix ./services/docker.nix ./services/fwupd.nix + ./services/gnome-keyring.nix ./services/irqbalance.nix ./services/journald.nix ./services/libinput.nix @@ -140,8 +141,6 @@ in { }; services = { - gnome.gnome-keyring.enable = !config.machineVars.headless; - udev.packages = with pkgs; [ yubikey-personalization android-udev-rules diff --git a/hosts/common/services/gnome-keyring.nix b/hosts/common/services/gnome-keyring.nix new file mode 100644 index 0000000..bddcf96 --- /dev/null +++ b/hosts/common/services/gnome-keyring.nix @@ -0,0 +1,9 @@ +{ config, lib, ... }: +let + cfg = config.services.gnome.gnome-keyring; +in +{ + services.gnome.gnome-keyring.enable = !config.machineVars.headless; + + systemd.user.services.gnome-keyring.serviceConfig.Slice = lib.mkIf cfg.enable "session.slice"; +}