diff --git a/homes/x86_64-linux/marley@nyx/default.nix b/homes/x86_64-linux/marley@nyx/default.nix
index 2330399..8d88b7c 100644
--- a/homes/x86_64-linux/marley@nyx/default.nix
+++ b/homes/x86_64-linux/marley@nyx/default.nix
@@ -54,8 +54,6 @@ in
       neo = enabled;
       rbw = enabled;
       ripgrep = enabled;
-      # TODO: is this xorg only? bundle under xorg if so
-      rofi = enabled;
       ssh = enabled;
       starship = enabled;
       systemctl = enabled;
@@ -67,14 +65,11 @@ in
     };
     services = {
       clipboard = enabled;
-      # TODO: bundle this under xorg
-      dunst = enabled;
-      # TODO: bundle this with xorg
-      polybar = enabled;
       syncthing = enabled;
     };
     xorg = {
       xsession = enabled;
+      i3 = enabled;
     };
   };
 
diff --git a/modules/home/xorg/i3/default.nix b/modules/home/xorg/i3/default.nix
new file mode 100644
index 0000000..e1e89d1
--- /dev/null
+++ b/modules/home/xorg/i3/default.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  config,
+  ...
+}:
+let
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
+
+  cfg = config.marleyos.xorg.i3;
+in
+{
+  options.marleyos.xorg.i3.enable = mkEnableOption "i3";
+
+  config = mkIf cfg.enable {
+    marleyos = {
+      programs.rofi = enabled;
+      services.polybar = enabled;
+      services.dunst = enabled;
+    };
+  };
+}