diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index 54b2c84..681457a 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -193,7 +193,7 @@ }; hydra = let - additional_iso_modules = additional_iso_modules ++ [ + hydra_additional_iso_modules = additional_iso_modules ++ [ { me.optimizations.enable = true; } @@ -206,13 +206,13 @@ ]; }; iso = main // { - modules = main.modules ++ additional_iso_modules; + modules = main.modules ++ hydra_additional_iso_modules; }; vm = main // { modules = main.modules ++ additional_vm_modules; }; vm_iso = main // { - modules = main.modules ++ additional_vm_modules ++ additional_iso_modules; + modules = main.modules ++ additional_vm_modules ++ hydra_additional_iso_modules; }; }; ionlybootzfs = rec { diff --git a/nix/configuration/hosts/hydra/VM_ISO b/nix/configuration/hosts/hydra/VM_ISO new file mode 100755 index 0000000..201b5f9 --- /dev/null +++ b/nix/configuration/hosts/hydra/VM_ISO @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# +set -euo pipefail +IFS=$'\n\t' +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +: "${JOBS:="1"}" + +nix flake update zsh-histdb --flake "$DIR/../../" +nix flake update ansible-sshjail --flake "$DIR/../../" +for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done +nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#vm_iso.hydra" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json + +install -m 0644 result/iso/nixos-*-x86_64-linux.iso ~/hydra.iso +unlink ./result diff --git a/nix/configuration/hosts/hydra/default.nix b/nix/configuration/hosts/hydra/default.nix index cb4dd65..f9d405d 100644 --- a/nix/configuration/hosts/hydra/default.nix +++ b/nix/configuration/hosts/hydra/default.nix @@ -24,7 +24,6 @@ imports = [ ./disk-config.nix ./hardware-configuration.nix - ./optimized_build.nix ./vm_disk.nix ]; diff --git a/nix/configuration/roles/network/default.nix b/nix/configuration/roles/network/default.nix index 1e99bb9..59eed75 100644 --- a/nix/configuration/roles/network/default.nix +++ b/nix/configuration/roles/network/default.nix @@ -114,4 +114,19 @@ # }) # ]; + # nixpkgs.overlays = [ + # (final: prev: { + # linux-firmware = prev.linux-firwmare.overrideAttrs (old: rec { + # version = "20250917"; + + # src = final.fetchFromGitLab { + # owner = "kernel-firmware"; + # repo = "linux-firmware"; + # tag = version; + # hash = "sha256-tecFB6WYEfBK9FB7Rv8nHLdefIoaFnHrpzXBl+iSd08="; + # }; + # }); + # }) + # ]; + }