options/custom/programs/seahorse.nix

@@ -10,5 +10,6 @@ in {
 
   config = mkIf cfg.enable {
     programs.seahorse.enable = true;
+    services.gnome.gnome-keyring.enable = true;
   };
 }

options/custom/services/default.nix

@@ -47,7 +47,6 @@ with lib; {
       swaync.enable = true;
       swayosd.enable = true;
       #// xembed-sni-proxy.enable = true;
-      zerotierone.enable = true;
     })
   ];
 }

options/custom/services/gnome-keyring.nix

@@ -8,10 +8,9 @@ with lib; let
 in {
   options.custom.services.gnome-keyring.enable = mkOption {default = false;};
 
-  config = mkIf cfg.enable {
+  config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
     # https://wiki.archlinux.org/title/GNOME/Keyring
     # https://gitlab.gnome.org/GNOME/gnome-keyring
-    services.gnome.gnome-keyring.enable = true;
-    home-manager.users.${config.custom.username}.services.gnome-keyring.enable = true;
+    services.gnome-keyring.enable = true;
   };
 }

options/custom/services/greetd.nix

@@ -33,9 +33,6 @@ in {
       };
     };
 
-    # Use password at login to unlock keyring
-    security.pam.services.greetd.fprintAuth = false;
-
     # Attempt to prevent bootlogs from polluting the tty
     # https://github.com/apognu/tuigreet/issues/68
     systemd.services.greetd.serviceConfig = {
@@ -47,5 +44,8 @@ in {
       TTYVHangup = true;
       TTYVTDisallocate = true;
     };
+
+    # FIXME: Does not unlock at login
+    security.pam.services.greetd.enableGnomeKeyring = true; # Allow PAM unlocking
   };
 }

options/custom/services/zerotierone.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.custom.services.zerotierone;
-in {
-  options.custom.services.zerotierone.enable = mkOption {default = false;};
-
-  config = mkIf cfg.enable {
-    #!! Configuration is imperative
-    # https://www.zerotier.com/
-    # https://github.com/zerotier/ZeroTierOne
-    services.zerotierone = {
-      enable = true;
-    };
-  };
-}