update

4 files changed, 31 insertions, 23 deletions

diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index 0cec34e..df9231e 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -1,24 +1,14 @@
 { pkgs, ... }:
 {
-  # imports = [ ./hyprland.nix ];
+  imports = [
+    ./gnupg.nix
+    ./nh.nix
+  ];
 
   programs = {
     fish.enable = true;
     mtr.enable = true;
     dconf.enable = true;
-
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
-    nh = {
-      enable = true;
-
-      clean = {
-        enable = true;
-        extraArgs = "--keep-since 4d --keep 3";
-      };
-    };
+    ssh.startAgent = false;
   };
 }
diff --git a/modules/programs/gnupg.nix b/modules/programs/gnupg.nix
new file mode 100644
index 0000000..604781d
--- /dev/null
+++ b/modules/programs/gnupg.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryPackage = pkgs.pinentry-curses;
+
+    settings = {
+      enable-ssh-support = "";
+      ttyname = "$GPG_TTY";
+      default-cache-ttl = 60;
+      max-cache-ttl = 120;
+      allow-loopback-pinentry = "";
+    };
+  };
+}
diff --git a/modules/programs/hyprland.nix b/modules/programs/hyprland.nix
deleted file mode 100644
index befea76..0000000
--- a/modules/programs/hyprland.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, inputs, ... }:
-{
-  programs.hyprland = {
-    enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-    portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
-  };
-}
diff --git a/modules/programs/nh.nix b/modules/programs/nh.nix
new file mode 100644
index 0000000..ebb4137
--- /dev/null
+++ b/modules/programs/nh.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  programs.nh = {
+    enable = true;
+
+    clean = {
+      enable = true;
+      extraArgs = "--keep-since 4d --keep 3";
+    };
+  };
+}