dln/dotfiles
0
0
Code Issues Pull requests 1 Activity

jj: use difftastic by default. add more aliases for convenience

Browse source
This commit is contained in:
Daniel Lundin 2024-08-07 12:22:47 +02:00
parent 5868da6c29
commit abb479c2cd
No known key found for this signature in database
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
files/config/fish/vcs.fish
View file

@ -23,7 +23,9 @@ end
function vcs_status
if __jj_in_repo
jj status --ignore-working-copy
jj status
echo
jj log --limit=20 -T builtin_log_comfortable -r "(main..@) | (main..@)-"
else
git status -sb
end

39
home/dln/home.nix
View file

@ -42,11 +42,11 @@ in
ui = {
"default-command" = [
"log"
"--limit=20"
"--template=builtin_log_comfortable"
"--limit=25"
"-T"
"builtin_log_comfortable"
];
pager = "bat";
pager = "delta";
};
"merge-tools" = {
@ -55,11 +55,21 @@ in
"$left"
"$right"
];
difftu = {
program = "difft";
"diff-args" = [
"--color=always"
"--display=inline"
"$left"
"$right"
];
};
};
aliases = {
l = [
"log"
"--limit=25"
"-T"
"builtin_log_comfortable"
"-r"
@ -67,6 +77,7 @@ in
];
la = [
"log"
"--limit=25"
"-T"
"builtin_log_oneline"
"-r"
@ -80,9 +91,23 @@ in
"new"
"main"
];
d = [ "diff" ];
s = [ "show" ];
sh = [
d = [
"diff"
"--tool=difftu"
];
dd = [
"diff"
"--git"
];
ds = [
"diff"
"--tool=difft"
];
s = [
"show"
"--tool=difftu"
];
ss = [
"show"
"--tool=difft"
];