diff --git a/systems/x86_64-linux/greylag/compositor/default.nix b/systems/x86_64-linux/greylag/compositor/default.nix
new file mode 100644
index 0000000..d6a852e
--- /dev/null
+++ b/systems/x86_64-linux/greylag/compositor/default.nix
@@ -0,0 +1,3 @@
+{
+  chimera.compositors.niri.enable = true;
+}
diff --git a/systems/x86_64-linux/greylag/default.nix b/systems/x86_64-linux/greylag/default.nix
index 0aa5820..ee66083 100644
--- a/systems/x86_64-linux/greylag/default.nix
+++ b/systems/x86_64-linux/greylag/default.nix
@@ -4,6 +4,7 @@
     ./boot/filesystems
     ./boot/initrd
     ./boot/logs
+    ./compositor
     ./console
     ./cpu
     ./credentials/gnome-keyring
diff --git a/systems/x86_64-linux/saurosuchus/compositor/default.nix b/systems/x86_64-linux/saurosuchus/compositor/default.nix
new file mode 100644
index 0000000..6ade8c5
--- /dev/null
+++ b/systems/x86_64-linux/saurosuchus/compositor/default.nix
@@ -0,0 +1,3 @@
+{
+  chimera.compositors.hyprland.enable = true;
+}
diff --git a/systems/x86_64-linux/saurosuchus/default.nix b/systems/x86_64-linux/saurosuchus/default.nix
index a0106ab..6341e28 100644
--- a/systems/x86_64-linux/saurosuchus/default.nix
+++ b/systems/x86_64-linux/saurosuchus/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./console
+    ./compositor
     ./games
     ./hardware/boot
     ./hardware/cpu
diff --git a/systems/x86_64-linux/shorthair/hardware/boot/default.nix b/systems/x86_64-linux/shorthair/boot/default.nix
similarity index 100%
rename from systems/x86_64-linux/shorthair/hardware/boot/default.nix
rename to systems/x86_64-linux/shorthair/boot/default.nix
diff --git a/systems/x86_64-linux/shorthair/compositor/default.nix b/systems/x86_64-linux/shorthair/compositor/default.nix
new file mode 100644
index 0000000..d6a852e
--- /dev/null
+++ b/systems/x86_64-linux/shorthair/compositor/default.nix
@@ -0,0 +1,3 @@
+{
+  chimera.compositors.niri.enable = true;
+}
diff --git a/systems/x86_64-linux/shorthair/default.nix b/systems/x86_64-linux/shorthair/default.nix
index ddf78e2..8767771 100644
--- a/systems/x86_64-linux/shorthair/default.nix
+++ b/systems/x86_64-linux/shorthair/default.nix
@@ -1,10 +1,11 @@
 { ... }:
 {
   imports = [
+    ./boot
     ./backlight
+    ./compositor
     ./console
     ./games
-    ./hardware/boot
     ./hardware/cpu
     ./hardware/filesystems
     ./networking