commit aa9576bceb56d4fe2fb24e6fb47001817baeab34 · pyrox.dev/nixpkgs

+78

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

···

       1
       1
       +
       # This module defines a NixOS installation CD that contains X11 and

     

       2
       2
       +
       # GNOME 3.

     

       3
       3
       +
       

     

       4
       4
       +
       { config, lib, pkgs, ... }:

     

       5
       5
       +
       

     

       6
       6
       +
       with lib;

     

       7
       7
       +
       

     

       8
       8
       +
       {

     

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

     

       10
       10
       +
       

     

       11
       11
       +
         services.xserver = {

     

       12
       12
       +
           enable = true;

     

       13
       13
       +
           # GDM doesn't start in virtual machines with ISO

     

       14
       14
       +
           displayManager.slim = {

     

       15
       15
       +
             enable = true;

     

       16
       16
       +
             defaultUser = "root";

     

       17
       17
       +
             autoLogin = true;

     

       18
       18
       +
           };

     

       19
       19
       +
           desktopManager.gnome3 = {

     

       20
       20
       +
             enable = true;

     

       21
       21
       +
             extraGSettingsOverrides = ''

     

       22
       22
       +
               [org.gnome.desktop.background]

     

       23
       23
       +
               show-desktop-icons=true

     

       24
       24
       +
       

     

       25
       25
       +
               [org.gnome.nautilus.desktop]

     

       26
       26
       +
               trash-icon-visible=false

     

       27
       27
       +
               volumes-visible=false

     

       28
       28
       +
               home-icon-visible=false

     

       29
       29
       +
               network-icon-visible=false

     

       30
       30
       +
             '';

     

       31
       31
       +
       

     

       32
       32
       +
             extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ];

     

       33
       33
       +
           };

     

       34
       34
       +
         };

     

       35
       35
       +
       

     

       36
       36
       +
         environment.systemPackages =

     

       37
       37
       +
           [ # Include gparted for partitioning disks.

     

       38
       38
       +
             pkgs.gparted

     

       39
       39
       +
       

     

       40
       40
       +
             # Include some editors.

     

       41
       41
       +
             pkgs.vim

     

       42
       42
       +
             pkgs.bvi # binary editor

     

       43
       43
       +
             pkgs.joe

     

       44
       44
       +
       

     

       45
       45
       +
             pkgs.glxinfo

     

       46
       46
       +
           ];

     

       47
       47
       +
       

     

       48
       48
       +
         # Don't start the X server by default.

     

       49
       49
       +
         services.xserver.autorun = mkForce false;

     

       50
       50
       +
       

     

       51
       51
       +
         # Auto-login as root.

     

       52
       52
       +
         services.xserver.displayManager.gdm.autoLogin = {

     

       53
       53
       +
           enable = true;

     

       54
       54
       +
           user = "root";

     

       55
       55
       +
         };

     

       56
       56
       +
       

     

       57
       57
       +
         system.activationScripts.installerDesktop = let

     

       58
       58
       +
           # Must be executable

     

       59
       59
       +
           desktopFile = pkgs.writeScript "nixos-manual.desktop" ''

     

       60
       60
       +
             [Desktop Entry]

     

       61
       61
       +
             Version=1.0

     

       62
       62
       +
             Type=Link

     

       63
       63
       +
             Name=NixOS Manual

     

       64
       64
       +
             URL=${config.system.build.manual.manual}/share/doc/nixos/index.html

     

       65
       65
       +
             Icon=system-help

     

       66
       66
       +
           '';

     

       67
       67
       +
       

     

       68
       68
       +
         # use cp and chmod +x, we must be sure the apps are in the nix store though

     

       69
       69
       +
         in ''

     

       70
       70
       +
           mkdir -p /root/Desktop

     

       71
       71
       +
           ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop

     

       72
       72
       +
           cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop

     

       73
       73
       +
           chmod a+rx /root/Desktop/gnome-terminal.desktop

     

       74
       74
       +
           cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop

     

       75
       75
       +
           chmod a+rx /root/Desktop/gparted.desktop

     

       76
       76
       +
         '';

     

       77
       77
       +
       

     

       78
       78
       +
       }

+1 -1

nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix

···

       1
       1
        
       { config, pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

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

     

       4
       4
       +
         imports = [ ./installation-cd-graphical-kde.nix ];

     

       5
       5
        
       

     

       6
       6
        
         boot.kernelPackages = pkgs.linuxPackages_latest;

     

       7
       7
        
       }

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

+38 -19

nixos/modules/services/x11/desktop-managers/gnome3.nix

···

       27
       27
        
       

     

       28
       28
        
         nixos-gsettings-desktop-schemas = pkgs.stdenv.mkDerivation {

     

       29
       29
        
           name = "nixos-gsettings-desktop-schemas";

     

       30
       30
       -
           buildInputs = [ pkgs.nixos-artwork ];

     

       31
       30
        
           buildCommand = ''

     

       32
       32
       -
            mkdir -p $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas

     

       33
       33
       -
            cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0 $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/

     

       34
       34
       -
            chmod -R a+w $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas

     

       35
       35
       -
            cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF

     

       31
       31
       +
            mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas

     

       32
       32
       +
            cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas

     

       33
       33
       +
       

     

       34
       34
       +
            ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}

     

       35
       35
       +
       

     

       36
       36
       +
            chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides

     

       37
       37
       +
            cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF

     

       36
       38
        
              [org.gnome.desktop.background]

     

       37
       39
        
              picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'

     

       38
       40
        
       

     

       39
       41
        
              [org.gnome.desktop.screensaver]

     

       40
       42
        
              picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'

     

       43
       43
       +
       

     

       44
       44
       +
              ${cfg.extraGSettingsOverrides}

     

       41
       45
        
            EOF

     

       42
       42
       -
            ${pkgs.glib}/bin/glib-compile-schemas $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/

     

       46
       46
       +
       

     

       47
       47
       +
            ${pkgs.glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/

     

       43
       48
        
           '';

     

       44
       49
        
         };

     

       45
       50
        
       

     
