diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 80046ef..a56569e 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -25,6 +25,7 @@
     # keep-sorted start
     "desktop"
     "dev"
+    "gui"
     # keep-sorted end
   ]);
 
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 67a1c36..b745929 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -13,6 +13,7 @@
     # keep-sorted start
     "desktop"
     "dev"
+    "gui"
     # keep-sorted end
   ]);
 
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index d85226d..209193a 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -23,6 +23,7 @@
     # keep-sorted start
     "desktop"
     "dev"
+    "gui"
     # keep-sorted end
   ]);
 
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 2fc7f29..1de2aff 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -13,6 +13,7 @@
     # keep-sorted start
     "desktop"
     "dev"
+    "gui"
     # keep-sorted end
   ]);
 
diff --git a/modules/home-manager/bundles/desktop.nix b/modules/home-manager/bundles/desktop.nix
index b85caa6..9287ba2 100644
--- a/modules/home-manager/bundles/desktop.nix
+++ b/modules/home-manager/bundles/desktop.nix
@@ -5,10 +5,9 @@
 {
   imports = util.toImports ../features [
     # keep-sorted start
-    "firefox"
-    "kitty"
-    "obsidian"
-    "zen-browser"
+    "aerc"
+    "mail"
+    "zellij"
     # keep-sorted end
   ];
 }
diff --git a/modules/home-manager/bundles/gui.nix b/modules/home-manager/bundles/gui.nix
new file mode 100644
index 0000000..b85caa6
--- /dev/null
+++ b/modules/home-manager/bundles/gui.nix
@@ -0,0 +1,14 @@
+{
+  util,
+  ...
+}:
+{
+  imports = util.toImports ../features [
+    # keep-sorted start
+    "firefox"
+    "kitty"
+    "obsidian"
+    "zen-browser"
+    # keep-sorted end
+  ];
+}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 6433535..56bc171 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -5,7 +5,6 @@
 {
   imports = util.toImports ./features [
     # keep-sorted start
-    "aerc"
     "agenix"
     "bat"
     "delta"
@@ -14,10 +13,8 @@
     "gh"
     "git"
     "lazygit"
-    "mail"
     "starship"
     "yazi"
-    "zellij"
     "zoxide"
     # keep-sorted end
   ];
diff --git a/modules/nixos/bundles/desktop.nix b/modules/nixos/bundles/desktop.nix
index 156acdc..b5b48c2 100644
--- a/modules/nixos/bundles/desktop.nix
+++ b/modules/nixos/bundles/desktop.nix
@@ -1,8 +1,5 @@
 {
-  # keep-sorted start
-  pkgs,
   util,
-  # keep-sorted end
   ...
 }:
 {
@@ -13,17 +10,4 @@
     "protonmail-bridge"
     # keep-sorted end
   ];
-
-  environment.systemPackages = with pkgs; [
-    # keep-sorted start
-    beeper
-    calibre
-    cameractrls-gtk3
-    jellyfin-desktop
-    # https://github.com/NixOS/nixpkgs/issues/437865
-    # jellyfin-media-player
-    onlyoffice-desktopeditors
-    textsnatcher
-    # keep-sorted end
-  ];
 }
diff --git a/modules/nixos/bundles/gui.nix b/modules/nixos/bundles/gui.nix
new file mode 100644
index 0000000..d1b81bc
--- /dev/null
+++ b/modules/nixos/bundles/gui.nix
@@ -0,0 +1,24 @@
+{
+  # keep-sorted start
+  pkgs,
+  util,
+  # keep-sorted end
+  ...
+}:
+{
+  imports = util.toImports ../features [
+    # keep-sorted start
+    "fonts"
+    # keep-sorted end
+  ];
+
+  environment.systemPackages = with pkgs; [
+    # keep-sorted start
+    beeper
+    cameractrls-gtk3
+    jellyfin-desktop
+    onlyoffice-desktopeditors
+    textsnatcher
+    # keep-sorted end
+  ];
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index c9e0229..05188b5 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -9,7 +9,6 @@
   imports = util.toImports ./features [
     # keep-sorted start
     "agenix"
-    "fonts"
     "localisation"
     "network"
     "nh"