home-manager tweaks

1 files changed, 24 insertions, 2 deletions

diff --git a/users/root.nix b/users/root.nix
index c6e7d712..24a5ae94 100644
--- a/users/root.nix
+++ b/users/root.nix
@@ -12,8 +12,30 @@ in {
   };
 
   home-manager.users.${userName} = {
-    programs = lib.mkIf haveGKleen {
-      inherit (config.home-manager.users.gkleen.programs) git ssh gpg;
+    programs = {
+      git = {
+        enable = true;
+        userEmail = "gkleen@yggdrasil.li";
+        userName = "Gregor Kleen";
+        delta.enable = true;
+        extraConfig = {
+          pull.rebase = false;
+        };
+      };
+
+      ssh = {
+        enable = true;
+        controlMaster = "auto";
+        controlPersist = "30m";
+        serverAliveInterval = 6;
+        hashKnownHosts = true;
+        extraConfig = ''
+          IdentitiesOnly true
+          ServerAliveCountMax 10
+        '';
+      };
+
+      gpg.enable = true;
     };
 
     services = {