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,19 +3,14 @@
   pkgs,
   ...
 }: {
-  home.packages = with pkgs; [
+  programs.git = {
-    delta # git diff viewer
-  ];
-
-  programs = {
-    git = {
     enable = true;
     lfs.enable = true;
 
     signing = {
-        key = "F68745A836CA0412";
+      # key = "F68745A836CA0412";
-        format = "openpgp";
+      # format = "openpgp";
-        signByDefault = true;
+      # signByDefault = true;
     };
 
     settings = {
@@ -34,16 +29,6 @@
       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";
       };
@@ -86,37 +71,4 @@
       # }
     ];
   };
-
-    lazygit = {
-      enable = true;
-      enableFishIntegration = true;
-      enableZshIntegration = true;
-
-      shellWrapperName = "lg";
-
-      settings = {
-        gui = {
-          useHunkModeInStagingView = false;
-
-          skipDiscardChangeWarning = false;
-          skipStashWarning = true;
-
-          animateExplosion = true; # FUCK YEAHHHHHHHHHHHHHHHHHHHHHHHHH
-
-          theme = {
-            lightTheme = false;
-            activeBorderColor = ["green" "bold"];
-            inactiveBorderColor = ["white"];
-            selectedLineBgColor = ["default"];
-          };
-        };
-
-        git.pagers = [
-          {
-            pager = "delta --dark --pager=never";
-          }
-        ];
-      };
-    };
-  };
 }