treewide: add types to boolean / enable options or make use of mkEnableOption

This commit is contained in:
Dominik Xaver Hörl 2020-04-27 09:04:07 +02:00
parent 5e4abf76c7
commit c10d82358f
19 changed files with 31 additions and 31 deletions

View File

@ -25,6 +25,7 @@ in
fonts = { fonts = {
enableFontDir = mkOption { enableFontDir = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
Whether to create a directory with links to all fonts in Whether to create a directory with links to all fonts in

View File

@ -9,6 +9,7 @@ with lib;
fonts = { fonts = {
enableGhostscriptFonts = mkOption { enableGhostscriptFonts = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
Whether to add the fonts provided by Ghostscript (such as Whether to add the fonts provided by Ghostscript (such as

View File

@ -88,6 +88,7 @@ in
}; };
useTLS = mkOption { useTLS = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
If enabled, use TLS (encryption) over an LDAP (port 389) If enabled, use TLS (encryption) over an LDAP (port 389)
@ -109,6 +110,7 @@ in
daemon = { daemon = {
enable = mkOption { enable = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
Whether to let the nslcd daemon (nss-pam-ldapd) handle the Whether to let the nslcd daemon (nss-pam-ldapd) handle the

View File

@ -9,6 +9,7 @@ with lib;
]; ];
options.security.apparmor.confineSUIDApplications = mkOption { options.security.apparmor.confineSUIDApplications = mkOption {
type = types.bool;
default = true; default = true;
description = '' description = ''
Install AppArmor profiles for commonly-used SUID application Install AppArmor profiles for commonly-used SUID application

View File

@ -545,6 +545,7 @@ in
}; };
security.pam.enableSSHAgentAuth = mkOption { security.pam.enableSSHAgentAuth = mkOption {
type = types.bool;
default = false; default = false;
description = description =
'' ''
@ -555,12 +556,7 @@ in
''; '';
}; };
security.pam.enableOTPW = mkOption { security.pam.enableOTPW = mkEnableOption "the OTPW (one-time password) PAM module";
default = false;
description = ''
Enable the OTPW (one-time password) PAM module.
'';
};
security.pam.u2f = { security.pam.u2f = {
enable = mkOption { enable = mkOption {
@ -719,12 +715,7 @@ in
}; };
}; };
security.pam.enableEcryptfs = mkOption { security.pam.enableEcryptfs = mkEnableOption "eCryptfs PAM module (mounting ecryptfs home directory on login)";
default = false;
description = ''
Enable eCryptfs PAM module (mounting ecryptfs home directory on login).
'';
};
users.motd = mkOption { users.motd = mkOption {
default = null; default = null;

View File

@ -269,6 +269,7 @@ in
}; };
enableSmtp = mkOption { enableSmtp = mkOption {
type = types.bool;
default = true; default = true;
description = "Whether to enable smtp in master.cf."; description = "Whether to enable smtp in master.cf.";
}; };

View File

@ -15,6 +15,7 @@ in
enable = mkEnableOption "the SpamAssassin daemon"; enable = mkEnableOption "the SpamAssassin daemon";
debug = mkOption { debug = mkOption {
type = types.bool;
default = false; default = false;
description = "Whether to run the SpamAssassin daemon in debug mode"; description = "Whether to run the SpamAssassin daemon in debug mode";
}; };

View File

@ -57,6 +57,7 @@ in
}; };
debug = mkOption { debug = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
Pass -d and -7 to automount and write log to the system journal. Pass -d and -7 to automount and write log to the system journal.

View File

@ -25,10 +25,7 @@ in
description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; description = "Whether to support multi-user mode by enabling the Disnix D-Bus service";
}; };
useWebServiceInterface = mkOption { useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat";
default = false;
description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
};
package = mkOption { package = mkOption {
type = types.path; type = types.path;

View File

@ -19,6 +19,7 @@ in
''; '';
}; };
autorun = mkOption { autorun = mkOption {
type = types.bool;
default = true; default = true;
description = '' description = ''
Whether to automatically start the tunnel. Whether to automatically start the tunnel.

View File

@ -72,6 +72,7 @@ in
}; };
noScan = mkOption { noScan = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
Do not scan for overlapping BSSs in HT40+/- mode. Do not scan for overlapping BSSs in HT40+/- mode.
@ -127,6 +128,7 @@ in
}; };
wpa = mkOption { wpa = mkOption {
type = types.bool;
default = true; default = true;
description = '' description = ''
Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point. Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point.

View File

@ -12,6 +12,7 @@ with lib;
enable = mkEnableOption "OpenFire XMPP server"; enable = mkEnableOption "OpenFire XMPP server";
usePostgreSQL = mkOption { usePostgreSQL = mkOption {
type = types.bool;
default = true; default = true;
description = " description = "
Whether you use PostgreSQL service for your storage back-end. Whether you use PostgreSQL service for your storage back-end.

View File

@ -54,21 +54,25 @@ in
}; };
syslog = mkOption { syslog = mkOption {
type = types.bool;
default = true; default = true;
description = ''Whether to enable syslog output.''; description = ''Whether to enable syslog output.'';
}; };
passwordAuthentication = mkOption { passwordAuthentication = mkOption {
type = types.bool;
default = true; default = true;
description = ''Whether to enable password authentication.''; description = ''Whether to enable password authentication.'';
}; };
publicKeyAuthentication = mkOption { publicKeyAuthentication = mkOption {
type = types.bool;
default = true; default = true;
description = ''Whether to enable public key authentication.''; description = ''Whether to enable public key authentication.'';
}; };
rootLogin = mkOption { rootLogin = mkOption {
type = types.bool;
default = false; default = false;
description = ''Whether to enable remote root login.''; description = ''Whether to enable remote root login.'';
}; };
@ -90,11 +94,13 @@ in
}; };
tcpForwarding = mkOption { tcpForwarding = mkOption {
type = types.bool;
default = true; default = true;
description = ''Whether to enable TCP/IP forwarding.''; description = ''Whether to enable TCP/IP forwarding.'';
}; };
x11Forwarding = mkOption { x11Forwarding = mkOption {
type = types.bool;
default = true; default = true;
description = ''Whether to enable X11 forwarding.''; description = ''Whether to enable X11 forwarding.'';
}; };

View File

@ -15,6 +15,7 @@ in
options = { options = {
networking.tcpcrypt.enable = mkOption { networking.tcpcrypt.enable = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
Whether to enable opportunistic TCP encryption. If the other end Whether to enable opportunistic TCP encryption. If the other end

View File

@ -9,6 +9,7 @@ with lib;
options = { options = {
networking.wicd.enable = mkOption { networking.wicd.enable = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
Whether to start <command>wicd</command>. Wired and Whether to start <command>wicd</command>. Wired and

View File

@ -60,6 +60,7 @@ in
}; };
useJK = mkOption { useJK = mkOption {
type = types.bool;
default = false; default = false;
description = "Whether to use to connector to the Apache HTTP server"; description = "Whether to use to connector to the Apache HTTP server";
}; };

View File

@ -93,16 +93,17 @@ in
}; };
wayland = mkOption { wayland = mkOption {
type = types.bool;
default = true; default = true;
description = '' description = ''
Allow GDM to run on Wayland instead of Xserver. Allow GDM to run on Wayland instead of Xserver.
Note to enable Wayland with Nvidia you need to Note to enable Wayland with Nvidia you need to
enable the <option>nvidiaWayland</option>. enable the <option>nvidiaWayland</option>.
''; '';
type = types.bool;
}; };
nvidiaWayland = mkOption { nvidiaWayland = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
Whether to allow wayland to be used with the proprietary Whether to allow wayland to be used with the proprietary

View File

@ -16,12 +16,7 @@ in
services.xserver.digimend = { services.xserver.digimend = {
enable = mkOption { enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets";
default = false;
description = ''
Whether to enable the digimend drivers for Huion/XP-Pen/etc. tablets.
'';
};
}; };

View File

@ -103,6 +103,7 @@ in
}; };
forwardDns = mkOption { forwardDns = mkOption {
type = types.bool;
default = false; default = false;
description = '' description = ''
If set to <literal>true</literal>, the DNS queries from the If set to <literal>true</literal>, the DNS queries from the
@ -135,14 +136,8 @@ in
}; };
}; };
virtualisation.xen.trace = virtualisation.xen.trace = mkEnableOption "Xen tracing";
mkOption {
default = false;
description =
''
Enable Xen tracing.
'';
};
}; };