commit 8a8056c302bf395f70fa72ac52984e4b3698bb9a · pyrox.dev/nixpkgs

+8 -20

nixos/modules/config/system-path.nix

···

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

     

       82
        
             };

     

       83
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       84
        
           };

     

       85
        
       

     

       86
        
           system = {

     
···

       107
        
               "/etc/gtk-3.0"

     

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

     

       109
        
               "/sbin"

     

       110
       -
               "/share/applications"

     

       111
       -
               "/share/desktop-directories"

     

       112
        
               "/share/emacs"

     

       113
       -
               "/share/icons"

     

       114
       -
               "/share/menus"

     

       115
       -
               "/share/mime"

     

       116
        
               "/share/nano"

     

       117
        
               "/share/org"

     

       118
        
               "/share/themes"

     
···

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

     

       133
        
             postBuild =

     

       134
        
               ''

     

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

     

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

     

       137
       -
                 fi

     

       138
       -
       

     

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

     

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

     

       141
        
                 fi

     
···

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

     

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

     

       145
        
                 fi

     

       146
       -
       

     

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

     

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

     

       149
       -
                 fi

     

       150
       -
       

     

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

     

       152
       -
                   shopt -s nullglob

     

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

     

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

     

       155
       -
                   done

     

       156
       -
                 fi

     

       157
        
               '';

     

       158
        
           };

     

       159

···

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

     

       82
        
             };

     

       83
        
       

     

       84
       +
             extraSetup = mkOption {

     

       85
       +
               type = types.lines;

     

       86
       +
               default = "";

     

       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
       +
             };

     

       89
       +
       

     

       90
        
           };

     

       91
        
       

     

       92
        
           system = {

     
···

       113
        
               "/etc/gtk-3.0"

     

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

     

       115
        
               "/sbin"

     

       0
        
       
     

       0
        
       
     

       116
        
               "/share/emacs"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       117
        
               "/share/nano"

     

       118
        
               "/share/org"

     

       119
        
               "/share/themes"

     
···

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

     

       134
        
             postBuild =

     

       135
        
               ''

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

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

     

       138
        
                 fi

     
···

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

     

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

     

       142
        
                 fi

     

       143
       +
                 

     

       144
       +
                 ${config.environment.extraSetup}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       145
        
               '';

     

       146
        
           };

     

       147

+22

nixos/modules/config/xdg/autostart.nix

···

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

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       {

     

       5
       +
         options = {

     

       6
       +
           xdg.autostart.enable = mkOption {

     

       7
       +
             type = types.bool;

     

       8
       +
             default = true;

     

       9
       +
             description = ''

     

       10
       +
               Whether to install files to support the 

     

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

     

       12
       +
             '';

     

       13
       +
           };

     

       14
       +
         };

     

       15
       +
       

     

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

     

       17
       +
           environment.pathsToLink = [ 

     

       18
       +
             "/etc/xdg/autostart"

     

       19
       +
           ];

     

       20
       +
         };

     

       21
       +
       

     

       22
       +
       }

+27

nixos/modules/config/xdg/icons.nix

···

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

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       {

     

       5
       +
         options = {

     

       6
       +
           xdg.icons.enable = mkOption {

     

       7
       +
             type = types.bool;

     

       8
       +
             default = true;

     

       9
       +
             description = ''

     

       10
       +
               Whether to install files to support the 

     

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

     

       12
       +
             '';

     

       13
       +
           };

     

       14
       +
         };

     

       15
       +
       

     

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

     

       17
       +
           environment.pathsToLink = [ 

     

       18
       +
             "/share/icons" 

     

       19
       +
             "/share/pixmaps" 

     

       20
       +
           ];

     

       21
       +
           

     

       22
       +
           environment.profileRelativeEnvVars = {

     

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

     

       24
       +
           };

     

       25
       +
         };

     

       26
       +
       

     

       27
       +
       }

+25

nixos/modules/config/xdg/menus.nix

