Laptops extend from user-facing, user-facing needs xorg

common/laptop-things.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
+  imports = [
+    ./user-facing.nix
+  ];
+
   services.logind = {
     extraConfig = "HandlePowerKey=suspend";
     lidSwitch = "suspend";
@@ -10,8 +14,8 @@
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "us,us";
+    layout = lib.mkForce "us,us";
-    xkbVariant = "dvorak,";
+    xkbVariant = lib.mkForce "dvorak,";
     xkbOptions = "grp:win_space_toggle";
   };
 

common/user-facing.nix

@@ -7,16 +7,44 @@
   sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
-  services.pipewire = {
+  services = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
 
-    # use the example session manager (no others are packaged yet so this is enabled by default,
+    pipewire = {
-    # no need to redefine it in your config for now)
+      enable = true;
-    # media-session.enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+
+      # use the example session manager (no others are packaged yet so this is enabled by default,
+      # no need to redefine it in your config for now)
+      # media-session.enable = true;
+    };
+  };
+
+  services.xserver = {
+    # Enable the X11 windowing system.
+    enable = true;
+
+    # Enable the KDE Plasma Desktop Environment.
+    desktopManager.plasma5.enable = true;
+
+    # Enable sddm, add exwm
+    displayManager = {
+      sddm.enable = true;
+      defaultSession = "none+exwm";
+    };
+
+    # Configure keymap in X11
+    layout = "us";
+    xkbVariant = "";
+
+    libinput = {
+      enable = true;
+      touchpad = {
+        naturalScrolling = true;
+      };
+    };
   };
 
   fonts = {

hosts/NixFrame/configuration.nix

@@ -3,7 +3,6 @@
   imports = [
     # ./home-git-repos.nix
     ../../common/configuration.nix
-    ../../common/user-facing.nix
     ../../common/development-machine.nix
     ../../common/laptop-things.nix
     ../../common/exwm.nix
@@ -18,13 +17,6 @@
   networking.hostName = "NixFrame"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
   services.syncthing = {
     enable = true;
     user = "benson";