flake.lock

@@ -71,8 +71,8 @@
         ]
       },
       "locked": {
-        "lastModified": 1772502318,
+        "lastModified": 1772461566,
-        "narHash": "sha256-7ZnsLuwU2/nDxWriEeccY2LvpJjPDyV13/hSKrdLFZ8=",
+        "narHash": "sha256-1Rib48xxOv5unR6KyBRs1wRoyC8MGguBno75fFGGbPs=",
         "path": "/home/me/cry/mk/cerulean",
         "type": "path"
       },

groups/cryos/programs.nix

@@ -78,6 +78,7 @@
     btop
     eza
     yazi
+    lazygit
     ripgrep
     viddy # modern `watch` command
     timg # terminal image (sixel) viewer

homes/modules/git.nix

@@ -3,120 +3,72 @@
   pkgs,
   ...
 }: {
-  home.packages = with pkgs; [
+  programs.git = {
-    delta # git diff viewer
+    enable = true;
-  ];
+    lfs.enable = true;
 
-  programs = {
+    signing = {
-    git = {
+      # key = "F68745A836CA0412";
-      enable = true;
+      # format = "openpgp";
-      lfs.enable = true;
+      # signByDefault = true;
-
-      signing = {
-        key = "F68745A836CA0412";
-        format = "openpgp";
-        signByDefault = true;
-      };
-
-      settings = {
-        user.name = "_cry64";
-        user.email = "them@dobutterfliescry.net";
-
-        alias = {
-          s = "status";
-          d = "diff";
-          l = "log";
-          c = "commit";
-          p = "push";
-        };
-
-        color.ui = true;
-        core.editor = "hx";
-        github.user = "cry128";
-
-        # delta diff viewer
-        core.pager = "delta";
-        interactive.diffFilter = "delta --color-only";
-        delta = {
-          navigate = true;
-          line-numbers = true;
-          side-by-side = true;
-        };
-        merge.conflictStyle = "zdiff3";
-
-        init = {
-          defaultBranch = "main";
-        };
-        url = {
-          "git@github.com:" = {
-            insteadOf = [
-              "gh:"
-              "github:"
-            ];
-          };
-          "https://gitlab.com/" = {
-            insteadOf = [
-              "gl:"
-              "gitlab:"
-            ];
-          };
-          "git@codeberg.org:" = {
-            insteadOf = [
-              "cb:"
-              "codeberg:"
-            ];
-          };
-          "git@tearforge.net/" = {
-            insteadOf = [
-              "cry:"
-              "forge:"
-            ];
-          };
-        };
-      };
-
-      includes = [
-        {
-          path = "/home/me/agribit/.gitconfig";
-          condition = "gitdir:/home/me/agribit/**";
-        }
-        # {
-        #   path = "/home/me/luminary/.gitconfig";
-        #   condition = "gitdir:/home/me/luminary/**";
-        # }
-      ];
     };
 
-    lazygit = {
+    settings = {
-      enable = true;
+      user.name = "_cry64";
-      enableFishIntegration = true;
+      user.email = "them@dobutterfliescry.net";
-      enableZshIntegration = true;
 
-      shellWrapperName = "lg";
+      alias = {
+        s = "status";
+        d = "diff";
+        l = "log";
+        c = "commit";
+        p = "push";
+      };
 
-      settings = {
+      color.ui = true;
-        gui = {
+      core.editor = "hx";
-          useHunkModeInStagingView = false;
+      github.user = "cry128";
 
-          skipDiscardChangeWarning = false;
+      init = {
-          skipStashWarning = true;
+        defaultBranch = "main";
-
+      };
-          animateExplosion = true; # FUCK YEAHHHHHHHHHHHHHHHHHHHHHHHHH
+      url = {
-
+        "git@github.com:" = {
-          theme = {
+          insteadOf = [
-            lightTheme = false;
+            "gh:"
-            activeBorderColor = ["green" "bold"];
+            "github:"
-            inactiveBorderColor = ["white"];
+          ];
-            selectedLineBgColor = ["default"];
+        };
-          };
+        "https://gitlab.com/" = {
+          insteadOf = [
+            "gl:"
+            "gitlab:"
+          ];
+        };
+        "git@codeberg.org:" = {
+          insteadOf = [
+            "cb:"
+            "codeberg:"
+          ];
+        };
+        "git@tearforge.net/" = {
+          insteadOf = [
+            "cry:"
+            "forge:"
+          ];
         };
-
-        git.pagers = [
-          {
-            pager = "delta --dark --pager=never";
-          }
-        ];
       };
     };
+
+    includes = [
+      {
+        path = "/home/me/agribit/.gitconfig";
+        condition = "gitdir:/home/me/agribit/**";
+      }
+      # {
+      #   path = "/home/me/luminary/.gitconfig";
+      #   condition = "gitdir:/home/me/luminary/**";
+      # }
+    ];
   };
 }