diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 533280890a70..d0243f9775c5 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -57,8 +57,8 @@ in
type = types.attrsOf (types.listOf types.str);
example = { PATH = [ "/bin" "/sbin" ]; MANPATH = [ "/man" "/share/man" ]; };
description = ''
- Attribute set of environment variable. Each attribute maps to a list
- of relative paths. Each relative path is appended to the each profile
+ Attribute set of environment variable. Each attribute maps to a list
+ of relative paths. Each relative path is appended to the each profile
of to form the content of the
corresponding environment variable.
'';
@@ -123,6 +123,7 @@ in
"''${pkgs.dash}/bin/dash"
'';
type = types.path;
+ visible = false;
description = ''
The shell executable that is linked system-wide to
/bin/sh. Please note that NixOS assumes all
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index cf7ef455eb85..87a7bac208b7 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -36,7 +36,6 @@ in
askPassword = mkOption {
type = types.str;
- default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
description = ''Program used by SSH to ask for passwords.'';
};
@@ -223,5 +222,7 @@ in
export SSH_ASKPASS=${askPassword}
'';
+ programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
+
};
}
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index ca3188b18199..8f85b602fe2c 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -99,7 +99,6 @@ in
};
outputTheme = mkOption {
- default = "${pkgs.venus}/themes/classic_fancy";
type = types.path;
description = ''
Directory containing a config.ini file which is merged with this one.
@@ -170,5 +169,7 @@ in
startAt = cfg.dates;
};
+ services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy";
+
};
}
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 261f97617664..56ff388f8a9e 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -32,7 +32,6 @@ in {
'';
};
configurationDir = mkOption {
- default = "${activemq}/conf";
description = ''
The base directory for ActiveMQ's configuration.
By default, this directory is searched for a file named activemq.xml,
@@ -126,6 +125,8 @@ in {
'';
};
+ services.activemq.configurationDir = mkDefault "${activemq}/conf";
+
};
}
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 3bf765c6f991..0428602688dd 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -36,7 +36,6 @@ in
hardware.sane.configDir = mkOption {
type = types.string;
- default = "${saneConfig}/etc/sane.d";
description = "The value of SANE_CONFIG_DIR.";
};
@@ -47,6 +46,8 @@ in
config = mkIf config.hardware.sane.enable {
+ hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d";
+
environment.systemPackages = backends;
environment.sessionVariables = {
SANE_CONFIG_DIR = config.hardware.sane.configDir;
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index aec45d9286d8..3a798c6f3724 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -84,10 +84,10 @@ in
type = types.lines;
default = ''stdin { type => "example" }'';
description = "Logstash input configuration.";
- example = ''
+ example = literalExample ''
# Read from journal
pipe {
- command => "${pkgs.systemd}/bin/journalctl -f -o json"
+ command => "''${pkgs.systemd}/bin/journalctl -f -o json"
type => "syslog" codec => json {}
}
'';
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index c570a01fb3b2..0c9a916ed21a 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -80,7 +80,6 @@ in
services.nixosManual.browser = mkOption {
type = types.path;
- default = "${pkgs.w3m}/bin/w3m";
description = ''
Browser used to show the manual.
'';
@@ -116,6 +115,8 @@ in
services.mingetty.helpLine = mkIf cfg.showManual
"\nPress for the NixOS manual.";
+ services.nixosManual.browser = mkDefault "${pkgs.w3m}/bin/w3m";
+
};
}
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 3e1a2e8fbb51..4d164ad8d65f 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -97,7 +97,6 @@ in
transcoders = mkOption {
type = types.listOf types.path;
- default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
description = ''
List of paths to transcoder executables that should be accessible
from Subsonic. Symlinks will be created to each executable inside
@@ -153,5 +152,8 @@ in
};
users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
+
+ services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
+
};
}
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 0393d01054d1..fa653565a67f 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -200,7 +200,6 @@ in {
staticRootPath = mkOption {
description = "Root path for static assets.";
- default = "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public";
type = types.str;
};
@@ -311,7 +310,7 @@ in {
config = mkIf cfg.enable {
warnings = [
- "Grafana passwords will be stored as plaintext in nix store!"
+ "Grafana passwords will be stored as plaintext in the Nix store!"
];
systemd.services.grafana = {
@@ -331,5 +330,8 @@ in {
home = cfg.dataDir;
createHome = true;
};
+
+ services.grafana.staticRootPath = mkDefault "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public";
+
};
}
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index c724ee979c2d..218bce2dbb31 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -52,10 +52,7 @@ in
default = "opendns";
type = types.nullOr types.string;
description = ''
- The name of the upstream DNSCrypt resolver to use. See
- ${resolverListFile} for alternative resolvers
- (e.g., if you are concerned about logging and/or server
- location).
+ The name of the upstream DNSCrypt resolver to use.
'';
};
customResolver = mkOption {
diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix
index 155ecbb98ef3..f5bc60be3457 100644
--- a/nixos/modules/services/networking/seeks.nix
+++ b/nixos/modules/services/networking/seeks.nix
@@ -33,7 +33,7 @@ in
type = types.str;
description = "
The Seeks server configuration. If it is not specified,
- a default configuration is used (${seeks}/etc/seeks).
+ a default configuration is used.
";
};
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 41dbfff41cfe..82398948bfaa 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -44,8 +44,7 @@ in {
phpIni = mkOption {
type = types.path;
- default = "${cfg.phpPackage}/etc/php-recommended.ini";
- description = "php.ini file to use.";
+ description = "PHP configuration file to use.";
};
poolConfigs = mkOption {
@@ -86,5 +85,7 @@ in {
};
};
+ services.phpfpm.phpIni = mkDefault "${cfg.phpPackage}/etc/php-recommended.ini";
+
};
}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index bc8f478c7d83..11e21c9d917f 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -104,7 +104,6 @@ in
};
background = mkOption {
- default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
description = ''
The background image or color to use.
'';
@@ -172,5 +171,8 @@ in
};
users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
+
+ services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
+
};
}