Modules/Lazygit: Move lazygit config to module

home/christoph/default.nix

@@ -211,6 +211,7 @@
 
     hyprpanel.enable = !headless;
     kitty.enable = !headless;
+    lazygit.enable = true;
     mpd.enable = !headless;
 
     neovim = {
@@ -596,39 +597,6 @@
       keys = ["id_ed25519"];
     };
 
-    lazygit = {
-      enable = true;
-      settings = {
-        notARepository = "quit";
-        timeFormat = "2022-12-31";
-        shortTimeFormat = "23:49";
-        border = "rounded";
-        update.method = "never";
-
-        git = {
-          overrideGpg = true; # Allow editing past signed commits
-          branchLogCmd = "git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an  %ar%C(auto)  %D%n%s%n'";
-          parseEmoji = true;
-        };
-
-        gui = {
-          nerdFontsVersion = "3"; # Show icons
-
-          theme = {
-            lightTheme = false;
-            activeBorderColor = ["#40a02b" "bold"];
-            inactiveBorderColor = ["#4c4f69"];
-            optionsTextColor = ["#1e66f5"];
-            selectedLineBgColor = ["#ccd0da"];
-            selectedRangeBgColor = ["#ccd0da"];
-            cherryPickedCommitBgColor = ["#179299"];
-            cherryPickedCommitFgColor = ["#1e66f5"];
-            unstagedChangeColor = ["red"];
-          };
-        };
-      };
-    };
-
     mpv = {
       enable = false;
       config = {

home/modules/default.nix

@@ -15,6 +15,7 @@
     ./hyprland
     ./hyprpanel
     ./kitty
+    ./lazygit
     ./mpd
     ./neovim
     ./nnn

home/modules/lazygit/default.nix

@@ -0,0 +1,47 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules) lazygit color;
+in {
+  options.modules.lazygit = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf lazygit.enable {
+    programs.lazygit = {
+      enable = true;
+      settings = {
+        notARepository = "quit";
+        timeFormat = "2022-12-31";
+        shortTimeFormat = "23:49";
+        border = "rounded";
+        update.method = "never";
+
+        git = {
+          overrideGpg = true; # Allow editing past signed commits
+          branchLogCmd = "git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an  %ar%C(auto)  %D%n%s%n'";
+          parseEmoji = true;
+        };
+
+        gui = {
+          nerdFontsVersion = "3"; # Show icons
+
+          theme = {
+            lightTheme = false;
+            activeBorderColor = [color.hexS.accent "bold"];
+            inactiveBorderColor = [color.hexS.overlay0];
+            optionsTextColor = [color.hexS.accentDim];
+            selectedLineBgColor = [color.hexS.accentDim];
+            selectedRangeBgColor = [color.hexS.accentDim];
+            cherryPickedCommitBgColor = ["#179299"];
+            cherryPickedCommitFgColor = ["#1e66f5"];
+            unstagedChangeColor = ["red"];
+          };
+        };
+      };
+    };
+  };
+}

home/modules/lazygit/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable lazygit";
+}