flake update,zed config update, git and jj tweaks

programs/default.nix

@@ -2,6 +2,7 @@
   ./broot
   ./fish
   ./git
+  ./jujutsu
   ./tmux
   ./wezterm
   ./vscode

programs/git/default.nix

@@ -4,16 +4,15 @@ let
   gitConfig = {
     core = {
       editor = "nvim";
-      pager = "delta";
-    };
-    delta = {
-      "line-numbers" = true;
-      "hyperlinks" = true;
-      "side-by-side" = true;
     };
     diff = {
       colorMoved = "default";
-      tool = "nvim";
+      external = "difft";
+      tool = "difftastic";
+    };
+    difftool.difftastic = {
+      cmd = "difft \"$MERGED\" \"$LOCAL\" \"abcdef1\" \"100644\" \"$REMOTE\" \"abcdef2\" \"100644\"";
+      prompt = false;
     };
     difftool.nvim = {
       cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"";
@@ -21,24 +20,24 @@ let
     };
     fetch.prune = true;
     init.defaultBranch = "main";
-    interactive = {
-      diffFilter = "delta --color-only";
-    };
-    merge.conflictstyle = "diff3";
+    merge.conflictstyle = "zdiff3";
     merge.tool = "nvim";
     mergetool.nvim = {
       cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";
       prompt = false;
       keepBackup = false;
     };
-    # url = {
-    #   "git@github.com:" = {
-    #     insteadOf = "https://github.com/";
-    #   };
-    # };
+    pager = {
+      difftool = true;
+    };
     pull = {
       rebase = true;
     };
+    url = {
+      "git@github.com:" = {
+        insteadOf = "https://github.com/";
+      };
+    };
   };
   myAliases = {
     ci = "commit";
@@ -53,7 +52,6 @@ let
     st = "status";
   };
   myIgnores = [
-    "*~"
     ".DS_Store"
     "*.bloop"
     ".direnv/"

programs/jujutsu/default.nix

@@ -0,0 +1,44 @@
+{ ... }:
+let
+  MyAliases = {
+    l = [
+      "log"
+      "-r"
+      "(main..@):: | (main..@)-"
+    ];
+  };
+in
+{
+  programs.jujutsu = {
+    enable = true;
+    settings = {
+      aliases = MyAliases;
+      signing = {
+        key = "~/.ssh/id_ed25519.pub";
+      };
+      ui = {
+        diff.format = "git";
+        diff.tool = [
+          "difft"
+          "--color=always"
+          "$left"
+          "$right"
+        ];
+        editor = "nvim";
+        merge-editor = [
+          "meld"
+          "$left"
+          "$base"
+          "$right"
+          "-o"
+          "$output"
+        ];
+        pager = "less -FRX";
+      };
+      user = {
+        name = "Salar Rahmanian";
+        email = "code@softinio.com";
+      };
+    };
+  };
+}

programs/zed/default.nix

@@ -16,9 +16,33 @@ in
     enable = true;
     extensions = myextensions;
     userSettings = {
+      assistant = {
+        version = "2";
+        default_model = {
+          provider = "copilot_chat";
+          model = "gpt-4o";
+        };
+      };
       features = {
         copilot = true;
       };
+      language_models = {
+        openai = {
+          available_models = [
+            {
+              provider = "openai";
+              name = "gpt-4o";
+              max_tokens = 128000;
+            }
+            {
+              provider = "openai";
+              name = "gpt-4o-mini";
+              max_tokens = 128000;
+            }
+          ];
+          version = "2";
+        };
+      };
       telemetry.metrics = false;
       theme = "Andromeda";
       vim_mode = true;