summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2026-05-19 10:19:18 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2026-05-19 10:19:18 +0200
commit747dc5d5b559b7e2c5ea1354a596597110208219 (patch)
treecd3f1aa5c5484a83b5235f9c10e97de5e4815ab4
parent6c4b4f65882cd3a428d48e6f4927ea2648812dfb (diff)
downloadnixos-747dc5d5b559b7e2c5ea1354a596597110208219.tar
nixos-747dc5d5b559b7e2c5ea1354a596597110208219.tar.gz
nixos-747dc5d5b559b7e2c5ea1354a596597110208219.tar.bz2
nixos-747dc5d5b559b7e2c5ea1354a596597110208219.tar.xz
nixos-747dc5d5b559b7e2c5ea1354a596597110208219.zip
bump
Diffstat
-rw-r--r--_sources/generated.json34
-rw-r--r--_sources/generated.nix34
-rw-r--r--flake.lock54
-rw-r--r--hosts/surtr/tls/default.nix6
-rw-r--r--hosts/vidhar/network/dhcp/default.nix102
-rw-r--r--overlays/etesync-web.nix26
-rw-r--r--system-profiles/zfs.nix1
7 files changed, 130 insertions, 127 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index 338b7940..50b2e4eb 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -111,11 +111,11 @@
111 "passthru": null, 111 "passthru": null,
112 "pinned": false, 112 "pinned": false,
113 "src": { 113 "src": {
114 "sha256": "sha256-LwolZ+BWR0lQ3vraRItA5vY9rb+yKC1um/xHvObDVaQ=", 114 "sha256": "sha256-Yp+qee5ng2soqnNYILGrDd5cwyw/g76yHfo+hxTht44=",
115 "type": "tarball", 115 "type": "tarball",
116 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.24.tar.gz" 116 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.25.tar.gz"
117 }, 117 },
118 "version": "2.24" 118 "version": "2.25"
119 }, 119 },
120 "mpv-autosave": { 120 "mpv-autosave": {
121 "cargoLock": null, 121 "cargoLock": null,
@@ -270,11 +270,11 @@
270 "pinned": false, 270 "pinned": false,
271 "src": { 271 "src": {
272 "name": null, 272 "name": null,
273 "sha256": "sha256-/MOoApIQjXjoQgb0Q075kP6IxbuDuzaHl6E14e7nzYM=", 273 "sha256": "sha256-4PbBxZPh2grQg/nXoOOjWAhR9gJqNgR53oriAUrv0i8=",
274 "type": "url", 274 "type": "url",
275 "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.1/netboot.xyz.efi" 275 "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.efi"
276 }, 276 },
277 "version": "3.0.1" 277 "version": "3.0.2"
278 }, 278 },
279 "netbootxyz-lkrn": { 279 "netbootxyz-lkrn": {
280 "cargoLock": null, 280 "cargoLock": null,
@@ -285,15 +285,15 @@
285 "pinned": false, 285 "pinned": false,
286 "src": { 286 "src": {
287 "name": null, 287 "name": null,
288 "sha256": "sha256-jRPqz/sdpJwuGTmtaaW/CMr1Ig35E8Oxh+UecgpYNyc=", 288 "sha256": "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE=",
289 "type": "url", 289 "type": "url",
290 "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.1/netboot.xyz.lkrn" 290 "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.lkrn"
291 }, 291 },
292 "version": "3.0.1" 292 "version": "3.0.2"
293 }, 293 },
294 "nix-output-monitor": { 294 "nix-output-monitor": {
295 "cargoLock": null, 295 "cargoLock": null,
296 "date": "2026-04-17", 296 "date": "2026-05-15",
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": "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b", 306 "rev": "35823353dd2a4f3c30ef650839c39ee843d85679",
307 "sha256": "sha256-DARjZPYhim9AGSdDsNL2GUfITCG+QSI+jaYMOYooRmU=", 307 "sha256": "sha256-dO9+Q2P7b9a7ivaNS9bbtkCaDi5eqZpzgIhUzc1iL/Y=",
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": "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b" 312 "version": "35823353dd2a4f3c30ef650839c39ee843d85679"
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-04-21", 378 "date": "2026-05-11",
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": "d60498adc038526b3d155e8ad61e51e78e6e32eb", 388 "rev": "7d1c9a9c6721606b129829134d6f614f015621e2",
389 "sha256": "sha256-0CTVYyznIl8QC6PpMoOSM2Qo4sIdHp3j3wV8lU7wON8=", 389 "sha256": "sha256-QSWgYuZUCNUJ/cxmaq83WkcT7lHQDDfsPVgH+96kIl0=",
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": "d60498adc038526b3d155e8ad61e51e78e6e32eb" 394 "version": "7d1c9a9c6721606b129829134d6f614f015621e2"
395 }, 395 },
396 "scutiger": { 396 "scutiger": {
397 "cargoLock": null, 397 "cargoLock": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 2015ea85..c8ae4bff 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -72,10 +72,10 @@
72 }; 72 };
73 lesspipe = { 73 lesspipe = {
74 pname = "lesspipe"; 74 pname = "lesspipe";
75 version = "2.24"; 75 version = "2.25";
76 src = fetchTarball { 76 src = fetchTarball {
77 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.24.tar.gz"; 77 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.25.tar.gz";
78 sha256 = "sha256-LwolZ+BWR0lQ3vraRItA5vY9rb+yKC1um/xHvObDVaQ="; 78 sha256 = "sha256-Yp+qee5ng2soqnNYILGrDd5cwyw/g76yHfo+hxTht44=";
79 }; 79 };
80 }; 80 };
81 mpv-autosave = { 81 mpv-autosave = {
@@ -169,33 +169,33 @@
169 }; 169 };
170 netbootxyz-efi = { 170 netbootxyz-efi = {
171 pname = "netbootxyz-efi"; 171 pname = "netbootxyz-efi";
172 version = "3.0.1"; 172 version = "3.0.2";
173 src = fetchurl { 173 src = fetchurl {
174 url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.1/netboot.xyz.efi"; 174 url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.efi";
175 sha256 = "sha256-/MOoApIQjXjoQgb0Q075kP6IxbuDuzaHl6E14e7nzYM="; 175 sha256 = "sha256-4PbBxZPh2grQg/nXoOOjWAhR9gJqNgR53oriAUrv0i8=";
176 }; 176 };
177 }; 177 };
178 netbootxyz-lkrn = { 178 netbootxyz-lkrn = {
179 pname = "netbootxyz-lkrn"; 179 pname = "netbootxyz-lkrn";
180 version = "3.0.1"; 180 version = "3.0.2";
181 src = fetchurl { 181 src = fetchurl {
182 url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.1/netboot.xyz.lkrn"; 182 url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.lkrn";
183 sha256 = "sha256-jRPqz/sdpJwuGTmtaaW/CMr1Ig35E8Oxh+UecgpYNyc="; 183 sha256 = "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE=";
184 }; 184 };
185 }; 185 };
186 nix-output-monitor = { 186 nix-output-monitor = {
187 pname = "nix-output-monitor"; 187 pname = "nix-output-monitor";
188 version = "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b"; 188 version = "35823353dd2a4f3c30ef650839c39ee843d85679";
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 = "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b"; 191 rev = "35823353dd2a4f3c30ef650839c39ee843d85679";
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-DARjZPYhim9AGSdDsNL2GUfITCG+QSI+jaYMOYooRmU="; 196 sha256 = "sha256-dO9+Q2P7b9a7ivaNS9bbtkCaDi5eqZpzgIhUzc1iL/Y=";
197 }; 197 };
198 date = "2026-04-17"; 198 date = "2026-05-15";
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 = "d60498adc038526b3d155e8ad61e51e78e6e32eb"; 240 version = "7d1c9a9c6721606b129829134d6f614f015621e2";
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 = "d60498adc038526b3d155e8ad61e51e78e6e32eb"; 243 rev = "7d1c9a9c6721606b129829134d6f614f015621e2";
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-0CTVYyznIl8QC6PpMoOSM2Qo4sIdHp3j3wV8lU7wON8="; 248 sha256 = "sha256-QSWgYuZUCNUJ/cxmaq83WkcT7lHQDDfsPVgH+96kIl0=";
249 }; 249 };
250 date = "2026-04-21"; 250 date = "2026-05-11";
251 }; 251 };
252 scutiger = { 252 scutiger = {
253 pname = "scutiger"; 253 pname = "scutiger";
diff --git a/flake.lock b/flake.lock
index c3b2c230..b9928432 100644
--- a/flake.lock
+++ b/flake.lock
@@ -611,11 +611,11 @@
611 "xwayland-satellite-unstable": "xwayland-satellite-unstable" 611 "xwayland-satellite-unstable": "xwayland-satellite-unstable"
612 }, 612 },
613 "locked": { 613 "locked": {
614 "lastModified": 1776791170, 614 "lastModified": 1778942403,
615 "narHash": "sha256-mf9M2WgY+DnQ0EbpLDTguBfKo9pegSD3VpU4aR6hOnE=", 615 "narHash": "sha256-SPCWvqeVySTNUgX/shARpRl5fi/NnkObUgDGR/Aco4c=",
616 "owner": "sodiboo", 616 "owner": "sodiboo",
617 "repo": "niri-flake", 617 "repo": "niri-flake",
618 "rev": "bcc58e672eea56892ebba58671e37dca00b701fc", 618 "rev": "daefca3370581223fedc24d0101c4915a3689f9e",
619 "type": "github" 619 "type": "github"
620 }, 620 },
621 "original": { 621 "original": {
@@ -687,11 +687,11 @@
687 ] 687 ]
688 }, 688 },
689 "locked": { 689 "locked": {
690 "lastModified": 1776575850, 690 "lastModified": 1778999127,
691 "narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=", 691 "narHash": "sha256-V5GquqJvAqwFTcpN6hxKSQAtwuJFRUEHmyNKbeaTQDg=",
692 "owner": "nix-community", 692 "owner": "nix-community",
693 "repo": "nix-index-database", 693 "repo": "nix-index-database",
694 "rev": "3b9653a107c736222b5ae0d4036dd3b885219065", 694 "rev": "f680e0d3c1dbefe298c423691662e238496890f2",
695 "type": "github" 695 "type": "github"
696 }, 696 },
697 "original": { 697 "original": {
@@ -708,11 +708,11 @@
708 ] 708 ]
709 }, 709 },
710 "locked": { 710 "locked": {
711 "lastModified": 1745680380, 711 "lastModified": 1778497292,
712 "narHash": "sha256-Z8PknjkmIr/8ZCH+dmc2Pc+UltiOr7/oKg37PXuVvuU=", 712 "narHash": "sha256-vodUt55p0PXOaKK5xE1dldTxdtyuttbdGy0LvP8cCxQ=",
713 "owner": "ners", 713 "owner": "ners",
714 "repo": "nix-monitored", 714 "repo": "nix-monitored",
715 "rev": "60f3baa4701d58eab86c2d1d9c3d7e820074d461", 715 "rev": "4a7e1e7dcd0c1f7c2d063928511ebd72afea7e58",
716 "type": "github" 716 "type": "github"
717 }, 717 },
718 "original": { 718 "original": {
@@ -744,11 +744,11 @@
744 }, 744 },
745 "nixos-hardware": { 745 "nixos-hardware": {
746 "locked": { 746 "locked": {
747 "lastModified": 1775490113, 747 "lastModified": 1779099457,
748 "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", 748 "narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=",
749 "owner": "NixOS", 749 "owner": "NixOS",
750 "repo": "nixos-hardware", 750 "repo": "nixos-hardware",
751 "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", 751 "rev": "8792fab9d4a6454a9201675f01326f827ce35ead",
752 "type": "github" 752 "type": "github"
753 }, 753 },
754 "original": { 754 "original": {
@@ -869,11 +869,11 @@
869 }, 869 },
870 "nixpkgs-stable_2": { 870 "nixpkgs-stable_2": {
871 "locked": { 871 "locked": {
872 "lastModified": 1776434932, 872 "lastModified": 1778737229,
873 "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", 873 "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
874 "owner": "NixOS", 874 "owner": "NixOS",
875 "repo": "nixpkgs", 875 "repo": "nixpkgs",
876 "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", 876 "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
877 "type": "github" 877 "type": "github"
878 }, 878 },
879 "original": { 879 "original": {
@@ -949,11 +949,11 @@
949 }, 949 },
950 "nixpkgs_4": { 950 "nixpkgs_4": {
951 "locked": { 951 "locked": {
952 "lastModified": 1776548001, 952 "lastModified": 1778869304,
953 "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", 953 "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
954 "owner": "NixOS", 954 "owner": "NixOS",
955 "repo": "nixpkgs", 955 "repo": "nixpkgs",
956 "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", 956 "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
957 "type": "github" 957 "type": "github"
958 }, 958 },
959 "original": { 959 "original": {
@@ -1242,11 +1242,11 @@
1242 ] 1242 ]
1243 }, 1243 },
1244 "locked": { 1244 "locked": {
1245 "lastModified": 1776715674, 1245 "lastModified": 1778901413,
1246 "narHash": "sha256-Gs1VnEkCkkRZxJQAC/Dhz0Jbfi22mFXChbtNg9w/Ybg=", 1246 "narHash": "sha256-GSKXTAnFqRAMlZkJrIPcQMYf+lpMr66K3i60mB9STvc=",
1247 "owner": "pyproject-nix", 1247 "owner": "pyproject-nix",
1248 "repo": "pyproject.nix", 1248 "repo": "pyproject.nix",
1249 "rev": "69f57f27e52a87c54e28138a75ec741cd46663c9", 1249 "rev": "a228447c3e179d477c1b6246ef3efa8cfe3c469a",
1250 "type": "github" 1250 "type": "github"
1251 }, 1251 },
1252 "original": { 1252 "original": {
@@ -1315,11 +1315,11 @@
1315 ] 1315 ]
1316 }, 1316 },
1317 "locked": { 1317 "locked": {
1318 "lastModified": 1776771786, 1318 "lastModified": 1777944972,
1319 "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", 1319 "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
1320 "owner": "Mic92", 1320 "owner": "Mic92",
1321 "repo": "sops-nix", 1321 "repo": "sops-nix",
1322 "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", 1322 "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
1323 "type": "github" 1323 "type": "github"
1324 }, 1324 },
1325 "original": { 1325 "original": {
@@ -1390,11 +1390,11 @@
1390 ] 1390 ]
1391 }, 1391 },
1392 "locked": { 1392 "locked": {
1393 "lastModified": 1776718528, 1393 "lastModified": 1778664018,
1394 "narHash": "sha256-XeGmo/BhkFXd8vVyendr3X4mQmw7CEkeQcpy7AHbVcg=", 1394 "narHash": "sha256-ogNyNANNLo0SMFevIeUpbTMOL9uUDu/hXvp7JlOYbwQ=",
1395 "owner": "pyproject-nix", 1395 "owner": "pyproject-nix",
1396 "repo": "uv2nix", 1396 "repo": "uv2nix",
1397 "rev": "60982c30e16db3e0cba6c0ed13f0894b06ab2bf1", 1397 "rev": "b48abe99ef639cd100c224898529370e5d935294",
1398 "type": "github" 1398 "type": "github"
1399 }, 1399 },
1400 "original": { 1400 "original": {
diff --git a/hosts/surtr/tls/default.nix b/hosts/surtr/tls/default.nix
index 2c346baa..edec60b1 100644
--- a/hosts/surtr/tls/default.nix
+++ b/hosts/surtr/tls/default.nix
@@ -58,16 +58,18 @@ in {
58 extraDomainNames = optional domainCfg.wildcard "*.${domain}"; 58 extraDomainNames = optional domainCfg.wildcard "*.${domain}";
59 dnsResolver = "127.0.0.1:53"; 59 dnsResolver = "127.0.0.1:53";
60 dnsProvider = "rfc2136"; 60 dnsProvider = "rfc2136";
61 credentialsFile = pkgs.writeText "${domain}_credentials.env" '' 61 environmentFile = pkgs.writeText "${domain}_credentials.env" ''
62 RFC2136_NAMESERVER=127.0.0.1:53 62 RFC2136_NAMESERVER=127.0.0.1:53
63 RFC2136_TSIG_ALGORITHM=hmac-sha256. 63 RFC2136_TSIG_ALGORITHM=hmac-sha256.
64 RFC2136_TSIG_KEY=${domain}_acme_key 64 RFC2136_TSIG_KEY=${domain}_acme_key
65 RFC2136_TSIG_SECRET_FILE=/run/credentials/acme-order-renew-${domain}.service/${tsigSecretName domain}
66 RFC2136_TTL=0 65 RFC2136_TTL=0
67 RFC2136_PROPAGATION_TIMEOUT=60 66 RFC2136_PROPAGATION_TIMEOUT=60
68 RFC2136_POLLING_INTERVAL=2 67 RFC2136_POLLING_INTERVAL=2
69 RFC2136_SEQUENCE_INTERVAL=1 68 RFC2136_SEQUENCE_INTERVAL=1
70 ''; 69 '';
70 credentialFiles = {
71 RFC2136_TSIG_SECRET_FILE = "/run/credentials/acme-order-renew-${domain}.service/${tsigSecretName domain}";
72 };
71 dnsPropagationCheck = false; 73 dnsPropagationCheck = false;
72 postRun = mkIf (domainCfg.restartUnits != []) '' 74 postRun = mkIf (domainCfg.restartUnits != []) ''
73 systemctl --no-block try-restart ${escapeShellArgs domainCfg.restartUnits} 75 systemctl --no-block try-restart ${escapeShellArgs domainCfg.restartUnits}
diff --git a/hosts/vidhar/network/dhcp/default.nix b/hosts/vidhar/network/dhcp/default.nix
index eda27663..557794e0 100644
--- a/hosts/vidhar/network/dhcp/default.nix
+++ b/hosts/vidhar/network/dhcp/default.nix
@@ -48,12 +48,12 @@ in {
48 }; 48 };
49 49
50 client-classes = [ 50 client-classes = [
51 { name = "ipxe-eostre"; 51 # { name = "ipxe-eostre";
52 test = "hexstring(pkt4.mac, ':') == '00:d8:61:79:c5:40' and option[77].hex == 'iPXE-yggdrasil'"; 52 # test = "hexstring(pkt4.mac, ':') == '00:d8:61:79:c5:40' and option[77].hex == 'iPXE-yggdrasil'";
53 next-server = tftpIp; 53 # next-server = tftpIp;
54 boot-file-name = "${nfsrootBaseUrl}/eostre.menu.ipxe"; 54 # boot-file-name = "${nfsrootBaseUrl}/eostre.menu.ipxe";
55 only-if-required = true; 55 # only-if-required = true;
56 } 56 # }
57 { name = "ipxe-yggdrasil"; 57 { name = "ipxe-yggdrasil";
58 test = "option[77].hex == 'iPXE-yggdrasil'"; 58 test = "option[77].hex == 'iPXE-yggdrasil'";
59 next-server = tftpIp; 59 next-server = tftpIp;
@@ -364,57 +364,57 @@ in {
364 install -m 0444 ${sources.netbootxyz-efi.src} $out/netboot.xyz.efi 364 install -m 0444 ${sources.netbootxyz-efi.src} $out/netboot.xyz.efi
365 install -m 0444 ${sources.netbootxyz-lkrn.src} $out/netboot.xyz.lkrn 365 install -m 0444 ${sources.netbootxyz-lkrn.src} $out/netboot.xyz.lkrn
366 '') 366 '')
367 (builtins.addErrorContext "while evaluating eostre" (let 367 # (builtins.addErrorContext "while evaluating eostre" (let
368 eostreBuild' = (flake.nixosConfigurations.eostre.extendModules { 368 # eostreBuild' = (flake.nixosConfigurations.eostre.extendModules {
369 modules = [ 369 # modules = [
370 ({ ... }: { 370 # ({ ... }: {
371 config.nfsroot.storeDevice = "${nfsIp}:nix-store"; 371 # config.nfsroot.storeDevice = "${nfsIp}:nix-store";
372 config.nfsroot.registrationUrl = "${nfsrootBaseUrl}/eostre/registration"; 372 # config.nfsroot.registrationUrl = "${nfsrootBaseUrl}/eostre/registration";
373 config.system.nixos.label = "eostre"; 373 # config.system.nixos.label = "eostre";
374 }) 374 # })
375 ]; 375 # ];
376 }); 376 # });
377 eostreBuild = eostreBuild'.config.system.build; 377 # eostreBuild = eostreBuild'.config.system.build;
378 in builtins.toPath (pkgs.runCommandLocal "eostre" {} '' 378 # in builtins.toPath (pkgs.runCommandLocal "eostre" {} ''
379 mkdir -p $out/eostre 379 # mkdir -p $out/eostre
380 install -m 0444 -t $out/eostre \ 380 # install -m 0444 -t $out/eostre \
381 ${eostreBuild.initialRamdisk}/initrd \ 381 # ${eostreBuild.initialRamdisk}/initrd \
382 ${eostreBuild.kernel}/bzImage \ 382 # ${eostreBuild.kernel}/bzImage \
383 ${eostreBuild.netbootIpxeScript}/netboot.ipxe \ 383 # ${eostreBuild.netbootIpxeScript}/netboot.ipxe \
384 ${pkgs.closureInfo { rootPaths = eostreBuild.storeContents; }}/registration 384 # ${pkgs.closureInfo { rootPaths = eostreBuild.storeContents; }}/registration
385 install -m 0444 ${pkgs.writeText "eostre.menu.ipxe" '' 385 # install -m 0444 ${pkgs.writeText "eostre.menu.ipxe" ''
386 #!ipxe 386 # #!ipxe
387 387
388 set menu-timeout 5000 388 # set menu-timeout 5000
389 389
390 :start 390 # :start
391 menu iPXE boot menu for eostre 391 # menu iPXE boot menu for eostre
392 item eostre ${with eostreBuild'; "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})"} 392 # item eostre ${with eostreBuild'; "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})"}
393 item memtest memtest86plus 393 # item memtest memtest86plus
394 item netboot netboot.xyz 394 # item netboot netboot.xyz
395 item shell iPXE shell 395 # item shell iPXE shell
396 choose --timeout ''${menu-timeout} --default eostre selected || goto shell 396 # choose --timeout ''${menu-timeout} --default eostre selected || goto shell
397 set menu-timeout 0 397 # set menu-timeout 0
398 goto ''${selected} 398 # goto ''${selected}
399 399
400 :shell 400 # :shell
401 set menu-timeout 0 401 # set menu-timeout 0
402 shell 402 # shell
403 goto start 403 # goto start
404 404
405 :eostre 405 # :eostre
406 chain eostre/netboot.ipxe 406 # chain eostre/netboot.ipxe
407 goto start 407 # goto start
408 408
409 :netboot 409 # :netboot
410 iseq ''${platform} efi && chain --autofree netboot.xyz.efi || chain --autofree netboot.xyz.lkrn 410 # iseq ''${platform} efi && chain --autofree netboot.xyz.efi || chain --autofree netboot.xyz.lkrn
411 goto start 411 # goto start
412 412
413 :memtest 413 # :memtest
414 chain --autofree mt86plus.efi 414 # chain --autofree mt86plus.efi
415 goto start 415 # goto start
416 ''} $out/eostre.menu.ipxe 416 # ''} $out/eostre.menu.ipxe
417 ''))) 417 # '')))
418 ]; 418 ];
419 }; 419 };
420 }; 420 };
diff --git a/overlays/etesync-web.nix b/overlays/etesync-web.nix
index 2d4c23ea..f922cbf9 100644
--- a/overlays/etesync-web.nix
+++ b/overlays/etesync-web.nix
@@ -1,5 +1,5 @@
1{ final, prev, ... }: { 1{ final, prev, ... }: {
2 etesync-web = final.mkYarnPackage rec { 2 etesync-web = final.stdenv.mkDerivation (finalAttrs: {
3 pname = "etesync-web"; 3 pname = "etesync-web";
4 version = "0.6.1"; 4 version = "0.6.1";
5 5
@@ -14,28 +14,28 @@
14 src = final.fetchFromGitHub { 14 src = final.fetchFromGitHub {
15 owner = "etesync"; 15 owner = "etesync";
16 repo = "etesync-web"; 16 repo = "etesync-web";
17 rev = "v${version}"; 17 rev = "v${finalAttrs.version}";
18 hash = "sha256-ZQpbeEIDj7cB0Y62uIw3qSClvwE4buVKh6ZPMfS53dY="; 18 hash = "sha256-ZQpbeEIDj7cB0Y62uIw3qSClvwE4buVKh6ZPMfS53dY=";
19 }; 19 };
20 20
21 buildPhase = '' 21 yarnOfflineCache = final.fetchYarnDeps {
22 runHook preBuild 22 yarnLock = finalAttrs.src + "/yarn.lock";
23 hash = "sha256-YHZulUhgieDAV1jyweeoXwzoklTnf4ZvuVmgGmM2eBE=";
24 };
23 25
24 REACT_APP_DEFAULT_API_PATH=https://etesync.yggdrasil.li \ 26 nativeBuildInputs = [
25 NODE_OPTIONS=--openssl-legacy-provider \ 27 final.nodejs final.yarnConfigHook final.yarnBuildHook
26 yarn --offline build 28 ];
27 29
28 runHook postBuild 30 REACT_APP_DEFAULT_API_PATH = "https://etesync.yggdrasil.li";
29 ''; 31 NODE_OPTIONS = "--openssl-legacy-provider";
30 32
31 installPhase = '' 33 installPhase = ''
32 runHook preInstall 34 runHook preInstall
33 35
34 cp -r deps/etesync-web/build $out 36 cp -r build $out
35 37
36 runHook postInstall 38 runHook postInstall
37 ''; 39 '';
38 40 });
39 distPhase = "true";
40 };
41} 41}
diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix
index c20acb9a..bb9dc2e2 100644
--- a/system-profiles/zfs.nix
+++ b/system-profiles/zfs.nix
@@ -5,6 +5,7 @@
5 zfs.package = lib.mkDefault pkgs.zfs_2_4; 5 zfs.package = lib.mkDefault pkgs.zfs_2_4;
6 6
7 supportedFilesystems.zfs = true; 7 supportedFilesystems.zfs = true;
8 zfs.forceImportRoot = true;
8 }; 9 };
9 10
10 environment.systemPackages = with pkgs; [ httm ]; 11 environment.systemPackages = with pkgs; [ httm ];
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-28 20:43:04 +0000