From 67a96de14ff12b6b3ca47705107f1cc5b2dfe98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 15 Nov 2024 10:23:02 +0100 Subject: [PATCH] remove embedding entire installations into the installer --- machine/not522/installer/default.nix | 6 ++---- machine/pc-installer/default.nix | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/machine/not522/installer/default.nix b/machine/not522/installer/default.nix index 6c8894db..05809852 100644 --- a/machine/not522/installer/default.nix +++ b/machine/not522/installer/default.nix @@ -17,10 +17,8 @@ system.stateVersion = config.system.nixos.version; - environment.etc."system/not522".source = "${nixos-config.nixosConfigurations.not522.config.system.build.toplevel - }"; - environment.etc."system/not522-disko".source = "${nixos-config.nixosConfigurations.not522.config.system.build.diskoScript - }"; + #environment.etc."system/not522".source = "${nixos-config.nixosConfigurations.not522.config.system.build.toplevel}"; + #environment.etc."system/not522-disko".source = "${nixos-config.nixosConfigurations.not522.config.system.build.diskoScript}"; environment.systemPackages = [ (pkgs.writeShellScriptBin "install-nixos-unattended" '' diff --git a/machine/pc-installer/default.nix b/machine/pc-installer/default.nix index 38e105c8..11399e9b 100644 --- a/machine/pc-installer/default.nix +++ b/machine/pc-installer/default.nix @@ -32,14 +32,16 @@ ]; }; isInstaller = true; - environment.etc."system/rainbow-resort".source = "${nixos-config.nixosConfigurations.rainbow-resort.config.system.build.toplevel - }"; - environment.etc."system/rainbow-resort-disko".source = "${nixos-config.nixosConfigurations.rainbow-resort.config.system.build.diskoScript - }"; - environment.etc."system/thinkrac".source = "${nixos-config.nixosConfigurations.thinkrac.config.system.build.toplevel - }"; - environment.etc."system/thinkrac-disko".source = "${nixos-config.nixosConfigurations.thinkrac.config.system.build.diskoScript - }"; + /* + environment.etc."system/rainbow-resort".source = "${nixos-config.nixosConfigurations.rainbow-resort.config.system.build.toplevel + }"; + environment.etc."system/rainbow-resort-disko".source = "${nixos-config.nixosConfigurations.rainbow-resort.config.system.build.diskoScript + }"; + environment.etc."system/thinkrac".source = "${nixos-config.nixosConfigurations.thinkrac.config.system.build.toplevel + }"; + environment.etc."system/thinkrac-disko".source = "${nixos-config.nixosConfigurations.thinkrac.config.system.build.diskoScript + }"; + */ environment.systemPackages = [ (pkgs.writeShellScriptBin "install-thinkrac-unattended" '' set -eux