diff --git a/modules/linux/xserver.nix b/modules/linux/xserver.nix
index ec1f0f1..c04ffb7 100644
--- a/modules/linux/xserver.nix
+++ b/modules/linux/xserver.nix
@@ -1,8 +1,19 @@
-{ pkgs, ... }: {
+{ pkgs, lib, config, ... }: let
+  inherit (lib) optionalAttrs;
+in {
   # TODO: write i3 and i3status here instead of stowing
+  virtualisation.vmware.guest.enable = true;
+
+  environment.systemPackages = [ pkgs.fuzzel ];
+  programs.niri.enable = config.isServer;
+
   services.xserver = {
     enable = true;
 
+    # Configure keymap in X11
+    # services.xserver.xkb.options = "eurosign:e,caps:escape";
+    xkb.layout = "us,ru";
+
     displayManager = {
       lightdm = {
         enable = true;
@@ -14,7 +25,7 @@
       };
     };
 
-    windowManager.i3 = {
+    windowManager.i3 = optionalAttrs (!config.isServer) {
       enable = true;
       package = pkgs.i3;
       configFile = ../home/dotfiles/i3/config;
@@ -35,10 +46,6 @@
     };
   };
 
-  # Configure keymap in X11
-  services.xserver.xkb.layout = "us,ru";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
   # home.file.".xprofile".text = ''
   #   xrandr --output HDMI-0 --primary
   # '';