From 1fc7d1cd87295494959b984181975e8a2fbda03e Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 19 Oct 2025 21:54:10 -0400
Subject: [PATCH] [flake] solve home-manager eval issues

---
 homeModules/programs/git/default.nix | 67 +++++++++-------------------
 homeModules/programs/ssh/default.nix | 14 +++++-
 2 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/homeModules/programs/git/default.nix b/homeModules/programs/git/default.nix
index b8ea5d89..77c72ed9 100644
--- a/homeModules/programs/git/default.nix
+++ b/homeModules/programs/git/default.nix
@@ -21,48 +21,14 @@ in
       git = lib.mkIf cfg.enable {
         enable = true;
         package = pkgs.git;
-        aliases = {
-          a = "add -p";
-          co = "checkout";
-          cob = "checkout -b";
-          f = "fetch -p";
-          c = "commit";
-          p = "push";
-          ba = "branch -a";
-          bd = "branch -d";
-          bD = "branch -D";
-          d = "diff";
-          dc = "diff --cached";
-          ds = "diff --staged";
-          r = "restore";
-          rs = "restore --staged";
-          st = "status -sb";
-          # reset
-          soft = "reset --soft";
-          hard = "reset --hard";
-          s1ft = "soft HEAD~1";
-          h1rd = "hard HEAD~1";
-          # logging
-          lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-          plog = "log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";
-          tlog = "log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative";
-          rank = "shortlog -sn --no-merges";
-          # delete merged branches
-          bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";
-          wt = "worktree";
-        };
-        delta = {
-          enable = true;
-          options.line-numbers = true;
-        };
-        extraConfig = {
+        settings = {
           branch.sort = "-committerdate";
           column.ui = "auto";
           core.editor = lib.getExe pkgs.neovim;
           "credential \"https://git.pyrox.dev\"".username = "pyrox";
           credential.helper = "rbw";
           diff = {
-            algorithm = "histogram";
+            algorithm = "diff3";
             colorMoved = "plain";
             mnemonicPrefix = true;
             renames = true;
@@ -81,18 +47,25 @@ in
           };
           rebase.updateRefs = true;
           tag.sort = "version:refname";
+          lfs = {
+            enable = true;
+            skipSmudge = false;
+          };
+          user = {
+            email = "pyrox@pyrox.dev";
+            name = "dish";
+          };
+          signing = {
+            key = "~/.ssh/main.pub";
+            format = "ssh";
+            signByDefault = true;
+          };
         };
-        lfs = {
-          enable = true;
-          skipSmudge = false;
-        };
-        signing = {
-          key = "~/.ssh/main.pub";
-          format = "ssh";
-          signByDefault = true;
-        };
-        userEmail = "pyrox@pyrox.dev";
-        userName = "dish";
+      };
+      delta = {
+        enable = true;
+        options.line-numbers = true;
+        enableGitIntegration = true;
       };
       mergiraf = lib.mkIf cfg.enable {
         enable = true;
diff --git a/homeModules/programs/ssh/default.nix b/homeModules/programs/ssh/default.nix
index f0c7132b..ad0b97bc 100644
--- a/homeModules/programs/ssh/default.nix
+++ b/homeModules/programs/ssh/default.nix
@@ -7,8 +7,20 @@ in
   config = lib.mkIf cfg.enable {
     programs.ssh = {
       enable = true;
-      compression = true;
+      enableDefaultConfig = false;
       matchBlocks = {
+        "*" = {
+          forwardAgent = false;
+          addKeysToAgent = "no";
+          serverAliveInterval = 0;
+          serverAliveCountMax = 3;
+          hashKnownHosts = false;
+          userKnownHostsFile = "~/.ssh/known_hosts";
+          controlMaster = "no";
+          controlPath = "~/.ssh/master-%r@%n:%p";
+          controlPersist = "no";
+          compression = true;
+        };
         "marvin" = {
           hostname = "100.123.15.72";
           user = "thehedgehog";
-- 
2.51.2