commit b07ce1fb74b90604a711ee545ca820ed38c66b2c · pyrox.dev/nixpkgs

-1

nixos/modules/config/system-path.nix

···

       109
       109
        
               "/sbin"

     

       110
       110
        
               "/share/applications"

     

       111
       111
        
               "/share/desktop-directories"

     

       112
       112
       -
               "/share/doc"

     

       113
       112
        
               "/share/emacs"

     

       114
       113
        
               "/share/icons"

     

       115
       114
        
               "/share/menus"

+77

nixos/modules/misc/documentation.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let cfg = config.documentation; in

     

       6
       6
       +
       

     

       7
       7
       +
       {

     

       8
       8
       +
       

     

       9
       9
       +
         options = {

     

       10
       10
       +
       

     

       11
       11
       +
           documentation = {

     

       12
       12
       +
       

     

       13
       13
       +
             enable = mkOption {

     

       14
       14
       +
               type = types.bool;

     

       15
       15
       +
               default = true;

     

       16
       16
       +
               description = ''

     

       17
       17
       +
                 Whether to install documentation of packages from

     

       18
       18
       +
                 <option>environment.systemPackages</option> into the generated system path.

     

       19
       19
       +
               '';

     

       20
       20
       +
             };

     

       21
       21
       +
       

     

       22
       22
       +
             man.enable = mkOption {

     

       23
       23
       +
               type = types.bool;

     

       24
       24
       +
               default = true;

     

       25
       25
       +
               description = ''

     

       26
       26
       +
                 Whether to install manual pages and the <command>man</command> command.

     

       27
       27
       +
                 This also includes "man" outputs.

     

       28
       28
       +
               '';

     

       29
       29
       +
             };

     

       30
       30
       +
       

     

       31
       31
       +
             doc.enable = mkOption {

     

       32
       32
       +
               type = types.bool;

     

       33
       33
       +
               default = true;

     

       34
       34
       +
               description = ''

     

       35
       35
       +
                 Whether to install documentation distributed in packages' <literal>/share/doc</literal>.

     

       36
       36
       +
                 Usually plain text and/or HTML.

     

       37
       37
       +
                 This also includes "doc" outputs.

     

       38
       38
       +
               '';

     

       39
       39
       +
             };

     

       40
       40
       +
       

     

       41
       41
       +
             info.enable = mkOption {

     

       42
       42
       +
               type = types.bool;

     

       43
       43
       +
               default = true;

     

       44
       44
       +
               description = ''

     

       45
       45
       +
                 Whether to install info pages and the <command>info</command> command.

     

       46
       46
       +
                 This also includes "info" outputs.

     

       47
       47
       +
               '';

     

       48
       48
       +
             };

     

       49
       49
       +
       

     

       50
       50
       +
           };

     

       51
       51
       +
       

     

       52
       52
       +
         };

     

       53
       53
       +
       

     

       54
       54
       +
         config = mkIf cfg.enable (mkMerge [

     

       55
       55
       +
       

     

       56
       56
       +
           (mkIf cfg.man.enable {

     

       57
       57
       +
             environment.systemPackages = [ pkgs.man-db ];

     

       58
       58
       +
             environment.pathsToLink = [ "/share/man" ];

     

       59
       59
       +
             environment.extraOutputsToInstall = [ "man" ];

     

       60
       60
       +
           })

     

       61
       61
       +
       

     

       62
       62
       +
           (mkIf cfg.doc.enable {

     

       63
       63
       +
             # TODO(@oxij): put it here and remove from profiles?

     

       64
       64
       +
             # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?

     

       65
       65
       +
             environment.pathsToLink = [ "/share/doc" ];

     

       66
       66
       +
             environment.extraOutputsToInstall = [ "doc" ];

     

       67
       67
       +
           })

     

       68
       68
       +
       

     

       69
       69
       +
           (mkIf cfg.info.enable {

     

       70
       70
       +
             environment.systemPackages = [ pkgs.texinfoInteractive ];

     

       71
       71
       +
             environment.pathsToLink = [ "/share/info" ];

     

       72
       72
       +
             environment.extraOutputsToInstall = [ "info" ];

     

       73
       73
       +
           })

     

       74
       74
       +
       

     

       75
       75
       +
         ]);

     

       76
       76
       +
       

     

       77
       77
       +
       }

+1 -2

nixos/modules/module-list.nix

···

       58
       58
        
         ./installer/tools/tools.nix

     

       59
       59
        
         ./misc/assertions.nix

     

       60
       60
        
         ./misc/crashdump.nix

     

       61
       61
       +
         ./misc/documentation.nix

     

       61
       62
        
         ./misc/extra-arguments.nix

     

       62
       63
        
         ./misc/ids.nix

     

       63
       64
        
         ./misc/lib.nix

     
