From 8fed016d195b38572dc988826bf59f6b08a4c11b Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 17 Nov 2024 17:53:26 -0800
Subject: [PATCH] flake update & update jujitsu / vscode / fish

---
 flake.lock                  | 24 ++++++++++++------------
 home.nix                    | 26 ++++++++++++++++++++++++--
 programs/fish/default.nix   |  4 +---
 programs/vscode/default.nix |  4 ----
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 486d439..fa57751 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731604581,
-        "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
+        "lastModified": 1732482255,
+        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
+        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731642829,
-        "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
+        "lastModified": 1732420287,
+        "narHash": "sha256-CzvYF4x6jUh/+NEEIFrIY5t1W/N3IA2bNZJiMXu9GTo=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
+        "rev": "3c52583b99666a349a6219dc1f0dd07d75c82d6a",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731319897,
-        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1731730181,
-        "narHash": "sha256-uCyImsva4NYsRywcT+U6cr+MZrXx/e4Gu8SqTujrCBY=",
+        "lastModified": 1732591297,
+        "narHash": "sha256-OLx52EsEPL1vumyGc49JY4636l+GTKxlL17jA1zVYEw=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "295cc9ee333bda9e7d58daae4d1c25fcdef3e5a6",
+        "rev": "f82e8ba200b6b2c6619dfce29c909faaf15387c0",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index 1c60660..4af4972 100644
--- a/home.nix
+++ b/home.nix
@@ -56,6 +56,7 @@
       marksman
       marp-cli
       maven
+      meld
       metals
       multimarkdown
       mypy
@@ -84,7 +85,6 @@
       sbt
       scala-cli
       shellcheck
-      skimpdf
       slack
       slides
       slumber
@@ -190,12 +190,34 @@
   programs.jujutsu = {
     enable = true;
     settings = {
+      signing = {
+        key = "~/.ssh/id_ed25519.pub";
+      };
       user = {
         name = "Salar Rahmanian";
         email = "code@softinio.com";
       };
       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";
       };
     };
   };
@@ -224,6 +246,6 @@
   # Neovim Configuration
   xdg.configFile."nvim".source = builtins.fetchGit {
     url = "https://code.softinio.com/softinio/nvim-config";
-    rev = "b535afb6d9259e0ec18e2e7fda54384b48264746";
+    rev = "a972cdf4f9067111d67f2f0b5655eede437cdff3";
   };
 }
diff --git a/programs/fish/default.nix b/programs/fish/default.nix
index e9ba0fa..f18f618 100644
--- a/programs/fish/default.nix
+++ b/programs/fish/default.nix
@@ -30,9 +30,7 @@
         fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
       end
 
-      set -xg PATH $HOME/bin $HOME/.cargo/bin $PATH
-
-      set -xg PATH /Users/salar/.luarocks/bin:/Users/salar/bin:/Users/salar/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin $PATH
+      set -xg PATH /Applications/Ghostty.app/Contents/MacOS $HOME/bin $HOME/.cargo/bin /Users/salar/.luarocks/bin:/Users/salar/bin:/Users/salar/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin $PATH
 
       set -xg WORKSPACE /Users/salar/Projects
 
diff --git a/programs/vscode/default.nix b/programs/vscode/default.nix
index 55f4a97..70d2c13 100644
--- a/programs/vscode/default.nix
+++ b/programs/vscode/default.nix
@@ -60,10 +60,6 @@ let
     "githubPullRequests.pullBranch" = "never";
     "markdown.extension.preview.autoShowPreviewToSide" = true;
     "notebook.formatOnSave" = true;
-    "notebook.codeActionsOnSave" = {
-      "notebook.source.fixAll" = true;
-      "notebook.source.organizeImports" = true;
-    };
     # Install paste image manually as not in nix ( https://marketplace.visualstudio.com/items?itemName=mushan.vscode-paste-image )
     "pasteImage.insertPattern" = "![[\${imageFileName}]]";
     "pasteImage.path" = "\${projectRoot}/Attachments";