aboutsummaryrefslogtreecommitdiffstats
path: root/modules/development/git
diff options
context:
space:
mode:
Diffstat (limited to 'modules/development/git')
-rw-r--r--modules/development/git/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index 21e1277..a62f866 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -2,7 +2,6 @@
{
config,
lib,
- pkgs,
...
}:
{
@@ -62,6 +61,7 @@
logallrefupdates = true;
};
log.showSignature = true;
+ pull.rebase = true;
}
(lib.optionalAttrs config.development.git.useSSH {
@@ -72,7 +72,7 @@
url."git@git.sr.ht:".insteadOf = "https://git.sr.ht/";
})
- (lib.optionalAttrs config.development.git.enable {
+ (lib.optionalAttrs config.development.delta.enable {
core.pager = "delta";
interactive.diffFilter = "delta --color-only";
delta.navigate = true;