diff --git a/nodes/hosts/common/configuration.nix b/nodes/hosts/common/configuration.nix
index cdb950c..1460343 100644
--- a/nodes/hosts/common/configuration.nix
+++ b/nodes/hosts/common/configuration.nix
@@ -20,6 +20,7 @@
     ./services/displaymanager.nix
     ./services/nix-flatpak.nix
     ./services/sound.nix
+    ./services/xserver.nix
     ./system/bluetooth.nix
     ./system/locale.nix
     ./system/security.nix
diff --git a/nodes/hosts/common/services/xserver.nix b/nodes/hosts/common/services/xserver.nix
new file mode 100644
index 0000000..2832fd7
--- /dev/null
+++ b/nodes/hosts/common/services/xserver.nix
@@ -0,0 +1,11 @@
+{ pkgs, ...}: {
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver = {
+    enable = true;
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
+  };
+}
diff --git a/nodes/hosts/lappy/configuration.nix b/nodes/hosts/lappy/configuration.nix
index a5ea5b2..2ab9e26 100644
--- a/nodes/hosts/lappy/configuration.nix
+++ b/nodes/hosts/lappy/configuration.nix
@@ -10,6 +10,7 @@
       ./hardware-configuration.nix
       ./filesystems.nix
       ./programs/sof-firmware.nix
+      ./services/touchpad.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -25,71 +26,6 @@
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-
-  
-
-  # Configure keymap in X11
-  services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.libinput.enable = true;
-
-  # List packages installed in system profile.
-  # You can use https://search.nixos.org/ to find more packages (and options).
-  # environment.systemPackages = with pkgs; [
-  #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #   wget
-  # ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
-  # This option defines the first version of NixOS you have installed on this particular machine,
-  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-  #
-  # Most users should NEVER change this value after the initial install, for any reason,
-  # even if you've upgraded your system to a new NixOS release.
-  #
-  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
-  # to actually do that.
-  #
-  # This value being lower than the current NixOS release does NOT mean your system is
-  # out of date, out of support, or vulnerable.
-  #
-  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-  # and migrated your data accordingly.
-  #
-  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "25.05"; # Did you read the comment?
 
 }
diff --git a/nodes/hosts/lappy/services/touchpad.nix b/nodes/hosts/lappy/services/touchpad.nix
new file mode 100644
index 0000000..6dc1887
--- /dev/null
+++ b/nodes/hosts/lappy/services/touchpad.nix
@@ -0,0 +1,4 @@
+{ pkgs, ...}: {
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.libinput.enable = true;
+}