diff --git a/modules/nixos/bundles/desktop/default.nix b/modules/nixos/bundles/desktop/default.nix
new file mode 100644
index 0000000..91484f8
--- /dev/null
+++ b/modules/nixos/bundles/desktop/default.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.bundles.desktop;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.bundles.desktop.enable = lib.mkEnableOption "desktop";
+
+  config = lib.mkIf cfg.enable {
+    marleyos = {
+      mounts.babeshare = enabled;
+
+      appearance = {
+        base = enabled;
+        console = enabled;
+      };
+
+      programs = {
+        cli = enabled;
+        tui = enabled;
+        gui = enabled;
+      };
+    };
+  };
+}
diff --git a/modules/nixos/programs/cli/default.nix b/modules/nixos/programs/cli/default.nix
index 5559667..fbeaf40 100644
--- a/modules/nixos/programs/cli/default.nix
+++ b/modules/nixos/programs/cli/default.nix
@@ -11,6 +11,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     marleyos.programs = {
+      fish = enabled;
+      nh = enabled;
     };
   };
 }
diff --git a/modules/nixos/programs/nh/default.nix b/modules/nixos/programs/cli/nh/default.nix
similarity index 100%
rename from modules/nixos/programs/nh/default.nix
rename to modules/nixos/programs/cli/nh/default.nix
diff --git a/modules/nixos/programs/gui/default.nix b/modules/nixos/programs/gui/default.nix
index e69de29..3a114ec 100644
--- a/modules/nixos/programs/gui/default.nix
+++ b/modules/nixos/programs/gui/default.nix
@@ -0,0 +1,18 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.gui;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.programs.gui.enable = lib.mkEnableOption "gui";
+
+  config = lib.mkIf cfg.enable {
+    marleyos.programs = {
+      lutris = enabled;
+      steam = enabled;
+    };
+  };
+}
diff --git a/modules/nixos/programs/lutris/default.nix b/modules/nixos/programs/gui/lutris/default.nix
similarity index 100%
rename from modules/nixos/programs/lutris/default.nix
rename to modules/nixos/programs/gui/lutris/default.nix
diff --git a/modules/nixos/programs/steam/default.nix b/modules/nixos/programs/gui/steam/default.nix
similarity index 100%
rename from modules/nixos/programs/steam/default.nix
rename to modules/nixos/programs/gui/steam/default.nix
diff --git a/modules/nixos/programs/hyprlock/default.nix b/modules/nixos/programs/hyprland/hyprlock/default.nix
similarity index 100%
rename from modules/nixos/programs/hyprlock/default.nix
rename to modules/nixos/programs/hyprland/hyprlock/default.nix
diff --git a/modules/nixos/programs/tui/default.nix b/modules/nixos/programs/tui/default.nix
index e69de29..01cd0f7 100644
--- a/modules/nixos/programs/tui/default.nix
+++ b/modules/nixos/programs/tui/default.nix
@@ -0,0 +1,16 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.tui;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.programs.tui.enable = lib.mkEnableOption "tui";
+
+  config = lib.mkIf cfg.enable {
+    marleyos.programs = {
+    };
+  };
+}
diff --git a/systems/x86_64-linux/nyx/default.nix b/systems/x86_64-linux/nyx/default.nix
index a264889..60f1168 100644
--- a/systems/x86_64-linux/nyx/default.nix
+++ b/systems/x86_64-linux/nyx/default.nix
@@ -11,20 +11,10 @@ in {
   marleyos = {
     hasNvidia = true;
     mounts.babeshare = enabled;
+
+    bundles.desktop = enabled;
+
     wayland.hyprland = enabled;
-
-    appearance = {
-      base = enabled;
-      console = enabled;
-    };
-
-    programs = {
-      fish = enabled;
-      lutris = enabled;
-      nh = enabled;
-      steam = enabled;
-    };
-
     services = {
       ly = enabled;
     };