diff --git a/modules/home/services/default.nix b/modules/home/services/default.nix index f603630..e3bdde4 100644 --- a/modules/home/services/default.nix +++ b/modules/home/services/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./gnome-keyring.nix ./swaybg.nix ./swaync.nix ]; diff --git a/modules/home/services/gnome-keyring.nix b/modules/home/services/gnome-keyring.nix new file mode 100644 index 0000000..4125c7e --- /dev/null +++ b/modules/home/services/gnome-keyring.nix @@ -0,0 +1,21 @@ +{ + marleylib, + config, + osConfig, + lib, + ... +}: let + inherit (marleylib.module) mkEnableOption'; + + cfg = config.marleyos.services.gnome-keyring; + osCfg = osConfig.marleyos.services.gnome-keyring; +in { + options.marleyos.services.gnome-keyring.enable = + mkEnableOption' "gnome-keyring" osCfg.enable; + + config = lib.mkIf cfg.enable { + services.gnome-keyring = { + enable = true; + }; + }; +} diff --git a/modules/home/shell/niri.nix b/modules/home/shell/niri.nix index 6d999f0..b548669 100644 --- a/modules/home/shell/niri.nix +++ b/modules/home/shell/niri.nix @@ -32,6 +32,7 @@ in { xwayland-satellite = enabled; }; services = { + gnome-keyring = enabled; swaybg = enabled; swaync = enabled; }; diff --git a/modules/nixos/shell/niri.nix b/modules/nixos/shell/niri.nix index fcaa6ae..82ec246 100644 --- a/modules/nixos/shell/niri.nix +++ b/modules/nixos/shell/niri.nix @@ -19,6 +19,9 @@ in { programs = { waybar = enabled; }; + services = { + gnome-keyring = enabled; + }; }; programs.niri = { diff --git a/snowflake/modules/home/services/gnome-keyring/default.nix b/snowflake/modules/home/services/gnome-keyring/default.nix deleted file mode 100644 index 2826705..0000000 --- a/snowflake/modules/home/services/gnome-keyring/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - lib, - config, - ... -}: let - cfg = config.marleyos.services.gnome-keyring; -in { - options.marleyos.services.gnome-keyring.enable = lib.mkEnableOption "gnome-keyring"; - - config = lib.mkIf cfg.enable { - services.gnome-keyring = { - enable = true; - }; - }; -}