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

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": {

4
modules/git/aliases.nix
View file

@ -1,5 +1,6 @@
{ {
flake.modules.homeManager.base.programs.git.aliases = { flake.modules.homeManager.base.programs.git = {
settings.aliases = {
aa = "add --all"; aa = "add --all";
assume = "update-index --assume-unchanged"; assume = "update-index --assume-unchanged";
assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-"; assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
@ -47,4 +48,5 @@
ureset = "!git reset --hard $(git upstream)"; ureset = "!git reset --hard $(git upstream)";
worktrees = "worktree list"; 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;
};
}; };
} }