diff options
author | Silvan Mosberger <contact@infinisil.com> | 2019-12-10 02:51:19 +0100 |
---|---|---|
committer | Silvan Mosberger <contact@infinisil.com> | 2019-12-10 02:51:19 +0100 |
commit | 4ee3e8b21dfeaf236b86a0c109953dd809a77e64 (patch) | |
tree | 79bf61d3635aa336cd88d215470be66f489cc267 /nixos/modules/hardware | |
parent | cd9ace689274fedd7e95dabdc99041d4c799c3dc (diff) | |
download | nixlib-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar nixlib-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.gz nixlib-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.bz2 nixlib-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.lz nixlib-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.xz nixlib-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.zst nixlib-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.zip |
nixos/treewide: Move rename.nix imports to their respective modules
A centralized list for these renames is not good because: - It breaks disabledModules for modules that have a rename defined - Adding/removing renames for a module means having to find them in the central file - Merge conflicts due to multiple people editing the central file
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r-- | nixos/modules/hardware/all-firmware.nix | 8 | ||||
-rw-r--r-- | nixos/modules/hardware/ckb-next.nix | 5 | ||||
-rw-r--r-- | nixos/modules/hardware/ksm.nix | 4 | ||||
-rw-r--r-- | nixos/modules/hardware/opengl.nix | 5 |
4 files changed, 22 insertions, 0 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 534fcc34276b..16be8bcfdd7d 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -6,6 +6,14 @@ let cfg = config.hardware; in { + imports = [ + (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + ]; + ###### interface options = { diff --git a/nixos/modules/hardware/ckb-next.nix b/nixos/modules/hardware/ckb-next.nix index 20b2756d8b26..fe0ca9f26d54 100644 --- a/nixos/modules/hardware/ckb-next.nix +++ b/nixos/modules/hardware/ckb-next.nix @@ -7,6 +7,11 @@ 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/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix index 99d46c25236e..0938dbdc1101 100644 --- a/nixos/modules/hardware/ksm.nix +++ b/nixos/modules/hardware/ksm.nix @@ -6,6 +6,10 @@ let cfg = config.hardware.ksm; in { + imports = [ + (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ]) + ]; + options.hardware.ksm = { enable = mkEnableOption "Kernel Same-Page Merging"; sleep = mkOption { diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 57cac56bd8ab..89dc5008df58 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -31,6 +31,11 @@ let in { + + imports = [ + (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ]) + ]; + options = { hardware.opengl = { |