softinio/nix-config
1
0
Fork 0
mirror of https://github.com/softinio/nix-config.git synced 2025-10-18 19:16:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

use intellij as git mergetool, update tmux theme

Browse source
This commit is contained in:
Salar Rahmanian 2025-10-04 15:19:46 -07:00
parent 91aa2d907a
commit 57313eb0d8
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
programs/jujutsu/default.nix
View file

@ -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";