genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 17:37:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #286 from genebean/gitconfig

Browse source 
Manage most of my git configuration
This commit is contained in:
Gene Liverman 2023-09-15 15:39:39 -04:00 • committed by GitHub
commit f73b118d84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/home-manager/default.nix
View file

@ -47,9 +47,23 @@
git = { git = {
enable = true; enable = true;
delta.enable = true; delta.enable = true;
includes = [ { path = "~/.gitconfig-local"; }];
lfs.enable = true; lfs.enable = true;
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;
userName = "Gene Liverman";
extraConfig = {
init = {
defaultBranch = "main";
}; };
merge = {
conflictStyle = "diff3";
tool = "meld";
};
pull = {
rebase = false;
};
};
}; # end git
go = { go = {
enable = true; enable = true;
goPath = "go"; goPath = "go";
@ -139,6 +153,7 @@
history.size = 1000000; history.size = 1000000;
initExtra = '' initExtra = ''
[ -f ~/.private-env ] && source ~/.private-env || echo '~/.private-env is missing' [ -f ~/.private-env ] && source ~/.private-env || echo '~/.private-env is missing'
[ -f ~/.gitconfig-local ] || echo '~/.gitconfig-local is missing. Create it and set user.email'
# Start GPG agent # Start GPG agent
# Some tips from https://hedberg.io/yubikey-for-ssh/ helped simplify this: # Some tips from https://hedberg.io/yubikey-for-ssh/ helped simplify this: