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

Refactor Git configuration

Browse source
This commit is contained in:
Oliver Davies 2025-07-24 20:37:58 +01:00
parent 8947c4abd2
commit e111506428
13 changed files with 180 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

3
home-manager/opdavies/PW05CH3L.nix
View file

@ -9,9 +9,6 @@
direnv.enable = true;
fzf.enable = true;
git.enable = true;
git.user.emailAddress = "oliver.davies@tfw.wales";
node.enable = true;
notes.enable = true;
ranger.enable = true;

3
home-manager/opdavies/t480.nix
View file

@ -13,9 +13,6 @@
direnv.enable = true;
fzf.enable = true;
git.enable = true;
git.user.emailAddress = "oliver@oliverdavies.uk";
node.enable = true;
notes.enable = true;

1
modules/home-manager/default.nix
View file

@ -9,7 +9,6 @@
./direnv.nix
./flameshot.nix
./fzf.nix
./git.nix
./gnupg.nix
./gtk.nix
./media/handbrake.nix

184
modules/home-manager/git.nix
View file

@ -1,184 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib;
let
cfg = config.features.cli.git;
in
{
options.features.cli.git = {
enable = mkEnableOption "Enable git";
user = mkOption {
type = types.submodule {
options = {
emailAddress = mkOption {
description = "User email address.";
type = types.str;
apply =
x:
assert builtins.match "^[^@]+@[^@]+\\.[^@]+$" x != null;
x;
};
};
};
};
};
config = mkIf cfg.enable {
home.file."${config.xdg.configHome}/git/message".text = ''
# Description
#
# - Why is this change necessary?
# - How does it address the issue?
# - What side effects does this change have?
#
# For breaking changes, uncomment the following line and describe the change:
#
# BREAKING CHANGE:
#
#
# Add any issue IDs or commit SHAs that this commit references:
#
# Refs:
'';
programs = {
git = {
enable = true;
userName = "Oliver Davies";
userEmail = cfg.user.emailAddress;
aliases = {
aa = "add --all";
assume = "update-index --assume-unchanged";
assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
b = "branch";
blame = "blame -w -C -C -C";
browse = "!gh repo view --web";
ca = "commit --amend --verbose";
car = "commit --amend --no-edit";
cl = "!hub clone";
co = "checkout";
compare = "!hub compare";
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 -";
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 -";
no-ff = "merge --no-ff";
pl = "pull";
prune = "remote prune origin";
ps = "push";
pulls = "!gh pr list --web";
rbc = "rebase --continue";
rdup = "!git dup && git rebase develop";
remotes = "remote -v";
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)";
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})";
rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
sl = "log --oneline --decorate -20";
sla = "log --oneline --decorate --graph --all -20";
slap = "log --oneline --decorate --graph --all";
slp = "log --oneline --decorate";
stash = "stash --included-untracked";
unassume = "update-index --no-assume-unchanged";
uncommit = "reset --soft HEAD^";
unstage = "reset";
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";
};
ignores = [
"/.ddev/providers/"
"/.direnv/"
"/.ignored/"
"/.issue-id"
"/.phpactor.json"
"/notes"
"/todo"
];
extraConfig = {
branch = {
autosetupmerge = true;
autosetuprebase = "always";
sort = "-committerdate";
};
checkout.defaultRemote = "origin";
color.ui = true;
column.ui = "auto";
commit.template = "${config.xdg.configHome}/git/message";
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";
};
diff.tool = "vimdiff";
fetch.prune = true;
gpg.format = "ssh";
grep.lineNumber = true;
help.autocorrect = "1";
init.defaultBranch = "main";
maintenance = {
auto = false;
strategy = "incremental";
};
merge.ff = "only";
push = {
autoSetupRemote = true;
default = "upstream";
};
pull = {
ff = "only";
rebase = true;
};
rebase = {
autosquash = true;
autostash = true;
};
user.signingkey = "~/.ssh/id_rsa.pub";
};
};
};
home = {
packages = with pkgs; [
git-exclude
git-extras
git-graph
git-trim
stable.git-instafix
];
sessionVariables = {
GIT_INSTAFIX_UPSTREAM = "origin/main";
};
};
};
}

1
modules/nixos/nixpad/default.nix
View file

