aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2020-11-03 15:31:24 +0100
committerAdrian Kummerlaender2020-11-03 15:31:24 +0100
commitc1f5b2a38369f008114834e22a056e45c552a723 (patch)
tree62cc60a3693f38bd7cf5e9cdd763e171b9eba7ba
parentb5a3fbb86ee94e5cc67c83cc1c5f96403089d826 (diff)
downloadnixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar
nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.gz
nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.bz2
nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.lz
nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.xz
nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.zst
nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.zip
Update git config
-rw-r--r--home.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/home.nix b/home.nix
index 6b5304c..230ae37 100644
--- a/home.nix
+++ b/home.nix
@@ -37,8 +37,11 @@ in {
userName = "Adrian Kummerlaender";
userEmail = "adrian@kummerlaender.eu";
- extraConfig.core.editor = "vim";
- extraConfig.merge.tool = "${pkgs.meld}/bin/meld";
+ extraConfig = {
+ core.editor = "vim";
+ merge.tool = "${pkgs.meld}/bin/meld";
+ pull.ff = "only";
+ };
};
programs.ssh = {