diff --git a/modules/iso/image.nix b/modules/iso/image.nix index 81c74e26..341c51a1 100644 --- a/modules/iso/image.nix +++ b/modules/iso/image.nix @@ -35,12 +35,6 @@ in # maximum compression, in exchange for build speed squashfsCompression = "zstd -Xcompression-level 19"; - # ISO image should be an EFI-bootable volume - makeEfiBootable = true; - - # ISO image should be bootable from USB - makeUsbBootable = true; - # remove "-installer" boot menu label appendToMenuLabel = ""; diff --git a/modules/iso/networking.nix b/modules/iso/networking.nix index d93d7994..e5029584 100644 --- a/modules/iso/networking.nix +++ b/modules/iso/networking.nix @@ -3,16 +3,6 @@ let inherit (lib) mkForce; in { - # use networkmanager in the live environment - networking.networkmanager = { - enable = true; - # we don't want any plugins, they only takeup space - # you might consider adding some if you need a VPN for example - plugins = [ ]; - }; - - networking.wireless.enable = mkForce false; - # allow ssh into the system for headless installs systemd.services.sshd.wantedBy = mkForce [ "multi-user.target" ]; users.users.root.openssh.authorizedKeys.keys = [ diff --git a/modules/iso/nix.nix b/modules/iso/nix.nix index 68417b57..9ac27b63 100644 --- a/modules/iso/nix.nix +++ b/modules/iso/nix.nix @@ -7,9 +7,6 @@ # we can disable channels since we can just use the flake channel.enable = false; - # we need to have nixpkgs in our path - nixPath = [ "nixpkgs=${config.nix.registry.nixpkgs.to.path}" ]; - settings = { # these are the bare minimum settings required to get my nixos config working experimental-features = [ diff --git a/modules/iso/nixpkgs.nix b/modules/iso/nixpkgs.nix index b2d16698..bde15bf4 100644 --- a/modules/iso/nixpkgs.nix +++ b/modules/iso/nixpkgs.nix @@ -9,7 +9,10 @@ overlays = [ (_: prev: { - nixVersions.stable = config.nix.package; + nixVersions = prev.nixVersions // { + stable = config.nix.package; + }; + nixForLinking = prev.nixVersions.stable; }) ]; diff --git a/modules/iso/programs.nix b/modules/iso/programs.nix index e7fb21e9..2ae48fe6 100644 --- a/modules/iso/programs.nix +++ b/modules/iso/programs.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - self', - ... -}: +{ pkgs, self', ... }: { # disable all installer tools and only bring the ones that we explicitly need # for installing or debugging @@ -21,15 +16,5 @@ programs.git.package = pkgs.gitMinimal; # needed packages for the installer - environment.systemPackages = lib.attrValues { - inherit (pkgs) - vim # we are not installing neovim here so we have a light dev environment - pciutils # going to need this for lspci - ; - - inherit (self'.packages) iztaller; - }; - - # provide all hardware drivers, including proprietary ones - hardware.enableRedistributableFirmware = true; + environment.systemPackages = [ self'.packages.iztaller ]; } diff --git a/modules/iso/space.nix b/modules/iso/space.nix index d1a05e6d..168cd2ea 100644 --- a/modules/iso/space.nix +++ b/modules/iso/space.nix @@ -1,48 +1,22 @@ { lib, ... }: let - inherit (lib) mkForce mkDefault; + inherit (lib) mkForce; in { # disable documentation documentation = { - enable = mkDefault false; - doc.enable = mkDefault false; - info.enable = mkDefault false; + enable = mkForce false; + dev.enable = mkForce false; + doc.enable = mkForce false; + info.enable = mkForce false; + nixos.enable = mkForce false; + + man = { + enable = false; + man-db.enable = false; + }; }; - # we don't need this, plus it adds extra programs to the iso - services = { - logrotate.enable = false; - udisks2.enable = false; - }; - - # disable fontConfig - fonts.fontconfig.enable = mkForce false; - - # disable containers as it also pulls in pearl - boot.enableContainers = false; - - programs = { - # disable less as it pulls in pearl - less.lessopen = null; - - # disable command-not-found and other similar programs - command-not-found.enable = false; - }; - - # Use environment options, minimal profile - environment = { - # we don't really need this warning on the minimal profile - stub-ld.enable = mkForce false; - - # no packages other, other then the ones I provide - defaultPackages = [ ]; - }; - - xdg = { - autostart.enable = false; - icons.enable = false; - mime.enable = false; - sounds.enable = false; - }; + # don't include nixpkgs in our iso + system.installer.channel.enable = false; }