commit 8a8056c302bf395f70fa72ac52984e4b3698bb9a · pyrox.dev/nixpkgs

+8 -20

nixos/modules/config/system-path.nix

···

       81
       81
        
               description = "List of additional package outputs to be symlinked into <filename>/run/current-system/sw</filename>.";

     

       82
       82
        
             };

     

       83
       83
        
       

     

       84
       84
       +
             extraSetup = mkOption {

     

       85
       85
       +
               type = types.lines;

     

       86
       86
       +
               default = "";

     

       87
       87
       +
               description = "Shell fragments to be run after the system environment has been created. This should only be used for things that need to modify the internals of the environment, e.g. generating MIME caches. The environment being built can be accessed at $out.";

     

       88
       88
       +
             };

     

       89
       89
       +
       

     

       84
       90
        
           };

     

       85
       91
        
       

     

       86
       92
        
           system = {

     
···

       107
       113
        
               "/etc/gtk-3.0"

     

       108
       114
        
               "/lib" # FIXME: remove and update debug-info.nix

     

       109
       115
        
               "/sbin"

     

       110
       110
       -
               "/share/applications"

     

       111
       111
       -
               "/share/desktop-directories"

     

       112
       116
        
               "/share/emacs"

     

       113
       113
       -
               "/share/icons"

     

       114
       114
       -
               "/share/menus"

     

       115
       115
       -
               "/share/mime"

     

       116
       117
        
               "/share/nano"

     

       117
       118
        
               "/share/org"

     

       118
       119
        
               "/share/themes"

     
···

       132
       133
        
             # outputs TODO: note that the tools will often not be linked by default

     

       133
       134
        
             postBuild =

     

       134
       135
        
               ''

     

       135
       135
       -
                 if [ -x $out/bin/update-mime-database -a -w $out/share/mime ]; then

     

       136
       136
       -
                     XDG_DATA_DIRS=$out/share $out/bin/update-mime-database -V $out/share/mime > /dev/null

     

       137
       137
       -
                 fi

     

       138
       138
       -
       

     

       139
       136
        
                 if [ -x $out/bin/gtk-update-icon-cache -a -f $out/share/icons/hicolor/index.theme ]; then

     

       140
       137
        
                     $out/bin/gtk-update-icon-cache $out/share/icons/hicolor

     

       141
       138
        
                 fi

     
···

       143
       140
        
                 if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then

     

       144
       141
        
                     $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas

     

       145
       142
        
                 fi

     

       146
       146
       -
       

     

       147
       147
       -
                 if [ -x $out/bin/update-desktop-database -a -w $out/share/applications ]; then

     

       148
       148
       -
                     $out/bin/update-desktop-database $out/share/applications

     

       149
       149
       -
                 fi

     

       150
       150
       -
       

     

       151
       151
       -
                 if [ -x $out/bin/install-info -a -w $out/share/info ]; then

     

       152
       152
       -
                   shopt -s nullglob

     

       153
       153
       -
                   for i in $out/share/info/*.info $out/share/info/*.info.gz; do

     

       154
       154
       -
                       $out/bin/install-info $i $out/share/info/dir

     

       155
       155
       -
                   done

     

       156
       156
       -
                 fi

     

       143
       143
       +
                 

     

       144
       144
       +
                 ${config.environment.extraSetup}

     

       157
       145
        
               '';

     

       158
       146
        
           };

     

       159
       147

+22

nixos/modules/config/xdg/autostart.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       {

     

       5
       5
       +
         options = {

     

       6
       6
       +
           xdg.autostart.enable = mkOption {

     

       7
       7
       +
             type = types.bool;

     

       8
       8
       +
             default = true;

     

       9
       9
       +
             description = ''

     

       10
       10
       +
               Whether to install files to support the 

     

       11
       11
       +
               <link xlink:href="https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html">XDG Autostart specification</link>.

     

       12
       12
       +
             '';

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         config = mkIf config.xdg.autostart.enable {

     

       17
       17
       +
           environment.pathsToLink = [ 

     

       18
       18
       +
             "/etc/xdg/autostart"

     

       19
       19
       +
           ];

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
       }

+27

nixos/modules/config/xdg/icons.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       {

     

       5
       5
       +
         options = {

     

       6
       6
       +
           xdg.icons.enable = mkOption {

     

       7
       7
       +
             type = types.bool;

     

       8
       8
       +
             default = true;

     

       9
       9
       +
             description = ''

     

       10
       10
       +
               Whether to install files to support the 

     

       11
       11
       +
               <link xlink:href="https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html">XDG Icon Theme specification</link>.

     

       12
       12
       +
             '';

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         config = mkIf config.xdg.icons.enable {

     

       17
       17
       +
           environment.pathsToLink = [ 

     

       18
       18
       +
             "/share/icons" 

     

       19
       19
       +
             "/share/pixmaps" 

     

       20
       20
       +
           ];

     

       21
       21
       +
           

     

       22
       22
       +
           environment.profileRelativeEnvVars = {

     

       23
       23
       +
             XCURSOR_PATH = [ "/share/icons" ];

     

       24
       24
       +
           };

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
       }

+25

nixos/modules/config/xdg/menus.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       {

     

       5
       5
       +
         options = {

     

       6
       6
       +
           xdg.menus.enable = mkOption {

     

       7
       7
       +
             type = types.bool;

     

       8
       8
       +
             default = true;

     

       9
       9
       +
             description = ''

     

       10
       10
       +
               Whether to install files to support the 

     

       11
       11
       +
               <link xlink:href="https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html">XDG Desktop Menu specification</link>.

     

       12
       12
       +
             '';

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         config = mkIf config.xdg.menus.enable {

     

       17
       17
       +
           environment.pathsToLink = [ 

     

       18
       18
       +
             "/share/applications"

     

       19
       19
       +
             "/share/desktop-directories"

     

       20
       20
       +
             "/etc/xdg/menus"

     

       21
       21
       +
             "/etc/xdg/menus/applications-merged"

     

       22
       22
       +
           ];

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
       }

+36

nixos/modules/config/xdg/mime.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       {

     

       5
       5
       +
         options = {

     

       6
       6
       +
           xdg.mime.enable = mkOption {

     

       7
       7
       +
             type = types.bool;

     

       8
       8
       +
             default = true;

     

       9
       9
       +
             description = ''

     

       10
       10
       +
               Whether to install files to support the 

     

       11
       11
       +
               <link xlink:href="https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html">XDG Shared MIME-info specification</link> and the

     

       12
       12
       +
               <link xlink:href="https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html">XDG MIME Applications specification</link>.

     

       13
       13
       +
             '';

     

       14
       14
       +
           };

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         config = mkIf config.xdg.mime.enable {

     

       18
       18
       +
           environment.pathsToLink = [ "/share/mime" ];

     

       19
       19
       +
       

     

       20
       20
       +
           environment.systemPackages = [ 

     

       21
       21
       +
             # this package also installs some useful data, as well as its utilities 

     

       22
       22
       +
             pkgs.shared-mime-info 

     

       23
       23
       +
           ];

     

       24
       24
       +
       

     

       25
       25
       +
           environment.extraSetup = ''

     

       26
       26
       +
             if [ -w $out/share/mime ]; then

     

       27
       27
       +
               XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null

     

       28
       28
       +
             fi

     

       29
       29
       +
       

     

       30
       30
       +
             if [ -w $out/share/applications ]; then

     

       31
       31
       +
               ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications

     

       32
       32
       +
             fi

     

       33
       33
       +
           '';

     

       34
       34
       +
         };

     

       35
       35
       +
       

     

       36
       36
       +
       }

+8

nixos/modules/misc/documentation.nix

···

       82
       82
        
             environment.systemPackages = [ pkgs.texinfoInteractive ];

     

       83
       83
        
             environment.pathsToLink = [ "/share/info" ];

     

       84
       84
        
             environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo";

     

       85
       85
       +
             environment.extraSetup = ''

     

       86
       86
       +
               if [ -w $out/share/info ]; then

     

       87
       87
       +
                 shopt -s nullglob

     

       88
       88
       +
                 for i in $out/share/info/*.info $out/share/info/*.info.gz; do

     

       89
       89
       +
                     ${pkgs.texinfo}/bin/install-info $i $out/share/info/dir

     

       90
       90
       +
                 done

     

       91
       91
       +
               fi

     

       92
       92
       +
             '';

     

       85
       93
        
           })

     

       86
       94
        
       

     

       87
       95
        
           (mkIf cfg.doc.enable {

+4

nixos/modules/module-list.nix

···

       7
       7
        
         ./config/fonts/fontdir.nix

     

       8
       8
        
         ./config/fonts/fonts.nix

     

       9
       9
        
         ./config/fonts/ghostscript.nix

     

       10
       10
       +
         ./config/xdg/autostart.nix

     

       11
       11
       +
         ./config/xdg/icons.nix

     

       12
       12
       +
         ./config/xdg/menus.nix

     

       13
       13
       +
         ./config/xdg/mime.nix

     

       10
       14
        
         ./config/gnu.nix

     

       11
       15
        
         ./config/i18n.nix

     

       12
       16
        
         ./config/iproute2.nix

-1

nixos/modules/programs/environment.nix

···

       40
       40
        
               GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];

     

       41
       41
        
               XDG_CONFIG_DIRS = [ "/etc/xdg" ];

     

       42
       42
        
               XDG_DATA_DIRS = [ "/share" ];

     

       43
       43
       -
               XCURSOR_PATH = [ "/share/icons" ];

     

       44
       43
        
               MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ];

     

       45
       44
        
               LIBEXEC_PATH = [ "/lib/libexec" ];

     

       46
       45
        
             };

+7 -3

nixos/modules/services/networking/xrdp.nix

···

       93
       93
        
       

     

       94
       94
        
         config = mkIf cfg.enable {

     

       95
       95
        
       

     

       96
       96
       -
           # copied from <nixos/modules/services/x11/xserver.nix>

     

       97
       96
        
           # xrdp can run X11 program even if "services.xserver.enable = false"

     

       98
       98
       -
           environment.pathsToLink =

     

       99
       99
       -
             [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];

     

       97
       97
       +
           xdg = {

     

       98
       98
       +
             autostart.enable = true;

     

       99
       99
       +
             menus.enable = true;

     

       100
       100
       +
             mime.enable = true;

     

       101
       101
       +
             icons.enable = true;

     

       102
       102
       +
           };

     

       103
       103
       +
       

     

       100
       104
        
           fonts.enableDefaultFonts = mkDefault true;

     

       101
       105
        
       

     

       102
       106
        
           systemd = {

+7 -2

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

···

       33
       33
        
             pkgs.xorg.xauth # used by kdesu

     

       34
       34
        
             pkgs.gtk2 # To get GTK+'s themes.

     

       35
       35
        
             pkgs.tango-icon-theme

     

       36
       36
       -
             pkgs.shared-mime-info

     

       36
       36
       +
       

     

       37
       37
        
             pkgs.gnome2.gnomeicontheme

     

       38
       38
        
             pkgs.xorg.xcursorthemes

     

       39
       39
        
           ];

     

       40
       40
        
       

     

       41
       41
       -
           environment.pathsToLink = [ "/etc/enlightenment" "/etc/xdg" "/share/enlightenment" "/share/elementary" "/share/applications" "/share/locale" "/share/icons" "/share/themes" "/share/mime" "/share/desktop-directories" ];

     

       41
       41
       +
           environment.pathsToLink = [ 

     

       42
       42
       +
             "/etc/enlightenment" 

     

       43
       43
       +
             "/share/enlightenment" 

     

       44
       44
       +
             "/share/elementary" 

     

       45
       45
       +
             "/share/locale"

     

       46
       46
       +
           ];

     

       42
       47
        
       

     

       43
       48
        
           services.xserver.desktopManager.session = [

     

       44
       49
        
           { name = "Enlightenment";

+1 -2

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

···

       41
       41
        
       

     

       42
       42
        
           # Link some extra directories in /run/current-system/software/share

     

       43
       43
        
           environment.pathsToLink = [

     

       44
       44
       -
             "/share/desktop-directories"

     

       45
       45
       -
             "/share/icons"

     

       46
       44
        
             "/share/lumina"

     

       45
       45
       +
             # FIXME: modules should link subdirs of `/share` rather than relying on this

     

       47
       46
        
             "/share"

     

       48
       47
        
           ];

     

       49
       48

+4 -1

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

···

       174
       174
        
               ++ lib.optional config.services.colord.enable colord-kde

     

       175
       175
        
               ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];

     

       176
       176
        
       

     

       177
       177
       -
             environment.pathsToLink = [ "/share" ];

     

       177
       177
       +
             environment.pathsToLink = [ 

     

       178
       178
       +
               # FIXME: modules should link subdirs of `/share` rather than relying on this

     

       179
       179
       +
               "/share" 

     

       180
       180
       +
             ];

     

       178
       181
        
       

     

       179
       182
        
             environment.etc = singleton {

     

       180
       183
        
               source = xcfg.xkbDir;

-5

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

···

       59
       59
        
             tango-icon-theme

     

       60
       60
        
             xfce4-icon-theme

     

       61
       61
        
       

     

       62
       62
       -
             desktop-file-utils

     

       63
       63
       -
             shared-mime-info

     

       64
       64
       -
       

     

       65
       62
        
             # Needed by Xfce's xinitrc script

     

       66
       63
        
             # TODO: replace with command -v

     

       67
       64
        
             which

     
···

       100
       97
        
           environment.pathsToLink = [

     

       101
       98
        
             "/share/xfce4"

     

       102
       99
        
             "/share/themes"

     

       103
       103
       -
             "/share/mime"

     

       104
       104
       -
             "/share/desktop-directories"

     

       105
       100
        
             "/share/gtksourceview-2.0"

     

       106
       101
        
           ];

     

       107
       102

+6 -2

nixos/modules/services/x11/xserver.nix

···

       616
       616
        
             ]

     

       617
       617
        
             ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;

     

       618
       618
        
       

     

       619
       619
       -
           environment.pathsToLink =

     

       620
       620
       -
             [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];

     

       619
       619
       +
           xdg = { 

     

       620
       620
       +
             autostart.enable = true;

     

       621
       621
       +
             menus.enable = true;

     

       622
       622
       +
             mime.enable = true;

     

       623
       623
       +
             icons.enable = true;

     

       624
       624
       +
           };

     

       621
       625
        
       

     

       622
       626
        
           # The default max inotify watches is 8192.

     

       623
       627
        
           # Nowadays most apps require a good number of inotify watches,