@ -23,7 +23,6 @@ in
programs = {
firefox.enable = true;
git.enable = true;
};
environment.systemPackages = with pkgs; [

50
modules2/git/aliases.nix Normal file
View file

@ -0,0 +1,50 @@
{
flake.modules.homeManager.base.programs.git.aliases = {
aa = "add --all";
assume = "update-index --assume-unchanged";
assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
b = "branch";
blame = "blame -w -C -C -C";
browse = "!gh repo view --web";
ca = "commit --amend --verbose";
car = "commit --amend --no-edit";
cl = "!hub clone";
co = "checkout";
compare = "!hub compare";
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 -";
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 -";
no-ff = "merge --no-ff";
pl = "pull";
prune = "remote prune origin";
ps = "push";
pulls = "!gh pr list --web";
rbc = "rebase --continue";
rdup = "!git dup && git rebase develop";
remotes = "remote -v";
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)";
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})";
rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
sl = "log --oneline --decorate -20";
sla = "log --oneline --decorate --graph --all -20";
slap = "log --oneline --decorate --graph --all";
slp = "log --oneline --decorate";
stash = "stash --included-untracked";
unassume = "update-index --no-assume-unchanged";
uncommit = "reset --soft HEAD^";
unstage = "reset";
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";
};
}

25
modules2/git/default-commit-message.nix Normal file
View file

@ -0,0 +1,25 @@
{
flake.modules.homeManager.base =
{ config, ... }:
{
home.file."${config.xdg.configHome}/git/message".text = ''
# Description
#
# - Why is this change necessary?
# - How does it address the issue?
# - What side effects does this change have?
#
# For breaking changes, uncomment the following line and describe the change:
#
# BREAKING CHANGE:
#
#
# Add any issue IDs or commit SHAs that this commit references:
#
# Refs:
'';
};
}

64
modules2/git/defaults.nix Normal file
View file

@ -0,0 +1,64 @@
{ config, ... }:
let
cfg = config;
in
{
flake.modules.homeManager.base =
{ config, ... }:
{
programs.git = {
userName = cfg.flake.meta.owner.name;
userEmail = cfg.flake.meta.owner.email;
extraConfig = {
branch = {
autosetupmerge = true;
autosetuprebase = "always";
sort = "-committerdate";
};
checkout.defaultRemote = "origin";
color.ui = true;
column.ui = "auto";
commit.template = "${config.xdg.configHome}/git/message";
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";
};
diff.tool = "vimdiff";
fetch.prune = true;
gpg.format = "ssh";
grep.lineNumber = true;
help.autocorrect = "1";
init.defaultBranch = "main";
maintenance = {
auto = false;
strategy = "incremental";
};
merge.ff = "only";
push = {
autoSetupRemote = true;
default = "upstream";
};
pull = {
ff = "only";
rebase = true;
};
rebase = {
autosquash = true;
autostash = true;
};
user.signingkey = "~/.ssh/id_rsa.pub";
};
};
};
}

3
modules2/git/enable.nix Normal file
View file

@ -0,0 +1,3 @@
{
flake.modules.homeManager.base.programs.git.enable = true;
}

13
modules2/git/extra-packages.nix Normal file
View file

@ -0,0 +1,13 @@
{
flake.modules.homeManager.base =
{ pkgs, ... }:
{
home.packages = with pkgs; [
git-exclude
git-extras
git-graph
git-trim
stable.git-instafix
];
};
}

11
modules2/git/ignores.nix Normal file
View file

@ -0,0 +1,11 @@
{
flake.modules.homeManager.base.programs.git.ignores = [
"/.ddev/providers/"
"/.direnv/"
"/.ignored/"
"/.issue-id"
"/.phpactor.json"
"/notes"
"/todo"
];
}

5
modules2/git/variables.nix Normal file
View file

@ -0,0 +1,5 @@
{
flake.modules.homeManager.base.home.sessionVariables = {
GIT_INSTAFIX_UPSTREAM = "origin/main";
};
}

11
modules2/owner.nix
View file

@ -2,14 +2,21 @@
{
flake = {
meta.owner.username = "opdavies";
meta.owner = {
email = "oliver@oliverdavies.uk";
name = "Oliver Davies";
username = "opdavies";
};
modules = {
nixos.pc = {
users.users.${config.flake.meta.owner.username} = {
isNormalUser = true;
initialPassword = lib.mkForce "";
extraGroups = [ "input" "wheel" ];
extraGroups = [
"input"
"wheel"
];
};
nix.settings.trusted-users = [ config.flake.meta.owner.username ];