softinio/nix-config
1
0
Fork 0
mirror of https://github.com/softinio/nix-config.git synced 2025-09-03 08:06:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

flake update,zed config update, git and jj tweaks

Browse source
This commit is contained in:
Salar Rahmanian 2024-12-18 22:15:42 -08:00
parent f4ac5a2006
commit 1f636db477
7 changed files with 102 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

32
programs/git/default.nix
View file

@ -4,16 +4,15 @@ let
gitConfig = {
core = {
editor = "nvim";
pager = "delta";
};
delta = {
"line-numbers" = true;
"hyperlinks" = true;
"side-by-side" = true;
};
diff = {
colorMoved = "default";
tool = "nvim";
external = "difft";
tool = "difftastic";
};
difftool.difftastic = {
cmd = "difft \"$MERGED\" \"$LOCAL\" \"abcdef1\" \"100644\" \"$REMOTE\" \"abcdef2\" \"100644\"";
prompt = false;
};
difftool.nvim = {
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"";
@ -21,24 +20,24 @@ let
};
fetch.prune = true;
init.defaultBranch = "main";
interactive = {
diffFilter = "delta --color-only";
};
merge.conflictstyle = "diff3";
merge.conflictstyle = "zdiff3";
merge.tool = "nvim";
mergetool.nvim = {
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";
prompt = false;
keepBackup = false;
};
# url = {
# "git@github.com:" = {
# insteadOf = "https://github.com/";
# };
# };
pager = {
difftool = true;
};
pull = {
rebase = true;
};
url = {
"git@github.com:" = {
insteadOf = "https://github.com/";
};
};
};
myAliases = {
ci = "commit";
@ -53,7 +52,6 @@ let
st = "status";
};
myIgnores = [
"*~"
".DS_Store"
"*.bloop"
".direnv/"