diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-09-15 18:25:40 +0200 |
---|---|---|
committer | Silvan Mosberger <infinisil@icloud.com> | 2019-09-15 18:25:40 +0200 |
commit | ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481 (patch) | |
tree | a76c6a867c8efc0c31ef49692e61b3458ccdbf1f | |
parent | 0c457cb348c66abfc26abbbccc2b42d78f52d458 (diff) | |
download | nixpkgs-ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481.tar nixpkgs-ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481.tar.gz nixpkgs-ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481.tar.bz2 nixpkgs-ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481.tar.lz nixpkgs-ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481.tar.xz nixpkgs-ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481.tar.zst nixpkgs-ecf5f85a81d9ddd5a5c40eabb0e8fba3c8ed7481.zip |
nixos/redshift: Move option renames to the module
-rw-r--r-- | nixos/modules/rename.nix | 14 | ||||
-rw-r--r-- | nixos/modules/services/x11/redshift.nix | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d1303f90ad8..0c7c45a4708 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -273,20 +273,6 @@ with lib; (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) - # Redshift - (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] - (config: - let value = getAttrFromPath [ "services" "redshift" "latitude" ] config; - in if value == null then - throw "services.redshift.latitude is set to null, you can remove this" - else builtins.fromJSON value)) - (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] - (config: - let value = getAttrFromPath [ "services" "redshift" "longitude" ] config; - in if value == null then - throw "services.redshift.longitude is set to null, you can remove this" - else builtins.fromJSON value)) - # Redis (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.") (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.") diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 6ddb4c83764..048cc16263d 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -9,6 +9,21 @@ let in { + imports = [ + (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] + (config: + let value = getAttrFromPath [ "services" "redshift" "latitude" ] config; + in if value == null then + throw "services.redshift.latitude is set to null, you can remove this" + else builtins.fromJSON value)) + (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] + (config: + let value = getAttrFromPath [ "services" "redshift" "longitude" ] config; + in if value == null then + throw "services.redshift.longitude is set to null, you can remove this" + else builtins.fromJSON value)) + ]; + options.services.redshift = { enable = mkOption { type = types.bool; |