From ec1bc63de75bba438216134693724793e24aa14f Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 29 May 2021 16:37:07 +0200 Subject: [PATCH] modules: hardware: move 'bluetooth' --- modules/default.nix | 1 - modules/{ => hardware}/bluetooth.nix | 4 ++-- modules/hardware/default.nix | 2 +- profiles/bluetooth.nix | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) rename modules/{ => hardware}/bluetooth.nix (95%) diff --git a/modules/default.nix b/modules/default.nix index 6d3e065..80bb699 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,7 +3,6 @@ { imports = [ - ./bluetooth.nix ./documentation.nix ./ergodox.nix ./hardware diff --git a/modules/bluetooth.nix b/modules/hardware/bluetooth.nix similarity index 95% rename from modules/bluetooth.nix rename to modules/hardware/bluetooth.nix index b4b8362..ffe0fbe 100644 --- a/modules/bluetooth.nix +++ b/modules/hardware/bluetooth.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.my.modules.bluetooth; + cfg = config.my.hardware.bluetooth; in { - options.my.modules.bluetooth = with lib; { + options.my.hardware.bluetooth = with lib; { enable = mkEnableOption "bluetooth configuration"; enableHeadsetIntegration = my.mkDisableOption "A2DP sink configuration"; diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index 26f40e3..383e1dd 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -3,6 +3,6 @@ { imports = [ - # FIXME: add modules + ./bluetooth.nix ]; } diff --git a/profiles/bluetooth.nix b/profiles/bluetooth.nix index 33792d7..292d0d1 100644 --- a/profiles/bluetooth.nix +++ b/profiles/bluetooth.nix @@ -8,7 +8,7 @@ in }; config = lib.mkIf cfg.enable { - my.modules.bluetooth.enable = true; + my.hardware.bluetooth.enable = true; my.home.bluetooth.enable = true; };