2 files changed, 52 insertions, 30 deletions

diff --git a/home-manager/default.nix b/home-manager/default.nix
index 6716682..f5efd4a 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -92,6 +92,7 @@
         EDITOR = "hx";
       };
     };
+
     programs = {
         ssh.matchBlocks = {
           serverAliveCountMax = 6;
@@ -103,6 +104,16 @@
             port = 2200;
           };
         };
+        git = {
+          enable = true;
+          userName = "Devin Finlinson";
+          userEmail = "devin.finlinson@pm.me";
+          includes = [{path = "~/.gitconfig.local";}];
+          extraConfig = {
+            editor = "hx";
+            pull = {rebase = false;};
+          };
+        };
 
       # Let Home Manager install and manage itself.
       # home-manager.enable = true;
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 607999e..a5a9298 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -173,42 +173,53 @@
         loadAutoconfig = true;      
       };
 
-        ssh = {
-          matchBlocks = {
-            serverAliveCountMax = 6;
-            serverAliveInterval = 30;
-            port  = 2200;
-            "doretta" = { 
-              forwardAgent = true;
-              setEnv = {
-                EDITOR = "hx";
-              };
-            };
-            "bosco" = { 
-              forwardAgent = true;
-              setEnv = {
-                EDITOR = "hx";
-              };
+      git = {
+        enable = true;
+        userName = "Devin Finlinson";
+        userEmail = "devin.finlinson@pm.me";
+        includes = [{path = "~/.gitconfig.local";}];
+        extraConfig = {
+          editor = "hx";
+          pull = {rebase = false;};
+        };
+      };
+
+      ssh = {
+        matchBlocks = {
+          serverAliveCountMax = 6;
+          serverAliveInterval = 30;
+          port  = 2200;
+          "doretta" = { 
+            forwardAgent = true;
+            setEnv = {
+              EDITOR = "hx";
             };
-            "zenbook" = { 
-              forwardAgent = true;
-              setEnv = {
-                EDITOR = "hx";
-              };
+          };
+          "bosco" = { 
+            forwardAgent = true;
+            setEnv = {
+              EDITOR = "hx";
             };
-            "khad" = { 
-              forwardAgent = true;
-              setEnv = {
-                EDITOR = "hx";
-              };
+          };
+          "zenbook" = { 
+            forwardAgent = true;
+            setEnv = {
+              EDITOR = "hx";
             };
-            "git.wormcar.gay" = {
-              user = "devinf";
-              host = "git.wormcar.gay";
-              port = 2200;
+          };
+          "khad" = { 
+            forwardAgent = true;
+            setEnv = {
+              EDITOR = "hx";
             };
           };
+          "git.wormcar.gay" = {
+            user = "devinf";
+            host = "git.wormcar.gay";
+            port = 2200;
+          };
         };
+      };
 
       # Let Home Manager install and manage itself.
       # home-manager.enable = true;