diff --git a/common/environment.nix b/common/environment.nix
index 384e88d..f9d3a84 100644
--- a/common/environment.nix
+++ b/common/environment.nix
@@ -2,6 +2,7 @@
 
 {
   environment.systemPackages = with pkgs; [
+    btop
     git
     lshw
     parted
diff --git a/home/qenya/cli.nix b/home/qenya/cli.nix
deleted file mode 100644
index a564d78..0000000
--- a/home/qenya/cli.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    tree # like `ls -R` but nicer
-    units
-
-    # Extremely important
-    fortune
-    cowsay
-    lolcat
-  ];
-
-  programs.btop.enable = true;
-}
diff --git a/home/qenya/default.nix b/home/qenya/default.nix
index 6745dc1..81b072c 100644
--- a/home/qenya/default.nix
+++ b/home/qenya/default.nix
@@ -2,9 +2,9 @@
   imports = [
     ./dconf
     ./plasma
-    ./cli.nix
     ./firefox.nix
     ./git.nix
+    ./packages.nix
     ./tmux.nix
     ./vscode.nix
     ./xdg-mime-apps.nix
diff --git a/home/qenya/firefox.nix b/home/qenya/firefox.nix
index 8e4d3bb..66b202d 100644
--- a/home/qenya/firefox.nix
+++ b/home/qenya/firefox.nix
@@ -1,7 +1,12 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, osConfig, ... }:
 
+let
+  inherit (lib) mkIf;
+in
 {
-  programs.firefox = {
+  programs.firefox = lib.mkIf osConfig.qenya.base-graphical.enable {
+    enable = true;
+
     # coming in 24.11
     # languagePacks = [ "en-GB" ];
 
diff --git a/home/qenya/packages.nix b/home/qenya/packages.nix
new file mode 100644
index 0000000..97d7442
--- /dev/null
+++ b/home/qenya/packages.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, osConfig, ... }:
+
+let
+  inherit (lib) optionals;
+in
+{
+  home.packages = with pkgs; [
+    tree # like `ls -R` but nicer
+    units
+
+    # Extremely important
+    fortune
+    cowsay
+    lolcat
+  ] ++ optionals osConfig.qenya.base-graphical.enable [
+    bitwarden
+    discord
+    feishin
+    gimp-with-plugins
+    jellyfin-media-player
+    tor-browser-bundle-bin
+    zoom-us
+
+    # libreoffice
+    libreoffice
+    hunspell
+    hunspellDicts.en_GB-ise
+  ];
+}
diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix
index 5a4c9bd..6a09189 100644
--- a/home/qenya/vscode.nix
+++ b/home/qenya/vscode.nix
@@ -4,7 +4,8 @@ let
   inherit (lib) mkIf;
 in
 {
-  programs.vscode = {
+  programs.vscode = mkIf osConfig.qenya.base-graphical.enable {
+    enable = true;
     enableExtensionUpdateCheck = false;
     enableUpdateCheck = false;
     package = pkgs.vscodium;
diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index 636f709..3d0129c 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -29,19 +29,6 @@
   users.users.qenya.hashedPasswordFile = config.age.secrets.user-password-kilgharrah-qenya.path;
   users.users.qenya.extraGroups = [ "wheel" ];
   home-manager.users.qenya = {
-    programs.firefox.enable = true;
-    programs.vscode.enable = true;
-
-    home.packages = with pkgs; [
-      bitwarden
-      discord
-      feishin
-      gimp-with-plugins
-      jellyfin-media-player
-      tor-browser-bundle-bin
-      zoom-us
-    ];
-
     # For the moment, this hosts some network-accessible services, so we want it on 24/7
     programs.plasma.powerdevil.AC.autoSuspend.action = "nothing";
   };
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index 4c4ba25..f1a62ba 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -1,28 +1,12 @@
 { config, lib, pkgs, ... }:
 
 {
-  programs.firefox.enable = true;
-  programs.vscode.enable = true;
-
   home.packages = with pkgs; [
-    bitwarden
-    discord
-    feishin
-    gimp-with-plugins
-    jellyfin-media-player
     keepassxc
-    tor-browser-bundle-bin
-    zoom-us
-
     amberol
     foliate
     nicotine-plus
 
-    # libreoffice
-    libreoffice
-    hunspell
-    hunspellDicts.en_GB-ise
-
     # games
     openttd
     prismlauncher