diff --git a/home/lukas/blueman.nix b/home/lukas/blueman.nix
deleted file mode 100644
index 2dfd66d..0000000
--- a/home/lukas/blueman.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.blueman.enable = true;
-}
diff --git a/home/lukas/hyprland.nix b/home/lukas/hyprland.nix
index fde0e93..50d26d6 100644
--- a/home/lukas/hyprland.nix
+++ b/home/lukas/hyprland.nix
@@ -11,12 +11,7 @@
         "nm-applet"
         "blueman-applet"
         "swww-daemon"
-        "swayidle -w \
-          timeout 300 'hyprlock' \
-          timeout 360 'hyprctl dispatch dpms off' \
-          resume 'hyprctl dispatch dpms on' \
-          before-sleep 'hyprlock'
-        "
+        "swayidle -w timeout 300 'hyprlock' timeout 360 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'hyprlock'"
         "swww img $HOME/Bilder/Wallpapers/mountain.jpg"
 
       ];
diff --git a/home/lukas/waybar.nix b/home/lukas/waybar.nix
index 0d3edb9..de90089 100644
--- a/home/lukas/waybar.nix
+++ b/home/lukas/waybar.nix
@@ -230,7 +230,8 @@ let
     "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
     "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
     "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
-    "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%"
+    "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
+    "on-click": "blueman-manager"
   }
 }
   '';
diff --git a/hosts/segfault-machine/configuration.nix b/hosts/segfault-machine/configuration.nix
index ad64e74..5dcbb82 100644
--- a/hosts/segfault-machine/configuration.nix
+++ b/hosts/segfault-machine/configuration.nix
@@ -5,6 +5,7 @@
     ../../modules/desktop/hyprland.nix
     ../../modules/input/katana.nix
     ../../modules/networking/networkmanager.nix
+    ../../modules/networking/bluetooth.nix
     ../../modules/system/locale.nix
     ../../modules/system/audio.nix
     ../../modules/system/printing.nix
diff --git a/hosts/segfault-machine/hardware.nix b/hosts/segfault-machine/hardware.nix
index c401389..66c3241 100644
--- a/hosts/segfault-machine/hardware.nix
+++ b/hosts/segfault-machine/hardware.nix
@@ -41,9 +41,5 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
 
 }
diff --git a/modules/networking/bluetooth.nix b/modules/networking/bluetooth.nix
new file mode 100644
index 0000000..e1f8c6e
--- /dev/null
+++ b/modules/networking/bluetooth.nix
@@ -0,0 +1,8 @@
+{
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = false;
+  };
+
+  services.blueman.enable = true;
+}