Daholli/nixos-config
1
0
Fork 0
Code Issues 5 Pull requests Actions Packages Releases Activity

set pull as rebase

Browse source
This commit is contained in:
Christoph Hollizeck 2024-03-27 14:34:33 +01:00
parent 3397f7ea85
commit 6bb351f89b
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/home/tools/git/default.nix
View file

@ -23,6 +23,7 @@ in {
lfs = enabled; lfs = enabled;
extraConfig = { extraConfig = {
init = {defaultBranch = "main";}; init = {defaultBranch = "main";};
pull = {rebase = true;};
push = {autoSetupRemote = true;}; push = {autoSetupRemote = true;};
}; };
}; };

2
modules/nixos/tools/git/default.nix
View file

@ -24,9 +24,11 @@ in {
programs.git = { programs.git = {
enable = true; enable = true;
inherit(cfg) userName userEmail;
lfs.enable = true; lfs.enable = true;
config = { config = {
init = {defaultBranch = "main";}; init = {defaultBranch = "main";};
pull = {rebase = true;};
push = {autoSetupRemote = true;}; push = {autoSetupRemote = true;};
}; };
}; };

2
modules/nixos/user/default.nix
View file

@ -65,7 +65,7 @@ in {
"Music/.keep".text = ""; "Music/.keep".text = "";
"Pictures/.keep".text = ""; "Pictures/.keep".text = "";
"Videos/.keep".text = ""; "Videos/.keep".text = "";
"work/.keep".text = ""; "projects/.keep".text = "";
".face".source = cfg.icon; ".face".source = cfg.icon;
"Pictures/${ "Pictures/${
cfg.icon.fileName or (builtins.baseNameOf cfg.icon) cfg.icon.fileName or (builtins.baseNameOf cfg.icon)