add ssh automatic signing through ssh

1 files changed, 13 insertions, 3 deletions

diff --git a/users/leonardo.nix b/users/leonardo.nix
index 4795223..d485e8f 100644
--- a/users/leonardo.nix
+++ b/users/leonardo.nix
@@ -1,4 +1,9 @@
 { pkgs, config, inputs, ... }:
+let
+  all-keys = import ../secrets/pub-ssh-keys.nix;
+  sshkeys = all-keys.${config.networking.hostName};
+  user-key = sshkeys.user;
+in
 {
   imports = [
     ../modules/gnome.nix
@@ -107,7 +112,7 @@
       extraGroups = [ "networkmanager" "wheel" ];
       shell = pkgs.bashInteractive;
       hashedPasswordFile = config.age.secrets.user-pass.path;
-      openssh.authorizedKeys.keys = builtins.attrValues (import ../secrets/hosts-pub-keys.nix);
+      openssh.authorizedKeys.keys = builtins.concatLists (map builtins.attrValues (builtins.attrValues all-keys));
     };
 
     age.secrets = {
@@ -227,9 +232,14 @@
             enable = true;
             diff-so-fancy.enable = true;
             extraConfig = {
-              user.name = "Leonardo Santiago";
-              user.email = "[email protected]";
+              user = {
+                name = "Leonardo Santiago";
+                email = "[email protected]";
+                signingkey = user-key;
+              };
               color.ui = true;
+              gpg.format = "ssh";
+              commit.gpgsign = true;
             };
           };
           mu.enable = true;