Merge branch 'ssh-agent'

rake5k · Jun 29, 2024 · 7b628cb · 7b628cb
2 parents 1cb40a4 + 1486855
commit 7b628cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/home/programs/ssh/default.nix b/home/programs/ssh/default.nix
@@ -33,9 +33,12 @@ in
     homeage.file = listToAttrs (map mkHomeageFile cfg.identities);
     programs.ssh = {
       enable = true;
+      addKeysToAgent = "yes";
       controlMaster = "auto";
       controlPath = "~/.ssh/master-%r@%n:%p";
       controlPersist = "10m";
     };
+
+    services.ssh-agent.enable = true;
   };
 }
diff --git a/home/roles/desktop/default.nix b/home/roles/desktop/default.nix
@@ -110,6 +110,7 @@ in
       gnome.gnome-characters
       gnome.nautilus
       gnome.pomodoro
+      gnome.seahorse
       mupdf
       peek
       gifski

diff --git a/home/users/christian/git/default.nix b/home/users/christian/git/default.nix
@@ -24,6 +24,7 @@ in
 
     programs.git = {
       enable = true;
+      package = pkgs.gitFull;
       lfs.enable = true;
       userName = "Christian Harke";
       signing.key = "630966F4";
@@ -47,6 +48,7 @@ in
       };
 
       extraConfig = {
+        credential.helper = "${pkgs.gitFull}/share/git/contrib/credential/libsecret/git-credential-libsecret";
         maintenance.repo = [
           "${config.home.homeDirectory}/.nix-config"
           "${config.home.homeDirectory}/code/nixcfg"

diff --git a/home/users/christian/gpg/default.nix b/home/users/christian/gpg/default.nix
@@ -18,13 +18,8 @@ in
   };
 
   config = mkIf cfg.enable {
-
-    home.file.".gnupg/gpg-agent.conf" = {
-      text = ''
-        pinentry-program ${getExe pinentryPkg}
-      '';
-    };
-
     programs.gpg.enable = true;
+
+    services.gpg-agent.pinentryPackage = pinentryPkg;
   };
 }