nixos/modules: remove trailing whitespace

This leads to ci failure otherwise if the file gets changed.
git-blame can ignore whitespace changes.
wip/yesman
Jörg Thalheim 4 years ago
parent e879d83e38
commit ba930d8679
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
  1. 8
      nixos/modules/config/appstream.nix
  2. 4
      nixos/modules/hardware/tuxedo-keyboard.nix
  3. 2
      nixos/modules/i18n/input-method/uim.nix
  4. 4
      nixos/modules/programs/autojump.nix
  5. 4
      nixos/modules/programs/freetds.nix
  6. 4
      nixos/modules/services/audio/icecast.nix
  7. 36
      nixos/modules/services/backup/bacula.nix
  8. 2
      nixos/modules/services/backup/restic.nix
  9. 2
      nixos/modules/services/computing/torque/mom.nix
  10. 2
      nixos/modules/services/computing/torque/server.nix
  11. 2
      nixos/modules/services/databases/riak-cs.nix
  12. 16
      nixos/modules/services/games/minetest-server.nix
  13. 2
      nixos/modules/services/games/terraria.nix
  14. 2
      nixos/modules/services/hardware/thinkfan.nix
  15. 4
      nixos/modules/services/hardware/trezord.nix
  16. 2
      nixos/modules/services/misc/matrix-synapse.nix
  17. 8
      nixos/modules/services/misc/siproxd.nix
  18. 4
      nixos/modules/services/misc/tzupdate.nix
  19. 2
      nixos/modules/services/monitoring/cadvisor.nix
  20. 4
      nixos/modules/services/monitoring/dd-agent/dd-agent.nix
  21. 2
      nixos/modules/services/monitoring/teamviewer.nix
  22. 4
      nixos/modules/services/networking/bitcoind.nix
  23. 2
      nixos/modules/services/networking/gateone.nix
  24. 2
      nixos/modules/services/networking/mstpd.nix
  25. 6
      nixos/modules/services/networking/nghttpx/default.nix
  26. 2
      nixos/modules/services/networking/onedrive.nix
  27. 2
      nixos/modules/services/networking/prosody.nix
  28. 26
      nixos/modules/services/networking/supplicant.nix
  29. 2
      nixos/modules/services/networking/trickster.nix
  30. 6
      nixos/modules/services/networking/websockify.nix
  31. 18
      nixos/modules/services/security/haveged.nix
  32. 2
      nixos/modules/services/web-apps/pgpkeyserver-lite.nix
  33. 2
      nixos/modules/services/web-apps/trilium.nix
  34. 2
      nixos/modules/services/web-servers/shellinabox.nix
  35. 2
      nixos/modules/services/x11/display-managers/default.nix
  36. 2
      nixos/modules/services/x11/window-managers/qtile.nix
  37. 18
      nixos/modules/system/boot/initrd-openvpn.nix
  38. 4
      nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
  39. 6
      nixos/modules/system/boot/systemd-nspawn.nix
  40. 2
      nixos/modules/tasks/bcache.nix
  41. 2
      nixos/modules/virtualisation/azure-image.nix
  42. 12
      nixos/modules/virtualisation/railcar.nix

