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

add .gitignore and switch to rebase strategy (#19)

Browse source
This commit is contained in:
Christoph Hollizeck 2024-08-21 22:49:00 +02:00 • committed by GitHub
commit 29fb05bd92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
# output of nixos-rebuild build or deploy-rs
result
.direnv

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

@ -34,7 +34,7 @@ in
defaultBranch = "main"; defaultBranch = "main";
}; };
pull = { pull = {
rebase = false; rebase = true;
}; };
push = { push = {
autoSetupRemote = true; autoSetupRemote = true;

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

@ -39,7 +39,7 @@ in
defaultBranch = "main"; defaultBranch = "main";
}; };
pull = { pull = {
rebase = false; rebase = true;
}; };
push = { push = {
autoSetupRemote = true; autoSetupRemote = true;

1
result
View file

@ -1 +0,0 @@
/nix/store/5bn24v1m3gsjr96fj9h2kavaj67lxh5q-nixos-24.05.20240410.1042fd8-x86_64-linux.iso