core: enable git module itself
oops
This commit is contained in:
parent
a6568d4891
commit
5acbee3237
1 changed files with 1 additions and 1 deletions
|
@ -18,7 +18,6 @@
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
wget
|
wget
|
||||||
git
|
|
||||||
ffmpeg
|
ffmpeg
|
||||||
yt-dlp
|
yt-dlp
|
||||||
htop
|
htop
|
||||||
|
@ -29,6 +28,7 @@
|
||||||
ddrescue
|
ddrescue
|
||||||
];
|
];
|
||||||
|
|
||||||
|
programs.git.enable = true;
|
||||||
programs.git.config = {
|
programs.git.config = {
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
merge.conflictstyle = "diff3";
|
merge.conflictstyle = "diff3";
|
||||||
|
|
Loading…
Reference in a new issue