use intellij as git mergetool, update tmux theme

home.nix

@@ -63,7 +63,6 @@
       marksman
       marp-cli
       maven
-      meld
       metals
       multimarkdown
       mypy

programs/fish/default.nix

@@ -46,7 +46,7 @@
         fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
       end
 
-      set -xg PATH $HOME/bin $HOME/.cargo/bin $HOME/.npm-global/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 PATH $HOME/bin $HOME/.cargo/bin $HOME/.npm-global/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 "/Applications/IntelliJ IDEA.app/Contents/MacOS" $PATH
 
       set -xg WORKSPACE /Users/salar/Projects
 

programs/jujutsu/default.nix

@@ -4,7 +4,7 @@ let
     l = [
       "log"
       "-r"
-      "(main..@):: | (main..@)-"
+      "(main@origin..@):: | (main@origin..@)-"
     ];
   };
 in
@@ -17,6 +17,7 @@ in
         key = "~/.ssh/id_ed25519.pub";
       };
       ui = {
+        default-command = "log";
         diff-formatter = [
           "difft"
           "--color=always"
@@ -25,11 +26,10 @@ in
         ];
         editor = "nvim";
         merge-editor = [
-          "meld"
+          "idea"
           "$left"
-          "$base"
           "$right"
-          "-o"
+          "$base"
           "$output"
         ];
         pager = "less -FRX";

programs/tmux/default.nix

@@ -15,8 +15,8 @@ in
     extraConfig = tmuxConfig;
     plugins = with pkgs.tmuxPlugins; [
       sensible
+      tokyo-night-tmux
       yank
-      kanagawa
       {
         plugin = tokyo-night-tmux;
         extraConfig = ''