dotfiles files and stuff

git: add git config to nix

Ehden Sinai 9b609ac1 2a65e5b2

Changed files
+65
git
home-manager
+3
.gitignore
··· 28 28 github-copilot/ 29 29 30 30 result 31 + 32 + git/ignore 33 + git/config
git/config git/config.bak
git/ignore git/ignore.bak
+61
home-manager/git.nix
··· 1 + {}: 2 + { 3 + enable = true; 4 + userName = "cixel"; 5 + userEmail = "ehdens@gmail.com"; 6 + 7 + aliases = { 8 + lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"; 9 + aa = "add -A ."; 10 + fpush = "push --force-with-lease"; 11 + st = "status"; 12 + ci = "commit"; 13 + co = "checkout"; 14 + cp = "cherry-pick"; 15 + put = "push origin HEAD"; 16 + fixup = "!sh -c 'git commit --no-verify -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -"; 17 + squash = "!sh -c 'git commit --no-verify -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -"; 18 + doff = "reset head^"; 19 + ri = "rebase --interactive"; 20 + br = "branch"; 21 + pruneremote = "remote prune origin"; 22 + tree = "log --graph --oneline --decorate --color --all"; 23 + tr = "log --graph --oneline --decorate --color"; 24 + unpushed = "!\"PROJ_BRANCH=$(git symbolic-ref HEAD | sed 's|refs/heads/||') && git log origin/$PROJ_BRANCH..HEAD\""; 25 + unpulled = "!\"PROJ_BRANCH=$(git symbolic-ref HEAD | sed 's|refs/heads/||') && git fetch && git log HEAD..origin/$PROJ_BRANCH\""; 26 + add-untracked = "!\"git status --porcelain | awk '/\\?\\?/{ print $2 }' | xargs git add\""; 27 + ln = "log --pretty=format:'%Cblue%h %Cred* %C(yellow)%s'"; 28 + reset-authors = "commit --amend --reset-author -CHEAD"; 29 + rmbranch = "!f(){ git branch -d \${1} && git push origin --delete \${1}; };f"; 30 + snapshot = "!git stash save \"snapshot: $(date)\" && git stash apply \"stash@{0}\" --abbrev-commit --date=relative"; 31 + stash = "git stash push"; 32 + save = "commit -m \"saving\" --no-verify"; 33 + rpull = "pull -r"; 34 + }; 35 + extraConfig = { 36 + rerere = { enabled = true; }; 37 + gc = { 38 + writeCommitGraph = true; 39 + }; 40 + pull = { 41 + rebase = true; 42 + }; 43 + 44 + difftool."vimdiff".cmd = "nvim -d $LOCAL $BASE"; 45 + 46 + # TODO: move these to work.nix 47 + url."git@github.com:Contrast-Security-Inc/".insteadOf = "https://github.com/Contrast-Security-Inc/"; 48 + url."git@bitbucket.org:".insteadOf = "https://bitbucket.org/"; 49 + }; 50 + ignores = [ 51 + ".classpath" 52 + ".project" 53 + ".settings/" 54 + 55 + "TODO" 56 + "NOTES" 57 + 58 + "gunk/" 59 + "nocommit/" 60 + ]; 61 + }
+1
home-manager/home.nix
··· 81 81 inherit pkgs wsl; 82 82 shell = "${pkgs.zsh}/bin/zsh"; 83 83 }; 84 + programs.git = import ./git.nix { }; 84 85 85 86 programs.atuin = { 86 87 enable = true;