public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67305 from adisbladis/iso-image-defaults

Browse Source 
Change ISO image defaults
This commit is contained in:
worldofpeace 2019-09-28 18:09:08 -04:00 committed by GitHub
commit 1d1ff2cc50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
View File

@ -22,14 +22,8 @@ with lib;
system.activationScripts.installerDesktop = let system.activationScripts.installerDesktop = let
manualDesktopFile = pkgs.writeScript "nixos-manual.desktop" '' # Comes from documentation.nix when xserver and nixos.enable are true.
[Desktop Entry] manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";
Version=1.0
Type=Application
Name=NixOS Manual
Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html
Icon=text-html
'';
homeDir = "/home/nixos/"; homeDir = "/home/nixos/";
desktopDir = homeDir + "Desktop/"; desktopDir = homeDir + "Desktop/";

6
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -165,8 +165,8 @@ let
else else
"# No refind for ${targetArch}" "# 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 = '' grubMenuCfg = ''
# #
@ -562,8 +562,6 @@ in
boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ]; boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ];
boot.blacklistedKernelModules = [ "nouveau" ];
boot.initrd.kernelModules = [ "loop" ]; boot.initrd.kernelModules = [ "loop" ];
# Closures to be copied to the Nix store on the CD, namely the init # Closures to be copied to the Nix store on the CD, namely the init