diff --git a/lib/shared/modules/git.nix b/lib/shared/modules/git.nix index 1aad65f..219ac08 100644 --- a/lib/shared/modules/git.nix +++ b/lib/shared/modules/git.nix @@ -105,40 +105,47 @@ autosetuprebase = "always"; sort = "-committerdate"; }; + checkout.defaultRemote = "origin"; color.ui = true; column.ui = "auto"; - commit = { - template = "~/.gitmessage"; - }; + commit.template = "~/.gitmessage"; + core = { editor = "nvim"; excludesFile = "~/.config/git/ignore"; pager = "delta"; }; + delta.line-numbers = true; fetch.prune = true; gpg.format = "ssh"; grep.lineNumber = true; help.autocorrect = "1"; init.defaultBranch = "main"; + maintenance = { auto = false; strategy = "incremental"; }; + merge.ff = "only"; + push = { autoSetupRemote = true; default = "upstream"; }; + pull = { ff = "only"; rebase = true; }; + rebase = { autosquash = true; autostash = true; }; + user.signingkey = "~/.ssh/id_rsa.pub"; }; };