@ -7,18 +7,18 @@ with lib;
type = types.bool;
default = true;
description = ''
Whether to install files to support the
Whether to install files to support the
<link xlink:href="https://www.freedesktop.org/software/appstream/docs/index.html">AppStream metadata specification</link>.
'';
};
};
config = mkIf config.appstream.enable {
environment.pathsToLink = [
environment.pathsToLink = [
# per component metadata
"/share/metainfo"
"/share/metainfo"
# legacy path for above
"/share/appdata"
"/share/appdata"
];
};

@ -2,7 +2,7 @@
with lib;
let
let
cfg = config.hardware.tuxedo-keyboard;
tuxedo-keyboard = config.boot.kernelPackages.tuxedo-keyboard;
in
@ -27,7 +27,7 @@ in
'';
};
config = mkIf cfg.enable
config = mkIf cfg.enable
{
boot.kernelModules = ["tuxedo_keyboard"];
boot.extraModulePackages = [ tuxedo-keyboard ];

@ -2,7 +2,7 @@
with lib;
let
let
cfg = config.i18n.inputMethod.uim;
in
{

@ -18,7 +18,7 @@ in
'';
};
};
};
};
###### implementation
@ -26,7 +26,7 @@ in
environment.pathsToLink = [ "/share/autojump" ];
environment.systemPackages = [ pkgs.autojump ];
programs.bash.interactiveShellInit = "source ${pkgs.autojump}/share/autojump/autojump.bash";
programs.bash.interactiveShellInit = "source ${pkgs.autojump}/share/autojump/autojump.bash";
programs.zsh.interactiveShellInit = mkIf prg.zsh.enable "source ${pkgs.autojump}/share/autojump/autojump.zsh";
programs.fish.interactiveShellInit = mkIf prg.fish.enable "source ${pkgs.autojump}/share/autojump/autojump.fish";
};