···

       47
       52
        
       

     

       48
       53
        
         options = {

     

       49
       54
        
       

     

       50
       50
       -
           services.xserver.desktopManager.gnome3.enable = mkOption {

     

       51
       51
       -
             default = false;

     

       52
       52
       -
             example = true;

     

       53
       53
       -
             description = "Enable Gnome 3 desktop manager.";

     

       54
       54
       -
           };

     

       55
       55
       +
           services.xserver.desktopManager.gnome3 = {

     

       56
       56
       +
             enable = mkOption {

     

       57
       57
       +
               default = false;

     

       58
       58
       +
               example = true;

     

       59
       59
       +
               description = "Enable Gnome 3 desktop manager.";

     

       60
       60
       +
             };

     

       61
       61
       +
       

     

       62
       62
       +
             sessionPath = mkOption {

     

       63
       63
       +
               default = [];

     

       64
       64
       +
               example = literalExample "[ pkgs.gnome3.gpaste ]";

     

       65
       65
       +
               description = "Additional list of packages to be added to the session search path.

     

       66
       66
       +
                              Useful for gnome shell extensions or gsettings-conditionated autostart.";

     

       67
       67
       +
               apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];

     

       68
       68
       +
             };

     

       69
       69
       +
       

     

       70
       70
       +
             extraGSettingsOverrides = mkOption {

     

       71
       71
       +
               default = "";

     

       72
       72
       +
               type = types.lines;

     

       73
       73
       +
               description = "Additional gsettings overrides.";

     

       74
       74
       +
             };

     

       55
       75
        
       

     

       56
       56
       -
           services.xserver.desktopManager.gnome3.sessionPath = mkOption {

     

       57
       57
       -
             default = [];

     

       58
       58
       -
             example = literalExample "[ pkgs.gnome3.gpaste ]";

     

       59
       59
       -
             description = "Additional list of packages to be added to the session search path.

     

       60
       60
       -
                            Useful for gnome shell extensions or gsettings-conditionated autostart.";

     

       61
       61
       -
             apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];

     

       62
       62
       -
           };

     

       76
       76
       +
             extraGSettingsOverridePackages = mkOption {

     

       77
       77
       +
               default = [];

     

       78
       78
       +
               type = types.listOf types.path;

     

       79
       79
       +
               description = "List of packages for which gsettings are overridden.";

     

       80
       80
       +
             };

     

       81
       81
       +
           };  

     

       63
       82
        
       

     

       64
       83
        
           environment.gnome3.packageSet = mkOption {

     

       65
       84
        
             type = types.nullOr types.package;

     
···

       130
       149
        
                 export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share

     

       131
       150
        
       

     

       132
       151
        
                 # Override gsettings-desktop-schema

     

       133
       133
       -
                 export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS

     

       152
       152
       +
                 export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS

     

       134
       153
        
       

     

       135
       154
        
                 # Let nautilus find extensions

     

       136
       155
        
                 export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/

+1 -1

nixos/release.nix

···

       113
       113
        
         });

     

       114
       114
        
       

     

       115
       115
        
         iso_graphical = forAllSystems (system: makeIso {

     

       116
       116
       -
           module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;

     

       116
       116
       +
           module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;

     

       117
       117
        
           type = "graphical";

     

       118
       118
        
           inherit system;

     

       119
       119
        
         });

+2 -1

pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix

···

       37
       37
        
             --prefix PATH : "${unzip}/bin" \

     

       38
       38
        
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       39
       39
        
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       40
       40
       -
             --suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

     

       40
       40
       +
             --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \

     

       41
       41
       +
             --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       41
       42
        
       

     

       42
       43
        
           wrapProgram "$out/libexec/gnome-shell-calendar-server" \

     

       43
       44
        
             --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

+2 -1

pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix

···

       13
       13
        
           wrapProgram "$out/bin/nautilus" \

     

       14
       14
        
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       15
       15
        
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       16
       16
       -
             --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       16
       16
       +
             --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" \

     

       17
       17
       +
             --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       17
       18
        
         '';

     

       18
       19
        
       

     

       19
       20
        
         patches = [ ./extension_dir.patch ];

+3

pkgs/desktops/gnome-3/3.18/default.nix

···

       65
       65
        
       # Simplify the nixos module and gnome packages

     

       66
       66
        
         defaultIconTheme = adwaita-icon-theme;

     

       67
       67
        
       

     

       68
       68
       +
       # ISO installer

     

       69
       69
       +
         installerIso = callPackage ./installer.nix {};

     

       70
       70
       +
       

     

       68
       71
        
       #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)

     

       69
       72
        
       

     

       70
       73
        
         adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };

+15

pkgs/desktops/gnome-3/3.18/installer.nix

···

       1
       1
       +
       { isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem

     

       2
       2
       +
       , extraModules ? [] }:

     

       3
       3
       +
           

     

       4
       4
       +
       let

     

       5
       5
       +
       

     

       6
       6
       +
         module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;

     

       7
       7
       +
       

     

       8
       8
       +
         config = (import ../../../../nixos/lib/eval-config.nix {

     

       9
       9
       +
           inherit system;

     

       10
       10
       +
           modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules;

     

       11
       11
       +
         }).config;

     

       12
       12
       +
       

     

       13
       13
       +
       in

     

       14
       14
       +
         config.system.build.isoImage

     

       15
       15
       +