diff --git a/configuration.nix b/configuration.nix
index 704e593f..95fbfe48 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -87,20 +87,6 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  # Configure keymap in X11
-  services.xserver = {
-    enable = true;
-    layout = "us";
-    xkbVariant = "";
-    libinput = {
-      enable = true;
-      touchpad.tapping = true;
-    };
-    # Enable nVidia drivers
-    videoDrivers = [ "nvidia" ];
-    autorun = true;
-  };
-
   # Enable sound with pipewire.
   sound.enable = true;
   hardware.pulseaudio.enable = false;
diff --git a/hosts/nixos-laptop/configuration.nix b/hosts/nixos-laptop/configuration.nix
index 0928a619..ddf4a606 100644
--- a/hosts/nixos-laptop/configuration.nix
+++ b/hosts/nixos-laptop/configuration.nix
@@ -33,4 +33,11 @@
 
   # Fingerprint software
   environment.systemPackages = with pkgs; [ fprintd ];
+
+
+  imports = [
+      # Modules
+      ../../modules/xserver.nix 
+      ../../modules/powertop.nix
+  ];
 }
\ No newline at end of file
diff --git a/modules/xserver.nix b/modules/xserver.nix
new file mode 100644
index 00000000..c386bb2e
--- /dev/null
+++ b/modules/xserver.nix
@@ -0,0 +1,13 @@
+  # Configure keymap in X11
+  services.xserver = {
+    enable = true;
+    layout = "us";
+    xkbVariant = "";
+    libinput = {
+      enable = true;
+      touchpad.tapping = true;
+    };
+    # Enable nVidia drivers
+    videoDrivers = [ "nvidia" ];
+    autorun = true;
+  };
\ No newline at end of file