@ -25,7 +25,7 @@ in
''';
}
'';
description =
description =
''
Configure freetds database entries. Each attribute denotes
a section within freetds.conf, and the value (a string) is the config
@ -47,7 +47,7 @@ in
environment.variables.FREETDS = "/etc/freetds.conf";
environment.variables.SYBASE = "${pkgs.freetds}";
environment.etc."freetds.conf" = { text =
environment.etc."freetds.conf" = { text =
(concatStrings (mapAttrsToList (name: value:
''
[${name}]

@ -23,7 +23,7 @@ let
<listen-socket>
<port>${toString cfg.listen.port}</port>
<bind-address>${cfg.listen.address}</bind-address>
</listen-socket>
</listen-socket>
<security>
<chroot>0</chroot>
@ -70,7 +70,7 @@ in {
description = "Base directory used for logging.";
default = "/var/log/icecast";
};
listen = {
port = mkOption {
type = types.int;

@ -18,7 +18,7 @@ let
Pid Directory = "/run";
${fd_cfg.extraClientConfig}
}
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
Director {
Name = "${name}";
@ -26,7 +26,7 @@ let
Monitor = "${value.monitor}";
}
'') fd_cfg.director)}
Messages {
Name = Standard;
syslog = all, !skipped, !restored
@ -35,7 +35,7 @@ let
'';
sd_cfg = config.services.bacula-sd;
sd_conf = pkgs.writeText "bacula-sd.conf"
sd_conf = pkgs.writeText "bacula-sd.conf"
''
Storage {
Name = "${sd_cfg.name}";
@ -80,7 +80,7 @@ let
'';
dir_cfg = config.services.bacula-dir;
dir_conf = pkgs.writeText "bacula-dir.conf"
dir_conf = pkgs.writeText "bacula-dir.conf"
''
Director {
Name = "${dir_cfg.name}";
@ -125,10 +125,10 @@ let
The password is plain text. It is not generated through any special
process but as noted above, it is better to use random text for
security reasons.
security reasons.
'';
};
monitor = mkOption {
default = "no";
example = "yes";
@ -140,7 +140,7 @@ let
Please note that if this director is being used by a Monitor, we
highly recommend to set this directive to yes to avoid serious
security problems.
security problems.
'';
};
};
@ -163,7 +163,7 @@ let
type of autochanger, what you specify here can vary. This directive
is optional. See the Using AutochangersAutochangersChapter chapter of
this manual for more details of using this and the following
autochanger directives.
autochanger directives.
'';
};
@ -200,7 +200,7 @@ let
Extra configuration to be passed in Autochanger directive.
'';
example = ''
'';
};
};
@ -222,7 +222,7 @@ let
if you are archiving to disk storage. In this case, you must supply
the full absolute path to the directory. When specifying a tape
device, it is preferable that the "non-rewind" variant of the device
file name be given.
file name be given.
'';
};
@ -290,7 +290,7 @@ in {
Whether to enable the Bacula File Daemon.
'';
};
name = mkOption {
default = "${config.networking.hostName}-fd";
description = ''
@ -300,7 +300,7 @@ in {
Clients. This directive is required.
'';
};
port = mkOption {
default = 9102;
type = types.int;
@ -310,7 +310,7 @@ in {
the Client resource of the Director's configuration file.
'';
};
director = mkOption {
default = {};
description = ''
@ -349,14 +349,14 @@ in {
Whether to enable Bacula Storage Daemon.
'';
};
name = mkOption {
default = "${config.networking.hostName}-sd";
description = ''
Specifies the Name of the Storage daemon.
'';
};
port = mkOption {
default = 9103;
type = types.int;
@ -410,7 +410,7 @@ in {
console = all
'';
};
};
services.bacula-dir = {
@ -429,7 +429,7 @@ in {
required.
'';
};
port = mkOption {
default = 9101;
type = types.int;
@ -442,7 +442,7 @@ in {
specify DirAddresses (N.B plural) directive.
'';
};
password = mkOption {
# TODO: required?
description = ''

@ -55,7 +55,7 @@ in
Configuration for the rclone remote being used for backup.
See the remote's specific options under rclone's docs at
<link xlink:href="https://rclone.org/docs/"/>. When specifying
option names, use the "config" name specified in the docs.
option names, use the "config" name specified in the docs.
For example, to set <literal>--b2-hard-delete</literal> for a B2
remote, use <literal>hard_delete = true</literal> in the
attribute set.

@ -35,7 +35,7 @@ in
Name of the Erlang node.
'';
};
anonymousUserCreation = mkOption {
type = types.bool;
default = false;

@ -5,12 +5,12 @@ with lib;
let
cfg = config.services.minetest-server;
flag = val: name: if val != null then "--${name} ${val} " else "";
flags = [
(flag cfg.gameId "gameid")
(flag cfg.world "world")
(flag cfg.configPath "config")
(flag cfg.logPath "logfile")
(flag cfg.port "port")
flags = [
(flag cfg.gameId "gameid")
(flag cfg.world "world")
(flag cfg.configPath "config")
(flag cfg.logPath "logfile")
(flag cfg.port "port")
];
in
{
@ -26,7 +26,7 @@ in
type = types.nullOr types.str;
default = null;
description = ''
Id of the game to use. To list available games run
Id of the game to use. To list available games run
`minetestserver --gameid list`.
If only one game exists, this option can be null.
@ -59,7 +59,7 @@ in
type = types.nullOr types.path;
default = null;
description = ''
Path to logfile for logging.
Path to logfile for logging.
If set to null, logging will be output to stdout which means
all output will be catched by systemd.

@ -7,7 +7,7 @@ let
worldSizeMap = { small = 1; medium = 2; large = 3; };
valFlag = name: val: optionalString (val != null) "-${name} \"${escape ["\\" "\""] (toString val)}\"";
boolFlag = name: val: optionalString val "-${name}";
flags = [
flags = [
(valFlag "port" cfg.port)
(valFlag "maxPlayers" cfg.maxPlayers)
(valFlag "password" cfg.password)

@ -67,7 +67,7 @@ in {
type = types.bool;
default = false;
description = ''
Whether to build thinkfan with SMART support to read temperatures
Whether to build thinkfan with SMART support to read temperatures
directly from hard disks.
'';
};

@ -10,7 +10,7 @@ in {
meta = {
doc = ./trezord.xml;
};
### interface
options = {
@ -40,7 +40,7 @@ in {
};
};
};
### implementation
config = mkIf cfg.enable {

@ -675,7 +675,7 @@ in {
}
];
users.users.matrix-synapse = {
users.users.matrix-synapse = {
group = "matrix-synapse";
home = cfg.dataDir;
createHome = true;

@ -38,7 +38,7 @@ in
type = types.bool;
default = false;
description = ''
Whether to enable the Siproxd SIP
Whether to enable the Siproxd SIP
proxy/masquerading daemon.
'';
};
@ -111,7 +111,7 @@ in
type = types.int;
default = 300;
description = ''
Timeout for an RTP stream. If for the specified
Timeout for an RTP stream. If for the specified
number of seconds no data is relayed on an active
stream, it is considered dead and will be killed.
'';
@ -122,7 +122,7 @@ in
default = 46;
description = ''
DSCP (differentiated services) value to be assigned
to RTP packets. Allows QOS aware routers to handle
to RTP packets. Allows QOS aware routers to handle
different types traffic with different priorities.
'';
};
@ -132,7 +132,7 @@ in
default = 0;
description = ''
DSCP (differentiated services) value to be assigned
to SIP packets. Allows QOS aware routers to handle
to SIP packets. Allows QOS aware routers to handle
different types traffic with different priorities.
'';
};

@ -11,7 +11,7 @@ in {
default = false;
description = ''
Enable the tzupdate timezone updating service. This provides
a one-shot service which can be activated with systemctl to
a one-shot service which can be activated with systemctl to
update the timezone.
'';
};
@ -21,7 +21,7 @@ in {
# We need to have imperative time zone management for this to work.
# This will give users an error if they have set an explicit time
# zone, which is better than silently overriding it.
time.timeZone = null;
time.timeZone = null;
# We provide a one-shot service which can be manually run. We could
# provide a service that runs on startup, but it's tricky to get

@ -90,7 +90,7 @@ in {
default = [];
description = ''
Additional cadvisor options.
See <link xlink:href='https://github.com/google/cadvisor/blob/master/docs/runtime_options.md'/> for available options.
'';
};

@ -97,11 +97,11 @@ let
"dd-agent/conf.d/nginx.yaml".source = nginxConfig;
}) //
(optionalAttrs (cfg.mongoConfig != null)
{
{
"dd-agent/conf.d/mongo.yaml".source = mongoConfig;
}) //
(optionalAttrs (cfg.processConfig != null)
{
{
"dd-agent/conf.d/process.yaml".source = processConfig;
}) //
(optionalAttrs (cfg.jmxConfig != null)

@ -15,7 +15,7 @@ in
options = {
services.teamviewer.enable = mkEnableOption "TeamViewer daemon";
};
###### implementation

@ -183,8 +183,8 @@ in
}
]) eachBitcoind);
environment.systemPackages = flatten (mapAttrsToList (bitcoindName: cfg: [
cfg.package
environment.systemPackages = flatten (mapAttrsToList (bitcoindName: cfg: [
cfg.package
]) eachBitcoind);
systemd.services = mapAttrs' (bitcoindName: cfg: (

@ -56,4 +56,4 @@ config = mkIf cfg.enable {
};
};
}

@ -5,7 +5,7 @@ in
with lib;
{
options.services.mstpd = {
enable = mkOption {
default = false;
type = types.bool;

@ -60,7 +60,7 @@ let
# NB: nghttpx doesn't accept "tls", you must omit "no-tls" for
# the default behavior of turning on TLS.
params1 = lib.remove "tls" params0;
sections = [ host] ++ params1;
formattedSections = lib.concatStringsSep ";" sections;
in
@ -90,7 +90,7 @@ in
{ imports = [
./nghttpx-options.nix
];
config = lib.mkIf cfg.enable {
users.groups.nghttpx = { };
@ -98,7 +98,7 @@ in
group = config.users.groups.nghttpx.name;
isSystemUser = true;
};
systemd.services = {
nghttpx = {

@ -23,7 +23,7 @@ in {
### Documentation
# meta.doc = ./onedrive.xml;
### Interface
### Interface
options.services.onedrive = {
enable = lib.mkOption {

@ -772,7 +772,7 @@ in
};
disco_items = {
${ lib.concatStringsSep "\n" (builtins.map (x: ''{ "${x.url}", "${x.description}"};'') discoItems)}
${ lib.concatStringsSep "\n" (builtins.map (x: ''{ "${x.url}", "${x.description}"};'') discoItems)}
};
allow_registration = ${toLua cfg.allowRegistration}

@ -76,9 +76,9 @@ in
networking.supplicant = mkOption {
type = with types; attrsOf (submodule {
options = {
configFile = {
path = mkOption {
type = types.nullOr types.path;
default = null;
@ -89,7 +89,7 @@ in
precedence over options defined in <literal>configFile</literal>.
'';
};
writable = mkOption {
type = types.bool;
default = false;
@ -98,9 +98,9 @@ in
<literal>wpa_supplicant</literal>.
'';
};
};
extraConf = mkOption {
type = types.lines;
default = "";
@ -126,7 +126,7 @@ in
use the <literal>configFile</literal> instead.
'';
};
extraCmdArgs = mkOption {
type = types.str;
default = "";
@ -134,21 +134,21 @@ in
description =
"Command line arguments to add when executing <literal>wpa_supplicant</literal>.";
};
driver = mkOption {
type = types.nullOr types.str;
default = "nl80211,wext";
description = "Force a specific wpa_supplicant driver.";
};
bridge = mkOption {
type = types.str;
default = "";
description = "Name of the bridge interface that wpa_supplicant should listen at.";
};
userControlled = {
enable = mkOption {
type = types.bool;
default = false;
@ -159,20 +159,20 @@ in
access points.
'';
};
socketDir = mkOption {
type = types.str;
default = "/run/wpa_supplicant";
description = "Directory of sockets for controlling wpa_supplicant.";
};
group = mkOption {
type = types.str;
default = "wheel";
example = "network";
description = "Members of this group can control wpa_supplicant.";
};
};
};
});

@ -106,7 +106,7 @@ in
Restart = "always";
};
};
};
};
meta.maintainers = with maintainers; [ maintainers."1000101" ];

@ -5,12 +5,12 @@ with lib;
let cfg = config.services.networking.websockify; in {
options = {
services.networking.websockify = {
enable = mkOption {
enable = mkOption {
description = "Whether to enable websockify to forward websocket connections to TCP connections.";
default = false;
default = false;
type = types.bool;
type = types.bool;
};
sslCert = mkOption {

@ -21,11 +21,11 @@ in
type = types.bool;
default = false;
description = ''
Whether to enable to haveged entropy daemon, which refills
Whether to enable to haveged entropy daemon, which refills
/dev/random when low.
'';
};
refill_threshold = mkOption {
type = types.int;
default = 1024;
@ -34,16 +34,16 @@ in
haveged should refill the entropy pool.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
systemd.services.haveged =
{ description = "Entropy Harvesting Daemon";
unitConfig.Documentation = "man:haveged(8)";
@ -63,5 +63,5 @@ in
};
};
}

@ -33,7 +33,7 @@ in
description = "
Which hostname to set the vHost to that is proxying to sks.
";
};
};
hkpAddress = mkOption {
default = builtins.head sksCfg.hkpAddress;

@ -83,7 +83,7 @@ in
};
};
config = lib.mkIf cfg.enable (lib.mkMerge [
config = lib.mkIf cfg.enable (lib.mkMerge [
{
meta.maintainers = with lib.maintainers; [ kampka ];

@ -51,7 +51,7 @@ in
Whether or not to enable SSL (https) support.
'';
};
certDirectory = mkOption {
type = types.nullOr types.path;
default = null;

@ -353,7 +353,7 @@ in
};
};
};
default = {};
description = ''
Auto login configuration attrset.

@ -19,7 +19,7 @@ in
waitPID=$!
'';
}];
environment.systemPackages = [ pkgs.qtile ];
};
}

@ -5,7 +5,7 @@ with lib;
let
cfg = config.boot.initrd.network.openvpn;
in
{
@ -16,17 +16,17 @@ in
type = types.bool;
default = false;
description = ''
Starts an OpenVPN client during initrd boot. It can be used to e.g.
remotely accessing the SSH service controlled by
<option>boot.initrd.network.ssh</option> or other network services
Starts an OpenVPN client during initrd boot. It can be used to e.g.
remotely accessing the SSH service controlled by
<option>boot.initrd.network.ssh</option> or other network services
included. Service is killed when stage-1 boot is finished.
'';
};
boot.initrd.network.openvpn.configuration = mkOption {
type = types.path; # Same type as boot.initrd.secrets
description = ''
The configuration file for OpenVPN.
The configuration file for OpenVPN.
<warning>
<para>
@ -47,7 +47,7 @@ in
message = "You should specify a configuration for initrd OpenVPN";
}
];
# Add kernel modules needed for OpenVPN
boot.initrd.kernelModules = [ "tun" "tap" ];
@ -60,11 +60,11 @@ in
cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib
cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib
'';
boot.initrd.secrets = {
"/etc/initrd.ovpn" = cfg.configuration;
};
# openvpn --version would exit with 1 instead of 0
boot.initrd.extraUtilsCommandsTest = ''
$out/bin/openvpn --show-gateway

@ -64,10 +64,10 @@ in {
example = 120;
type = types.nullOr types.int;
description = ''
Maximum number of latest generations in the boot menu.
Maximum number of latest generations in the boot menu.
Useful to prevent boot partition running out of disk space.
<literal>null</literal> means no limit i.e. all generations
<literal>null</literal> means no limit i.e. all generations
that were not garbage collected yet.
'';
};

@ -113,9 +113,9 @@ in {
config =
let
units = mapAttrs' (n: v: let nspawnFile = "${n}.nspawn"; in nameValuePair nspawnFile (instanceToUnit nspawnFile v)) cfg;
in
in
mkMerge [
(mkIf (cfg != {}) {
(mkIf (cfg != {}) {
environment.etc."systemd/nspawn".source = mkIf (cfg != {}) (generateUnits' false "nspawn" units [] []);
})
{
@ -123,7 +123,7 @@ in {
# Workaround for https://github.com/NixOS/nixpkgs/pull/67232#issuecomment-531315437 and https://github.com/systemd/systemd/issues/13622
# Once systemd fixes this upstream, we can re-enable -U
systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [
systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [
"" # deliberately empty. signals systemd to override the ExecStart
# Only difference between upstream is that we do not pass the -U flag
"${config.systemd.package}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i"

@ -8,6 +8,6 @@
boot.initrd.extraUdevRulesCommands = ''
cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/
'';
'';
}

@ -6,7 +6,7 @@ let
in
{
imports = [ ./azure-common.nix ];
options = {
virtualisation.azureImage.diskSize = mkOption {
type = with types; int;

@ -29,9 +29,9 @@ let
default = "none";
description = ''
The type of the filesystem to be mounted.
Linux: filesystem types supported by the kernel as listed in
`/proc/filesystems` (e.g., "minix", "ext2", "ext3", "jfs", "xfs",
"reiserfs", "msdos", "proc", "nfs", "iso9660"). For bind mounts
Linux: filesystem types supported by the kernel as listed in
`/proc/filesystems` (e.g., "minix", "ext2", "ext3", "jfs", "xfs",
"reiserfs", "msdos", "proc", "nfs", "iso9660"). For bind mounts
(when options include either bind or rbind), the type is a dummy,
often "none" (not listed in /proc/filesystems).
'';
@ -45,9 +45,9 @@ let
default = [ "bind" ];
description = ''
Mount options of the filesystem to be used.
Support optoions are listed in the mount(8) man page. Note that
both filesystem-independent and filesystem-specific options
Support optoions are listed in the mount(8) man page. Note that
both filesystem-independent and filesystem-specific options
are listed.
'';
};

Loading…
Cancel
Save