samw/home
1
Fork 0
mirror of https://github.com/wlcx/home.git synced 2025-12-08 19:43:46 +00:00
Code Issues Projects Releases Wiki Activity

update to 25.11

Browse Source
This commit is contained in:
Sam W 2025-12-05 15:54:38 +00:00
parent 7c56f42779
commit 31b30027ce
3 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock generated
View File

@ -48,32 +48,32 @@
]
},
"locked": {
"lastModified": 1756245065,
"narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=",
"lastModified": 1764866045,
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "54b2879ce622d44415e727905925e21b8f833a98",
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1756494058,
"narHash": "sha256-Yxg5zKIM450FAq7ihT6wkbuJ+Fl3KjbSpPjwFhSgMGc=",
"lastModified": 1764948399,
"narHash": "sha256-yFQk8eqAX41XTZ20q4AV8QKvO3AcYgkuTE0IX1S8znA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2788026c663a210beeb81e85f93ca5e86243fb3c",
"rev": "97b06a59ddaf7f110b3846ce789a52e0486b42db",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-25.05",
"ref": "release-25.11",
"repo": "nixpkgs",
"type": "github"
}

4
flake.nix
View File

@ -3,14 +3,14 @@
inputs = {
# Nixpkgs
nixpkgs = {
url = "github:nixos/nixpkgs/release-25.05";
url = "github:nixos/nixpkgs/release-25.11";
};
nixpkgs-unstable = {
url = "github:nixos/nixpkgs";
};
# Other modules
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils";

71
home/git.nix
View File

@ -4,47 +4,46 @@
git-open
tea
];
programs.delta = {
# Better diffs
enable = true;
enableGitIntegration = true;
options = {
line-numbers = true;
};
};
programs.git = {
enable = true;
lfs.enable = true;
userName = "Sam Willcocks";
userEmail = "sam@wlcx.cc";
settings = {
user.name = "Sam Willcocks";
user.email = "sam@wlcx.cc";
alias = {
a = "add";
ap = "add -p";
br = "branch";
c = "commit";
ca = "commit --amend";
can = "commit --amend --no-edit";
cm = "commit -m";
co = "checkout";
d = "diff";
dc = "diff --cached";
l = "log";
lp = "log --patch";
p = "push";
pf = "push --force-with-lease";
r = "rebase";
rc = "rebase --continue";
ra = "rebase --autostash";
rai = "rebase --autostash --interactive";
rs = "restore --staged";
st = "status";
sw = "switch";
swc = "switch --create";
delta = {
# Better diffs
enable = true;
options = {
line-numbers = true;
gone = ''! git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' │ awk '$2 == "[gone]" {print $1}' | xargs -r git branch -D'';
};
};
aliases = {
a = "add";
ap = "add -p";
br = "branch";
c = "commit";
ca = "commit --amend";
can = "commit --amend --no-edit";
cm = "commit -m";
co = "checkout";
d = "diff";
dc = "diff --cached";
l = "log";
lp = "log --patch";
p = "push";
pf = "push --force-with-lease";
r = "rebase";
rc = "rebase --continue";
ra = "rebase --autostash";
rai = "rebase --autostash --interactive";
rs = "restore --staged";
st = "status";
sw = "switch";
swc = "switch --create";
gone = ''! git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' │ awk '$2 == "[gone]" {print $1}' | xargs -r git branch -D'';
};
extraConfig = {
branch.sort = "-committerdate";
push.default = "current";
init.defaultBranch = "main";