From 1ec13f09fbf67657941280cd6d9b52c35326e82d Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 6 Sep 2026 04:43:27 -0600 Subject: add live iso output for x86 --- flake.nix | 12 +++++++++--- machines/iso/configuration.nix | 13 ------------- machines/iso/default.nix | 13 +++++++++++++ machines/iso/hardware-configuration.nix | 2 -- 4 files changed, 22 insertions(+), 18 deletions(-) delete mode 100644 machines/iso/configuration.nix create mode 100644 machines/iso/default.nix diff --git a/flake.nix b/flake.nix index 6c50a41..f72e220 100644 --- a/flake.nix +++ b/flake.nix @@ -440,14 +440,20 @@ ]; }; live = lib.nixosSystem { - modules = minimalModuleConfig ++ [ + modules = minimalModuleConfig ++ [ ./machines/iso ./machines/iso/aarch-hardware.nix (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix") - ./machines/iso/configuration.nix - + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } { nixpkgs.hostPlatform = "aarch64-linux"; } ]; }; + live86 = lib.nixosSystem { # installation iso for x86_64 systems + modules = minimalModuleConfig ++ [ ./machines/iso + ({modulesPath, ... }: {imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")];}) + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } + { nixpkgs.hostPlatform = "x86_64-linux"; } + ] ; + }; livetest = lib.nixosSystem { modules = [ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") diff --git a/machines/iso/configuration.nix b/machines/iso/configuration.nix deleted file mode 100644 index 29b429a..0000000 --- a/machines/iso/configuration.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: { - imports = [ - ./hardware-configuration.nix - ]; - nixpkgs = { - config.allowUnfree = true; - }; - nix = { - settings.experimental-features = ["nix-command" "flakes"]; - extraOptions = "experimental-features = nix-command flakes"; - }; - networking.hostName = "iso"; -} diff --git a/machines/iso/default.nix b/machines/iso/default.nix new file mode 100644 index 0000000..29b429a --- /dev/null +++ b/machines/iso/default.nix @@ -0,0 +1,13 @@ +{ ... }: { + imports = [ + ./hardware-configuration.nix + ]; + nixpkgs = { + config.allowUnfree = true; + }; + nix = { + settings.experimental-features = ["nix-command" "flakes"]; + extraOptions = "experimental-features = nix-command flakes"; + }; + networking.hostName = "iso"; +} diff --git a/machines/iso/hardware-configuration.nix b/machines/iso/hardware-configuration.nix index 78601ad..5058e8f 100644 --- a/machines/iso/hardware-configuration.nix +++ b/machines/iso/hardware-configuration.nix @@ -30,6 +30,4 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.end0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; } -- cgit v1.3.1