diff options
author | Franck Cuny <franck@fcuny.net> | 2022-06-09 08:56:52 -0700 |
---|---|---|
committer | Franck Cuny <franck@fcuny.net> | 2022-06-09 09:31:45 -0700 |
commit | 4400b3cc00d38b3c82e061785ea4ef97a0947c8c (patch) | |
tree | 32a7d988dc9ca1517eccf24f48e4e7f0180df7a9 | |
parent | fix(gerrit-hook): update the configuration with correct URL (diff) | |
download | world-4400b3cc00d38b3c82e061785ea4ef97a0947c8c.tar.gz |
ref(bluetooth): remove the profile
I don't need a profile for this, the module can be consumed directly from the host's hardware configuration. It removes one level of indirection and helps us toward the goal of completely removing all the profiles. Change-Id: I95a6fdc985420e7fe0ad737e7576d10d5c7eb114 Reviewed-on: https://cl.fcuny.net/c/world/+/289 Reviewed-by: Franck Cuny <franck@fcuny.net>
-rw-r--r-- | hosts/aptos/hardware.nix | 2 | ||||
-rw-r--r-- | hosts/aptos/profile.nix | 1 | ||||
-rw-r--r-- | profiles/bluetooth/default.nix | 9 | ||||
-rw-r--r-- | profiles/default.nix | 5 |
4 files changed, 3 insertions, 14 deletions
diff --git a/hosts/aptos/hardware.nix b/hosts/aptos/hardware.nix index 085db9f..2189a6f 100644 --- a/hosts/aptos/hardware.nix +++ b/hosts/aptos/hardware.nix @@ -41,5 +41,7 @@ [{ device = "/dev/disk/by-uuid/24041034-ff39-44bf-a04c-8fd8318b554d"; }]; my.hardware.intel.enable = true; + my.hardware.bluetooth.enable = true; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/hosts/aptos/profile.nix b/hosts/aptos/profile.nix index 4e5b48d..1ba221e 100644 --- a/hosts/aptos/profile.nix +++ b/hosts/aptos/profile.nix @@ -6,7 +6,6 @@ my.profiles = { # Laptop specific configuration laptop.enable = true; - bluetooth.enable = true; desktop.enable = true; multimedia.enable = true; trusted.enable = true; diff --git a/profiles/bluetooth/default.nix b/profiles/bluetooth/default.nix deleted file mode 100644 index ffd05b4..0000000 --- a/profiles/bluetooth/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, ... }: -let cfg = config.my.profiles.bluetooth; -in { - options.my.profiles.bluetooth = with lib; { - enable = mkEnableOption "bluetooth profile"; - }; - - config = lib.mkIf cfg.enable { my.hardware.bluetooth.enable = true; }; -} diff --git a/profiles/default.nix b/profiles/default.nix index d683b58..9c0d2f9 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -1,4 +1 @@ -{ ... }: { - imports = - [ ./bluetooth ./laptop ./gtk ./trusted ./wm ./desktop ./multimedia ]; -} +{ ... }: { imports = [ ./laptop ./gtk ./trusted ./wm ./desktop ./multimedia ]; } |