diff --git a/flake.nix b/flake.nix
index 6307ea7..3096bc6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,12 @@
       # e.g the inputs which contain `legacyPackages` attribute are used.
       channelsConfig.allowUnfree = true;
 
+
+      nix.package = nixpkgs.nixFlakes;
+      nix.extraOptions = ''
+        experimental-features = nix-command flakes
+      '';
+
       hostDefaults.modules = [
         home-manager.nixosModules.home-manager
         {
diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix
index ef87e23..c8e7982 100644
--- a/hosts/nixos-laptop/default.nix
+++ b/hosts/nixos-laptop/default.nix
@@ -9,11 +9,6 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
- 
-  nix.package = pkgs.nixFlakes;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
 
   # BOOT
   boot = {
@@ -39,65 +34,9 @@
     interfaces.wlp1s0.useDHCP = true;
   };
 
-  # LOCALS 
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "firacode-14";
-    keyMap = "de";
-  };
-  time.timeZone = "Europe/Berlin";
-
-  # 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;
-  };
-  
-  # Enable sound
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
   # Powersaving
   services.tlp.enable = true;
 
-  # USERS
-  users.users.moritz = {
-    shell = pkgs.zsh;
-    isNormalUser = true;
-    home = "/home/moritz";
-    extraGroups = [ "wheel" "networkmanager" "video" ]; # Enable ‘sudo’ for the user.
-  };
- 
-  fonts.fonts = with pkgs; [
-    (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono"];})
-  ];
- 
-  # PACKAGES
-  environment.systemPackages = with pkgs; [
-    vim 
-    wget
-    firefox
-  ];
-
   # 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/bspwm/default.nix b/modules/bspwm/default.nix
index b510376..ab84bd7 100644
--- a/modules/bspwm/default.nix
+++ b/modules/bspwm/default.nix
@@ -2,6 +2,7 @@
 
 let
   base = {
+    xsession.windowManager.bspwm.enable = true;
     xdg = {
       enable = true;
       configFile = {
diff --git a/modules/default.nix b/modules/default.nix
index 4b132e5..035e87a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -13,6 +13,26 @@
     ./zathura.nix
     ./zsh.nix
   ];
+
+  # USERS
+  users.users.moritz = {
+    shell = pkgs.zsh;
+    isNormalUser = true;
+    home = "/home/moritz";
+    extraGroups = [ "wheel" "networkmanager" "video" ]; # Enable ‘sudo’ for the user.
+  };
+
+  fonts.fonts = with pkgs; [
+    (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono"];})
+  ];
+
+  # PACKAGES
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    firefox
+  ];
+
   home-manager.users.moritz = {
     # Let Home Manager install and manage itself.
     programs.home-manager.enable = true;