Merge pull request #6601 from joachifm/gardening

nixos: some gardening

Changed files
+14 -3
nixos
modules
system
boot
loader
generations-dir
grub
init-script
raspberrypi
tasks
virtualisation
+2
nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
···
enable = mkOption {
default = false;
description = ''
Whether to create symlinks to the system generations under
<literal>/boot</literal>. When enabled,
···
copyKernels = mkOption {
default = false;
description = "
Whether copy the necessary boot files into /boot, so
/nix/store is not needed by the boot loader.
···
enable = mkOption {
default = false;
+
type = types.bool;
description = ''
Whether to create symlinks to the system generations under
<literal>/boot</literal>. When enabled,
···
copyKernels = mkOption {
default = false;
+
type = types.bool;
description = "
Whether copy the necessary boot files into /boot, so
/nix/store is not needed by the boot loader.
+1
nixos/modules/system/boot/loader/grub/grub.nix
···
};
splashImage = mkOption {
example = literalExample "./my-background.png";
description = ''
Background image used for GRUB. It must be a 640x480,
···
};
splashImage = mkOption {
+
type = types.nullOr types.path;
example = literalExample "./my-background.png";
description = ''
Background image used for GRUB. It must be a 640x480,
+1
nixos/modules/system/boot/loader/init-script/init-script.nix
···
enable = mkOption {
default = false;
description = ''
Some systems require a /sbin/init script which is started.
Or having it makes starting NixOS easier.
···
enable = mkOption {
default = false;
+
type = types.bool;
description = ''
Some systems require a /sbin/init script which is started.
Or having it makes starting NixOS easier.
+1
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
···
boot.loader.raspberryPi.enable = mkOption {
default = false;
description = ''
Whether to create files with the system generations in
<literal>/boot</literal>.
···
boot.loader.raspberryPi.enable = mkOption {
default = false;
+
type = types.bool;
description = ''
Whether to create files with the system generations in
<literal>/boot</literal>.
+1
nixos/modules/tasks/kbd.nix
···
# FIXME: still needed?
boot.extraTTYs = mkOption {
default = [];
example = ["tty8" "tty9"];
description = ''
Tty (virtual console) devices, in addition to the consoles on
···
# FIXME: still needed?
boot.extraTTYs = mkOption {
default = [];
+
type = types.listOf types.string;
example = ["tty8" "tty9"];
description = ''
Tty (virtual console) devices, in addition to the consoles on
+8 -3
nixos/modules/virtualisation/lxc.nix
···
default = "";
description =
''
-
This is the system-wide LXC config. See lxc.system.conf(5).
'';
};
···
description =
''
Default config (default.conf) for new containers, i.e. for
-
network config. See lxc.container.conf(5).
'';
};
···
description =
''
This is the config file for managing unprivileged user network
-
administration access in LXC. See lxc-user-net(5).
'';
};
···
default = "";
description =
''
+
This is the system-wide LXC config. See
+
<citerefentry><refentrytitle>lxc.system.conf</refentrytitle>
+
<manvolnum>5</manvolnum></citerefentry>.
'';
};
···
description =
''
Default config (default.conf) for new containers, i.e. for
+
network config. See <citerefentry><refentrytitle>lxc.container.conf
+
</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
'';
};
···
description =
''
This is the config file for managing unprivileged user network
+
administration access in LXC. See <citerefentry>
+
<refentrytitle>lxc-user-net</refentrytitle><manvolnum>5</manvolnum>
+
</citerefentry>.
'';
};