Detangle gpg-agent enablement from X up and enable extra socket

9 files changed, 28 insertions, 21 deletions

diff --git a/home/nipsy/arrakis.nix b/home/nipsy/arrakis.nix
index 1504ecb..2776524 100644
--- a/home/nipsy/arrakis.nix
+++ b/home/nipsy/arrakis.nix
@@ -4,6 +4,7 @@
     common/core
     #common/optional/desktops
     #common/optional/desktops/services/xscreensaver.nix
+    common/optional/secrets.nix
     #inputs.sops-nix.homeManagerModules.sops
   ];
 
diff --git a/home/nipsy/caladan.nix b/home/nipsy/caladan.nix
index 4b2a655..45ca9a2 100644
--- a/home/nipsy/caladan.nix
+++ b/home/nipsy/caladan.nix
@@ -5,6 +5,7 @@
     common/optional/desktops
     common/optional/desktops/services/xscreensaver.nix
     common/optional/desktops/xdg.nix
+    common/optional/secrets.nix
     #inputs.sops-nix.homeManagerModules.sops
   ];
 
diff --git a/home/nipsy/common/optional/desktops/default.nix b/home/nipsy/common/optional/desktops/default.nix
index 5f5b4b0..d42e587 100644
--- a/home/nipsy/common/optional/desktops/default.nix
+++ b/home/nipsy/common/optional/desktops/default.nix
@@ -1,4 +1,3 @@
-{ config, pkgs, ... }:
 {
   imports = [
     ./fonts.nix
@@ -6,23 +5,4 @@
     ./i3
     ./services/dunst.nix
   ];
-
-  programs.password-store = {
-    enable = true;
-    package =  pkgs.pass.withExtensions (exts: [
-      exts.pass-otp
-    ]);
-    settings = {
-      PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
-    };
-  };
-
-  services.gpg-agent = {
-    defaultCacheTtl = 43200;
-    defaultCacheTtlSsh = 43200;
-    enable = true;
-    enableSshSupport = true;
-    maxCacheTtl = 86400;
-    maxCacheTtlSsh = 86400;
-  };
 }
diff --git a/home/nipsy/common/optional/secrets.nix b/home/nipsy/common/optional/secrets.nix
new file mode 100644
index 0000000..24ea99c
--- /dev/null
+++ b/home/nipsy/common/optional/secrets.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+{
+  programs.password-store = {
+    enable = true;
+    package =  pkgs.pass.withExtensions (exts: [
+      exts.pass-otp
+    ]);
+    settings = {
+      PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
+    };
+  };
+
+  services.gpg-agent = {
+    defaultCacheTtl = 43200;
+    defaultCacheTtlSsh = 43200;
+    enable = true;
+    enableExtraSocket = true;
+    enableSshSupport = true;
+    maxCacheTtl = 86400;
+    maxCacheTtlSsh = 86400;
+  };
+}
diff --git a/home/nipsy/fangorn.nix b/home/nipsy/fangorn.nix
index cee431b..4a50c81 100644
--- a/home/nipsy/fangorn.nix
+++ b/home/nipsy/fangorn.nix
@@ -5,5 +5,6 @@
     common/optional/desktops
     common/optional/desktops/services/blueman-applet.nix
     common/optional/desktops/services/xscreensaver.nix
+    common/optional/secrets.nix
   ];
 }
diff --git a/home/nipsy/ginaz.nix b/home/nipsy/ginaz.nix
index 0cf807d..fb3ac3b 100644
--- a/home/nipsy/ginaz.nix
+++ b/home/nipsy/ginaz.nix
@@ -11,6 +11,7 @@
     common/optional/desktops/services/blueman-applet.nix
     common/optional/desktops/services/xscreensaver.nix
     common/optional/desktops/xdg.nix
+    common/optional/secrets.nix
     #inputs.sops-nix.homeManagerModules.sops
   ];
 
diff --git a/home/nipsy/kaitain.nix b/home/nipsy/kaitain.nix
index 83406e0..11813e7 100644
--- a/home/nipsy/kaitain.nix
+++ b/home/nipsy/kaitain.nix
@@ -3,6 +3,7 @@
   imports = [
     common/core
     common/optional/desktops
+    common/optional/secrets.nix
   ];
 
   home.file.".ansible.cfg".text = ''
diff --git a/home/nipsy/richese.nix b/home/nipsy/richese.nix
index 7c3e0b0..7f698d1 100644
--- a/home/nipsy/richese.nix
+++ b/home/nipsy/richese.nix
@@ -3,6 +3,7 @@
   imports = [
     common/core
     common/optional/desktops
+    common/optional/secrets.nix
   ];
 
   home.file.".ansible.cfg".text = ''
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index cac2018..58c7ee9 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -91,7 +91,6 @@
     pkgs.moc
     pkgs.nethack
     #pkgs.openttd
-    pkgs.pinentry-curses
     pkgs.prowlarr
     pkgs.qbittorrent-nox
     pkgs.radarr