diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-28 18:09:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-28 18:09:08 -0400 |
| commit | 1d1ff2cc500a812010023cf1a4a4e89102c0d08c (patch) | |
| tree | 0107a1e6149453ced7868306eaeb373930fec754 /nixos | |
| parent | 67393f6441317b54bbabc4f08b1bf8316a501728 (diff) | |
| parent | 04bd834d691a64a3fb4bb07ec0d4d28d00f48edb (diff) | |
| download | nixlib-1d1ff2cc500a812010023cf1a4a4e89102c0d08c.tar nixlib-1d1ff2cc500a812010023cf1a4a4e89102c0d08c.tar.gz nixlib-1d1ff2cc500a812010023cf1a4a4e89102c0d08c.tar.bz2 nixlib-1d1ff2cc500a812010023cf1a4a4e89102c0d08c.tar.lz nixlib-1d1ff2cc500a812010023cf1a4a4e89102c0d08c.tar.xz nixlib-1d1ff2cc500a812010023cf1a4a4e89102c0d08c.tar.zst nixlib-1d1ff2cc500a812010023cf1a4a4e89102c0d08c.zip | |
Merge pull request #67305 from adisbladis/iso-image-defaults
Change ISO image defaults
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 559899b0a3b1..1dc7920ff640 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -22,14 +22,8 @@ with lib; system.activationScripts.installerDesktop = let - manualDesktopFile = pkgs.writeScript "nixos-manual.desktop" '' - [Desktop Entry] - Version=1.0 - Type=Application - Name=NixOS Manual - Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html - Icon=text-html - ''; + # Comes from documentation.nix when xserver and nixos.enable are true. + manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop"; homeDir = "/home/nixos/"; desktopDir = homeDir + "Desktop/"; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index d5c92cfc1d9e..93c8ebaa2496 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -165,8 +165,8 @@ let else "# No refind for ${targetArch}" ; - - grubPkgs = if config.boot.loader.grub.forcei686 then pkgs.pkgsi686Linux else pkgs; + + grubPkgs = if config.boot.loader.grub.forcei686 then pkgs.pkgsi686Linux else pkgs; grubMenuCfg = '' # @@ -562,8 +562,6 @@ in boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ]; - boot.blacklistedKernelModules = [ "nouveau" ]; - boot.initrd.kernelModules = [ "loop" ]; # Closures to be copied to the Nix store on the CD, namely the init |