···

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

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       {

     

       5
       +
         options = {

     

       6
       +
           xdg.menus.enable = mkOption {

     

       7
       +
             type = types.bool;

     

       8
       +
             default = true;

     

       9
       +
             description = ''

     

       10
       +
               Whether to install files to support the 

     

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

     

       12
       +
             '';

     

       13
       +
           };

     

       14
       +
         };

     

       15
       +
       

     

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

     

       17
       +
           environment.pathsToLink = [ 

     

       18
       +
             "/share/applications"

     

       19
       +
             "/share/desktop-directories"

     

       20
       +
             "/etc/xdg/menus"

     

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

     

       22
       +
           ];

     

       23
       +
         };

     

       24
       +
       

     

       25
       +
       }

+36

nixos/modules/config/xdg/mime.nix

···

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

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       {

     

       5
       +
         options = {

     

       6
       +
           xdg.mime.enable = mkOption {

     

       7
       +
             type = types.bool;

     

       8
       +
             default = true;

     

       9
       +
             description = ''

     

       10
       +
               Whether to install files to support the 

     

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

     

       13
       +
             '';

     

       14
       +
           };

     

       15
       +
         };

     

       16
       +
       

     

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

     

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

     

       19
       +
       

     

       20
       +
           environment.systemPackages = [ 

     

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

     

       22
       +
             pkgs.shared-mime-info 

     

       23
       +
           ];

     

       24
       +
       

     

       25
       +
           environment.extraSetup = ''

     

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

     

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

     

       28
       +
             fi

     

       29
       +
       

     

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

     

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

     

       32
       +
             fi

     

       33
       +
           '';

     

       34
       +
         };

     

       35
       +
       

     

       36
       +
       }

+8

nixos/modules/misc/documentation.nix

···

       82
        
             environment.systemPackages = [ pkgs.texinfoInteractive ];

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       85
        
           })

     

       86
        
       

     

       87
        
           (mkIf cfg.doc.enable {

···

       82
        
             environment.systemPackages = [ pkgs.texinfoInteractive ];

     

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

     

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

     

       85
       +
             environment.extraSetup = ''

     

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

     

       87
       +
                 shopt -s nullglob

     

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

     

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

     

       90
       +
                 done

     

       91
       +
               fi

     

       92
       +
             '';

     

       93
        
           })

     

       94
        
       

     

       95
        
           (mkIf cfg.doc.enable {

+4

nixos/modules/module-list.nix

···

       7
        
         ./config/fonts/fontdir.nix

     

       8
        
         ./config/fonts/fonts.nix

     

       9
        
         ./config/fonts/ghostscript.nix

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10
        
         ./config/gnu.nix

     

       11
        
         ./config/i18n.nix

     

       12
        
         ./config/iproute2.nix

···

       7
        
         ./config/fonts/fontdir.nix

     

       8
        
         ./config/fonts/fonts.nix

     

       9
        
         ./config/fonts/ghostscript.nix

     

       10
       +
         ./config/xdg/autostart.nix

     

       11
       +
         ./config/xdg/icons.nix

     

       12
       +
         ./config/xdg/menus.nix

     

       13
       +
         ./config/xdg/mime.nix

     

       14
        
         ./config/gnu.nix

     

       15
        
         ./config/i18n.nix

     

       16
        
         ./config/iproute2.nix

-1

nixos/modules/programs/environment.nix

···

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

     

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

     

       42
        
               XDG_DATA_DIRS = [ "/share" ];

     

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

     

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

     

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

     

       46
        
             };

···

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

     

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

     

       42
        
               XDG_DATA_DIRS = [ "/share" ];

     

       0
        
       
     

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

     

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

     

       45
        
             };

+7 -3

nixos/modules/services/networking/xrdp.nix

