From 8110cae57e1e82a38bda2b6bfb1c3db4b2d1674b Mon Sep 17 00:00:00 2001 From: Silas Schöffel Date: Sun, 2 Jun 2024 14:15:56 +0200 Subject: bluetooth: init module --- modules/nixos/sils/bluetooth.nix | 12 ++++++++++++ modules/nixos/sils/default.nix | 3 ++- modules/nixos/sils/roles.nix | 1 + sys/bluetooth/default.nix | 3 --- sys/default.nix | 1 - 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 modules/nixos/sils/bluetooth.nix delete mode 100644 sys/bluetooth/default.nix diff --git a/modules/nixos/sils/bluetooth.nix b/modules/nixos/sils/bluetooth.nix new file mode 100644 index 0000000..2d67717 --- /dev/null +++ b/modules/nixos/sils/bluetooth.nix @@ -0,0 +1,12 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.bluetooth; +in { + options.sils.bluetooth.enable = lib.mkEnableOption "bluetooth"; + config = lib.mkIf cfg.enable { + hardware.bluetooth.enable = true; + }; +} diff --git a/modules/nixos/sils/default.nix b/modules/nixos/sils/default.nix index 926814f..9a0c533 100644 --- a/modules/nixos/sils/default.nix +++ b/modules/nixos/sils/default.nix @@ -1,11 +1,12 @@ {...}: { imports = [ - ./roles.nix ./basesystem.nix + ./bluetooth.nix ./meta.nix ./networking.nix ./nix.nix ./plymouth.nix + ./roles.nix ./sudo.nix ./theming.nix ]; diff --git a/modules/nixos/sils/roles.nix b/modules/nixos/sils/roles.nix index 811c0ea..3b88e99 100644 --- a/modules/nixos/sils/roles.nix +++ b/modules/nixos/sils/roles.nix @@ -4,6 +4,7 @@ in { config.sils = if roleCmp "laptop" then { + bluetooth.enable = true; basesystem.enable = true; networking.enable = true; nix-config.enable = true; diff --git a/sys/bluetooth/default.nix b/sys/bluetooth/default.nix deleted file mode 100644 index 6dc8d17..0000000 --- a/sys/bluetooth/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - hardware.bluetooth.enable = true; -} diff --git a/sys/default.nix b/sys/default.nix index 82d323a..c5711cd 100644 --- a/sys/default.nix +++ b/sys/default.nix @@ -1,6 +1,5 @@ {...}: { imports = [ - ./bluetooth ./desktop/hyprland ./desktop/sway ./environment -- cgit 1.4.1