diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2016-02-29 15:56:47 +0100 |
---|---|---|
committer | Luca Bruno <lucabru@src.gnome.org> | 2016-02-29 15:56:47 +0100 |
commit | 55c20bfe892a33cca331e9419e275e5c212b987d (patch) | |
tree | db1a90d4926aee5c3ced6bdb9288a6b41dae00ad /nixos/modules/installer | |
parent | 694a5ba291c37a324cc8076e456e2e9c85077029 (diff) | |
parent | aa9576bceb56d4fe2fb24e6fb47001817baeab34 (diff) | |
download | nixlib-55c20bfe892a33cca331e9419e275e5c212b987d.tar nixlib-55c20bfe892a33cca331e9419e275e5c212b987d.tar.gz nixlib-55c20bfe892a33cca331e9419e275e5c212b987d.tar.bz2 nixlib-55c20bfe892a33cca331e9419e275e5c212b987d.tar.lz nixlib-55c20bfe892a33cca331e9419e275e5c212b987d.tar.xz nixlib-55c20bfe892a33cca331e9419e275e5c212b987d.tar.zst nixlib-55c20bfe892a33cca331e9419e275e5c212b987d.zip |
Merge pull request #10288 from lethalman/gnomeiso
installer: add graphical GNOME iso
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix | 78 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix (renamed from nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix) | 2 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix (renamed from nixos/modules/installer/cd-dvd/installation-cd-graphical.nix) | 0 |
3 files changed, 79 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix new file mode 100644 index 000000000000..5725938465f5 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -0,0 +1,78 @@ +# This module defines a NixOS installation CD that contains X11 and +# GNOME 3. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = [ ./installation-cd-base.nix ]; + + services.xserver = { + enable = true; + # GDM doesn't start in virtual machines with ISO + displayManager.slim = { + enable = true; + defaultUser = "root"; + autoLogin = true; + }; + desktopManager.gnome3 = { + enable = true; + extraGSettingsOverrides = '' + [org.gnome.desktop.background] + show-desktop-icons=true + + [org.gnome.nautilus.desktop] + trash-icon-visible=false + volumes-visible=false + home-icon-visible=false + network-icon-visible=false + ''; + + extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ]; + }; + }; + + environment.systemPackages = + [ # Include gparted for partitioning disks. + pkgs.gparted + + # Include some editors. + pkgs.vim + pkgs.bvi # binary editor + pkgs.joe + + pkgs.glxinfo + ]; + + # Don't start the X server by default. + services.xserver.autorun = mkForce false; + + # Auto-login as root. + services.xserver.displayManager.gdm.autoLogin = { + enable = true; + user = "root"; + }; + + system.activationScripts.installerDesktop = let + # Must be executable + desktopFile = pkgs.writeScript "nixos-manual.desktop" '' + [Desktop Entry] + Version=1.0 + Type=Link + Name=NixOS Manual + URL=${config.system.build.manual.manual}/share/doc/nixos/index.html + Icon=system-help + ''; + + # use cp and chmod +x, we must be sure the apps are in the nix store though + in '' + mkdir -p /root/Desktop + ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop + cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop + chmod a+rx /root/Desktop/gnome-terminal.desktop + cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop + chmod a+rx /root/Desktop/gparted.desktop + ''; + +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix index 506b9292b01e..a4bcd7079a4f 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - imports = [ ./installation-cd-graphical.nix ]; + imports = [ ./installation-cd-graphical-kde.nix ]; boot.kernelPackages = pkgs.linuxPackages_latest; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index d14768bc1079..d14768bc1079 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix |