diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix
index 9e2d4f8..47b68c7 100644
--- a/hosts/nixos-laptop/default.nix
+++ b/hosts/nixos-laptop/default.nix
@@ -25,14 +25,30 @@
     kernelPackages = pkgs.linuxPackages_zen;
   };
 
+  # SERVICES
   services = {
     xserver = {
+      enable = true;
+      layout = "de";
+
+      displayManager = {
+        defaultSession = "none+bspwm";
+
+        autoLogin = {
+          enable = true;
+          user = "moritz";
+        };
+        lightdm = {
+          enable = true;
+        };
+      };
+
       libinput.enable = true;
+      windowManager.bspwm.enable = true;
     };
     printing.enable = true;
   };
 
-
   # NETWORKING
   networking = {
     hostName = "nixos-laptop";
diff --git a/modules/bspwm/default.nix b/modules/bspwm/default.nix
index 050196e..31a3103 100644
--- a/modules/bspwm/default.nix
+++ b/modules/bspwm/default.nix
@@ -23,24 +23,5 @@ let
   };
 in
 {
-  # SERVICES
-  services = {
-    xserver = {
-      enable = true;
-      layout = "de";
-
-      displayManager = {
-        defaultSession = "none+bspwm";
-
-        autoLogin = {
-          enable = true;
-          user = "moritz";
-        };
-        lightdm = {
-          enable = true;
-        };
-      };
-    };
-  };
   home-manager.users.moritz = {...}: (base);
 }
diff --git a/modules/default.nix b/modules/default.nix
index 035e87a..77ba20a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -37,31 +37,19 @@
     # Let Home Manager install and manage itself.
     programs.home-manager.enable = true;
 
-
-
     # paths it should manage.
     home.username = "moritz";
     home.homeDirectory = "/home/moritz";
 
-
     services = {
       kdeconnect.enable = true;
     };
 
-
     home.packages = with pkgs; [
       neofetch
       keepassxc
     ];
 
-    # This value determines the Home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new Home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
     home.stateVersion = "21.05";
   };
 }