diff --git a/home/common.nix b/home/common.nix index e38801a..46cf0cf 100644 --- a/home/common.nix +++ b/home/common.nix @@ -44,7 +44,6 @@ extraConfig = { credential.helper = "cache"; push.default = "simple"; - push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background init.defaultBranch = "mainline"; diff.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 programs.zsh = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1d2a5f5..73ac231 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -106,6 +106,7 @@ let ripgrep fd gitui + lazygit pre-commit scriv