♻️ [shared] Move gnome-keyring to base

hosts/pi4/default.nix

@@ -1,8 +1,4 @@
-{
+{ lib, ... }:
-  lib,
-  systemConfig,
-  ...
-}:
 
 {
   imports = with lib.custom; [
@@ -11,6 +7,4 @@
     ./hardware.nix
     ./security
   ];
-
-  system.stateVersion = systemConfig.version;
 }

hosts/pi4/security/default.nix

@@ -1,17 +1,8 @@
-{ lib, ... }:
-
 {
-  imports = with lib.custom; [
+  imports = [
-    (relativeToRoot "shared/modules/security/ssh.nix")
     ./firewall.nix
   ];
 
-  programs.gnupg.agent = {
+  programs.gnupg.agent.enableSSHSupport = true;
-    enable = true;
+  services.pcscd.enable = true;
-    enableSSHSupport = true;
-  };
-  services = {
-    pcscd.enable = true;
-    gnome.gnome-keyring.enable = true;
-  };
 }

shared/base/modules/security/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./keyring.nix
     ./sops.nix
     ./ssh.nix
   ];

shared/base/modules/security/keyring.nix

@@ -0,0 +1,3 @@
+{
+  services.gnome.gnome-keyring.enable = true;
+}

shared/desktop/modules/gnome/default.nix

@@ -21,7 +21,6 @@
   programs.dconf.enable = true; # Required for some gnome applications
 
   services = {
-    gnome.gnome-keyring.enable = true;
     gvfs.enable = true; # Gnome Virtual File-system. Required for various things in nautilus
     udev.packages = with pkgs; [ gnome-settings-daemon ];
   };