add lock merge strategy

This commit is contained in:
Vivian 2023-06-27 11:19:54 +02:00
parent 7daf1c88d0
commit 940b3219e6
5 changed files with 73 additions and 52 deletions

View file

@ -41,27 +41,6 @@ in {
direnv = true;
};
programs.exa = {
enable = true;
enableAliases = true;
};
programs.bat.enable = true;
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
userName = "Victor";
userEmail = "victor@xirion.net";
lfs.enable = true;
extraConfig = {
push.autoSetupRemote = true;
init.defaultBranch = "main";
};
difftastic.enable = true;
};
programs.firefox.enable = true;
programs.chromium = {