···

       85
       86
        
         ./programs/freetds.nix

     

       86
       87
        
         ./programs/gnupg.nix

     

       87
       88
        
         ./programs/gphoto2.nix

     

       88
       88
       -
         ./programs/info.nix

     

       89
       89
        
         ./programs/java.nix

     

       90
       90
        
         ./programs/kbdlight.nix

     

       91
       91
        
         ./programs/less.nix

     

       92
       92
        
         ./programs/light.nix

     

       93
       93
       -
         ./programs/man.nix

     

       94
       93
        
         ./programs/mosh.nix

     

       95
       94
        
         ./programs/mtr.nix

     

       96
       95
        
         ./programs/nano.nix

+2 -3

nixos/modules/profiles/minimal.nix

···

       10
       10
        
       

     

       11
       11
        
         # This isn't perfect, but let's expect the user specifies an UTF-8 defaultLocale

     

       12
       12
        
         i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];

     

       13
       13
       +
       

     

       14
       14
       +
         documentation.enable = mkDefault false;

     

       13
       15
        
         services.nixosManual.enable = mkDefault false;

     

       14
       14
       -
       

     

       15
       15
       -
         programs.man.enable = mkDefault false;

     

       16
       16
       -
         programs.info.enable = mkDefault false;

     

       17
       16
        
       

     

       18
       17
        
         sound.enable = mkDefault false;

     

       19
       18
        
       }

-30

nixos/modules/programs/info.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       {

     

       6
       6
       -
       

     

       7
       7
       -
         options = {

     

       8
       8
       -
       

     

       9
       9
       -
           programs.info.enable = mkOption {

     

       10
       10
       -
             type = types.bool;

     

       11
       11
       -
             default = true;

     

       12
       12
       -
             description = ''

     

       13
       13
       -
               Whether to enable info pages and the <command>info</command> command.

     

       14
       14
       -
             '';

     

       15
       15
       -
           };

     

       16
       16
       -
       

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
       

     

       20
       20
       -
         config = mkIf config.programs.info.enable {

     

       21
       21
       -
       

     

       22
       22
       -
           environment.systemPackages = [ pkgs.texinfoInteractive ];

     

       23
       23
       -
       

     

       24
       24
       -
           environment.pathsToLink = [ "/info" "/share/info" ];

     

       25
       25
       -
       

     

       26
       26
       -
           environment.extraOutputsToInstall = [ "info" ];

     

       27
       27
       -
       

     

       28
       28
       -
         };

     

       29
       29
       -
       

     

       30
       30
       -
       }

-31

nixos/modules/programs/man.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       {

     

       6
       6
       -
       

     

       7
       7
       -
         options = {

     

       8
       8
       -
       

     

       9
       9
       -
           programs.man.enable = mkOption {

     

       10
       10
       -
             type = types.bool;

     

       11
       11
       -
             default = true;

     

       12
       12
       -
             description = ''

     

       13
       13
       -
               Whether to enable manual pages and the <command>man</command> command.

     

       14
       14
       -
               This also includes "man" outputs of all <literal>systemPackages</literal>.

     

       15
       15
       -
             '';

     

       16
       16
       -
           };

     

       17
       17
       -
       

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
       

     

       21
       21
       -
         config = mkIf config.programs.man.enable {

     

       22
       22
       -
       

     

       23
       23
       -
           environment.systemPackages = [ pkgs.man-db ];

     

       24
       24
       -
       

     

       25
       25
       -
           environment.pathsToLink = [ "/share/man" ];

     

       26
       26
       -
       

     

       27
       27
       -
           environment.extraOutputsToInstall = [ "man" ];

     

       28
       28
       -
       

     

       29
       29
       -
         };

     

       30
       30
       -
       

     

       31
       31
       -
       }

nixos/modules/rename.nix

···

       245
       245
        
       

     

       246
       246
        
           # Xen

     

       247
       247
        
           (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])

     

       248
       248
       +
       

     

       249
       249
       +
           (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])

     

       250
       250
       +
           (mkRenamedOptionModule [ "programs" "man"  "enable" ] [ "documentation" "man"  "enable" ])

     

       251
       251
       +
       

     

       248
       252
        
         ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"

     

       249
       253
        
                          "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"

     

       250
       254
        
                          "snmpExporter" "unifiExporter" "varnishExporter" ]

+4 -4

nixos/modules/services/misc/nixos-manual.nix

···

       112
       112
        
       

     

       113
       113
        
           system.build.manual = manual;

     

       114
       114
        
       

     

       115
       115
       -
           environment.systemPackages =

     

       116
       116
       -
             [ manual.manual helpScript ]

     

       117
       117
       -
             ++ optionals config.services.xserver.enable [desktopItem pkgs.nixos-icons]

     

       118
       118
       -
             ++ optional config.programs.man.enable manual.manpages;

     

       115
       115
       +
           environment.systemPackages = []

     

       116
       116
       +
             ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]

     

       117
       117
       +
             ++ optional  config.documentation.man.enable manual.manpages

     

       118
       118
       +
             ++ optionals config.documentation.doc.enable [ manual.manual helpScript ];

     

       119
       119
        
       

     

       120
       120
        
           boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];

     

       121
       121