about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorKier Davis <kierdavis@gmail.com>2018-11-06 00:50:00 +0000
committerKier Davis <kierdavis@gmail.com>2018-11-06 00:50:00 +0000
commitde009133d4a9cf1fbde924c55e207ebf40fefc40 (patch)
treeae3ca07922841032b7116353aae8e65d1a5d601e /nixos
parent3b7984dd51346ae83454e7bd3d17a2c7a4f23fbf (diff)
downloadnixlib-de009133d4a9cf1fbde924c55e207ebf40fefc40.tar
nixlib-de009133d4a9cf1fbde924c55e207ebf40fefc40.tar.gz
nixlib-de009133d4a9cf1fbde924c55e207ebf40fefc40.tar.bz2
nixlib-de009133d4a9cf1fbde924c55e207ebf40fefc40.tar.lz
nixlib-de009133d4a9cf1fbde924c55e207ebf40fefc40.tar.xz
nixlib-de009133d4a9cf1fbde924c55e207ebf40fefc40.tar.zst
nixlib-de009133d4a9cf1fbde924c55e207ebf40fefc40.zip
ckb-next: move option renames to nixos/modules/rename.nix for consistency
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/hardware/ckb-next.nix5
-rw-r--r--nixos/modules/rename.nix4
2 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/hardware/ckb-next.nix b/nixos/modules/hardware/ckb-next.nix
index 7c8e0f559587..a275fb8fd604 100644
--- a/nixos/modules/hardware/ckb-next.nix
+++ b/nixos/modules/hardware/ckb-next.nix
@@ -7,11 +7,6 @@ let
 
 in
   {
-    imports = [
-      (mkRenamedOptionModule ["hardware" "ckb" "enable"] ["hardware" "ckb-next" "enable"])
-      (mkRenamedOptionModule ["hardware" "ckb" "package"] ["hardware" "ckb-next" "package"])
-    ];
-
     options.hardware.ckb-next = {
       enable = mkEnableOption "the Corsair keyboard/mouse driver";
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index aa2b5c0b2dfb..dc0a175d5bb8 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -282,6 +282,10 @@ with lib;
     (mkRenamedOptionModule [ "programs" "man"  "enable" ] [ "documentation" "man"  "enable" ])
     (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
 
+    # ckb
+    (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
+    (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
+
   ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
                    "snmpExporter" "unifiExporter" "varnishExporter" ]