opdavies/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run nix fmt

Browse source 
Format using `nixfmt-rfc-style`.
This commit is contained in:
Oliver Davies 2024-06-10 09:31:28 +01:00
parent 14a1f177a0
commit 7f2df5f726
24 changed files with 317 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/shared/modules/git.nix
View file

@ -34,10 +34,12 @@
userName = "Oliver Davies";
userEmail = "oliver@oliverdavies.dev";
includes = [{
condition = "gitdir:~/Code/bitbucket.org/transportforwales/";
contents.user.email = "oliver.davies@tfw.wales";
}];
includes = [
{
condition = "gitdir:~/Code/bitbucket.org/transportforwales/";
contents.user.email = "oliver.davies@tfw.wales";
}
];
aliases = {
aa = "add --all";
@ -54,12 +56,10 @@
current-branch = "rev-parse --abbrev-ref HEAD";
dc = "diff --color --word-diff --cached";
df = "diff --color --word-diff";
dup =
"!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
fixup = "commit --fixup";
issues = "!gh issue list --web";
mup =
"!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
mup = "!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";
pl = "pull";
prune = "remote prune origin";
@ -71,12 +71,10 @@
repush = "!git pull --rebase && git push";
ri = "rebase --interactive";
rid = "!git rebase -i $(git merge-base develop HEAD)";
rim =
"!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
rip = "!git rebase -i $(git merge-base production HEAD)";
ris = "!git rebase -i $(git merge-base staging HEAD)";
riu =
"!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
sl = "log --oneline --decorate -20";
sla = "log --oneline --decorate --graph --all -20";
@ -87,8 +85,7 @@
unassume = "update-index --no-assume-unchanged";
uncommit = "reset --soft HEAD^";
unstage = "reset";
update =
"!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat";
update = "!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat";
upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}";
ureset = "!git reset --hard $(git upstream)";
worktrees = "worktree list";
@ -103,7 +100,9 @@
checkout.defaultRemote = "origin";
color.ui = true;
column.ui = "auto";
commit = { template = "~/.gitmessage"; };
commit = {
template = "~/.gitmessage";
};
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";