treewide: mkAliasOptionModuleMD -> mkAliasOptionModule
This commit is contained in:
@@ -30,7 +30,7 @@ let
|
|||||||
mapAttrs'
|
mapAttrs'
|
||||||
mapAttrsToList
|
mapAttrsToList
|
||||||
match
|
match
|
||||||
mkAliasOptionModuleMD
|
mkAliasOptionModule
|
||||||
mkDefault
|
mkDefault
|
||||||
mkIf
|
mkIf
|
||||||
mkMerge
|
mkMerge
|
||||||
@@ -666,8 +666,8 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ])
|
(mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
|
||||||
(mkAliasOptionModuleMD [ "users" "extraGroups" ] [ "users" "groups" ])
|
(mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
|
||||||
(mkRenamedOptionModule
|
(mkRenamedOptionModule
|
||||||
[ "security" "initialRootPassword" ]
|
[ "security" "initialRootPassword" ]
|
||||||
[ "users" "users" "root" "initialHashedPassword" ]
|
[ "users" "users" "root" "initialHashedPassword" ]
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib)
|
inherit (lib)
|
||||||
mkAliasOptionModuleMD
|
mkAliasOptionModule
|
||||||
mkRemovedOptionModule
|
mkRemovedOptionModule
|
||||||
;
|
;
|
||||||
in
|
in
|
||||||
@@ -18,7 +18,7 @@ in
|
|||||||
|
|
||||||
# This alias module can't be where _module.check is defined because it would
|
# This alias module can't be where _module.check is defined because it would
|
||||||
# be added to submodules as well there
|
# be added to submodules as well there
|
||||||
(mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
|
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
|
||||||
|
|
||||||
# Completely removed modules
|
# Completely removed modules
|
||||||
(mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ]
|
(mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ]
|
||||||
|
|||||||
@@ -177,8 +177,8 @@ in
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(lib.mkAliasOptionModuleMD [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
|
(lib.mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
|
||||||
(lib.mkAliasOptionModuleMD [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
|
(lib.mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
|
||||||
(lib.mkRenamedOptionModule
|
(lib.mkRenamedOptionModule
|
||||||
[ "services" "openssh" "challengeResponseAuthentication" ]
|
[ "services" "openssh" "challengeResponseAuthentication" ]
|
||||||
[ "services" "openssh" "kbdInteractiveAuthentication" ]
|
[ "services" "openssh" "kbdInteractiveAuthentication" ]
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
let
|
let
|
||||||
inherit (lib)
|
inherit (lib)
|
||||||
mkRenamedOptionModule
|
mkRenamedOptionModule
|
||||||
mkAliasOptionModuleMD
|
mkAliasOptionModule
|
||||||
mkEnableOption
|
mkEnableOption
|
||||||
mkOption
|
mkOption
|
||||||
types
|
types
|
||||||
@@ -26,7 +26,6 @@ let
|
|||||||
|
|
||||||
cfg = config.services.transmission;
|
cfg = config.services.transmission;
|
||||||
opt = options.services.transmission;
|
opt = options.services.transmission;
|
||||||
inherit (config.environment) etc;
|
|
||||||
apparmor = config.security.apparmor;
|
apparmor = config.security.apparmor;
|
||||||
rootDir = "/run/transmission";
|
rootDir = "/run/transmission";
|
||||||
settingsDir = ".config/transmission-daemon";
|
settingsDir = ".config/transmission-daemon";
|
||||||
@@ -51,7 +50,7 @@ in
|
|||||||
"rpc-port"
|
"rpc-port"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
(mkAliasOptionModuleMD
|
(mkAliasOptionModule
|
||||||
[
|
[
|
||||||
"services"
|
"services"
|
||||||
"transmission"
|
"transmission"
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ in
|
|||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
(mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
|
(mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ])
|
||||||
(mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
|
(mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
|
||||||
This option corresponds to `refresh-rate`, which has been unused
|
This option corresponds to `refresh-rate`, which has been unused
|
||||||
since picom v6 and was subsequently removed by upstream.
|
since picom v6 and was subsequently removed by upstream.
|
||||||
|
|||||||
Reference in New Issue
Block a user