schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Compare commits

base: schmittlauch:67904896a2797276b82202516f12e23550bd0cd3
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
..
compare: schmittlauch:e2467646d8bb6f3207a684532c224b04888b6515
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

No commits in common. "67904896a2797276b82202516f12e23550bd0cd3" and "e2467646d8bb6f3207a684532c224b04888b6515" have entirely different histories.
67904896a2 ... e2467646d8

2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
home/common.nix
View file

@ -44,7 +44,6 @@
extraConfig = { extraConfig = {
credential.helper = "cache"; credential.helper = "cache";
push.default = "simple"; push.default = "simple";
push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background
init.defaultBranch = "mainline"; init.defaultBranch = "mainline";
diff.tool = "vimdiff"; diff.tool = "vimdiff";
merge.tool = "vimdiff"; merge.tool = "vimdiff";
@ -76,16 +75,6 @@
}; };
}; };
}; };
programs.lazygit = {
enable = true;
settings = {
git = {
autoFetch = false;
mainBranches = ["main" "master" "mainline"];
};
update.method = "never";
};
};
# shell config # shell config
programs.zsh = { programs.zsh = {

1
home/modules/packages.nix
View file

@ -106,6 +106,7 @@ let
ripgrep ripgrep
fd fd
gitui gitui
lazygit
pre-commit pre-commit
scriv scriv