moons-14/dotfiles
1
0
Fork 0
mirror of https://github.com/moons-14/dotfiles.git synced 2026-10-06 08:08:11 +09:00
Code Issues Actions 1 Packages Projects Releases 4 Wiki Activity

home: fix deprecated git and ssh option names

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
This commit is contained in:
moons-14
2026-03-11 16:47:40 +09:00
co-authored by Claude Sonnet 4.6
parent 35dc4be1b8
commit 6caf91b208
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/home/git.nix
+15 -18
View File
@@ -2,34 +2,31 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
userName = "moons-14";
userEmail = "moons@moons14.com";
ignores = [ ignores = [
".direnv/" ".direnv/"
".envrc" ".envrc"
"!.envrc.example" "!.envrc.example"
]; ];
extraConfig = { settings = {
user.name = "moons-14";
user.email = "moons@moons14.com";
push.default = "simple"; push.default = "simple";
credential.helper = "cache --timeout=7200"; credential.helper = "cache --timeout=7200";
init.defaultBranch = "main"; init.defaultBranch = "main";
log.decorate = "full"; # Show branch/tag info in git log log.decorate = "full";
log.date = "iso"; # ISO 8601 date format log.date = "iso";
# Conflict resolution style for readable diffs
merge.conflictStyle = "diff3"; merge.conflictStyle = "diff3";
}; alias = {
# Optional: FOSS-friendly Git aliases br = "branch --sort=-committerdate";
aliases = { co = "checkout";
br = "branch --sort=-committerdate"; df = "diff";
co = "checkout"; com = "commit -a";
df = "diff"; gs = "stash";
com = "commit -a"; gp = "pull";
gs = "stash"; lg = "log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %C(green)(%cr)%C(bold blue) <%an>%Creset' --abbrev-commit";
gp = "pull"; st = "status";
lg = "log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %C(green)(%cr)%C(bold blue) <%an>%Creset' --abbrev-commit"; };
st = "status";
}; };
}; };
} }
modules/home/ssh.nix
+7 -6
View File
@@ -32,11 +32,12 @@
}; };
}; };
extraConfig = '' enableDefaultConfig = false;
Host *
AddKeysToAgent yes matchBlocks."*" = {
IdentityFile ~/.ssh/id_ed25519 identityFile = "~/.ssh/id_ed25519";
''; extraOptions.AddKeysToAgent = "yes";
};
}; };
home.activation.generateSshKey = lib.hm.dag.entryAfter [ "writeBoundary" ] '' home.activation.generateSshKey = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
@@ -58,7 +59,7 @@
signByDefault = true; signByDefault = true;
}; };
extraConfig = { settings = {
gpg.format = "ssh"; gpg.format = "ssh";
tag.gpgSign = true; tag.gpgSign = true;
}; };