diff --git a/modules/hardware/bluetooth/default.nix b/modules/hardware/bluetooth/default.nix
index 5763148..2e9ee8f 100644
--- a/modules/hardware/bluetooth/default.nix
+++ b/modules/hardware/bluetooth/default.nix
@@ -18,7 +18,7 @@ in
       powerOnBoot = true;
       settings = {
         General = {
-          Experimental = true; # show battery percentages
+          Enable = "Source,Sink,Media,Socket";
         };
       };
     };
diff --git a/profiles/powersave/default.nix b/profiles/powersave/default.nix
index 01d6501..4f53939 100644
--- a/profiles/powersave/default.nix
+++ b/profiles/powersave/default.nix
@@ -27,12 +27,5 @@ in
       thermald.enable = true;
       upower.enable = true;
     };
-
-    services.udev.extraRules = ''
-      # disable USB auto suspend for Keychron Q3 HE
-      ACTION=="bind", SUBSYSTEM=="usb", ATTR{idVendor}=="3434", ATTR{idProduct}=="0b31", ATTR{power/autosuspend}="-1"
-      # disable USB auto suspend for Keychron Q3
-      ACTION=="bind", SUBSYSTEM=="usb", ATTR{idVendor}=="3434", ATTR{idProduct}=="0123", ATTR{power/autosuspend}="-1"
-    '';
   };
 }
diff --git a/profiles/sway/autostart.nix b/profiles/sway/autostart.nix
index 494fc81..bf814f5 100644
--- a/profiles/sway/autostart.nix
+++ b/profiles/sway/autostart.nix
@@ -8,12 +8,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-
-    # start sway if login happens
-    environment.interactiveShellInit = ''
-      if test `tty` = /dev/tty1; then
-        exec sway
-      fi
-    '';
+    services.displayManager.lemurs = {
+      enable = true;
+      settings.environment_switcher.include_tty_shell = true;
+    };
   };
 }