summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_sources/generated.json30
-rw-r--r--_sources/generated.nix30
-rw-r--r--accounts/gkleen@sif/systemd.nix63
-rw-r--r--flake.lock267
-rw-r--r--flake.nix10
-rw-r--r--hosts/sif/default.nix4
-rw-r--r--lib/pythonSet.nix7
-rw-r--r--nvfetcher.toml4
-rw-r--r--overlays/etesync-dav.nix6
-rw-r--r--overlays/nix-output-monitor.nix9
-rw-r--r--system-profiles/nfsroot.nix2
-rw-r--r--user-profiles/utils.nix2
12 files changed, 208 insertions, 226 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index d8abdb3b..df25df57 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -22,7 +22,7 @@
22 }, 22 },
23 "bpf-examples": { 23 "bpf-examples": {
24 "cargoLock": null, 24 "cargoLock": null,
25 "date": "2026-06-09", 25 "date": "2026-07-13",
26 "extract": null, 26 "extract": null,
27 "name": "bpf-examples", 27 "name": "bpf-examples",
28 "passthru": null, 28 "passthru": null,
@@ -34,12 +34,12 @@
34 "name": null, 34 "name": null,
35 "owner": "xdp-project", 35 "owner": "xdp-project",
36 "repo": "bpf-examples", 36 "repo": "bpf-examples",
37 "rev": "43e565901c4287efa863edca7f0e6cd6e35ed896", 37 "rev": "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3",
38 "sha256": "sha256-d4JZy/QXGc0r3IaxgnmfIx45Sh5iH1VxbB/Pkz8XvoI=", 38 "sha256": "sha256-GMU07jroyT4dckTqfip1WgBjfSXNO7vmueb0VmcVE30=",
39 "sparseCheckout": [], 39 "sparseCheckout": [],
40 "type": "github" 40 "type": "github"
41 }, 41 },
42 "version": "43e565901c4287efa863edca7f0e6cd6e35ed896" 42 "version": "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3"
43 }, 43 },
44 "emacs-scratch_el": { 44 "emacs-scratch_el": {
45 "cargoLock": null, 45 "cargoLock": null,
@@ -293,7 +293,7 @@
293 }, 293 },
294 "nix-output-monitor": { 294 "nix-output-monitor": {
295 "cargoLock": null, 295 "cargoLock": null,
296 "date": "2026-05-29", 296 "date": "2026-07-14",
297 "extract": null, 297 "extract": null,
298 "name": "nix-output-monitor", 298 "name": "nix-output-monitor",
299 "passthru": null, 299 "passthru": null,
@@ -303,13 +303,13 @@
303 "fetchSubmodules": false, 303 "fetchSubmodules": false,
304 "leaveDotGit": false, 304 "leaveDotGit": false,
305 "name": null, 305 "name": null,
306 "rev": "df744a9d1777f05ea3cb6a173a280c595b8f69b0", 306 "rev": "030658cd63512887c74652261079ca8bbb636c23",
307 "sha256": "sha256-74ZOOlyPjLKohnxn4ghsyk5o1Ts3RTlJ4L7klCCdp/U=", 307 "sha256": "sha256-Ok5wLwYcQvM4u4zS1b7aP72sFH/bWlowWvBPvx+LPqs=",
308 "sparseCheckout": [], 308 "sparseCheckout": [],
309 "type": "git", 309 "type": "git",
310 "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" 310 "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git"
311 }, 311 },
312 "version": "df744a9d1777f05ea3cb6a173a280c595b8f69b0" 312 "version": "030658cd63512887c74652261079ca8bbb636c23"
313 }, 313 },
314 "postfix-mta-sts-resolver": { 314 "postfix-mta-sts-resolver": {
315 "cargoLock": null, 315 "cargoLock": null,
@@ -375,7 +375,7 @@
375 }, 375 },
376 "quickshell": { 376 "quickshell": {
377 "cargoLock": null, 377 "cargoLock": null,
378 "date": "2026-06-18", 378 "date": "2026-07-10",
379 "extract": null, 379 "extract": null,
380 "name": "quickshell", 380 "name": "quickshell",
381 "passthru": null, 381 "passthru": null,
@@ -385,13 +385,13 @@
385 "fetchSubmodules": false, 385 "fetchSubmodules": false,
386 "leaveDotGit": false, 386 "leaveDotGit": false,
387 "name": null, 387 "name": null,
388 "rev": "68c2c85c33845385f7ab8147b32f1450b1e468e0", 388 "rev": "4df562dfb2475a9057f0f33a8db75808efad8670",
389 "sha256": "sha256-Mo2YtNEGlcySnbq0YuP3nUKMAQCMAfE+TcCffo5vzD8=", 389 "sha256": "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs=",
390 "sparseCheckout": [], 390 "sparseCheckout": [],
391 "type": "git", 391 "type": "git",
392 "url": "https://git.outfoxxed.me/quickshell/quickshell.git" 392 "url": "https://git.outfoxxed.me/quickshell/quickshell.git"
393 }, 393 },
394 "version": "68c2c85c33845385f7ab8147b32f1450b1e468e0" 394 "version": "4df562dfb2475a9057f0f33a8db75808efad8670"
395 }, 395 },
396 "scutiger": { 396 "scutiger": {
397 "cargoLock": null, 397 "cargoLock": null,
@@ -511,12 +511,12 @@
511 "name": null, 511 "name": null,
512 "owner": "yt-dlp", 512 "owner": "yt-dlp",
513 "repo": "yt-dlp", 513 "repo": "yt-dlp",
514 "rev": "2026.06.09", 514 "rev": "2026.07.04",
515 "sha256": "sha256-ykqTDPzKKIWRGSQmw2esCRKyYqDZKXRYDeba888tkDU=", 515 "sha256": "sha256-+oHcVylLXFJTRR6jXF6IXvgntXJz0tRdtnwTruRPkoc=",
516 "sparseCheckout": [], 516 "sparseCheckout": [],
517 "type": "github" 517 "type": "github"
518 }, 518 },
519 "version": "2026.06.09" 519 "version": "2026.07.04"
520 }, 520 },
521 "yt-dlp-ejs": { 521 "yt-dlp-ejs": {
522 "cargoLock": null, 522 "cargoLock": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 7a5e95ab..bc46d643 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -23,15 +23,15 @@
23 }; 23 };
24 bpf-examples = { 24 bpf-examples = {
25 pname = "bpf-examples"; 25 pname = "bpf-examples";
26 version = "43e565901c4287efa863edca7f0e6cd6e35ed896"; 26 version = "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3";
27 src = fetchFromGitHub { 27 src = fetchFromGitHub {
28 owner = "xdp-project"; 28 owner = "xdp-project";
29 repo = "bpf-examples"; 29 repo = "bpf-examples";
30 rev = "43e565901c4287efa863edca7f0e6cd6e35ed896"; 30 rev = "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3";
31 fetchSubmodules = true; 31 fetchSubmodules = true;
32 sha256 = "sha256-d4JZy/QXGc0r3IaxgnmfIx45Sh5iH1VxbB/Pkz8XvoI="; 32 sha256 = "sha256-GMU07jroyT4dckTqfip1WgBjfSXNO7vmueb0VmcVE30=";
33 }; 33 };
34 date = "2026-06-09"; 34 date = "2026-07-13";
35 }; 35 };
36 emacs-scratch_el = { 36 emacs-scratch_el = {
37 pname = "emacs-scratch_el"; 37 pname = "emacs-scratch_el";
@@ -185,17 +185,17 @@
185 }; 185 };
186 nix-output-monitor = { 186 nix-output-monitor = {
187 pname = "nix-output-monitor"; 187 pname = "nix-output-monitor";
188 version = "df744a9d1777f05ea3cb6a173a280c595b8f69b0"; 188 version = "030658cd63512887c74652261079ca8bbb636c23";
189 src = fetchgit { 189 src = fetchgit {
190 url = "https://code.maralorn.de/maralorn/nix-output-monitor.git"; 190 url = "https://code.maralorn.de/maralorn/nix-output-monitor.git";
191 rev = "df744a9d1777f05ea3cb6a173a280c595b8f69b0"; 191 rev = "030658cd63512887c74652261079ca8bbb636c23";
192 fetchSubmodules = false; 192 fetchSubmodules = false;
193 deepClone = false; 193 deepClone = false;
194 leaveDotGit = false; 194 leaveDotGit = false;
195 sparseCheckout = [ ]; 195 sparseCheckout = [ ];
196 sha256 = "sha256-74ZOOlyPjLKohnxn4ghsyk5o1Ts3RTlJ4L7klCCdp/U="; 196 sha256 = "sha256-Ok5wLwYcQvM4u4zS1b7aP72sFH/bWlowWvBPvx+LPqs=";
197 }; 197 };
198 date = "2026-05-29"; 198 date = "2026-07-14";
199 }; 199 };
200 postfix-mta-sts-resolver = { 200 postfix-mta-sts-resolver = {
201 pname = "postfix-mta-sts-resolver"; 201 pname = "postfix-mta-sts-resolver";
@@ -237,17 +237,17 @@
237 }; 237 };
238 quickshell = { 238 quickshell = {
239 pname = "quickshell"; 239 pname = "quickshell";
240 version = "68c2c85c33845385f7ab8147b32f1450b1e468e0"; 240 version = "4df562dfb2475a9057f0f33a8db75808efad8670";
241 src = fetchgit { 241 src = fetchgit {
242 url = "https://git.outfoxxed.me/quickshell/quickshell.git"; 242 url = "https://git.outfoxxed.me/quickshell/quickshell.git";
243 rev = "68c2c85c33845385f7ab8147b32f1450b1e468e0"; 243 rev = "4df562dfb2475a9057f0f33a8db75808efad8670";
244 fetchSubmodules = false; 244 fetchSubmodules = false;
245 deepClone = false; 245 deepClone = false;
246 leaveDotGit = false; 246 leaveDotGit = false;
247 sparseCheckout = [ ]; 247 sparseCheckout = [ ];
248 sha256 = "sha256-Mo2YtNEGlcySnbq0YuP3nUKMAQCMAfE+TcCffo5vzD8="; 248 sha256 = "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs=";
249 }; 249 };
250 date = "2026-06-18"; 250 date = "2026-07-10";
251 }; 251 };
252 scutiger = { 252 scutiger = {
253 pname = "scutiger"; 253 pname = "scutiger";
@@ -313,13 +313,13 @@
313 }; 313 };
314 yt-dlp = { 314 yt-dlp = {
315 pname = "yt-dlp"; 315 pname = "yt-dlp";
316 version = "2026.06.09"; 316 version = "2026.07.04";
317 src = fetchFromGitHub { 317 src = fetchFromGitHub {
318 owner = "yt-dlp"; 318 owner = "yt-dlp";
319 repo = "yt-dlp"; 319 repo = "yt-dlp";
320 rev = "2026.06.09"; 320 rev = "2026.07.04";
321 fetchSubmodules = false; 321 fetchSubmodules = false;
322 sha256 = "sha256-ykqTDPzKKIWRGSQmw2esCRKyYqDZKXRYDeba888tkDU="; 322 sha256 = "sha256-+oHcVylLXFJTRR6jXF6IXvgntXJz0tRdtnwTruRPkoc=";
323 }; 323 };
324 }; 324 };
325 yt-dlp-ejs = { 325 yt-dlp-ejs = {
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index c21514ea..7aee29c5 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -239,69 +239,6 @@ in {
239 WatchdogSec = "2s"; 239 WatchdogSec = "2s";
240 }; 240 };
241 }; 241 };
242 gtklock = {
243 Unit = {
244 Requisite = ["graphical-session.target"];
245 After = [ "graphical-session.target" ];
246 PartOf = ["graphical-session.target"];
247 };
248 Service = {
249 Type = "notify";
250 RuntimeDirectory = "gtklock";
251 CacheDirectory = "gtklock";
252 ExecStartPre = [
253 "-${lib.getExe' pkgs.libsForQt5.qt5.qttools.bin "qdbus"} org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases"
254 "-${lib.getExe' config.systemd.package "systemctl"} --user stop gpg-agent.service"
255 "-${lib.getExe pkgs.playerctl} -a pause"
256 "-${lib.getExe (pkgs.writeShellApplication {
257 name = "generate-css";
258 runtimeInputs = with pkgs; [cfg.services.wpaperd.package jq coreutils imagemagick findutils];
259 text = ''
260 declare -A monitors
261 monitors=()
262 while IFS= read -r entry; do
263 path=$(jq -r ".path" <<<"$entry")
264 [[ -z "$path" || ! -f "$path" ]] && continue
265 blurred_path="$CACHE_DIRECTORY"/"$(b2sum -l 128 <<<"$path" | cut -d' ' -f1)"."''${path##*.}"
266 monitor=$(jq -r ".display" <<<"$entry")
267 if [[ ! -f "$blurred_path" ]]; then
268 mkdir -p "$(dirname "$blurred_path")"
269 magick "$path" -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$blurred_path" &
270 fi
271 monitors+=([$monitor]="$blurred_path")
272 done < <(wpaperctl all-wallpapers -j | jq -c ".[]")
273 # wait
274
275 cp --no-preserve=mode ${pkgs.writeText "gtklock.css" ''
276 #window-box {
277 padding: 64px;
278 /* border: 1px solid black; */
279 border-radius: 4px;
280 box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 12px;
281 /* background-color: white; */
282 background-color: rgba(0, 0, 0, 0.5);
283 }
284 ''} "$RUNTIME_DIRECTORY"/style.css
285 for monitor in "''${!monitors[@]}"; do
286 cat >>"$RUNTIME_DIRECTORY"/style.css <<EOF
287 window#''${monitor} {
288 background-image: url("''${monitors[$monitor]}");
289 background-repeat: no-repeat;
290 background-size: 100% 100%;
291 background-origin: content-box;
292 }
293 EOF
294 done
295 '';
296 })}"
297 ];
298 NotifyAccess = "all";
299 ExecStart = ''${lib.getExe pkgs.gtklock} -s "''${RUNTIME_DIRECTORY}/style.css" -L ${pkgs.writeShellScript "after-lock" ''
300 ${lib.getExe cfg.programs.niri.package} msg action power-off-monitors
301 ${lib.getExe' config.systemd.package "systemd-notify"} --ready
302 ''}'';
303 };
304 };
305 "yt-dlp@" = { 242 "yt-dlp@" = {
306 Service = { 243 Service = {
307 Type = "notify"; 244 Type = "notify";
diff --git a/flake.lock b/flake.lock
index b2b23295..106f7c3e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,11 +65,11 @@
65 }, 65 },
66 "crane": { 66 "crane": {
67 "locked": { 67 "locked": {
68 "lastModified": 1754269165, 68 "lastModified": 1781825982,
69 "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", 69 "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=",
70 "owner": "ipetkov", 70 "owner": "ipetkov",
71 "repo": "crane", 71 "repo": "crane",
72 "rev": "444e81206df3f7d92780680e45858e31d2f07a08", 72 "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",
73 "type": "github" 73 "type": "github"
74 }, 74 },
75 "original": { 75 "original": {
@@ -91,11 +91,11 @@
91 ] 91 ]
92 }, 92 },
93 "locked": { 93 "locked": {
94 "lastModified": 1770019181, 94 "lastModified": 1781627888,
95 "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", 95 "narHash": "sha256-5yHuAh9k7rT7rtf3uRaXkiUyYvQE9oaCgzhprLm2mr8=",
96 "owner": "serokell", 96 "owner": "serokell",
97 "repo": "deploy-rs", 97 "repo": "deploy-rs",
98 "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", 98 "rev": "6d3087eedff75a715b40c0e124ba15d2dd7bec28",
99 "type": "github" 99 "type": "github"
100 }, 100 },
101 "original": { 101 "original": {
@@ -157,15 +157,15 @@
157 "flake-compat_4": { 157 "flake-compat_4": {
158 "flake": false, 158 "flake": false,
159 "locked": { 159 "locked": {
160 "lastModified": 1747046372, 160 "lastModified": 1767039857,
161 "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", 161 "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
162 "owner": "edolstra", 162 "owner": "NixOS",
163 "repo": "flake-compat", 163 "repo": "flake-compat",
164 "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", 164 "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
165 "type": "github" 165 "type": "github"
166 }, 166 },
167 "original": { 167 "original": {
168 "owner": "edolstra", 168 "owner": "NixOS",
169 "repo": "flake-compat", 169 "repo": "flake-compat",
170 "type": "github" 170 "type": "github"
171 } 171 }
@@ -189,6 +189,22 @@
189 "flake-compat_6": { 189 "flake-compat_6": {
190 "flake": false, 190 "flake": false,
191 "locked": { 191 "locked": {
192 "lastModified": 1767039857,
193 "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
194 "owner": "NixOS",
195 "repo": "flake-compat",
196 "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
197 "type": "github"
198 },
199 "original": {
200 "owner": "NixOS",
201 "repo": "flake-compat",
202 "type": "github"
203 }
204 },
205 "flake-compat_7": {
206 "flake": false,
207 "locked": {
192 "lastModified": 1673956053, 208 "lastModified": 1673956053,
193 "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", 209 "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
194 "owner": "edolstra", 210 "owner": "edolstra",
@@ -240,27 +256,6 @@
240 }, 256 },
241 "flake-parts_3": { 257 "flake-parts_3": {
242 "inputs": { 258 "inputs": {
243 "nixpkgs-lib": [
244 "lanzaboote",
245 "nixpkgs"
246 ]
247 },
248 "locked": {
249 "lastModified": 1754091436,
250 "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
251 "owner": "hercules-ci",
252 "repo": "flake-parts",
253 "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
254 "type": "github"
255 },
256 "original": {
257 "owner": "hercules-ci",
258 "repo": "flake-parts",
259 "type": "github"
260 }
261 },
262 "flake-parts_4": {
263 "inputs": {
264 "nixpkgs-lib": "nixpkgs-lib_3" 259 "nixpkgs-lib": "nixpkgs-lib_3"
265 }, 260 },
266 "locked": { 261 "locked": {
@@ -280,11 +275,11 @@
280 "flake-registry": { 275 "flake-registry": {
281 "flake": false, 276 "flake": false,
282 "locked": { 277 "locked": {
283 "lastModified": 1763556067, 278 "lastModified": 1782548455,
284 "narHash": "sha256-q2jzJQdsJMpD3dbuNphQJgwx6XeGPonWOp43U0nY7o0=", 279 "narHash": "sha256-Jjp/ZivVqZCLptwlSuwU8n0a8b8PXJqabxpSG7KRNuI=",
285 "owner": "NixOS", 280 "owner": "NixOS",
286 "repo": "flake-registry", 281 "repo": "flake-registry",
287 "rev": "cb70c9306b44501de412649c356dee503a25f119", 282 "rev": "10bd3d9e8eefb4725e346eddd3a505aa0aacf01b",
288 "type": "github" 283 "type": "github"
289 }, 284 },
290 "original": { 285 "original": {
@@ -327,6 +322,28 @@
327 "type": "github" 322 "type": "github"
328 } 323 }
329 }, 324 },
325 "git-hooks": {
326 "inputs": {
327 "flake-compat": "flake-compat_6",
328 "nixpkgs": [
329 "nix-output-monitor",
330 "nixpkgs"
331 ]
332 },
333 "locked": {
334 "lastModified": 1783008725,
335 "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=",
336 "owner": "cachix",
337 "repo": "git-hooks.nix",
338 "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe",
339 "type": "github"
340 },
341 "original": {
342 "owner": "cachix",
343 "repo": "git-hooks.nix",
344 "type": "github"
345 }
346 },
330 "gitignore": { 347 "gitignore": {
331 "inputs": { 348 "inputs": {
332 "nixpkgs": [ 349 "nixpkgs": [
@@ -395,7 +412,7 @@
395 "inputs": { 412 "inputs": {
396 "nixpkgs": [ 413 "nixpkgs": [
397 "lanzaboote", 414 "lanzaboote",
398 "pre-commit-hooks-nix", 415 "pre-commit",
399 "nixpkgs" 416 "nixpkgs"
400 ] 417 ]
401 }, 418 },
@@ -543,25 +560,23 @@
543 "lanzaboote": { 560 "lanzaboote": {
544 "inputs": { 561 "inputs": {
545 "crane": "crane", 562 "crane": "crane",
546 "flake-compat": "flake-compat_4",
547 "flake-parts": "flake-parts_3",
548 "nixpkgs": [ 563 "nixpkgs": [
549 "nixpkgs" 564 "nixpkgs"
550 ], 565 ],
551 "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", 566 "pre-commit": "pre-commit",
552 "rust-overlay": "rust-overlay" 567 "rust-overlay": "rust-overlay"
553 }, 568 },
554 "locked": { 569 "locked": {
555 "lastModified": 1762205063, 570 "lastModified": 1782141370,
556 "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", 571 "narHash": "sha256-hqijVSEETttmo8Okql9/LG0Ua34hdciKW1a5zzlj8mU=",
557 "owner": "nix-community", 572 "owner": "nix-community",
558 "repo": "lanzaboote", 573 "repo": "lanzaboote",
559 "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", 574 "rev": "7c9a54a7f87b4539ddbd8bda09a8a5f5f9361aa9",
560 "type": "github" 575 "type": "github"
561 }, 576 },
562 "original": { 577 "original": {
563 "owner": "nix-community", 578 "owner": "nix-community",
564 "ref": "v0.4.3", 579 "ref": "v1.1.0",
565 "repo": "lanzaboote", 580 "repo": "lanzaboote",
566 "type": "github" 581 "type": "github"
567 } 582 }
@@ -586,11 +601,11 @@
586 "pre-commit-hooks": "pre-commit-hooks" 601 "pre-commit-hooks": "pre-commit-hooks"
587 }, 602 },
588 "locked": { 603 "locked": {
589 "lastModified": 1774615085, 604 "lastModified": 1783168812,
590 "narHash": "sha256-MoLQKyK7wHL9ffTQ+V7Xxkj2SYMSUwQXYRlCZ9ZQ/lM=", 605 "narHash": "sha256-MIbPzNH0ZjQVrpmhvfp6+VHIoGx4/SFJ4C8OYDrzWIQ=",
591 "ref": "refs/heads/main", 606 "ref": "refs/heads/main",
592 "rev": "8347adf30aa1c7c43bc0abbc2bee7d3bb49ccd95", 607 "rev": "0b3ca2661ecdb36f9b61499d94e80b8f47b528ca",
593 "revCount": 6, 608 "revCount": 8,
594 "type": "git", 609 "type": "git",
595 "url": "https://codeberg.org/debugloop/niri-autoselect-portal.git" 610 "url": "https://codeberg.org/debugloop/niri-autoselect-portal.git"
596 }, 611 },
@@ -611,11 +626,11 @@
611 "xwayland-satellite-unstable": "xwayland-satellite-unstable" 626 "xwayland-satellite-unstable": "xwayland-satellite-unstable"
612 }, 627 },
613 "locked": { 628 "locked": {
614 "lastModified": 1780062130, 629 "lastModified": 1784043058,
615 "narHash": "sha256-3XF+oy0PX4aajJw2RNB8rlMpyu0eXCG4pGH7fe94yBg=", 630 "narHash": "sha256-/LXa/IHpH6zqcxrfhtUaZOPZHfk0WXi5YUTICaslMCI=",
616 "owner": "sodiboo", 631 "owner": "sodiboo",
617 "repo": "niri-flake", 632 "repo": "niri-flake",
618 "rev": "3cb351d73c357a4e413f59c4551d219118791c14", 633 "rev": "24728b7da2cde86eb119a771c16b214f0751f91e",
619 "type": "github" 634 "type": "github"
620 }, 635 },
621 "original": { 636 "original": {
@@ -645,11 +660,11 @@
645 "niri-unstable": { 660 "niri-unstable": {
646 "flake": false, 661 "flake": false,
647 "locked": { 662 "locked": {
648 "lastModified": 1770366183, 663 "lastModified": 1784188820,
649 "narHash": "sha256-kqllrO92WQEjqEOoxHxt2L64NwUhbRKoKdBijbK9qnM=", 664 "narHash": "sha256-7v8TuMV5ns5DType3nSmW/gWn/rCcH6tAD6qQz4fL8I=",
650 "owner": "gkleen", 665 "owner": "gkleen",
651 "repo": "niri", 666 "repo": "niri",
652 "rev": "eb22080cfd1fe7e60e860934c3ac087cd175ec2a", 667 "rev": "d37ad88eb9222c1163bb050b00dc4b663cf1d433",
653 "type": "github" 668 "type": "github"
654 }, 669 },
655 "original": { 670 "original": {
@@ -687,11 +702,11 @@
687 ] 702 ]
688 }, 703 },
689 "locked": { 704 "locked": {
690 "lastModified": 1780210899, 705 "lastModified": 1783864904,
691 "narHash": "sha256-4axz3OBPTKa6LIkXV8n0lc63MQU+et2CB5DGobEAi6k=", 706 "narHash": "sha256-BQxN5UMg9FOevAsgBRwPxfxlh51Puj+dNn/8Dsi3sPM=",
692 "owner": "nix-community", 707 "owner": "nix-community",
693 "repo": "nix-index-database", 708 "repo": "nix-index-database",
694 "rev": "97df9dc0b7c924344b793a15c1e8e4522ebb854e", 709 "rev": "1111b9bc836afb7e31a7014e8d1272de9b1c917d",
695 "type": "github" 710 "type": "github"
696 }, 711 },
697 "original": { 712 "original": {
@@ -722,6 +737,30 @@
722 "type": "github" 737 "type": "github"
723 } 738 }
724 }, 739 },
740 "nix-output-monitor": {
741 "inputs": {
742 "flake-utils": [
743 "flake-utils"
744 ],
745 "git-hooks": "git-hooks",
746 "nixpkgs": [
747 "nixpkgs"
748 ]
749 },
750 "locked": {
751 "lastModified": 1784058796,
752 "narHash": "sha256-Ok5wLwYcQvM4u4zS1b7aP72sFH/bWlowWvBPvx+LPqs=",
753 "ref": "refs/heads/main",
754 "rev": "030658cd63512887c74652261079ca8bbb636c23",
755 "revCount": 793,
756 "type": "git",
757 "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git"
758 },
759 "original": {
760 "type": "git",
761 "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git"
762 }
763 },
725 "nixVirt": { 764 "nixVirt": {
726 "inputs": { 765 "inputs": {
727 "nixpkgs": [ 766 "nixpkgs": [
@@ -729,11 +768,11 @@
729 ] 768 ]
730 }, 769 },
731 "locked": { 770 "locked": {
732 "lastModified": 1774166436, 771 "lastModified": 1783240168,
733 "narHash": "sha256-Lr1R+tx8ZMiB+aBWyvCaeDaFGivhMMQEq9iGp4F43bI=", 772 "narHash": "sha256-9zaLOKal8uI+ecKaOBCOfGcZe/HG1xQQnlDDjPoOmwE=",
734 "owner": "AshleyYakeley", 773 "owner": "AshleyYakeley",
735 "repo": "NixVirt", 774 "repo": "NixVirt",
736 "rev": "bf291972bec36018f39e61b0915940628ba9054c", 775 "rev": "6d213ab42f72ba41c2eb4e6bdb97581c0642d942",
737 "type": "github" 776 "type": "github"
738 }, 777 },
739 "original": { 778 "original": {
@@ -747,11 +786,11 @@
747 "nixpkgs": "nixpkgs_4" 786 "nixpkgs": "nixpkgs_4"
748 }, 787 },
749 "locked": { 788 "locked": {
750 "lastModified": 1780065812, 789 "lastModified": 1784100666,
751 "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=", 790 "narHash": "sha256-HF/mrw5NYQfKFZgkfV2h1UL5/E3ccfsE2XJ1AbbLLJ0=",
752 "owner": "NixOS", 791 "owner": "NixOS",
753 "repo": "nixos-hardware", 792 "repo": "nixos-hardware",
754 "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144", 793 "rev": "fccfa9031a85b78a437f2f153c1f6449f3bc3185",
755 "type": "github" 794 "type": "github"
756 }, 795 },
757 "original": { 796 "original": {
@@ -872,11 +911,11 @@
872 }, 911 },
873 "nixpkgs-stable_2": { 912 "nixpkgs-stable_2": {
874 "locked": { 913 "locked": {
875 "lastModified": 1779796641, 914 "lastModified": 1782847189,
876 "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", 915 "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
877 "owner": "NixOS", 916 "owner": "NixOS",
878 "repo": "nixpkgs", 917 "repo": "nixpkgs",
879 "rev": "25f538306313eae3927264466c70d7001dcea1df", 918 "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
880 "type": "github" 919 "type": "github"
881 }, 920 },
882 "original": { 921 "original": {
@@ -965,11 +1004,11 @@
965 }, 1004 },
966 "nixpkgs_5": { 1005 "nixpkgs_5": {
967 "locked": { 1006 "locked": {
968 "lastModified": 1779560665, 1007 "lastModified": 1784120854,
969 "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", 1008 "narHash": "sha256-KesHgItiZPgGX740axSiQLcIQ8D24MDqNpkKYWIek8k=",
970 "owner": "NixOS", 1009 "owner": "NixOS",
971 "repo": "nixpkgs", 1010 "repo": "nixpkgs",
972 "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", 1011 "rev": "753cc8a3a87467296ddd1fa93f0cc3e81120ee46",
973 "type": "github" 1012 "type": "github"
974 }, 1013 },
975 "original": { 1014 "original": {
@@ -1049,6 +1088,29 @@
1049 "type": "github" 1088 "type": "github"
1050 } 1089 }
1051 }, 1090 },
1091 "pre-commit": {
1092 "inputs": {
1093 "flake-compat": "flake-compat_4",
1094 "gitignore": "gitignore_4",
1095 "nixpkgs": [
1096 "lanzaboote",
1097 "nixpkgs"
1098 ]
1099 },
1100 "locked": {
1101 "lastModified": 1781733627,
1102 "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
1103 "owner": "cachix",
1104 "repo": "pre-commit-hooks.nix",
1105 "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
1106 "type": "github"
1107 },
1108 "original": {
1109 "owner": "cachix",
1110 "repo": "pre-commit-hooks.nix",
1111 "type": "github"
1112 }
1113 },
1052 "pre-commit-hooks": { 1114 "pre-commit-hooks": {
1053 "inputs": { 1115 "inputs": {
1054 "flake-compat": "flake-compat_5", 1116 "flake-compat": "flake-compat_5",
@@ -1115,33 +1177,7 @@
1115 }, 1177 },
1116 "pre-commit-hooks-nix_3": { 1178 "pre-commit-hooks-nix_3": {
1117 "inputs": { 1179 "inputs": {
1118 "flake-compat": [ 1180 "flake-compat": "flake-compat_7",
1119 "lanzaboote",
1120 "flake-compat"
1121 ],
1122 "gitignore": "gitignore_4",
1123 "nixpkgs": [
1124 "lanzaboote",
1125 "nixpkgs"
1126 ]
1127 },
1128 "locked": {
1129 "lastModified": 1750779888,
1130 "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
1131 "owner": "cachix",
1132 "repo": "pre-commit-hooks.nix",
1133 "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
1134 "type": "github"
1135 },
1136 "original": {
1137 "owner": "cachix",
1138 "repo": "pre-commit-hooks.nix",
1139 "type": "github"
1140 }
1141 },
1142 "pre-commit-hooks-nix_4": {
1143 "inputs": {
1144 "flake-compat": "flake-compat_6",
1145 "flake-utils": "flake-utils_2", 1181 "flake-utils": "flake-utils_2",
1146 "gitignore": "gitignore_6", 1182 "gitignore": "gitignore_6",
1147 "nixpkgs": "nixpkgs_6", 1183 "nixpkgs": "nixpkgs_6",
@@ -1163,14 +1199,14 @@
1163 }, 1199 },
1164 "prometheus-borg-exporter": { 1200 "prometheus-borg-exporter": {
1165 "inputs": { 1201 "inputs": {
1166 "flake-parts": "flake-parts_4", 1202 "flake-parts": "flake-parts_3",
1167 "gitignore": [ 1203 "gitignore": [
1168 "gitignore" 1204 "gitignore"
1169 ], 1205 ],
1170 "nixpkgs": [ 1206 "nixpkgs": [
1171 "nixpkgs" 1207 "nixpkgs"
1172 ], 1208 ],
1173 "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", 1209 "pre-commit-hooks-nix": "pre-commit-hooks-nix_3",
1174 "pyproject-build-systems": [ 1210 "pyproject-build-systems": [
1175 "pyproject-build-systems" 1211 "pyproject-build-systems"
1176 ], 1212 ],
@@ -1238,11 +1274,11 @@
1238 ] 1274 ]
1239 }, 1275 },
1240 "locked": { 1276 "locked": {
1241 "lastModified": 1779676664, 1277 "lastModified": 1782093830,
1242 "narHash": "sha256-MbXylBTkWqVm8/VYjoULtMoVRgWBN1gSHbeRKsOsPlU=", 1278 "narHash": "sha256-6gmEVe69+KlRkZD4PEEV5xAlB9CB0Y9TiuEgQjDrKTQ=",
1243 "owner": "pyproject-nix", 1279 "owner": "pyproject-nix",
1244 "repo": "build-system-pkgs", 1280 "repo": "build-system-pkgs",
1245 "rev": "7bff980f37fc24e09dbc986643719900c139bf12", 1281 "rev": "430680a19bc85a3bda55f12e4cc1a1aadcf2e478",
1246 "type": "github" 1282 "type": "github"
1247 }, 1283 },
1248 "original": { 1284 "original": {
@@ -1258,11 +1294,11 @@
1258 ] 1294 ]
1259 }, 1295 },
1260 "locked": { 1296 "locked": {
1261 "lastModified": 1778901413, 1297 "lastModified": 1782905613,
1262 "narHash": "sha256-GSKXTAnFqRAMlZkJrIPcQMYf+lpMr66K3i60mB9STvc=", 1298 "narHash": "sha256-SvXJcAemihifkTn4BGvyE5K1FJX9bl4U8DQ5pqKvD0s=",
1263 "owner": "pyproject-nix", 1299 "owner": "pyproject-nix",
1264 "repo": "pyproject.nix", 1300 "repo": "pyproject.nix",
1265 "rev": "a228447c3e179d477c1b6246ef3efa8cfe3c469a", 1301 "rev": "7af23cfe91064865ecf2e835da28b45b3c6f49fd",
1266 "type": "github" 1302 "type": "github"
1267 }, 1303 },
1268 "original": { 1304 "original": {
@@ -1288,6 +1324,7 @@
1288 "niri-flake": "niri-flake", 1324 "niri-flake": "niri-flake",
1289 "nix-index-database": "nix-index-database", 1325 "nix-index-database": "nix-index-database",
1290 "nix-monitored": "nix-monitored", 1326 "nix-monitored": "nix-monitored",
1327 "nix-output-monitor": "nix-output-monitor",
1291 "nixVirt": "nixVirt", 1328 "nixVirt": "nixVirt",
1292 "nixos-hardware": "nixos-hardware", 1329 "nixos-hardware": "nixos-hardware",
1293 "nixpkgs": "nixpkgs_5", 1330 "nixpkgs": "nixpkgs_5",
@@ -1311,11 +1348,11 @@
1311 ] 1348 ]
1312 }, 1349 },
1313 "locked": { 1350 "locked": {
1314 "lastModified": 1761791894, 1351 "lastModified": 1782012058,
1315 "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", 1352 "narHash": "sha256-9mWUnReOUXfKjZuJAL/bAFH3LUyECTRtXgSNVjRw3UY=",
1316 "owner": "oxalica", 1353 "owner": "oxalica",
1317 "repo": "rust-overlay", 1354 "repo": "rust-overlay",
1318 "rev": "59c45eb69d9222a4362673141e00ff77842cd219", 1355 "rev": "8534567325bd8a8d2928e6afd81e0a87d19efd3c",
1319 "type": "github" 1356 "type": "github"
1320 }, 1357 },
1321 "original": { 1358 "original": {
@@ -1331,11 +1368,11 @@
1331 ] 1368 ]
1332 }, 1369 },
1333 "locked": { 1370 "locked": {
1334 "lastModified": 1777944972, 1371 "lastModified": 1783174389,
1335 "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", 1372 "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
1336 "owner": "Mic92", 1373 "owner": "Mic92",
1337 "repo": "sops-nix", 1374 "repo": "sops-nix",
1338 "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", 1375 "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
1339 "type": "github" 1376 "type": "github"
1340 }, 1377 },
1341 "original": { 1378 "original": {
@@ -1406,11 +1443,11 @@
1406 ] 1443 ]
1407 }, 1444 },
1408 "locked": { 1445 "locked": {
1409 "lastModified": 1779411315, 1446 "lastModified": 1783511944,
1410 "narHash": "sha256-IMFlxeyClau51KplhhSRGhdGTvD/knShHdybP1UOTuk=", 1447 "narHash": "sha256-Z/Ss9rWw9QYcRK+Qqkmty7PB1pIik5XGbrtit+ad2qs=",
1411 "owner": "pyproject-nix", 1448 "owner": "pyproject-nix",
1412 "repo": "uv2nix", 1449 "repo": "uv2nix",
1413 "rev": "fdf2a76275d7a9c27deb5d2f2ab33526ac9052ff", 1450 "rev": "83995ef5e4ece3c9c704aa645bbff439e15a0ac3",
1414 "type": "github" 1451 "type": "github"
1415 }, 1452 },
1416 "original": { 1453 "original": {
@@ -1439,11 +1476,11 @@
1439 "xwayland-satellite-unstable": { 1476 "xwayland-satellite-unstable": {
1440 "flake": false, 1477 "flake": false,
1441 "locked": { 1478 "locked": {
1442 "lastModified": 1779745227, 1479 "lastModified": 1783895132,
1443 "narHash": "sha256-yqY7RtEJGJiENzR0GwL6q69tSAy6xAAmAcLuIhLjPf8=", 1480 "narHash": "sha256-Dl0Gvrig3EpE962hzF3ETPhUztlfuRhcmlpd8ioHN54=",
1444 "owner": "Supreeeme", 1481 "owner": "Supreeeme",
1445 "repo": "xwayland-satellite", 1482 "repo": "xwayland-satellite",
1446 "rev": "5d1efbc9dc3ab1c10160b656e0247f3325daf0f2", 1483 "rev": "a2b5c635d8c8c99b286967658d0d177044887eb8",
1447 "type": "github" 1484 "type": "github"
1448 }, 1485 },
1449 "original": { 1486 "original": {
diff --git a/flake.nix b/flake.nix
index 8a230dd2..be850a92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -229,7 +229,7 @@
229 type = "github"; 229 type = "github";
230 owner = "nix-community"; 230 owner = "nix-community";
231 repo = "lanzaboote"; 231 repo = "lanzaboote";
232 ref = "v0.4.3"; 232 ref = "v1.1.0";
233 233
234 inputs.nixpkgs.follows = "nixpkgs"; 234 inputs.nixpkgs.follows = "nixpkgs";
235 }; 235 };
@@ -238,6 +238,14 @@
238 238
239 inputs.nixpkgs.follows = "nixpkgs"; 239 inputs.nixpkgs.follows = "nixpkgs";
240 }; 240 };
241 nix-output-monitor = {
242 url = "git+https://code.maralorn.de/maralorn/nix-output-monitor.git";
243
244 inputs = {
245 nixpkgs.follows = "nixpkgs";
246 flake-utils.follows = "flake-utils";
247 };
248 };
241 }; 249 };
242 250
243 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs: 251 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs:
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 498e12b6..80d54f8f 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -58,7 +58,7 @@ in {
58 58
59 plymouth.enable = true; 59 plymouth.enable = true;
60 60
61 kernelPackages = pkgs.linuxPackages_7_0; 61 kernelPackages = pkgs.linuxPackages_7_1;
62 consoleLogLevel = 3; 62 consoleLogLevel = 3;
63 kernelParams = [ 63 kernelParams = [
64 "quiet" 64 "quiet"
@@ -426,7 +426,7 @@ in {
426 426
427 envfs.enable = false; 427 envfs.enable = false;
428 428
429 displayManager.defaultSession = "Niri"; 429 displayManager.defaultSession = "niri";
430 }; 430 };
431 431
432 systemd.tmpfiles.settings = { 432 systemd.tmpfiles.settings = {
diff --git a/lib/pythonSet.nix b/lib/pythonSet.nix
index c69216cc..98315718 100644
--- a/lib/pythonSet.nix
+++ b/lib/pythonSet.nix
@@ -37,6 +37,13 @@
37 (final.resolveBuildSystem { setuptools = []; }) 37 (final.resolveBuildSystem { setuptools = []; })
38 ]; 38 ];
39 }); 39 });
40 pyyaml = (prev.pyyaml.override {
41 sourcePreference = "sdist";
42 }).overrideAttrs (oldAttrs: {
43 nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [
44 (final.resolveBuildSystem { setuptools = []; })
45 ];
46 });
40 }) 47 })
41 ] 48 ]
42 ) 49 )
diff --git a/nvfetcher.toml b/nvfetcher.toml
index 23f4c5dd..b5b4f445 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -124,10 +124,6 @@ fetch.url = "https://github.com/netbootxyz/netboot.xyz/releases/download/$ver/ne
124src.git = "https://git.outfoxxed.me/quickshell/quickshell.git" 124src.git = "https://git.outfoxxed.me/quickshell/quickshell.git"
125fetch.git = "https://git.outfoxxed.me/quickshell/quickshell.git" 125fetch.git = "https://git.outfoxxed.me/quickshell/quickshell.git"
126 126
127[nix-output-monitor]
128src.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git"
129fetch.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git"
130
131[ldif2json] 127[ldif2json]
132src.git = "https://codeberg.org/joatca/ldif2json.git" 128src.git = "https://codeberg.org/joatca/ldif2json.git"
133fetch.git = "https://codeberg.org/joatca/ldif2json.git" 129fetch.git = "https://codeberg.org/joatca/ldif2json.git"
diff --git a/overlays/etesync-dav.nix b/overlays/etesync-dav.nix
index e0ced1e3..08a70c62 100644
--- a/overlays/etesync-dav.nix
+++ b/overlays/etesync-dav.nix
@@ -1,5 +1,5 @@
1{ final, prev, ... }: { 1{ final, prev, ... }: {
2 etesync-dav = final.python3Packages.buildPythonApplication rec { 2 etesync-dav = final.python310Packages.buildPythonApplication rec {
3 pname = "etesync-dav"; 3 pname = "etesync-dav";
4 version = "0.35.1"; 4 version = "0.35.1";
5 pyproject = true; 5 pyproject = true;
@@ -11,9 +11,9 @@
11 hash = "sha256-y4BhU2kSn+RWqc5+pJQFhbwfat9cMWD0ED0EXJp25cY="; 11 hash = "sha256-y4BhU2kSn+RWqc5+pJQFhbwfat9cMWD0ED0EXJp25cY=";
12 }; 12 };
13 13
14 build-system = with final.python3Packages; [ setuptools ]; 14 build-system = with final.python310Packages; [ setuptools ];
15 15
16 dependencies = with final.python3Packages; [ 16 dependencies = with final.python310Packages; [
17 appdirs 17 appdirs
18 etebase 18 etebase
19 etesync 19 etesync
diff --git a/overlays/nix-output-monitor.nix b/overlays/nix-output-monitor.nix
index a15913ef..8e7fa76f 100644
--- a/overlays/nix-output-monitor.nix
+++ b/overlays/nix-output-monitor.nix
@@ -1,6 +1,3 @@
1{ final, prev, sources, ... }: 1{ final, prev, flakeInputs, ... }:
2{ 2 flakeInputs.nix-output-monitor.overlays.default
3 nix-output-monitor = prev.nix-output-monitor.overrideAttrs (oldAttrs: prev.lib.optionalAttrs (prev.lib.versionAtLeast prev.ghc.version "9.10.1") { 3 final prev
4 inherit (sources.nix-output-monitor) version src;
5 });
6}
diff --git a/system-profiles/nfsroot.nix b/system-profiles/nfsroot.nix
index e3dc2d2e..28bfc1b9 100644
--- a/system-profiles/nfsroot.nix
+++ b/system-profiles/nfsroot.nix
@@ -97,7 +97,7 @@ in {
97 #!ipxe 97 #!ipxe
98 # Use the cmdline variable to allow the user to specify custom kernel params 98 # Use the cmdline variable to allow the user to specify custom kernel params
99 # when chainloading this script from other iPXE scripts like netboot.xyz 99 # when chainloading this script from other iPXE scripts like netboot.xyz
100 kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} ''${cmdline} 100 kernel ${config.boot.kernelPackages.kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} ''${cmdline}
101 initrd initrd 101 initrd initrd
102 boot 102 boot
103 ''; 103 '';
diff --git a/user-profiles/utils.nix b/user-profiles/utils.nix
index edf6da11..eea68f84 100644
--- a/user-profiles/utils.nix
+++ b/user-profiles/utils.nix
@@ -55,7 +55,7 @@ in {
55 }; 55 };
56 56
57 home.packages = with pkgs; [ 57 home.packages = with pkgs; [
58 autossh usbutils pciutils eza silver-searcher pwgen xkcdpass 58 autossh usbutils pciutils eza silver-searcher-ng pwgen xkcdpass
59 unzip magic-wormhole dnsutils openssl sshfs 59 unzip magic-wormhole dnsutils openssl sshfs
60 psmisc mosh tree vnstat file pv bc zip nmap aspell 60 psmisc mosh tree vnstat file pv bc zip nmap aspell
61 aspellDicts.de aspellDicts.en borgbackup man-pages rsync socat 61 aspellDicts.de aspellDicts.en borgbackup man-pages rsync socat
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-21 17:52:45 +0000