From 2b020958ed833dbbec936aba9c0b6d32272d60e1 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Thu, 22 May 2025 19:50:11 +0200
Subject: [PATCH] :recycle: [shared] Move gnome-keyring to base

---
 hosts/pi4/default.nix                    |  8 +-------
 hosts/pi4/security/default.nix           | 15 +++------------
 shared/base/modules/security/default.nix |  1 +
 shared/base/modules/security/keyring.nix |  3 +++
 shared/desktop/modules/gnome/default.nix |  1 -
 5 files changed, 8 insertions(+), 20 deletions(-)
 create mode 100644 shared/base/modules/security/keyring.nix

diff --git a/hosts/pi4/default.nix b/hosts/pi4/default.nix
index eeebb93..7c4b105 100644
--- a/hosts/pi4/default.nix
+++ b/hosts/pi4/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  systemConfig,
-  ...
-}:
+{ lib, ... }:
 
 {
   imports = with lib.custom; [
@@ -11,6 +7,4 @@
     ./hardware.nix
     ./security
   ];
-
-  system.stateVersion = systemConfig.version;
 }
diff --git a/hosts/pi4/security/default.nix b/hosts/pi4/security/default.nix
index 540dbfd..5aad9ee 100644
--- a/hosts/pi4/security/default.nix
+++ b/hosts/pi4/security/default.nix
@@ -1,17 +1,8 @@
-{ lib, ... }:
-
 {
-  imports = with lib.custom; [
-    (relativeToRoot "shared/modules/security/ssh.nix")
+  imports = [
     ./firewall.nix
   ];
 
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-  services = {
-    pcscd.enable = true;
-    gnome.gnome-keyring.enable = true;
-  };
+  programs.gnupg.agent.enableSSHSupport = true;
+  services.pcscd.enable = true;
 }
diff --git a/shared/base/modules/security/default.nix b/shared/base/modules/security/default.nix
index 02f28b8..707d0f9 100644
--- a/shared/base/modules/security/default.nix
+++ b/shared/base/modules/security/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./keyring.nix
     ./sops.nix
     ./ssh.nix
   ];
diff --git a/shared/base/modules/security/keyring.nix b/shared/base/modules/security/keyring.nix
new file mode 100644
index 0000000..9dd1656
--- /dev/null
+++ b/shared/base/modules/security/keyring.nix
@@ -0,0 +1,3 @@
+{
+  services.gnome.gnome-keyring.enable = true;
+}
diff --git a/shared/desktop/modules/gnome/default.nix b/shared/desktop/modules/gnome/default.nix
index 982be65..fa7cfa6 100644
--- a/shared/desktop/modules/gnome/default.nix
+++ b/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 ];
   };