From 5f612eafeabd83f3346e6dbef2e3f81907c61253 Mon Sep 17 00:00:00 2001 From: foglar Date: Sat, 14 Dec 2024 16:34:30 +0100 Subject: [PATCH] bluetooth/blueman config --- leanix/configuration.nix | 3 ++- nixos/system/sys/network.nix | 5 +++++ nixos/system/system.nix | 12 +++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/leanix/configuration.nix b/leanix/configuration.nix index 7df67fc..7927a2e 100644 --- a/leanix/configuration.nix +++ b/leanix/configuration.nix @@ -22,7 +22,7 @@ }; }; - # Bootloader. + # Bootloader boot.loader.systemd-boot.enable = true; environment.sessionVariables = { @@ -49,6 +49,7 @@ locales.enable = true; network.enable = true; bluetooth.enable = true; + bluetooth.blueman.enable = false; nvidia.enable = false; printing.enable = false; sddm.enable = false; diff --git a/nixos/system/sys/network.nix b/nixos/system/sys/network.nix index dd8ce29..3c5e103 100644 --- a/nixos/system/sys/network.nix +++ b/nixos/system/sys/network.nix @@ -8,6 +8,7 @@ options = { sys.network.enable = lib.mkEnableOption "Enable networking"; sys.bluetooth.enable = lib.mkEnableOption "Enable Bluetooth support"; + sys.bluetooth.blueman.enable = lib.mkEnableOption "Enable Blueman App"; }; config = lib.mkMerge [ @@ -27,6 +28,10 @@ lib.mkIf config.sys.bluetooth.enable { hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot + } + ) + ( + lib.mkIf config.sys.bluetooth.blueman.enable { services.blueman.enable = true; } ) diff --git a/nixos/system/system.nix b/nixos/system/system.nix index 72f2821..fbdf20d 100644 --- a/nixos/system/system.nix +++ b/nixos/system/system.nix @@ -7,7 +7,7 @@ ./sys/network.nix ./sys/nvidia.nix ./sys/printing.nix - ./sys/sddm.nix + ./sys/loginManager.nix ./sys/style.nix ]; @@ -21,10 +21,16 @@ fonts.packages = lib.mkDefault true; locales.enable = lib.mkDefault true; network.enable = lib.mkDefault true; - bluetooth.enable = lib.mkDefault true; + bluetooth = { + enable = lib.mkDefault true; + blueman = lib.mkDefault true; + }; nvidia.enable = lib.mkDefault true; printing.enable = lib.mkDefault true; - sddm.enable = lib.mkDefault true; + login = { + sddm.enable = lib.mkDefault true; + gdm.enable = lib.mkDefault false; + }; style.enable = lib.mkDefault true; }; }