softinio/nix-config
softinio/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup git aliases and switch to delta for diffs

Browse source
This commit is contained in:
Salar Rahmanian 2024-11-09 21:15:31 -08:00
parent a5bbdd636c
commit 52ae41a79b
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
home.nix
View file

@ -48,7 +48,6 @@
fishPlugins.foreign-env fishPlugins.foreign-env
fishPlugins.bobthefish fishPlugins.bobthefish
font-awesome font-awesome
gitAndTools.diff-so-fancy
gnupg gnupg
go go
graphviz graphviz
@ -259,11 +258,6 @@
pj = "python -m json.tool"; pj = "python -m json.tool";
l = "ll"; l = "ll";
g = "git"; g = "git";
gl = "git log";
gc = "git commit -m";
gca = "git commit -am";
gws = "git status";
gu = "gitui";
ghauth = "gh auth login --with-token < ~/.ghauth"; ghauth = "gh auth login --with-token < ~/.ghauth";
gitpurgemain = ''git branch --merged | grep -v "\*" | grep -v "main" | xargs -n 1 git branch -d''; gitpurgemain = ''git branch --merged | grep -v "\*" | grep -v "main" | xargs -n 1 git branch -d'';
gitpurgemaster = ''git branch --merged | grep -v "\*" | grep -v "master" | xargs -n 1 git branch -d''; gitpurgemaster = ''git branch --merged | grep -v "\*" | grep -v "master" | xargs -n 1 git branch -d'';
@ -281,7 +275,6 @@
nixupgrade = "nix upgrade-nix"; nixupgrade = "nix upgrade-nix";
rmxcodederived = "rm -fr ~/Library/Developer/Xcode/DerivedData"; rmxcodederived = "rm -fr ~/Library/Developer/Xcode/DerivedData";
v = "nvim"; v = "nvim";
wezk = "wezterm show-keys --lua";
sshhcloud1 = "ssh salar@hcloud1.softinio.net"; sshhcloud1 = "ssh salar@hcloud1.softinio.net";
sshhcloud1r = "ssh root@hcloud1.softinio.net"; sshhcloud1r = "ssh root@hcloud1.softinio.net";
}; };

31
programs/git/default.nix
View file

@ -4,9 +4,26 @@ let
gitConfig = { gitConfig = {
core = { core = {
editor = "nvim"; editor = "nvim";
pager = "diff-so-fancy | less --tabs=4 -RFX"; pager = "delta";
}; };
delta = {
"line-numbers" = true;
"hyperlinks" = true;
"side-by-side" = true;
};
diff = {
colorMoved = "default";
tool = "nvim";
};
difftool.nvim = {
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"";
prompt = false;
};
fetch.prune = true;
init.defaultBranch = "main"; init.defaultBranch = "main";
interactive = {
diffFilter = "delta --color-only";
};
merge.conflictstyle = "diff3"; merge.conflictstyle = "diff3";
merge.tool = "nvim"; merge.tool = "nvim";
mergetool.nvim = { mergetool.nvim = {
@ -14,26 +31,26 @@ let
prompt = false; prompt = false;
keepBackup = false; keepBackup = false;
}; };
diff.tool = "nvim";
difftool.nvim = {
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"";
prompt = false;
};
# url = { # url = {
# "git@github.com:" = { # "git@github.com:" = {
# insteadOf = "https://github.com/"; # insteadOf = "https://github.com/";
# }; # };
# }; # };
fetch.prune = true;
pull = { pull = {
rebase = true; rebase = true;
}; };
}; };
myAliases = { myAliases = {
ci = "commit"; ci = "commit";
cim = "commit -m";
cia = "commit -am";
co = "checkout"; co = "checkout";
cob = "checkout -b";
di = "diff";
gpo = "push origin";
main = "checkout main"; main = "checkout main";
master = "checkout master"; master = "checkout master";
st = "status";
}; };
myIgnores = [ myIgnores = [
"*~" "*~"