diff --git a/user-modules/desktop/window-manager/i3.nix b/user-modules/desktop/window-manager/i3.nix
index 12359ab..6d5903f 100644
--- a/user-modules/desktop/window-manager/i3.nix
+++ b/user-modules/desktop/window-manager/i3.nix
@@ -13,7 +13,7 @@ in
 
   config = lib.mkIf cfg.enable {
     # Set desktop type to x11
-    modules.desktop.x11 = true;
+    # modules.desktop.x11 = true;
     modules.rofi.enable = true;
 
     modules.desktop.initScript = ''
diff --git a/user-modules/systemwide/default.nix b/user-modules/systemwide/default.nix
index bc88457..522e0a5 100644
--- a/user-modules/systemwide/default.nix
+++ b/user-modules/systemwide/default.nix
@@ -4,6 +4,7 @@
   imports = [
     # Import systemwide configuration files.
     ./docker.nix
+    ./i3.nix
     ./keyring.nix
     ./river.nix
     ./steam.nix
diff --git a/user-modules/systemwide/i3.nix b/user-modules/systemwide/i3.nix
new file mode 100644
index 0000000..f41371c
--- /dev/null
+++ b/user-modules/systemwide/i3.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  enabled = any (user: user.modules.i3.enable) (attrValues config.home-manager.users);
+in
+{
+  config = mkIf enabled {
+    services.xserver = {
+      layout = "us";
+      xkbVariant = "";
+      enable = true;
+      windowManager.i3.enable = true;
+      desktopManager = {
+        xterm.enable = true;
+        noDesktop = true;
+        enableXfwm = false;
+      };
+    };
+  };
+}
diff --git a/users/jan.nix b/users/jan.nix
index 1a9ada2..20edb49 100644
--- a/users/jan.nix
+++ b/users/jan.nix
@@ -41,10 +41,10 @@
 
       # Window manager
       i3.enable = true;
-      # river.enable = true;
-      # waylock.enable = true;
-      # waybar.enable = true;
-      # glpaper.enable = false;
+      river.enable = true;
+      waylock.enable = true;
+      waybar.enable = true;
+      glpaper.enable = false;
 
       # Desktop environment
       mako.enable = true;