3 files changed, 5 insertions, 9 deletions
diff --git a/users/tazjin/nixos/arbat/default.nix b/users/tazjin/nixos/arbat/default.nix
index 3bf039e94bae..c87aa445c29c 100644
--- a/users/tazjin/nixos/arbat/default.nix
+++ b/users/tazjin/nixos/arbat/default.nix
@@ -66,8 +66,6 @@ in
     mouse.naturalScrolling = false;
     mouse.disableWhileTyping = true;
   };
-  # services.xserver.libinput.touchpad.clickMethod = "clickfinger";
-  # services.xserver.libinput.touchpad.tapping = false;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   system.stateVersion = "24.11";
diff --git a/users/tazjin/nixos/modules/desktop.nix b/users/tazjin/nixos/modules/desktop.nix
index f59b868ad363..6f7c8906334b 100644
--- a/users/tazjin/nixos/modules/desktop.nix
+++ b/users/tazjin/nixos/modules/desktop.nix
@@ -14,11 +14,7 @@
     libinput.enable = true;
 
     xserver = {
-      enable = true;
-      xkb.layout = "us";
-      xkb.options = "caps:super";
-
-      displayManager.sessionPackages = [ pkgs.niri ];
+      enable = true; # wayland doesn't work otherwise ...?!
       displayManager.gdm = {
         enable = true;
         wayland = true;
@@ -26,6 +22,8 @@
     };
   };
 
+  services.displayManager.sessionPackages = [ pkgs.niri ];
+
   programs.xwayland.enable = true;
 
   environment.systemPackages = with pkgs; [
diff --git a/users/tazjin/nixos/zamalek/default.nix b/users/tazjin/nixos/zamalek/default.nix
index e6159444d246..ebaf2d2cfa6d 100644
--- a/users/tazjin/nixos/zamalek/default.nix
+++ b/users/tazjin/nixos/zamalek/default.nix
@@ -74,8 +74,8 @@ in
     graphics.enable = true;
   };
 
-  services.xserver.libinput.touchpad.clickMethod = "clickfinger";
-  services.xserver.libinput.touchpad.tapping = false;
+  services.libinput.touchpad.clickMethod = "clickfinger";
+  services.libinput.touchpad.tapping = false;
   services.avahi.enable = true;
   services.tailscale.enable = true;