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

@ -30,6 +30,7 @@
home.stateVersion = "23.05";
programs.v.nvim.enable = true;
programs.v.git.enable = true;
programs.tmux = {
enable = true;
@ -37,5 +38,13 @@
terminal = "screen-256color";
clock24 = true;
};
programs.exa = {
enable = true;
enableAliases = true;
};
programs.bat.enable = true;
};
}