treewide: add bool type to enable options, or make use of mkEnableOption

Add missing type information to manually specified enable options or replace them by mkEnableOption where appropriate.
This commit is contained in:
Dominik Xaver Hörl 2020-04-20 20:05:26 +02:00
parent 3bbd074217
commit 0412bde942
59 changed files with 71 additions and 175 deletions

View File

@ -8,6 +8,7 @@ in {
options = {
programs.cdemu = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
<command>cdemu</command> for members of

View File

@ -8,6 +8,7 @@ in {
options = {
programs.criu = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Install <command>criu</command> along with necessary kernel options.

View File

@ -8,6 +8,7 @@ in {
options = {
programs.systemtap = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Install <command>systemtap</command> along with necessary kernel options.

View File

@ -39,6 +39,7 @@ in
options = {
programs.zsh.ohMyZsh = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable oh-my-zsh.

View File

@ -17,6 +17,7 @@ in {
options = {
services.rabbitmq = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the RabbitMQ server, an Advanced Message

View File

@ -37,12 +37,7 @@ in
services.mysqlBackup = {
enable = mkOption {
default = false;
description = ''
Whether to enable MySQL backups.
'';
};
enable = mkEnableOption "MySQL backups";
calendar = mkOption {
type = types.str;

View File

@ -44,12 +44,7 @@ in {
options = {
services.postgresqlBackup = {
enable = mkOption {
default = false;
description = ''
Whether to enable PostgreSQL dumps.
'';
};
enable = mkEnableOption "PostgreSQL dumps";
startAt = mkOption {
default = "*-*-* 01:15:00";

View File

@ -11,10 +11,7 @@ with lib;
services.clickhouse = {
enable = mkOption {
default = false;
description = "Whether to enable ClickHouse database server.";
};
enable = mkEnableOption "ClickHouse database server";
};

View File

@ -40,12 +40,7 @@ in
services.firebird = {
enable = mkOption {
default = false;
description = ''
Whether to enable the Firebird super server.
'';
};
enable = mkEnableOption "the Firebird super server";
package = mkOption {
default = pkgs.firebirdSuper;

View File

@ -18,12 +18,7 @@ in
services.memcached = {
enable = mkOption {
default = false;
description = "
Whether to enable Memcached.
";
};
enable = mkEnableOption "Memcached";
user = mkOption {
default = "memcached";

View File

@ -29,12 +29,7 @@ in
services.mongodb = {
enable = mkOption {
default = false;
description = "
Whether to enable the MongoDB server.
";
};
enable = mkEnableOption "the MongoDB server";
package = mkOption {
default = pkgs.mongodb;

View File

@ -13,10 +13,7 @@ with lib;
services.virtuoso = {
enable = mkOption {
default = false;
description = "Whether to enable Virtuoso Opensource database server.";
};
enable = mkEnableOption "Virtuoso Opensource database server";
config = mkOption {
default = "";

View File

@ -10,12 +10,7 @@ in
options = {
services.ratbagd = {
enable = mkOption {
default = false;
description = ''
Whether to enable ratbagd for configuring gaming mice.
'';
};
enable = mkEnableOption "ratbagd for configuring gaming mice";
};
};

View File

@ -8,12 +8,7 @@ in {
###### interface
options = {
services.thermald = {
enable = mkOption {
default = false;
description = ''
Whether to enable thermald, the temperature management daemon.
'';
};
enable = mkEnableOption "thermald, the temperature management daemon";
debug = mkOption {
type = types.bool;

View File

@ -12,10 +12,7 @@ in
options = {
services.spamassassin = {
enable = mkOption {
default = false;
description = "Whether to run the SpamAssassin daemon";
};
enable = mkEnableOption "the SpamAssassin daemon";
debug = mkOption {
default = false;

View File

@ -19,6 +19,7 @@ in
services.autofs = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Mount filesystems on demand. Unmount them automatically.

View File

@ -31,13 +31,7 @@ in
services.cgminer = {
enable = mkOption {
default = false;
description = ''
Whether to enable cgminer, an ASIC/FPGA/GPU miner for bitcoin and
litecoin.
'';
};
enable = mkEnableOption "cgminer, an ASIC/FPGA/GPU miner for bitcoin and litecoin";
package = mkOption {
default = pkgs.cgminer;

View File

@ -8,12 +8,7 @@ let
in {
options = {
services.devmon = {
enable = mkOption {
default = false;
description = ''
Whether to enable devmon, an automatic device mounting daemon.
'';
};
enable = mkEnableOption "devmon, an automatic device mounting daemon";
};
};

View File

@ -17,10 +17,7 @@ in
services.disnix = {
enable = mkOption {
default = false;
description = "Whether to enable Disnix";
};
enable = mkEnableOption "Disnix";
enableMultiUser = mkOption {
type = types.bool;

View File

@ -17,10 +17,7 @@ in
services.felix = {
enable = mkOption {
default = false;
description = "Whether to enable the Apache Felix OSGi service";
};
enable = mkEnableOption "the Apache Felix OSGi service";
bundles = mkOption {
type = types.listOf types.package;

View File

@ -15,6 +15,7 @@ in
options = {
services.ihaskell = {
enable = mkOption {
type = types.bool;
default = false;
description = "Autostart an IHaskell notebook service.";
};

View File

@ -16,10 +16,7 @@ in
services.safeeyes = {
enable = mkOption {
default = false;
description = "Whether to enable the safeeyes OSGi service";
};
enable = mkEnableOption "the safeeyes OSGi service";
};

View File

@ -18,6 +18,7 @@ in
services.svnserve = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol.";
};

View File

@ -19,12 +19,8 @@ in
# !!! All these option descriptions needs to be cleaned up.
client = {
enable = mkOption {
default = false;
description = "
Whether to enable the Synergy client (receive keyboard and mouse events from a Synergy server).
";
};
enable = mkEnableOption "the Synergy client (receive keyboard and mouse events from a Synergy server)";
screenName = mkOption {
default = "";
description = ''
@ -47,12 +43,8 @@ in
};
server = {
enable = mkOption {
default = false;
description = ''
Whether to enable the Synergy server (send keyboard and mouse events).
'';
};
enable = mkEnableOption "the Synergy server (send keyboard and mouse events)";
configFile = mkOption {
default = "/etc/synergy-server.conf";
description = "The Synergy server configuration file.";

View File

@ -43,10 +43,7 @@ in
options = {
services.netatalk = {
enable = mkOption {
default = false;
description = "Whether to enable the Netatalk AFP fileserver.";
};
enable = mkEnableOption "the Netatalk AFP fileserver";
port = mkOption {
default = 548;
@ -65,6 +62,7 @@ in
homes = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable sharing of the UNIX server user home directories.";
};

View File

@ -29,10 +29,7 @@ in
options = {
services.rsyncd = {
enable = mkOption {
default = false;
description = "Whether to enable the rsync daemon.";
};
enable = mkEnableOption "the rsync daemon";
motd = mkOption {
type = types.str;

View File

@ -100,11 +100,13 @@ in
dir = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS DIR service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40";
description = ''
@ -218,11 +220,13 @@ in
mrc = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS MRC service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41";
description = ''
@ -354,11 +358,13 @@ in
osd = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable XtreemFS OSD service.
'';
};
uuid = mkOption {
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42";
description = ''

View File

@ -21,6 +21,7 @@ in
services.yandex-disk = {
enable = mkOption {
type = types.bool;
default = false;
description = "
Whether to enable Yandex-disk client. See https://disk.yandex.ru/

View File

@ -16,6 +16,7 @@ in
services.amule = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time.

View File

@ -35,12 +35,7 @@ in
services.babeld = {
enable = mkOption {
default = false;
description = ''
Whether to run the babeld network routing daemon.
'';
};
enable = mkEnableOption "the babeld network routing daemon";
interfaceDefaults = mkOption {
default = null;

View File

@ -68,12 +68,7 @@ in
services.bind = {
enable = mkOption {
default = false;
description = "
Whether to enable BIND domain name server.
";
};
enable = mkEnableOption "BIND domain name server";
cacheNetworks = mkOption {
default = ["127.0.0.0/24"];

View File

@ -48,6 +48,7 @@ in
services.bitlbee = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to run the BitlBee IRC to other chat network gateway.

View File

@ -33,12 +33,7 @@ in
options.services.cntlm = {
enable = mkOption {
default = false;
description = ''
Whether to enable the cntlm, which start a local proxy.
'';
};
enable = mkEnableOption "cntlm, which starts a local proxy";
username = mkOption {
description = ''

View File

@ -39,6 +39,7 @@ in
services.flashpolicyd = {
enable = mkOption {
type = types.bool;
default = false;
description =
''

View File

@ -42,12 +42,8 @@ in
{
options = {
services.gvpe = {
enable = mkOption {
default = false;
description = ''
Whether to run gvpe
'';
};
enable = lib.mkEnableOption "gvpe";
nodename = mkOption {
default = null;
description =''

View File

@ -49,6 +49,7 @@ in
services.hostapd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable putting a wireless interface into infrastructure mode,

View File

@ -36,12 +36,7 @@ in
services.ircdHybrid = {
enable = mkOption {
default = false;
description = "
Enable IRCD.
";
};
enable = mkEnableOption "IRCD";
serverName = mkOption {
default = "hades.arpa";

View File

@ -18,12 +18,8 @@ in
options = {
services.mailpile = {
enable = mkOption {
default = false;
description = "
Whether to enable Mailpile the mail client.
";
};
enable = mkEnableOption "Mailpile the mail client";
hostname = mkOption {
default = "localhost";
description = "Listen to this hostname or ip.";

View File

@ -30,6 +30,7 @@ in
options = {
services.chrony = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to synchronise your machine's time using chrony.

View File

@ -40,6 +40,7 @@ in
services.ntp = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to synchronise your machine's time using ntpd, as a peer in

View File

@ -9,12 +9,7 @@ with lib;
services.openfire = {
enable = mkOption {
default = false;
description = "
Whether to enable OpenFire XMPP server.
";
};
enable = mkEnableOption "OpenFire XMPP server";
usePostgreSQL = mkOption {
default = true;

View File

@ -41,12 +41,7 @@ in
services.prayer = {
enable = mkOption {
default = false;
description = ''
Whether to run the prayer webmail http server.
'';
};
enable = mkEnableOption "the prayer webmail http server";
port = mkOption {
default = "2080";

View File

@ -16,12 +16,7 @@ in
services.quassel = {
enable = mkOption {
default = false;
description = ''
Whether to run the Quassel IRC client daemon.
'';
};
enable = mkEnableOption "the Quassel IRC client daemon";
certificateFile = mkOption {
type = types.nullOr types.str;

View File

@ -19,6 +19,7 @@ in
options = {
services.radvd.enable = mkOption {
type = types.bool;
default = false;
description =
''

View File

@ -17,6 +17,7 @@ in
options = {
services.rdnssd.enable = mkOption {
type = types.bool;
default = false;
#default = config.networking.enableIPv6;
description =

View File

@ -15,10 +15,8 @@ in
options = {
services.sabnzbd = {
enable = mkOption {
default = false;
description = "Whether to enable the sabnzbd server.";
};
enable = mkEnableOption "the sabnzbd server";
configFile = mkOption {
default = "/var/lib/sabnzbd/sabnzbd.ini";
description = "Path to config file.";

View File

@ -17,6 +17,7 @@ in
services.shairport-sync = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable the shairport-sync daemon.

View File

@ -19,6 +19,7 @@ in
services.lshd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the GNU lshd SSH2 daemon, which allows

View File

@ -44,12 +44,7 @@ in
options = {
services.xinetd.enable = mkOption {
default = false;
description = ''
Whether to enable the xinetd super-server daemon.
'';
};
services.xinetd.enable = mkEnableOption "the xinetd super-server daemon";
services.xinetd.extraDefaults = mkOption {
default = "";

View File

@ -10,12 +10,7 @@ in {
services.fprot = {
updater = {
enable = mkOption {
default = false;
description = ''
Whether to enable automatic F-Prot virus definitions database updates.
'';
};
enable = mkEnableOption "automatic F-Prot virus definitions database updates";
productData = mkOption {
description = ''

View File

@ -51,12 +51,7 @@ in
###### interface
options = {
services.kerberos_server = {
enable = mkOption {
default = false;
description = ''
Enable the kerberos authentification server.
'';
};
enable = lib.mkEnableOption "the kerberos authentification server";
realms = mkOption {
type = types.attrsOf (types.submodule realm);

View File

@ -8,6 +8,7 @@ in {
options = {
services.localtime = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable <literal>localtime</literal>, simple daemon for keeping the system

View File

@ -10,6 +10,7 @@ in
options = {
services.uptimed = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable <literal>uptimed</literal>, allowing you to track

View File

@ -24,6 +24,7 @@ in
services.jboss = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities.";
};

View File

@ -23,6 +23,7 @@ in
options = {
services.xserver.desktopManager.enlightenment.enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Enlightenment desktop environment.";
};

View File

@ -72,6 +72,7 @@ in
services.xserver.desktopManager.gnome3 = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable Gnome 3 desktop manager.";
};

View File

@ -10,6 +10,7 @@ in
options = {
services.xserver.desktopManager.kodi = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the kodi multimedia center.";
};

View File

@ -15,6 +15,7 @@ in
options = {
services.xserver.displayManager.startx = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the dummy "startx" pseudo-display manager,

View File

@ -15,6 +15,7 @@ in
services.xserver.wacom = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the Wacom touchscreen/digitizer/tablet.