From 97bf51e81a2d4e40f5c69f29453f0852d9aeef5b Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sat, 29 Jul 2023 12:12:34 -0400 Subject: [PATCH] wireless: use private wireless module automatically --- hosts/Infini-DESKTOP/default.nix | 2 -- hosts/Infini-FRAMEWORK/default.nix | 2 -- hosts/Infini-STICK/default.nix | 2 -- hosts/Infini-SWIFT/default.nix | 1 - modules/modules/hardware/wireless.nix | 4 +++- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix index af6c413..e7e34bc 100644 --- a/hosts/Infini-DESKTOP/default.nix +++ b/hosts/Infini-DESKTOP/default.nix @@ -1,7 +1,5 @@ { pkgs, lib, private, ... }: { imports = lib.lists.flatten [ - private.nixosModules.wireless - ./hardware-configuration.nix ./filesystems.nix ]; diff --git a/hosts/Infini-FRAMEWORK/default.nix b/hosts/Infini-FRAMEWORK/default.nix index 486e7ff..9ef6040 100644 --- a/hosts/Infini-FRAMEWORK/default.nix +++ b/hosts/Infini-FRAMEWORK/default.nix @@ -1,7 +1,5 @@ { pkgs, lib, private, ... }: { imports = lib.lists.flatten [ - private.nixosModules.wireless - ./hardware-configuration.nix ./filesystems.nix ]; diff --git a/hosts/Infini-STICK/default.nix b/hosts/Infini-STICK/default.nix index 44bf316..52b6fff 100644 --- a/hosts/Infini-STICK/default.nix +++ b/hosts/Infini-STICK/default.nix @@ -1,8 +1,6 @@ { lib, private, ... }: { imports = lib.lists.flatten [ - private.nixosModules.wireless - ./hardware-configuration.nix ]; diff --git a/hosts/Infini-SWIFT/default.nix b/hosts/Infini-SWIFT/default.nix index 49a4222..8d553a6 100644 --- a/hosts/Infini-SWIFT/default.nix +++ b/hosts/Infini-SWIFT/default.nix @@ -2,7 +2,6 @@ { imports = [ ./hardware-configuration.nix - private.nixosModules.wireless ]; system.stateVersion = "21.11"; diff --git a/modules/modules/hardware/wireless.nix b/modules/modules/hardware/wireless.nix index e0a283a..8597811 100644 --- a/modules/modules/hardware/wireless.nix +++ b/modules/modules/hardware/wireless.nix @@ -1,10 +1,12 @@ -{ config, lib, ... }: +{ config, lib, private, ... }: with lib; with lib.hlissner; let cfg = config.modules.hardware.wireless; in { + imports = [ private.nixosModules.wireless ]; + options.modules.hardware.wireless = { enable = mkBoolOpt false; bluetooth = {