chandlerswift/machine-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update git settings to match renamed upstream vars

Browse source 
evaluation warning: chandler profile: The option `programs.git.userName' defined in `/home/chandler/projects/machine-config/sam/configuration.nix' has been renamed to `programs.git.settings.user.name'.
    evaluation warning: chandler profile: The option `programs.git.extraConfig' defined in `/home/chandler/projects/machine-config/sam/configuration.nix' has been renamed to `programs.git.settings'.
This commit is contained in:
Chandler Swift 2026-02-10 10:37:54 -06:00
parent b765bb1a97
commit 0f38e26d7f
No known key found for this signature in database
GPG key ID: B123483B24A4D579
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
oscar/configuration.nix
View file

@ -247,11 +247,11 @@
programs.git = {
enable = true;
userEmail = "chandler@chandlerswift.com";
userName = "Chandler Swift";
lfs.enable = true;
# TODO: delta or diff-so-fancy or difftastic
extraConfig = {
settings = {
user.name = "Chandler Swift;
user.email = "chandler@chandlerswift.com";
init.defaultBranch = "main";
pull.ff = "only";
#init.templatedir = "~/.git-template"; # unsure what this was intended to do -- default hooks, maybe?

4
sam/configuration.nix
View file

@ -169,10 +169,10 @@
programs.git = {
enable = true;
userName = "Chandler Swift";
lfs.enable = true;
# TODO: delta or diff-so-fancy or difftastic
extraConfig = {
settings = {
user.name = "Chandler Swift";
help.autoCorrect = "prompt";
init.defaultBranch = "main";
diff.wsErrorHighlight = "all";