From c69697bbd3b41dc2200c1f761a316e4b1f810e45 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 4 Mar 2026 19:45:03 +0100
Subject: [PATCH] fixes cli tools config

---
 modules/cli-tools/default.nix | 39 ++++++++++++++++++++++++--
 modules/git/default.nix       | 52 +++++++++++++++++------------------
 2 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/modules/cli-tools/default.nix b/modules/cli-tools/default.nix
index 54cff99..80dff42 100644
--- a/modules/cli-tools/default.nix
+++ b/modules/cli-tools/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 let
   commonPackages =
     pkgs: with pkgs; [
@@ -15,7 +15,6 @@ let
       just
       mmv-go
       usbutils
-      lazygit
       opencode
     ];
 in
@@ -24,11 +23,47 @@ in
     { pkgs, ... }:
     {
       environment.systemPackages = commonPackages pkgs;
+
+      home-manager.sharedModules = [
+        inputs.self.modules.homeManager.git
+      ];
     };
 
   flake.modules.darwin.cli-tools =
     { pkgs, ... }:
     {
       environment.systemPackages = commonPackages pkgs;
+
+      home-manager.sharedModules = [
+        inputs.self.modules.homeManager.git
+      ];
+    };
+
+  flake.modules.homeManager.cli-tools =
+    { pkgs, ... }:
+    {
+      programs.lazygit = {
+        enable = true;
+        settings = {
+          gui = {
+            nerdFontsVersion = "3";
+            theme = {
+              lightTheme = false;
+              activeBorderColor = [
+                "magenta"
+                "bold"
+              ];
+              searchingActiveBorderColor = [
+                "cyan"
+                "bold"
+              ];
+              inactiveBorderColor = [ "#807c9f" ];
+              optionsTextColor = [ "#807c9f" ];
+              selectedLineBgColor = [ "#331531" ];
+              inactiveViewSelectedLineBgColor = [ "#1d202f" ];
+            };
+          };
+        };
+      };
     };
 }
diff --git a/modules/git/default.nix b/modules/git/default.nix
index 7d51347..8adfbc7 100644
--- a/modules/git/default.nix
+++ b/modules/git/default.nix
@@ -4,7 +4,7 @@
     { pkgs, ... }:
     {
       environment.systemPackages = with pkgs; [
-      	git
+        git
       ];
 
       home-manager.sharedModules = [
@@ -16,7 +16,7 @@
     { pkgs, ... }:
     {
       environment.systemPackages = with pkgs; [
-      	git
+        git
       ];
 
       home-manager.sharedModules = [
@@ -24,35 +24,35 @@
       ];
     };
 
-    flake.modules.homeManager.git =
+  flake.modules.homeManager.git =
     { pkgs, config, ... }:
     {
-	    programs.git = {
-		    enable = true;
-		    settings = {
-			    init = {
-				    defaultBranch = "main";
-			    };
+      programs.git = {
+        enable = true;
+        settings = {
+          init = {
+            defaultBranch = "main";
+          };
 
-			    core = {
-				    ignorecase = "false";
-			    };
+          core = {
+            ignorecase = "false";
+          };
 
-			    pull = {
-				    rebase = false;
-			    };
+          pull = {
+            rebase = false;
+          };
 
-			    push = {
-				    autoSetupRemote = true;
-			    };
+          push = {
+            autoSetupRemote = true;
+          };
 
-			    user = {
-			    # TODO get from config
-				    name = "Dennis Schoepf";
-				    email = "me@dnsc.io";
-			    };
-		    };
-		    ignores = [ ".DS_Store" ];
-	    };
+          user = {
+            # TODO get from config
+            name = "Dennis Schoepf";
+            email = "me@dnsc.io";
+          };
+        };
+        ignores = [ ".DS_Store" ];
+      };
     };
 }