diff options
Diffstat (limited to 'modules/home')
| -rw-r--r-- | modules/home/common.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/modules/home/common.nix b/modules/home/common.nix index 0bbb68c..4379a2b 100644 --- a/modules/home/common.nix +++ b/modules/home/common.nix @@ -16,8 +16,6 @@ in programs = { git = { enable = true; - userName = "Mel"; - userEmail = "mel@rnrd.eu"; signing = { key = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B"; signByDefault = true; @@ -27,12 +25,22 @@ in "*~" "[._]*.sw?" ]; - aliases = { - "skip" = "update-index --skip-worktree"; - "unskip" = "update-index --no-skip-worktree"; + + settings = { + user = { + name = "Mel"; + email = "mel@rnrd.eu"; + }; + + alias = { + "skip" = "update-index --skip-worktree"; + "unskip" = "update-index --no-skip-worktree"; + }; + + init.defaultBranch = "main"; + pull.rebase = true; }; - extraConfig.init.defaultBranch = "main"; }; direnv = { |