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

flake update
All checks were successful
/ check (push) Successful in 51s
Details

Browse source 
Signed-off-by: Oliver Davies <oliver@oliverdavies.uk>
This commit is contained in:
Oliver Davies 2025-10-27 01:56:44 +00:00
parent bbd29560ed
commit e8dd94db0b
4 changed files with 60 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -232,11 +232,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761468550, "lastModified": 1761513701,
"narHash": "sha256-nY4vyN1QdHhC5Gj3545fI2Y7FSr/gs8ID4gPmF8HPww=", "narHash": "sha256-w7qOcQb1FSMZASvWe01r99QqZ5LnHO0k3rgs5ryyig0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1830716059bfee7cbcfbfcc38d7be98e482a5762", "rev": "255b6a0ef2f488a2fad051361699cc67db57338c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761500659, "lastModified": 1761528699,
"narHash": "sha256-hgOT9DvpiH/GJgCRKtXZfj+CbvEsg3vy2BDkknJxEJ4=", "narHash": "sha256-XT8oTUrURT1myYtyq651RizuGixuLEYvCoEPo6wAOiM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "7bb12d3c06e545aec77fb1242068c1bde089e791", "rev": "9df0e174938fe27df6bb81e856a64f6e2db31670",
"type": "github" "type": "github"
}, },
"original": { "original": {

96
modules/git/aliases.nix
View file

@ -1,50 +1,52 @@
{ {
flake.modules.homeManager.base.programs.git.aliases = { flake.modules.homeManager.base.programs.git = {
aa = "add --all"; settings.aliases = {
assume = "update-index --assume-unchanged"; aa = "add --all";
assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-"; assume = "update-index --assume-unchanged";
b = "branch"; assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
blame = "blame -w -C -C -C"; b = "branch";
browse = "!gh repo view --web"; blame = "blame -w -C -C -C";
ca = "commit --amend --verbose"; browse = "!gh repo view --web";
car = "commit --amend --no-edit"; ca = "commit --amend --verbose";
cl = "!hub clone"; car = "commit --amend --no-edit";
co = "checkout"; cl = "!hub clone";
compare = "!hub compare"; co = "checkout";
current-branch = "rev-parse --abbrev-ref HEAD"; compare = "!hub compare";
dc = "diff --color --word-diff --cached"; current-branch = "rev-parse --abbrev-ref HEAD";
df = "diff --color --word-diff"; dc = "diff --color --word-diff --cached";
dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -"; df = "diff --color --word-diff";
fixup = "commit --fixup"; dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
issues = "!gh issue list --web"; fixup = "commit --fixup";
mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -"; issues = "!gh issue list --web";
no-ff = "merge --no-ff"; mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
pl = "pull"; no-ff = "merge --no-ff";
prune = "remote prune origin"; pl = "pull";
ps = "push"; prune = "remote prune origin";
pulls = "!gh pr list --web"; ps = "push";
rbc = "rebase --continue"; pulls = "!gh pr list --web";
rdup = "!git dup && git rebase develop"; rbc = "rebase --continue";
remotes = "remote -v"; rdup = "!git dup && git rebase develop";
repush = "!git pull --rebase && git push"; remotes = "remote -v";
ri = "rebase --interactive"; repush = "!git pull --rebase && git push";
rid = "!git rebase -i $(git merge-base develop HEAD)"; ri = "rebase --interactive";
rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)"; rid = "!git rebase -i $(git merge-base develop HEAD)";
rip = "!git rebase -i $(git merge-base production HEAD)"; rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
ris = "!git rebase -i $(git merge-base staging HEAD)"; rip = "!git rebase -i $(git merge-base production HEAD)";
riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})"; ris = "!git rebase -i $(git merge-base staging HEAD)";
rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%"; riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
sl = "log --oneline --decorate -20"; rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
sla = "log --oneline --decorate --graph --all -20"; sl = "log --oneline --decorate -20";
slap = "log --oneline --decorate --graph --all"; sla = "log --oneline --decorate --graph --all -20";
slp = "log --oneline --decorate"; slap = "log --oneline --decorate --graph --all";
stash = "stash --included-untracked"; slp = "log --oneline --decorate";
unassume = "update-index --no-assume-unchanged"; stash = "stash --included-untracked";
uncommit = "reset --soft HEAD^"; unassume = "update-index --no-assume-unchanged";
unstage = "reset"; uncommit = "reset --soft HEAD^";
update = "!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat"; unstage = "reset";
upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}"; update = "!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat";
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";
};
}; };
} }

2
modules/git/defaults.nix
View file

@ -2,7 +2,7 @@
flake.modules.homeManager.base = flake.modules.homeManager.base =
{ config, ... }: { config, ... }:
{ {
programs.git.extraConfig = { programs.git.settings = {
branch = { branch = {
autosetupmerge = true; autosetupmerge = true;
autosetuprebase = "always"; autosetuprebase = "always";

6
modules/git/user.nix
View file

@ -2,7 +2,9 @@
{ {
flake.modules.homeManager.base.programs.git = { flake.modules.homeManager.base.programs.git = {
userName = config.flake.meta.owner.name; settings.user = {
userEmail = config.flake.meta.owner.email; email = config.flake.meta.owner.email;
name = config.flake.meta.owner.name;
};
}; };
} }