Use alejandra for formatting Nix files

This commit is contained in:
Oliver Davies 2024-02-13 21:33:32 +00:00
parent 7db4788e49
commit 7302dae7ec
17 changed files with 273 additions and 244 deletions
system/shared/modules

View file

@ -48,12 +48,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";
@ -65,12 +63,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";
@ -92,7 +88,7 @@
};
checkout.defaultRemote = "origin";
color.ui = true;
commit = { template = "~/.gitmessage"; };
commit = {template = "~/.gitmessage";};
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";