fix(home/wm): unlock gnome-keyring when logging

3 files changed, 19 insertions, 17 deletions

diff --git a/home/wm/default.nix b/home/wm/default.nix
index 0125dd1..92d450a 100644
--- a/home/wm/default.nix
+++ b/home/wm/default.nix
@@ -1,14 +1,6 @@
-{ config, lib, pkgs, ... }:
-let
-  mkRelatedOption = description: relatedWMs:
-    let isActivatedWm = wm: config.my.home.wm.windowManager == wm;
-    in
-    (lib.mkEnableOption description) // {
-      default = builtins.any isActivatedWm relatedWMs;
-    };
-in
+{ lib, ... }:
 {
-  imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ];
+  imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ./gnome ];
   options.my.home.wm = with lib; {
     windowManager = mkOption {
       type = with types; nullOr (enum [ "sway" ]);
@@ -16,6 +8,5 @@ in
       example = "sway";
       description = "Which window manager to use for home session";
     };
-    waybar = { enable = mkRelatedOption "waybar configuration" [ "sway" ]; };
   };
 }
diff --git a/home/wm/gnome/default.nix b/home/wm/gnome/default.nix
new file mode 100644
index 0000000..0b14a0b
--- /dev/null
+++ b/home/wm/gnome/default.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+let
+  isEnabled = config.my.home.wm.windowManager == "sway";
+in
+{
+  config = lib.mkIf isEnabled {
+    home.packages = with pkgs; [ gnome.gnome-keyring ];
+    services.gnome-keyring = {
+      enable = true;
+      components = [
+        "pkcs11"
+        "secrets"
+        "ssh"
+      ];
+    };
+  };
+}
diff --git a/modules/services/gnome/default.nix b/modules/services/gnome/default.nix
index 0ea32d2..392496a 100644
--- a/modules/services/gnome/default.nix
+++ b/modules/services/gnome/default.nix
@@ -17,12 +17,6 @@ in
         enable = true;
         package = pkgs.gnome.gvfs;
       };
-
-      gnome = {
-        gnome-keyring.enable = true;
-        # !https://github.com/NixOS/nixpkgs/issues/16327
-        at-spi2-core.enable = true;
-      };
     };
   };
 }