From 9f1d8d22e81ab05d244c0902a29eba6a053d911d Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 19 Sep 2025 11:34:09 +0200 Subject: [PATCH] demo-iso: fix evaluation warning --- flakeModules/demo_iso.nix | 46 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/flakeModules/demo_iso.nix b/flakeModules/demo_iso.nix index b4bccfec7..fb8158afc 100644 --- a/flakeModules/demo_iso.nix +++ b/flakeModules/demo_iso.nix @@ -45,29 +45,33 @@ let ''; }; - morphModule = { - imports = [ - ( - { modulesPath, ... }: - { - imports = [ "${modulesPath}/image/images.nix" ]; - } - ) - ]; - image.modules.iso.isoImage.squashfsCompression = "zstd -Xcompression-level 1"; - networking.networkmanager.enable = true; - services.getty.autologinUser = "root"; - programs.bash.interactiveShellInit = '' - if [[ "$(tty)" =~ /dev/(tty1|hvc0|ttyS0)$ ]]; then - # workaround for https://github.com/NixOS/nixpkgs/issues/219239 - systemctl restart systemd-vconsole-setup.service + morphModule = + { config, ... }: + { + imports = [ + ( + { modulesPath, ... }: + { + imports = [ "${modulesPath}/image/images.nix" ]; + } + ) + ]; + image.modules.iso.isoImage.squashfsCompression = "zstd -Xcompression-level 1"; + networking.networkmanager.enable = true; + services.getty.autologinUser = "root"; + programs.bash.interactiveShellInit = '' + if [[ "$(tty)" =~ /dev/(tty1|hvc0|ttyS0)$ ]]; then + # workaround for https://github.com/NixOS/nixpkgs/issues/219239 + systemctl restart systemd-vconsole-setup.service - reset + reset - ${clan_welcome}/bin/clan_welcome - fi - ''; - }; + ${clan_welcome}/bin/clan_welcome + fi + ''; + + system.stateVersion = config.system.nixos.release; + }; in { clan.templates.machine.demo-template = {