diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix
index 0808ce4..0359215 100644
--- a/hosts/nixos-laptop/default.nix
+++ b/hosts/nixos-laptop/default.nix
@@ -27,25 +27,7 @@
 
   # 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;
-    };
+    xserver.libinput.enable = true;
     printing.enable = true;
     pipewire = {
       enable = true;
@@ -63,10 +45,6 @@
     interfaces.wlp1s0.useDHCP = true;
   };
 
-  environment.systemPackages = with pkgs; [
-    brightnessctl
-  ];
-
   time.timeZone = "Europe/Berlin";
 
   # Powersaving
diff --git a/modules/bspwm/default.nix b/modules/bspwm/default.nix
index 538d943..a4961c8 100644
--- a/modules/bspwm/default.nix
+++ b/modules/bspwm/default.nix
@@ -1,7 +1,26 @@
 { config, lib, pkgs, ... }:
 
-let
-  base = {
+{
+  services = {
+    xserver = {
+      enable = true;
+      layout = "de";
+
+      displayManager = {
+        defaultSession = "none+bspwm";
+
+        autoLogin = {
+          enable = true;
+          user = "moritz";
+        };
+        lightdm = {
+          enable = true;
+        };
+      };
+      windowManager.bspwm.enable = true;
+    };
+  };
+  home-manager.users.moritz = {
     xsession.windowManager.bspwm.enable = true;
 
     xdg = {
@@ -24,9 +43,7 @@ let
       feh
       playerctl
       pamixer
+      brightnessctl
     ];
   };
-in
-{
-  home-manager.users.moritz = {...}: (base);
 }