flake.lock

@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736013363,
-        "narHash": "sha256-P4lsS2Y5GzBfC8OfXtD/xWEucX6oHGTjOzjEjEJbXfc=",
+        "lastModified": 1734093295,
+        "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d7908bd09165db6699908b7e3970f137327cbf0",
+        "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736002328,
-        "narHash": "sha256-anoVvML2D+nLfHlBfhEcCMjTou/9SRrrlqQN+Ug39ws=",
+        "lastModified": 1733570843,
+        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "a464e5ba8cfb10a81599dbd422f30f5d37997916",
+        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
         "type": "github"
       },
       "original": {
@@ -100,11 +100,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1736020005,
-        "narHash": "sha256-1wLkiazcUjmFj7UYb7VoqClAvoGc+k061Lqc5Tqrw8A=",
+        "lastModified": 1734313665,
+        "narHash": "sha256-aRhBY3xl7CVlXXtMI7ryjscdsoJItw75hhQJ7sZK49g=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "33f1c2d499b8eac46ec4fc19b49c8740a2482cc1",
+        "rev": "3d3b39dbfb201d65fb8c2ee2a0cf6b1ada87a8dc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -28,7 +28,7 @@
         config:
         { ... }:
         {
-          nixpkgs.overlays = [ nur.overlays.default ];
+          nixpkgs.overlays = [ nur.overlay ];
           imports = [
             config
           ];

home.nix

@@ -23,7 +23,7 @@
     ];
 
   home = {
-    stateVersion = "24.11";
+    stateVersion = "24.05";
     sessionVariables = {
       EDITOR = "nvim";
       VISUAL = "$EDITOR";
@@ -37,9 +37,9 @@
       cmake
       coursier
       curlFull
+      delta
       deno
       devenv
-      difftastic
       discord
       dua
       fd
@@ -49,6 +49,7 @@
       go
       graphviz
       jq-lsp
+      lazyjj
       luajit
       lua-language-server
       marksman
@@ -169,7 +170,6 @@
     enable = true;
     settings = {
       theme = "tokyonight";
-      editor.file-picker.hidden = false;
     };
   };
 
@@ -185,6 +185,48 @@
     enable = true;
   };
 
+  programs.jujutsu = {
+    enable = true;
+    settings = {
+      signing = {
+        key = "~/.ssh/id_ed25519.pub";
+      };
+      user = {
+        name = "Salar Rahmanian";
+        email = "code@softinio.com";
+      };
+      aliases = {
+        l = [
+          "log"
+          "-r"
+          "(main..@):: | (main..@)-"
+        ];
+      };
+      ui = {
+        diff.format = "git";
+        diff.tool = [
+          "delta"
+          "--color-only"
+          "--hyperlinks"
+          "--line-numbers"
+          "--side-by-side"
+          "$left"
+          "$right"
+        ];
+        editor = "nvim";
+        merge-editor = [
+          "meld"
+          "$left"
+          "$base"
+          "$right"
+          "-o"
+          "$output"
+        ];
+        pager = "delta";
+      };
+    };
+  };
+
   programs.lazygit = {
     enable = true;
   };

programs/default.nix

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

programs/git/default.nix

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

programs/jujutsu/default.nix

@@ -1,44 +0,0 @@
-{ ... }:
-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,33 +16,9 @@ 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;