diff --git a/hosts/MaxNixosLaptop/configuration.nix b/hosts/MaxNixosLaptop/configuration.nix
index f9a8fba..a53889e 100644
--- a/hosts/MaxNixosLaptop/configuration.nix
+++ b/hosts/MaxNixosLaptop/configuration.nix
@@ -83,19 +83,12 @@
   programs.steam.enable = true;
 
   security.polkit.enable = true;
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   # List services that you want to enable:
 
   # fingerprint unlock
   services.fprintd.enable = true;
 
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
-  services.blueman.enable = true;
-
   services.udisks2.enable = true;
 
   services.udev = {
@@ -108,8 +101,6 @@
     ];
   };
 
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/home/sway/default.nix b/modules/home/sway/default.nix
index 3ce4bac..ee8bad6 100644
--- a/modules/home/sway/default.nix
+++ b/modules/home/sway/default.nix
@@ -68,6 +68,10 @@ in {
       keepassxc # used for secrets instead of gnome-keyring
     ];
 
+    home.sessionVariables = {
+      NIXOS_OZONE_WL = "1";
+    };
+
     wayland.windowManager.sway = {
       enable = true;
       systemd = {
diff --git a/modules/nixos/bluetooth.nix b/modules/nixos/bluetooth.nix
new file mode 100644
index 0000000..7a127d0
--- /dev/null
+++ b/modules/nixos/bluetooth.nix
@@ -0,0 +1,19 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.myConfig.bluetooth;
+in {
+  options.myConfig.bluetooth = {
+    enable = lib.mkEnableOption "bluetooth";
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+    services.blueman.enable = true;
+  };
+}
diff --git a/modules/nixos/qemu.nix b/modules/nixos/qemu.nix
index 1782277..5a40060 100644
--- a/modules/nixos/qemu.nix
+++ b/modules/nixos/qemu.nix
@@ -34,5 +34,6 @@ in {
         };
       };
     };
+    boot.binfmt.emulatedSystems = ["aarch64-linux"];
   };
 }