mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

refactor: split hardware related and system related common configuration

Browse source
This commit is contained in:
oddlama 2023-05-01 15:27:28 +02:00
parent f55c83c1b8
commit de19b23d3d
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
9 changed files with 82 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

5
users/common/git.nix
View file

@ -5,14 +5,11 @@
difftastic.enable = true;
lfs.enable = lib.mkDefault false;
extraConfig = {
#diff = {
# colorMoved = "default";
# age.textconv = "${pkgs.rage}/bin/rage -i ~/.ssh/username --decrypt";
#};
difftool.prompt = true;
init.defaultBranch = "main";
merge.conflictstyle = "diff3";
mergetool.prompt = true;
pull.rebase = true;
};
aliases = {
unstash = "stash pop";