diff --git a/configuration.nix b/configuration.nix
index 69e2294..7658711 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,6 +8,8 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ./desktop.nix
+      # ./laptop.nix
       ./users.nix
       ./de.nix
       ./discord.nix
diff --git a/de.nix b/de.nix
index 0979764..5543ea3 100644
--- a/de.nix
+++ b/de.nix
@@ -1,35 +1,16 @@
 { config, pkgs, ... }:
 
 {
-  hardware.nvidia = {
-    modesetting.enable = true;
-    open = false;
-    nvidiaSettings = true;
-  };
   services.xserver = {
     enable = true;
-    videoDrivers = [ "nvidia" ];
-    xrandrHeads = [
-      {
-        output = "DP-0";
-	primary = true;
-      }
-      {
-	output = "DP-2";
-	monitorConfig = ''
-	  Option "Rotate" "right"
-	  Option "LeftOf" "DP-0"
-	'';
-      }
-    ];
     displayManager.sddm = {
       enable = true;
       wayland.enable = true;
       settings = {
         Theme = {
-	  Current = "breeze";
-	  ThemeDir = "/sddmt";
-	};
+          Current = "breeze";
+          ThemeDir = "/sddmt";
+        };
       };
     };
   };
@@ -39,7 +20,6 @@
     driSupport = true;
     driSupport32Bit = true;
   };
-  services.xrdp.enable = true;
   services.xrdp.defaultWindowManager = "startplasma-x11";
   services.xrdp.openFirewall = true;
   security.rtkit.enable = true;
diff --git a/desktop.nix b/desktop.nix
new file mode 100644
index 0000000..58d8725
--- /dev/null
+++ b/desktop.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, ... }:
+
+{
+  services.xrdp.enable = true;
+  hardware.nvidia = {
+    modesetting.enable = true;
+    open = false;
+    nvidiaSettings = true;
+  };
+  services.xserver = {
+    videoDrivers = [ "nvidia" ];
+    xrandrHeads = [
+      {
+        output = "DP-0";
+        primary = true;
+      }
+      {
+        output = "DP-2";
+        monitorConfig = ''
+          Option "Rotate" "right"
+          Option "LeftOf" "DP-0"
+      '';
+      }
+    ];
+  }
+}
diff --git a/laptop.nix b/laptop.nix
index a7c8818..5f1e350 100644
--- a/laptop.nix
+++ b/laptop.nix
@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  boot.kernelParams = [ "i915.force_probe=a7a1" ];
+
   services.tlp = {
     enable = true;
     settings = {
@@ -28,6 +30,7 @@
     fakeButtons = false;
   };
 
+  services.fstrim.enable = true;
 
   environment.systemPackages = with pkgs; [
     powertop