Skip to content

Commit fb5fde1

Browse files
GerschtliGerschtli
committed
treewide: update to 25.11
1 parent 4d9c4db commit fb5fde1

File tree

14 files changed

+128
-129
lines changed

14 files changed

+128
-129
lines changed

‎files/nix/nixos-shell-vm.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rootPath:
1515
};
1616
};
1717

18-
system.stateVersion = "25.05";
18+
system.stateVersion = "25.11";
1919

2020
virtualisation = {
2121
cores = 8;

‎files/nix/rpi-firmware.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let
1818
cp -r firmware/* ${placeholder "out"}
1919
'';
2020

21-
stateVersion = "25.05";
21+
stateVersion = "25.11";
2222
};
2323
};
2424

‎files/nix/rpi-image.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let
2222

2323
services.openssh.enable = true;
2424

25-
system.stateVersion = "25.05";
25+
system.stateVersion = "25.11";
2626

2727
# needed because wpa_supplicant fails on startup
2828
# see https://github.com/NixOS/nixpkgs/issues/82462

‎flake.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
description = "A collection of my system configs and dotfiles.";
33

44
inputs = {
5-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
66
unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
77

88
home-manager = {
9-
url = "github:nix-community/home-manager/release-25.05";
9+
url = "github:nix-community/home-manager/release-25.11";
1010
inputs.nixpkgs.follows = "nixpkgs";
1111
};
1212
nix-on-droid = {

‎home/base/desktop.nix‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ in
4848
development.direnv.enable = true;
4949

5050
programs = {
51-
idea-ultimate.enable = !config.custom.base.general.darwin;
52-
5351
pass = mkIf cfg.private {
5452
enable = true;
5553
browserpass = true;

‎home/base/general.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ in
108108
PAGER = "${pkgs.less}/bin/less";
109109
};
110110

111-
stateVersion = "25.05";
111+
stateVersion = "25.11";
112112
};
113113

114114
programs.fzf.enable = true;

‎home/base/server.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ in
2020
# needed because of https://github.com/NixOS/nix/issues/8508
2121
nix.gc = mkIf (config.home.username != "root") {
2222
automatic = true;
23-
frequency = "*-*-* 00:30:00";
23+
dates = "*-*-* 00:30:00";
2424
options = "--delete-older-than 14d";
2525
};
2626

‎home/programs/git/default.nix‎

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -112,82 +112,9 @@ in
112112
enable = true;
113113
lfs.enable = true;
114114

115-
userName = "Tobias Happ";
116-
userEmail = "[email protected]";
117-
118115
ignores = ignoreList;
119116

120-
aliases = {
121-
ad = "add --all --ignore-errors --";
122-
ba = "branch -a --verbose";
123-
bc = "switch --create";
124-
bd = "branch --verbose --delete";
125-
bdd = "branch --verbose -D";
126-
ca = "commit -q --branch --status --verbose --amend";
127-
cl = externGitAlias "git clone --recursive --progress";
128-
cm = "commit --branch --status --verbose";
129-
cn = externGitAlias ''git reflog expire --all && git fsck --unreachable --full && git prune && \
130-
git gc --aggressive --quiet && git repack -Adq && git prune-packed --quiet'';
131-
df = "diff";
132-
di = "diff --ignore-all-space";
133-
ds = "diff --staged";
134-
dsi = "diff --staged --ignore-all-space";
135-
fe = "fetch --progress";
136-
fm = externGitAlias "git fe --all && git fe --all --tags";
137-
lg = "log --stat";
138-
lp = "log -10 --patch-with-stat";
139-
ma = "merge --abort";
140-
me = "merge --stat --summary";
141-
mm = externGitAlias "git me origin/$(git branch-name)";
142-
pd = "push --no-verify --delete --progress origin";
143-
pf = externGitAlias "git ph --force-with-lease origin $(git branch-name)";
144-
pnf = externGitAlias "git pf --no-verify";
145-
ph = "push --progress --tags --set-upstream";
146-
pu = externGitAlias "for i in $(git remote); do git ph $i $(git branch-name); done";
147-
pn = externGitAlias "for i in $(git remote); do git ph --no-verify $i $(git branch-name); done";
148-
ra = "rebase --abort";
149-
rc = "rebase --continue";
150-
re = "reset";
151-
rh = "reset --hard";
152-
ri = "rebase --interactive";
153-
rp = "rebase --skip";
154-
rs = "reset --soft";
155-
rt = "restore";
156-
rv = "remote --verbose";
157-
sa = "stash push";
158-
sau = "stash push --include-untracked";
159-
sc = "stash clear";
160-
sl = "stash list";
161-
so = "stash pop";
162-
sp = "stash show --patch";
163-
st = "status";
164-
sw = "switch";
165-
sd = "switch --detach";
166-
tl = "tag --list -n";
167-
168-
mma = externGitAlias "git merge origin/$(git default-branch)";
169-
rde = externGitAlias "git rebase origin/develop";
170-
rma = externGitAlias "git rebase origin/$(git default-branch)";
171-
rup = externGitAlias "git rebase upstream/$(git default-branch)";
172-
sde = externGitAlias "git switch develop && git rebase origin/develop";
173-
sma = externGitAlias "git switch $(git default-branch) && git rebase origin/$(git default-branch)";
174-
175-
aliases = ''config --get-regexp "^alias"'';
176-
177-
bclean = externGitAlias ''git for-each-ref --format "%(refname:short)" refs/heads |
178-
${pkgs.gnugrep}/bin/grep -Ev "$(git default-branch)|$(git branch-name)" | ${pkgs.findutils}/bin/xargs git bd'';
179-
180-
branch-name = "branch --show-current";
181-
total-clean = externGitAlias "git co -f && git clean -dfx && git clean -dfX";
182-
183-
initial-commit = externGitAlias "git init && git commit --allow-empty --message 'chore: initial commit'";
184-
disable-upstream-push = "remote set-url upstream --push DISABLED";
185-
set-head = "remote set-head origin --auto";
186-
set-upstream = externGitAlias "git branch --set-upstream-to=origin/$(git branch-name) $(git branch-name)";
187-
default-branch = externGitAlias "git symbolic-ref refs/remotes/origin/HEAD | ${pkgs.gnused}/bin/sed 's@^refs/remotes/origin/@@'";
188-
};
189-
190-
extraConfig = {
117+
settings = {
191118
absorb.oneFixupPerCommit = true;
192119

193120
add.ignore-errors = true;
@@ -199,6 +126,77 @@ in
199126
statusHints = false;
200127
};
201128

129+
alias = {
130+
ad = "add --all --ignore-errors --";
131+
ba = "branch -a --verbose";
132+
bc = "switch --create";
133+
bd = "branch --verbose --delete";
134+
bdd = "branch --verbose -D";
135+
ca = "commit -q --branch --status --verbose --amend";
136+
cl = externGitAlias "git clone --recursive --progress";
137+
cm = "commit --branch --status --verbose";
138+
cn = externGitAlias ''git reflog expire --all && git fsck --unreachable --full && git prune && \
139+
git gc --aggressive --quiet && git repack -Adq && git prune-packed --quiet'';
140+
df = "diff";
141+
di = "diff --ignore-all-space";
142+
ds = "diff --staged";
143+
dsi = "diff --staged --ignore-all-space";
144+
fe = "fetch --progress";
145+
fm = externGitAlias "git fe --all && git fe --all --tags";
146+
lg = "log --stat";
147+
lp = "log -10 --patch-with-stat";
148+
ma = "merge --abort";
149+
me = "merge --stat --summary";
150+
mm = externGitAlias "git me origin/$(git branch-name)";
151+
pd = "push --no-verify --delete --progress origin";
152+
pf = externGitAlias "git ph --force-with-lease origin $(git branch-name)";
153+
pnf = externGitAlias "git pf --no-verify";
154+
ph = "push --progress --tags --set-upstream";
155+
pu = externGitAlias "for i in $(git remote); do git ph $i $(git branch-name); done";
156+
pn = externGitAlias "for i in $(git remote); do git ph --no-verify $i $(git branch-name); done";
157+
ra = "rebase --abort";
158+
rc = "rebase --continue";
159+
re = "reset";
160+
rh = "reset --hard";
161+
ri = "rebase --interactive";
162+
rp = "rebase --skip";
163+
rs = "reset --soft";
164+
rt = "restore";
165+
rv = "remote --verbose";
166+
sa = "stash push";
167+
sau = "stash push --include-untracked";
168+
sc = "stash clear";
169+
sl = "stash list";
170+
so = "stash pop";
171+
sp = "stash show --patch";
172+
st = "status";
173+
sw = "switch";
174+
sd = "switch --detach";
175+
tl = "tag --list -n";
176+
177+
mma = externGitAlias "git merge origin/$(git default-branch)";
178+
rde = externGitAlias "git rebase origin/develop";
179+
rma = externGitAlias "git rebase origin/$(git default-branch)";
180+
rup = externGitAlias "git rebase upstream/$(git default-branch)";
181+
sde = externGitAlias "git switch develop && git rebase origin/develop";
182+
sma = externGitAlias "git switch $(git default-branch) && git rebase origin/$(git default-branch)";
183+
184+
aliases = ''config --get-regexp "^alias"'';
185+
186+
bclean = externGitAlias ''git for-each-ref --format "%(refname:short)" refs/heads |
187+
${pkgs.gnugrep}/bin/grep -Ev "$(git default-branch)|$(git branch-name)" | ${pkgs.findutils}/bin/xargs git bd'';
188+
189+
branch-name = "branch --show-current";
190+
total-clean = externGitAlias "git co -f && git clean -dfx && git clean -dfX";
191+
192+
initial-commit = externGitAlias "git init && git commit --allow-empty --message 'chore: initial commit'";
193+
disable-upstream-push = "remote set-url upstream --push DISABLED";
194+
set-head = "remote set-head origin --auto";
195+
set-upstream = externGitAlias "git branch --set-upstream-to=origin/$(git branch-name) $(git branch-name)";
196+
default-branch = externGitAlias "git symbolic-ref refs/remotes/origin/HEAD | ${pkgs.gnused}/bin/sed 's@^refs/remotes/origin/@@'";
197+
};
198+
199+
202200
apply = {
203201
ignorewhitespace = "change";
204202
whitespace = "nowarn";
@@ -362,6 +360,11 @@ in
362360
title-focus = "blue default bold";
363361
};
364362
};
363+
364+
user = {
365+
name = "Tobias Happ";
366+
email = "[email protected]";
367+
};
365368
};
366369

367370
includes = flip map (attrValues config.custom.misc.work) (work: {

‎home/programs/ssh/default.nix‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -91,36 +91,22 @@ in
9191
};
9292
};
9393

94-
home.packages = [
95-
pkgs.openssh
96-
97-
(config.lib.custom.mkZshCompletion
98-
"kadd"
99-
./kadd-completion.zsh
100-
{ inherit keysDirectory; }
101-
)
102-
];
103-
104-
programs = {
105-
keychain = {
106-
enable = true;
107-
agents = [ "ssh" ];
108-
keys = [ ];
109-
};
110-
111-
ssh = {
112-
inherit (cfg) controlMaster;
113-
114-
enable = true;
94+
home = {
95+
file.".ssh/config".text = ''
96+
Include ~/.ssh/config.d/*
97+
98+
Host *
99+
ForwardAgent no
100+
AddKeysToAgent no
101+
Compression yes
102+
ServerAliveInterval 30
103+
ServerAliveCountMax 3
104+
HashKnownHosts yes
105+
UserKnownHostsFile ~/.ssh/known_hosts
106+
ControlMaster ${cfg.controlMaster}
107+
ControlPath ~/.ssh/socket-%r@%h-%p
108+
ControlPersist 10m
115109
116-
compression = true;
117-
serverAliveInterval = 30;
118-
hashKnownHosts = true;
119-
controlPath = "~/.ssh/socket-%r@%h-%p";
120-
controlPersist = "10m";
121-
122-
includes = [ "~/.ssh/config.d/*" ];
123-
extraConfig = ''
124110
CheckHostIP yes
125111
ConnectTimeout 60
126112
EnableSSHKeysign yes
@@ -132,8 +118,22 @@ in
132118
PubKeyAuthentication yes
133119
SendEnv LANG LC_*
134120
ServerAliveCountMax 30
135-
'';
136-
};
121+
'';
122+
123+
packages = [
124+
pkgs.openssh
125+
126+
(config.lib.custom.mkZshCompletion
127+
"kadd"
128+
./kadd-completion.zsh
129+
{ inherit keysDirectory; }
130+
)
131+
];
132+
};
133+
134+
programs.keychain = {
135+
enable = true;
136+
keys = [ ];
137137
};
138138

139139
};

0 commit comments

Comments
 (0)