lytedev/nix
1
0
Fork 1
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Add some new git options, foxtrot fixes

Browse source
This commit is contained in:
Daniel Flanagan 2024-02-16 16:53:58 -06:00
parent c15642693e
commit f9c274f61a
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/home-manager/git.nix
View file

@ -46,6 +46,12 @@ in {
# TODO: https://blog.scottlowe.org/2023/12/15/conditional-git-configuration/ # TODO: https://blog.scottlowe.org/2023/12/15/conditional-git-configuration/
extraConfig = { extraConfig = {
init = {
defaultBranch = "main";
};
merge.conflictstyle = "zdiff3";
push = { push = {
autoSetupRemote = true; autoSetupRemote = true;
}; };

3
nixos/foxtrot.nix
View file

@ -1,9 +1,6 @@
{ {
flake,
inputs, inputs,
outputs, outputs,
# lib,
# config,
pkgs, pkgs,
... ...
}: let }: let