diff --git a/home-manager/git/default.nix b/home-manager/git/default.nix index d6a7873..a7c5608 100644 --- a/home-manager/git/default.nix +++ b/home-manager/git/default.nix @@ -9,9 +9,9 @@ userEmail = "personal@noahknegt.com"; extraConfig = { - push = { - autoSetupRemote = true; - }; + push = { autoSetupRemote = true; }; + pull = { rebase = true; }; + fetch = { prune = true; }; }; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 2752423..f3004d7 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -53,7 +53,6 @@ # Enable home-manager and git programs.home-manager.enable = true; - programs.git.enable = true; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch";