further gpg-ssh edits

home-modules/gpg.nix

@@ -1,11 +1,5 @@
-{ pkgs, ... }@all: with all;
+{ pkgs, ... }@all: with all; {
-{
+  home.packages = with pkgs; [ pinentry-all ];
-  # there also is a system module
-  home.packages = with pkgs; [
-    gpg-tui
-    pinentry-all
-  ];
-
   programs.gpg = {
     enable = true;
     package = pkgs.gnupg;
@@ -33,4 +27,24 @@
       with-fingerprint = true;
     };
   };
+  services.gpg-agent = let 
+    min2sec = min: (min * 60);
+  in {
+    enable = false;
+    verbose = true;
+    sshKeys = [
+      "97081264F7FD72D890D496E839AA9A4C7892A7D8" # Keygrip (not Fingerprint!) of [A] Subkey
+    ];
+    enableSshSupport = true;
+    enableFishIntegration = true;
+    defaultCacheTtlSsh = min2sec 60;
+    defaultCacheTtl = min2sec 30;
+    pinentry = {
+      package = pkgs.pinentry;
+      program = "pinentry";
+    };
+    extraConfig = ''
+      allow-loopback-pinentry
+    '';
+  };
 }

home-modules/ssh.nix

@@ -1,7 +1,9 @@
 { pkgs, ... }@all: with all; {
+  home.packages = with pkgs; [ sshfs ];
   programs.ssh = {
     enable = true;
     package = pkgs.openssh;
+    addKeysToAgent = "yes";
     matchBlocks = let
       nxace = name: {
         host = name;
@@ -21,33 +23,9 @@
       };
     };
   };
-  home.packages = with pkgs; [ sshfs ];
+  services.ssh-agent = {
-
+    enable = true;
-  services = {
+    # socket = "ssh-agent"; # suffix to $XDG_RUNTIME_DIR
-    ssh-agent = {
+    # package = pkgs.openssh;
-      enable = true;
-      # socket = "ssh-agent"; # suffix to $XDG_RUNTIME_DIR
-      # package = pkgs.openssh;
-    };
-    gpg-agent = let 
-      min2sec = min: (min * 60);
-    in {
-      enable = false;
-      verbose = true;
-      sshKeys = [
-        "97081264F7FD72D890D496E839AA9A4C7892A7D8" # Keygrip (not Fingerprint!) of [A] Subkey
-      ];
-      enableSshSupport = true;
-      enableFishIntegration = true;
-      defaultCacheTtlSsh = min2sec 60;
-      defaultCacheTtl = min2sec 30;
-      pinentry = {
-        package = pkgs.pinentry;
-        program = "pinentry";
-      };
-      extraConfig = ''
-        allow-loopback-pinentry
-      '';
-    };
   };
 }