diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index a53d695..d337ac1 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -32,28 +32,6 @@
 
   virtualisation.docker.enable = true;
 
-  # Enable the X11 windowing system.
-  services.xserver = {
-    enable = true;
-    layout = "gb";
-
-    libinput = {
-      enable = true;
-      mouse = {
-        accelProfile = "flat";
-        accelSpeed = "1";
-      };
-    };
-
-    displayManager = {
-      gdm.enable = true;
-    };
-
-    windowManager.i3.enable = true;
-
-  };
-  
-
   # Enable sound.
   services.pipewire = {
 	enable = true;
@@ -84,7 +62,6 @@
     firefox
     gcc
     git
-    i3
     ripgrep
     wget
     zsh
diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix
new file mode 100644
index 0000000..4d53d21
--- /dev/null
+++ b/hosts/common/graphical/default.nix
@@ -0,0 +1,27 @@
+{ config, pkgs, ...}:
+
+{
+  # Enable the X11 windowing system.
+  services.xserver = {
+    enable = true;
+    layout = "gb";
+
+    libinput = {
+      enable = true;
+      mouse = {
+        accelProfile = "flat";
+        accelSpeed = "1";
+      };
+    };
+
+    displayManager = {
+      gdm.enable = true;
+    };
+
+    windowManager.i3 = {
+      enable = true;
+      package = pkgs.i3-gaps;
+    };
+  };
+}
+
diff --git a/hosts/dingbox/configuration.nix b/hosts/dingbox/configuration.nix
index 51e2bdf..f854e62 100644
--- a/hosts/dingbox/configuration.nix
+++ b/hosts/dingbox/configuration.nix
@@ -10,6 +10,7 @@
       ./hardware-configuration.nix
       ./syncthing
       ../common
+      ../common/graphical
     ];
 
   services.xserver = {