Merge branch 'master' into treewide-init-maintainers

modules/lazygit/hm.nix

@@ -3,9 +3,6 @@
   lib,
   ...
 }:
-let
-  colors = config.lib.stylix.colors.withHashtag;
-in
 {
   options.stylix.targets.lazygit.enable =
     config.lib.stylix.mkEnableTarget "lazygit" true;
@@ -13,22 +10,23 @@ in
   config =
     lib.mkIf (config.stylix.enable && config.stylix.targets.lazygit.enable)
       {
-        programs.lazygit.settings.gui.theme = {
-          activeBorderColor = [
-            colors.base07
-            "bold"
-          ];
-          inactiveBorderColor = [ colors.base04 ];
-          searchingActiveBorderColor = [
-            colors.base02
-            "bold"
-          ];
-          optionsTextColor = [ colors.base06 ];
-          selectedLineBgColor = [ colors.base03 ];
-          cherryPickedCommitBgColor = [ colors.base02 ];
-          cherryPickedCommitFgColor = [ colors.base03 ];
-          unstagedChangesColor = [ colors.base08 ];
-          defaultFgColor = [ colors.base05 ];
-        };
+        programs.lazygit.settings.gui.theme =
+          with config.lib.stylix.colors.withHashtag; {
+            activeBorderColor = [
+              base07
+              "bold"
+            ];
+            inactiveBorderColor = [ base04 ];
+            searchingActiveBorderColor = [
+              base02
+              "bold"
+            ];
+            optionsTextColor = [ base06 ];
+            selectedLineBgColor = [ base03 ];
+            cherryPickedCommitBgColor = [ base02 ];
+            cherryPickedCommitFgColor = [ base03 ];
+            unstagedChangesColor = [ base08 ];
+            defaultFgColor = [ base05 ];
+          };
       };
 }

modules/lazygit/meta.nix

@@ -4,4 +4,6 @@
     mateusauler
     naho
   ];
+
+  name = "Lazygit";
 }