dec

home-manager/shared/programs/shell/git.nix

@@ -2,26 +2,28 @@
 {
   programs.git = {
     enable = true;
-    userEmail = "cjriddz@protonmail.com";
-    userName = "iofq";
-    delta = {
-      enable = true;
-      options = {
-        side-by-side = true;
-        line-numbers = true;
+    settings = {
+      user = {
+        email = "cjriddz@protonmail.com";
+        name = "iofq";
       };
-    };
-    extraConfig = {
       core.editor = "nvim";
+      pull.rebase = true;
     };
     signing = {
       key = "cjriddz@protonmail.com";
       signByDefault = false;
     };
-    extraConfig.pull.rebase = true;
+  };
+  programs.delta = {
+    enable = true;
+    options = {
+      side-by-side = true;
+      line-numbers = true;
+    };
   };
 
-  home.packages = [ pkgs.watchman ];
+  # home.packages = [ pkgs.watchman ];
   programs.jujutsu = {
     enable = true;
     settings = {
@@ -49,7 +51,6 @@
         merge-editor = "vimdiff";
         diff-editor = "diffview";
         diff-formatter = ":git";
-        paginate = "never";
         movement = {
           edit = true;
         };
@@ -69,7 +70,7 @@
             git -C "$left" commit -q -m baseline --allow-empty
             mv "$left/.git" "$right"
             git -C "$right" add --intent-to-add -A
-            (cd "$right"; nvim -c "lua vim.g.snacks_indent=false" -c "lua require('lazy').load({plugins = {'diffview.nvim'}})" -c DiffviewOpen)
+            (cd "$right"; nix run /home/e/dev/nvim.nix/ -- -c "lua require('difftool').open('$left', '$right', {ignore = { '.git', '.jj' }})")
             git -C "$right" diff-index --quiet --cached HEAD && { echo "No changes done, aborting split."; exit 1; }
             git -C "$right" commit -q -m split
             git -C "$right" restore . # undo changes in modified files