···

       93
        
       

     

       94
        
         config = mkIf cfg.enable {

     

       95
        
       

     

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

     

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

     

       98
       -
           environment.pathsToLink =

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       100
        
           fonts.enableDefaultFonts = mkDefault true;

     

       101
        
       

     

       102
        
           systemd = {

···

       93
        
       

     

       94
        
         config = mkIf cfg.enable {

     

       95
        
       

     

       0
        
       
     

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

     

       97
       +
           xdg = {

     

       98
       +
             autostart.enable = true;

     

       99
       +
             menus.enable = true;

     

       100
       +
             mime.enable = true;

     

       101
       +
             icons.enable = true;

     

       102
       +
           };

     

       103
       +
       

     

       104
        
           fonts.enableDefaultFonts = mkDefault true;

     

       105
        
       

     

       106
        
           systemd = {

+7 -2

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

···

       33
        
             pkgs.xorg.xauth # used by kdesu

     

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

     

       35
        
             pkgs.tango-icon-theme

     

       36
       -
             pkgs.shared-mime-info

     

       37
        
             pkgs.gnome2.gnomeicontheme

     

       38
        
             pkgs.xorg.xcursorthemes

     

       39
        
           ];

     

       40
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       42
        
       

     

       43
        
           services.xserver.desktopManager.session = [

     

       44
        
           { name = "Enlightenment";

···

       33
        
             pkgs.xorg.xauth # used by kdesu

     

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

     

       35
        
             pkgs.tango-icon-theme

     

       36
       +
       

     

       37
        
             pkgs.gnome2.gnomeicontheme

     

       38
        
             pkgs.xorg.xcursorthemes

     

       39
        
           ];

     

       40
        
       

     

       41
       +
           environment.pathsToLink = [ 

     

       42
       +
             "/etc/enlightenment" 

     

       43
       +
             "/share/enlightenment" 

     

       44
       +
             "/share/elementary" 

     

       45
       +
             "/share/locale"

     

       46
       +
           ];

     

       47
        
       

     

       48
        
           services.xserver.desktopManager.session = [

     

       49
        
           { name = "Enlightenment";

+1 -2

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

···

       41
        
       

     

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

     

       43
        
           environment.pathsToLink = [

     

       44
       -
             "/share/desktop-directories"

     

       45
       -
             "/share/icons"

     

       46
        
             "/share/lumina"

     

       0
        
       
     

       47
        
             "/share"

     

       48
        
           ];

     

       49

···

       41
        
       

     

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

     

       43
        
           environment.pathsToLink = [

     

       0
        
       
     

       0
        
       
     

       44
        
             "/share/lumina"

     

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

     

       46
        
             "/share"

     

       47
        
           ];

     

       48

+4 -1

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

···

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

     

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

     

       176
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       178
        
       

     

       179
        
             environment.etc = singleton {

     

       180
        
               source = xcfg.xkbDir;

···

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

     

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

     

       176
        
       

     

       177
       +
             environment.pathsToLink = [ 

     

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

     

       179
       +
               "/share" 

     

       180
       +
             ];

     

       181
        
       

     

       182
        
             environment.etc = singleton {

     

       183
        
               source = xcfg.xkbDir;

-5

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

···

       59
        
             tango-icon-theme

     

       60
        
             xfce4-icon-theme

     

       61
        
       

     

       62
       -
             desktop-file-utils

     

       63
       -
             shared-mime-info

     

       64
       -
       

     

       65
        
             # Needed by Xfce's xinitrc script

     

       66
        
             # TODO: replace with command -v

     

       67
        
             which

     
···

       100
        
           environment.pathsToLink = [

     

       101
        
             "/share/xfce4"

     

       102
        
             "/share/themes"

     

       103
       -
             "/share/mime"

     

       104
       -
             "/share/desktop-directories"

     

       105
        
             "/share/gtksourceview-2.0"

     

       106
        
           ];

     

       107

···

       59
        
             tango-icon-theme

     

       60
        
             xfce4-icon-theme

     

       61
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       62
        
             # Needed by Xfce's xinitrc script

     

       63
        
             # TODO: replace with command -v

     

       64
        
             which

     
···

       97
        
           environment.pathsToLink = [

     

       98
        
             "/share/xfce4"

     

       99
        
             "/share/themes"

     

       0
        
       
     

       0
        
       
     

       100
        
             "/share/gtksourceview-2.0"

     

       101
        
           ];

     

       102

+6 -2

nixos/modules/services/x11/xserver.nix

···

       616
        
             ]

     

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

     

       618
        
       

     

       619
       -
           environment.pathsToLink =

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       621
        
       

     

       622
        
           # The default max inotify watches is 8192.

     

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

···

       616
        
             ]

     

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

     

       618
        
       

     

       619
       +
           xdg = { 

     

       620
       +
             autostart.enable = true;

     

       621
       +
             menus.enable = true;

     

       622
       +
             mime.enable = true;

     

       623
       +
             icons.enable = true;

     

       624
       +
           };

     

       625
        
       

     

       626
        
           # The default max inotify watches is 8192.

     

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