commit 67b5b4cabfee04ad6ec82333b964c31fb16ed472 · pyrox.dev/nixpkgs

+14 -8

nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix

···

       35
        
         # Enable sound in graphical iso's.

     

       36
        
         hardware.pulseaudio.enable = true;

     

       37
        
       

     

       38
       -
         environment.systemPackages = [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       39
        
           # Include gparted for partitioning disks.

     

       40
       -
           pkgs.gparted

     

       41
        
       

     

       42
        
           # Include some editors.

     

       43
       -
           pkgs.vim

     

       44
       -
           pkgs.bvi # binary editor

     

       45
       -
           pkgs.joe

     

       46
        
       

     

       47
        
           # Include some version control tools.

     

       48
       -
           pkgs.git

     

       0
        
       
     

       49
        
       

     

       50
        
           # Firefox for reading the manual.

     

       51
       -
           pkgs.firefox

     

       52
        
       

     

       53
       -
           pkgs.glxinfo

     

       54
        
         ];

     

       55
        
       

     

       56
        
       }

···

       35
        
         # Enable sound in graphical iso's.

     

       36
        
         hardware.pulseaudio.enable = true;

     

       37
        
       

     

       38
       +
         # Spice guest additions

     

       39
       +
         services.spice-vdagentd.enable = true;

     

       40
       +
       

     

       41
       +
         # Enable plymouth

     

       42
       +
         boot.plymouth.enable = true;

     

       43
       +
       

     

       44
       +
         environment.defaultPackages = with pkgs; [

     

       45
        
           # Include gparted for partitioning disks.

     

       46
       +
           gparted

     

       47
        
       

     

       48
        
           # Include some editors.

     

       49
       +
           vim

     

       50
       +
           nano

     

       0
        
       
     

       51
        
       

     

       52
        
           # Include some version control tools.

     

       53
       +
           git

     

       54
       +
           rsync

     

       55
        
       

     

       56
        
           # Firefox for reading the manual.

     

       57
       +
           firefox

     

       58
        
       

     

       59
       +
           glxinfo

     

       60
        
         ];

     

       61
        
       

     

       62
        
       }

+59

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix

···

       1
       +
       # This module defines a NixOS installation CD that contains GNOME.

     

       2
       +
       

     

       3
       +
       { pkgs, ... }:

     

       4
       +
       

     

       5
       +
       {

     

       6
       +
         imports = [ ./installation-cd-graphical-calamares.nix ];

     

       7
       +
       

     

       8
       +
         isoImage.edition = "gnome";

     

       9
       +
       

     

       10
       +
         services.xserver.desktopManager.gnome = {

     

       11
       +
           # Add Firefox and other tools useful for installation to the launcher

     

       12
       +
           favoriteAppsOverride = ''

     

       13
       +
             [org.gnome.shell]

     

       14
       +
             favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop', 'io.calamares.calamares.desktop' ]

     

       15
       +
           '';

     

       16
       +
       

     

       17
       +
           # Override GNOME defaults to disable GNOME tour and disable suspend

     

       18
       +
           extraGSettingsOverrides = ''

     

       19
       +
             [org.gnome.shell]

     

       20
       +
             welcome-dialog-last-shown-version='9999999999'

     

       21
       +
       

     

       22
       +
             [org.gnome.settings-daemon.plugins.power]

     

       23
       +
             sleep-inactive-ac-type='nothing'

     

       24
       +
             sleep-inactive-battery-type='nothing'

     

       25
       +
           '';

     

       26
       +
       

     

       27
       +
           extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ];

     

       28
       +
       

     

       29
       +
           enable = true;

     

       30
       +
         };

     

       31
       +
       

     

       32
       +
         # Theme calamares with GNOME theme

     

       33
       +
         qt5 = {

     

       34
       +
           enable = true;

     

       35
       +
           platformTheme = "gnome";

     

       36
       +
         };

     

       37
       +
       

     

       38
       +
         # Fix scaling for calamares on wayland

     

       39
       +
         environment.variables = {

     

       40
       +
           QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";

     

       41
       +
         };

     

       42
       +
       

     

       43
       +
         services.xserver.displayManager = {

     

       44
       +
           gdm = {

     

       45
       +
             enable = true;

     

       46
       +
             # autoSuspend makes the machine automatically suspend after inactivity.

     

       47
       +
             # It's possible someone could/try to ssh'd into the machine and obviously

     

       48
       +
             # have issues because it's inactive.

     

       49
       +
             # See:

     

       50
       +
             # * https://github.com/NixOS/nixpkgs/pull/63790

     

       51
       +
             # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22

     

       52
       +
             autoSuspend = false;

     

       53
       +
           };

     

       54
       +
           autoLogin = {

     

       55
       +
             enable = true;

     

       56
       +
             user = "nixos";

     

       57
       +
           };

     

       58
       +
         };

     

       59
       +
       }

+20

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix

···

       1
       +
       # This module adds the calamares installer to the basic graphical NixOS

     

       2
       +
       # installation CD.

     

       3
       +
       

     

       4
       +
       { pkgs, ... }:

     

       5
       +
       let

     

       6
       +
         calamares-nixos-autostart = pkgs.makeAutostartItem { name = "io.calamares.calamares"; package = pkgs.calamares-nixos; };

     

       7
       +
       in

     

       8
       +
       {

     

       9
       +
         imports = [ ./installation-cd-graphical-base.nix ];

     

       10
       +
       

     

       11
       +
         environment.systemPackages = with pkgs; [

     

       12
       +
           # Calamares for graphical installation

     

       13
       +
           libsForQt5.kpmcore

     

       14
       +
           calamares-nixos

     

       15
       +
           calamares-nixos-autostart

     

       16
       +
           calamares-nixos-extensions

     

       17
       +
           # Needed for calamares QML module packagechooserq

     

       18
       +
           libsForQt5.full

     

       19
       +
         ];

     

       20
       +
       }

+1 -3

nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix

···

       1
        
       # This module defines a NixOS installation CD that contains GNOME.

     

       2
        
       

     

       3
       -
       { lib, ... }:

     

       4
       -
       

     

       5
       -
       with lib;

     

       6
        
       

     

       7
        
       {

     

       8
        
         imports = [ ./installation-cd-graphical-base.nix ];

···

       1
        
       # This module defines a NixOS installation CD that contains GNOME.

     

       2
        
       

     

       3
       +
       { ... }:

     

       0
        
       
     

       0
        
       
     

       4
        
       

     

       5
        
       {

     

       6
        
         imports = [ ./installation-cd-graphical-base.nix ];