From 747dc5d5b559b7e2c5ea1354a596597110208219 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 19 May 2026 10:19:18 +0200 Subject: bump --- _sources/generated.json | 34 ++++++------ _sources/generated.nix | 34 ++++++------ flake.lock | 54 +++++++++--------- hosts/surtr/tls/default.nix | 6 +- hosts/vidhar/network/dhcp/default.nix | 102 +++++++++++++++++----------------- overlays/etesync-web.nix | 26 ++++----- system-profiles/zfs.nix | 1 + 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 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-LwolZ+BWR0lQ3vraRItA5vY9rb+yKC1um/xHvObDVaQ=", + "sha256": "sha256-Yp+qee5ng2soqnNYILGrDd5cwyw/g76yHfo+hxTht44=", "type": "tarball", - "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.24.tar.gz" + "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.25.tar.gz" }, - "version": "2.24" + "version": "2.25" }, "mpv-autosave": { "cargoLock": null, @@ -270,11 +270,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-/MOoApIQjXjoQgb0Q075kP6IxbuDuzaHl6E14e7nzYM=", + "sha256": "sha256-4PbBxZPh2grQg/nXoOOjWAhR9gJqNgR53oriAUrv0i8=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.1/netboot.xyz.efi" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.efi" }, - "version": "3.0.1" + "version": "3.0.2" }, "netbootxyz-lkrn": { "cargoLock": null, @@ -285,15 +285,15 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-jRPqz/sdpJwuGTmtaaW/CMr1Ig35E8Oxh+UecgpYNyc=", + "sha256": "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.1/netboot.xyz.lkrn" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.lkrn" }, - "version": "3.0.1" + "version": "3.0.2" }, "nix-output-monitor": { "cargoLock": null, - "date": "2026-04-17", + "date": "2026-05-15", "extract": null, "name": "nix-output-monitor", "passthru": null, @@ -303,13 +303,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b", - "sha256": "sha256-DARjZPYhim9AGSdDsNL2GUfITCG+QSI+jaYMOYooRmU=", + "rev": "35823353dd2a4f3c30ef650839c39ee843d85679", + "sha256": "sha256-dO9+Q2P7b9a7ivaNS9bbtkCaDi5eqZpzgIhUzc1iL/Y=", "sparseCheckout": [], "type": "git", "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" }, - "version": "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b" + "version": "35823353dd2a4f3c30ef650839c39ee843d85679" }, "postfix-mta-sts-resolver": { "cargoLock": null, @@ -375,7 +375,7 @@ }, "quickshell": { "cargoLock": null, - "date": "2026-04-21", + "date": "2026-05-11", "extract": null, "name": "quickshell", "passthru": null, @@ -385,13 +385,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "d60498adc038526b3d155e8ad61e51e78e6e32eb", - "sha256": "sha256-0CTVYyznIl8QC6PpMoOSM2Qo4sIdHp3j3wV8lU7wON8=", + "rev": "7d1c9a9c6721606b129829134d6f614f015621e2", + "sha256": "sha256-QSWgYuZUCNUJ/cxmaq83WkcT7lHQDDfsPVgH+96kIl0=", "sparseCheckout": [], "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, - "version": "d60498adc038526b3d155e8ad61e51e78e6e32eb" + "version": "7d1c9a9c6721606b129829134d6f614f015621e2" }, "scutiger": { "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 @@ }; lesspipe = { pname = "lesspipe"; - version = "2.24"; + version = "2.25"; src = fetchTarball { - url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.24.tar.gz"; - sha256 = "sha256-LwolZ+BWR0lQ3vraRItA5vY9rb+yKC1um/xHvObDVaQ="; + url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.25.tar.gz"; + sha256 = "sha256-Yp+qee5ng2soqnNYILGrDd5cwyw/g76yHfo+hxTht44="; }; }; mpv-autosave = { @@ -169,33 +169,33 @@ }; netbootxyz-efi = { pname = "netbootxyz-efi"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.1/netboot.xyz.efi"; - sha256 = "sha256-/MOoApIQjXjoQgb0Q075kP6IxbuDuzaHl6E14e7nzYM="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.efi"; + sha256 = "sha256-4PbBxZPh2grQg/nXoOOjWAhR9gJqNgR53oriAUrv0i8="; }; }; netbootxyz-lkrn = { pname = "netbootxyz-lkrn"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.1/netboot.xyz.lkrn"; - sha256 = "sha256-jRPqz/sdpJwuGTmtaaW/CMr1Ig35E8Oxh+UecgpYNyc="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.lkrn"; + sha256 = "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE="; }; }; nix-output-monitor = { pname = "nix-output-monitor"; - version = "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b"; + version = "35823353dd2a4f3c30ef650839c39ee843d85679"; src = fetchgit { url = "https://code.maralorn.de/maralorn/nix-output-monitor.git"; - rev = "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b"; + rev = "35823353dd2a4f3c30ef650839c39ee843d85679"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-DARjZPYhim9AGSdDsNL2GUfITCG+QSI+jaYMOYooRmU="; + sha256 = "sha256-dO9+Q2P7b9a7ivaNS9bbtkCaDi5eqZpzgIhUzc1iL/Y="; }; - date = "2026-04-17"; + date = "2026-05-15"; }; postfix-mta-sts-resolver = { pname = "postfix-mta-sts-resolver"; @@ -237,17 +237,17 @@ }; quickshell = { pname = "quickshell"; - version = "d60498adc038526b3d155e8ad61e51e78e6e32eb"; + version = "7d1c9a9c6721606b129829134d6f614f015621e2"; src = fetchgit { url = "https://git.outfoxxed.me/quickshell/quickshell.git"; - rev = "d60498adc038526b3d155e8ad61e51e78e6e32eb"; + rev = "7d1c9a9c6721606b129829134d6f614f015621e2"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-0CTVYyznIl8QC6PpMoOSM2Qo4sIdHp3j3wV8lU7wON8="; + sha256 = "sha256-QSWgYuZUCNUJ/cxmaq83WkcT7lHQDDfsPVgH+96kIl0="; }; - date = "2026-04-21"; + date = "2026-05-11"; }; scutiger = { pname = "scutiger"; diff --git a/flake.lock b/flake.lock index c3b2c230..b9928432 100644 --- a/flake.lock +++ b/flake.lock @@ -611,11 +611,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776791170, - "narHash": "sha256-mf9M2WgY+DnQ0EbpLDTguBfKo9pegSD3VpU4aR6hOnE=", + "lastModified": 1778942403, + "narHash": "sha256-SPCWvqeVySTNUgX/shARpRl5fi/NnkObUgDGR/Aco4c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bcc58e672eea56892ebba58671e37dca00b701fc", + "rev": "daefca3370581223fedc24d0101c4915a3689f9e", "type": "github" }, "original": { @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1776575850, - "narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=", + "lastModified": 1778999127, + "narHash": "sha256-V5GquqJvAqwFTcpN6hxKSQAtwuJFRUEHmyNKbeaTQDg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3b9653a107c736222b5ae0d4036dd3b885219065", + "rev": "f680e0d3c1dbefe298c423691662e238496890f2", "type": "github" }, "original": { @@ -708,11 +708,11 @@ ] }, "locked": { - "lastModified": 1745680380, - "narHash": "sha256-Z8PknjkmIr/8ZCH+dmc2Pc+UltiOr7/oKg37PXuVvuU=", + "lastModified": 1778497292, + "narHash": "sha256-vodUt55p0PXOaKK5xE1dldTxdtyuttbdGy0LvP8cCxQ=", "owner": "ners", "repo": "nix-monitored", - "rev": "60f3baa4701d58eab86c2d1d9c3d7e820074d461", + "rev": "4a7e1e7dcd0c1f7c2d063928511ebd72afea7e58", "type": "github" }, "original": { @@ -744,11 +744,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1779099457, + "narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "8792fab9d4a6454a9201675f01326f827ce35ead", "type": "github" }, "original": { @@ -869,11 +869,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1776434932, - "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { @@ -949,11 +949,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -1242,11 +1242,11 @@ ] }, "locked": { - "lastModified": 1776715674, - "narHash": "sha256-Gs1VnEkCkkRZxJQAC/Dhz0Jbfi22mFXChbtNg9w/Ybg=", + "lastModified": 1778901413, + "narHash": "sha256-GSKXTAnFqRAMlZkJrIPcQMYf+lpMr66K3i60mB9STvc=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "69f57f27e52a87c54e28138a75ec741cd46663c9", + "rev": "a228447c3e179d477c1b6246ef3efa8cfe3c469a", "type": "github" }, "original": { @@ -1315,11 +1315,11 @@ ] }, "locked": { - "lastModified": 1776771786, - "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1390,11 +1390,11 @@ ] }, "locked": { - "lastModified": 1776718528, - "narHash": "sha256-XeGmo/BhkFXd8vVyendr3X4mQmw7CEkeQcpy7AHbVcg=", + "lastModified": 1778664018, + "narHash": "sha256-ogNyNANNLo0SMFevIeUpbTMOL9uUDu/hXvp7JlOYbwQ=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "60982c30e16db3e0cba6c0ed13f0894b06ab2bf1", + "rev": "b48abe99ef639cd100c224898529370e5d935294", "type": "github" }, "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 { extraDomainNames = optional domainCfg.wildcard "*.${domain}"; dnsResolver = "127.0.0.1:53"; dnsProvider = "rfc2136"; - credentialsFile = pkgs.writeText "${domain}_credentials.env" '' + environmentFile = pkgs.writeText "${domain}_credentials.env" '' RFC2136_NAMESERVER=127.0.0.1:53 RFC2136_TSIG_ALGORITHM=hmac-sha256. RFC2136_TSIG_KEY=${domain}_acme_key - RFC2136_TSIG_SECRET_FILE=/run/credentials/acme-order-renew-${domain}.service/${tsigSecretName domain} RFC2136_TTL=0 RFC2136_PROPAGATION_TIMEOUT=60 RFC2136_POLLING_INTERVAL=2 RFC2136_SEQUENCE_INTERVAL=1 ''; + credentialFiles = { + RFC2136_TSIG_SECRET_FILE = "/run/credentials/acme-order-renew-${domain}.service/${tsigSecretName domain}"; + }; dnsPropagationCheck = false; postRun = mkIf (domainCfg.restartUnits != []) '' 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 { }; client-classes = [ - { name = "ipxe-eostre"; - test = "hexstring(pkt4.mac, ':') == '00:d8:61:79:c5:40' and option[77].hex == 'iPXE-yggdrasil'"; - next-server = tftpIp; - boot-file-name = "${nfsrootBaseUrl}/eostre.menu.ipxe"; - only-if-required = true; - } + # { name = "ipxe-eostre"; + # test = "hexstring(pkt4.mac, ':') == '00:d8:61:79:c5:40' and option[77].hex == 'iPXE-yggdrasil'"; + # next-server = tftpIp; + # boot-file-name = "${nfsrootBaseUrl}/eostre.menu.ipxe"; + # only-if-required = true; + # } { name = "ipxe-yggdrasil"; test = "option[77].hex == 'iPXE-yggdrasil'"; next-server = tftpIp; @@ -364,57 +364,57 @@ in { install -m 0444 ${sources.netbootxyz-efi.src} $out/netboot.xyz.efi install -m 0444 ${sources.netbootxyz-lkrn.src} $out/netboot.xyz.lkrn '') - (builtins.addErrorContext "while evaluating eostre" (let - eostreBuild' = (flake.nixosConfigurations.eostre.extendModules { - modules = [ - ({ ... }: { - config.nfsroot.storeDevice = "${nfsIp}:nix-store"; - config.nfsroot.registrationUrl = "${nfsrootBaseUrl}/eostre/registration"; - config.system.nixos.label = "eostre"; - }) - ]; - }); - eostreBuild = eostreBuild'.config.system.build; - in builtins.toPath (pkgs.runCommandLocal "eostre" {} '' - mkdir -p $out/eostre - install -m 0444 -t $out/eostre \ - ${eostreBuild.initialRamdisk}/initrd \ - ${eostreBuild.kernel}/bzImage \ - ${eostreBuild.netbootIpxeScript}/netboot.ipxe \ - ${pkgs.closureInfo { rootPaths = eostreBuild.storeContents; }}/registration - install -m 0444 ${pkgs.writeText "eostre.menu.ipxe" '' - #!ipxe + # (builtins.addErrorContext "while evaluating eostre" (let + # eostreBuild' = (flake.nixosConfigurations.eostre.extendModules { + # modules = [ + # ({ ... }: { + # config.nfsroot.storeDevice = "${nfsIp}:nix-store"; + # config.nfsroot.registrationUrl = "${nfsrootBaseUrl}/eostre/registration"; + # config.system.nixos.label = "eostre"; + # }) + # ]; + # }); + # eostreBuild = eostreBuild'.config.system.build; + # in builtins.toPath (pkgs.runCommandLocal "eostre" {} '' + # mkdir -p $out/eostre + # install -m 0444 -t $out/eostre \ + # ${eostreBuild.initialRamdisk}/initrd \ + # ${eostreBuild.kernel}/bzImage \ + # ${eostreBuild.netbootIpxeScript}/netboot.ipxe \ + # ${pkgs.closureInfo { rootPaths = eostreBuild.storeContents; }}/registration + # install -m 0444 ${pkgs.writeText "eostre.menu.ipxe" '' + # #!ipxe - set menu-timeout 5000 + # set menu-timeout 5000 - :start - menu iPXE boot menu for eostre - item eostre ${with eostreBuild'; "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})"} - item memtest memtest86plus - item netboot netboot.xyz - item shell iPXE shell - choose --timeout ''${menu-timeout} --default eostre selected || goto shell - set menu-timeout 0 - goto ''${selected} + # :start + # menu iPXE boot menu for eostre + # item eostre ${with eostreBuild'; "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})"} + # item memtest memtest86plus + # item netboot netboot.xyz + # item shell iPXE shell + # choose --timeout ''${menu-timeout} --default eostre selected || goto shell + # set menu-timeout 0 + # goto ''${selected} - :shell - set menu-timeout 0 - shell - goto start + # :shell + # set menu-timeout 0 + # shell + # goto start - :eostre - chain eostre/netboot.ipxe - goto start + # :eostre + # chain eostre/netboot.ipxe + # goto start - :netboot - iseq ''${platform} efi && chain --autofree netboot.xyz.efi || chain --autofree netboot.xyz.lkrn - goto start + # :netboot + # iseq ''${platform} efi && chain --autofree netboot.xyz.efi || chain --autofree netboot.xyz.lkrn + # goto start - :memtest - chain --autofree mt86plus.efi - goto start - ''} $out/eostre.menu.ipxe - ''))) + # :memtest + # chain --autofree mt86plus.efi + # goto start + # ''} $out/eostre.menu.ipxe + # ''))) ]; }; }; 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 @@ { final, prev, ... }: { - etesync-web = final.mkYarnPackage rec { + etesync-web = final.stdenv.mkDerivation (finalAttrs: { pname = "etesync-web"; version = "0.6.1"; @@ -14,28 +14,28 @@ src = final.fetchFromGitHub { owner = "etesync"; repo = "etesync-web"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ZQpbeEIDj7cB0Y62uIw3qSClvwE4buVKh6ZPMfS53dY="; }; - buildPhase = '' - runHook preBuild + yarnOfflineCache = final.fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-YHZulUhgieDAV1jyweeoXwzoklTnf4ZvuVmgGmM2eBE="; + }; - REACT_APP_DEFAULT_API_PATH=https://etesync.yggdrasil.li \ - NODE_OPTIONS=--openssl-legacy-provider \ - yarn --offline build + nativeBuildInputs = [ + final.nodejs final.yarnConfigHook final.yarnBuildHook + ]; - runHook postBuild - ''; + REACT_APP_DEFAULT_API_PATH = "https://etesync.yggdrasil.li"; + NODE_OPTIONS = "--openssl-legacy-provider"; installPhase = '' runHook preInstall - cp -r deps/etesync-web/build $out + cp -r build $out runHook postInstall ''; - - distPhase = "true"; - }; + }); } 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 @@ zfs.package = lib.mkDefault pkgs.zfs_2_4; supportedFilesystems.zfs = true; + zfs.forceImportRoot = true; }; environment.systemPackages = with pkgs; [ httm ]; -- cgit v1.2.3