opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add and configure lazygit

Browse source
This commit is contained in:
Oliver Davies 2024-01-25 08:12:33 +00:00
parent 0ab2622453
commit 948d68c2ca
1 changed files with 94 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

177
system/shared/modules/git.nix
View file

@ -26,92 +26,103 @@
/.phpactor.json /.phpactor.json
''; '';
programs.git = { programs = {
enable = true; git = {
userName = "Oliver Davies"; enable = true;
userEmail = "oliver@oliverdavies.uk"; userName = "Oliver Davies";
userEmail = "oliver@oliverdavies.uk";
aliases = { aliases = {
aa = "add --all"; aa = "add --all";
assume = "update-index --assume-unchanged"; assume = "update-index --assume-unchanged";
assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-"; assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
b = "branch"; b = "branch";
browse = "!gh repo view --web"; browse = "!gh repo view --web";
ca = "commit --amend --verbose"; ca = "commit --amend --verbose";
car = "commit --amend --no-edit"; car = "commit --amend --no-edit";
cl = "!hub clone"; cl = "!hub clone";
co = "checkout"; co = "checkout";
compare = "!hub compare"; compare = "!hub compare";
current-branch = "rev-parse --abbrev-ref HEAD"; current-branch = "rev-parse --abbrev-ref HEAD";
dc = "diff --color --word-diff --cached"; dc = "diff --color --word-diff --cached";
df = "diff --color --word-diff"; df = "diff --color --word-diff";
dup = dup =
"!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -"; "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
fixup = "commit --fixup"; fixup = "commit --fixup";
issues = "!gh issue list --web"; issues = "!gh issue list --web";
mup = mup =
"!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -"; "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
no-ff = "merge --no-ff"; no-ff = "merge --no-ff";
pl = "pull"; pl = "pull";
prune = "remote prune origin"; prune = "remote prune origin";
ps = "push"; ps = "push";
pulls = "!gh pr list --web"; pulls = "!gh pr list --web";
rbc = "rebase --continue"; rbc = "rebase --continue";
rdup = "!git dup && git rebase develop"; rdup = "!git dup && git rebase develop";
remotes = "remote -v"; remotes = "remote -v";
repush = "!git pull --rebase && git push"; repush = "!git pull --rebase && git push";
ri = "rebase --interactive"; ri = "rebase --interactive";
rid = "!git rebase -i $(git merge-base develop HEAD)"; rid = "!git rebase -i $(git merge-base develop HEAD)";
rim = rim =
"!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)"; "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
rip = "!git rebase -i $(git merge-base production HEAD)"; rip = "!git rebase -i $(git merge-base production HEAD)";
ris = "!git rebase -i $(git merge-base staging HEAD)"; ris = "!git rebase -i $(git merge-base staging HEAD)";
riu = riu =
"!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})"; "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%"; rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
sl = "log --oneline --decorate -20"; sl = "log --oneline --decorate -20";
sla = "log --oneline --decorate --graph --all -20"; sla = "log --oneline --decorate --graph --all -20";
slap = "log --oneline --decorate --graph --all"; slap = "log --oneline --decorate --graph --all";
slp = "log --oneline --decorate"; slp = "log --oneline --decorate";
staged = "diff --staged"; staged = "diff --staged";
unassume = "update-index --no-assume-unchanged"; unassume = "update-index --no-assume-unchanged";
unstage = "reset"; uncommit = "reset --soft HEAD^";
upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}"; unstage = "reset";
ureset = "!git reset --hard $(git upstream)"; upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}";
worktrees = "worktree list"; ureset = "!git reset --hard $(git upstream)";
worktrees = "worktree list";
};
extraConfig = {
branch = {
autosetupmerge = true;
autosetuprebase = "always";
};
checkout.defaultRemote = "origin";
color.ui = true;
commit = { template = "~/.gitmessage"; };
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";
pager = "delta";
};
delta.line-numbers = true;
diff.tool = "vimdiff";
fetch.prune = true;
grep.lineNumber = true;
help.autocorrect = "1";
init.defaultBranch = "main";
merge.ff = "only";
push = {
autoSetupRemote = true;
default = "upstream";
};
pull = {
ff = "only";
rebase = true;
};
rebase = {
autosquash = true;
autostash = true;
};
};
}; };
extraConfig = { lazygit = {
branch = { enable = true;
autosetupmerge = true;
autosetuprebase = "always"; settings = {
}; gui.skipDiscardChangeWarning = true;
checkout.defaultRemote = "origin";
color.ui = true;
commit = { template = "~/.gitmessage"; };
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";
pager = "delta";
};
delta.line-numbers = true;
diff.tool = "vimdiff";
fetch.prune = true;
grep.lineNumber = true;
help.autocorrect = "1";
init.defaultBranch = "main";
merge.ff = "only";
push = {
autoSetupRemote = true;
default = "upstream";
};
pull = {
ff = "only";
rebase = true;
};
rebase = {
autosquash = true;
autostash = true;
}; };
}; };
}; };