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

chore: upgrade to NixOS 25.11
All checks were successful
Test / tests (push) Successful in 13m10s
Details

Browse source
This commit is contained in:
Felix Schröter 2025-12-09 22:41:14 +01:00
parent 75d3736626
commit e1a08c7246
Signed by: felschr
GPG key ID: 671E39E6744C807D
20 changed files with 44 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

20
home/git.nix
View file

@ -28,7 +28,7 @@
signing = {
signByDefault = true;
};
extraConfig = {
settings = {
init = {
defaultBranch = "main";
};
@ -41,15 +41,15 @@
abbreviateCommands = true;
missingCommitsCheck = "warn";
};
};
aliases = {
# usage: git mr <source> <MR number> (git mr origin 1010)
mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
# usage: git pr <source> <PR number> (git pr origin 1010)
pr = "!sh -c 'git fetch $1 pull/$2/head:pr/$2 && git checkout pr/$2' -";
# delete branches locally that have already been merged
# usage: git clean-branches <branch> (branch to check against, defaults to main)
clean-branches = ''!sh -c 'git branch --merged "''${1:-main}" | egrep -v "(^\*|master|main|staging|production)" | xargs git branch -d' -'';
alias = {
# usage: git mr <source> <MR number> (git mr origin 1010)
mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
# usage: git pr <source> <PR number> (git pr origin 1010)
pr = "!sh -c 'git fetch $1 pull/$2/head:pr/$2 && git checkout pr/$2' -";
# delete branches locally that have already been merged
# usage: git clean-branches <branch> (branch to check against, defaults to main)
clean-branches = ''!sh -c 'git branch --merged "''${1:-main}" | egrep -v "(^\*|master|main|staging|production)" | xargs git branch -d' -'';
};
};
};
}