From e1087fcdcdfb980035f167b816bd0c9eb7ca1ade Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 19 Aug 2024 11:01:11 -0400 Subject: [PATCH] moved bluetooth out --- hosts/fwbook.nix | 8 ++++++++ modules/nixos/common/hardware/bluetooth.nix | 7 ------- modules/nixos/common/hardware/default.nix | 9 --------- 3 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 modules/nixos/common/hardware/bluetooth.nix diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 35cdbe0..5400f31 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -20,7 +20,15 @@ in }) { inherit (pkgs) system; }).fwupd; services.fprintd.enable = true; + # Yubikey + services.yubikey-agent.enable = true; + # Enable CUPS to print documents. + services.printing.enable = true; + # Bluetooth hardware.bluetooth.settings.General = { ControllerMode = "bredr"; }; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + services.blueman.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/nixos/common/hardware/bluetooth.nix b/modules/nixos/common/hardware/bluetooth.nix deleted file mode 100644 index 2946799..0000000 --- a/modules/nixos/common/hardware/bluetooth.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: { - - # enables support for Bluetooth - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - services.blueman.enable = true; -} diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index 2ef2e04..de181d9 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -4,18 +4,9 @@ ./fan2go.nix ./fancontrol.nix ./sound.nix - ./bluetooth.nix ]; # Firmware Updater services.fwupd.enable = true; # Enable all license firmware hardware.enableAllFirmware = true; - - - - # Yubikey - services.yubikey-agent.enable = true; - - # Enable CUPS to print documents. - services.printing.enable = true; }