diff --git a/hosts/yodaGaming/configuration.nix b/hosts/yodaGaming/configuration.nix
index a29256e..267953f 100644
--- a/hosts/yodaGaming/configuration.nix
+++ b/hosts/yodaGaming/configuration.nix
@@ -28,7 +28,8 @@
       #../../modules/gnome-terminal.nix
       ../../modules/blackbox.nix
 
-      ../../modules/programs.nix
+      ../../modules/programs-base.nix
+      #../../modules/programs.nix
       ../../modules/flatpak.nix
       ../../modules/signal-desktop.nix
       #../../modules/games.nix
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index b77a57d..e34a37a 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -30,6 +30,7 @@
       #../../modules/gnome-terminal.nix
       ../../modules/blackbox.nix
 
+      ../../modules/programs-base.nix
       ../../modules/programs.nix
       ../../modules/flatpak.nix
       ../../modules/nextcloud-client.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 47a1e25..319cf5e 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -32,6 +32,7 @@
       #../../modules/gnome-terminal.nix
       ../../modules/blackbox.nix
 
+      ../../modules/programs-base.nix
       ../../modules/programs.nix
       ../../modules/flatpak.nix
       ../../modules/ausweisapp.nix
diff --git a/modules/programs-base.nix b/modules/programs-base.nix
new file mode 100644
index 0000000..c33bd65
--- /dev/null
+++ b/modules/programs-base.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+{
+  users.users.yoda = {
+    packages = with pkgs; [
+      btop # Terminal resource monitor / task manager
+      htop # Terminal resource monitor / task manager
+      colmena
+
+      gnome.gnome-tweaks
+      gnome.dconf-editor
+      unstable.resources # Resource monitor / task manager
+
+      #gnome-secrets # Password manager (Native Wayland client), but very slow.
+      keepassxc # Password manager. TODO Wayland: Maybe QT_QPA_PLATFORM defined in ghostwriter.nix fixed blurry fonts?
+      warp # Fast and secure file transfer
+    ];
+  };
+}
diff --git a/modules/programs.nix b/modules/programs.nix
index 8fa8aa1..d064997 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -9,14 +9,9 @@
       # CLI apps
       gnumake # make
       wget
-      btop # Terminal resource monitor / task manager
-      htop # Terminal resource monitor / task manager
       killall
-      colmena
 
       # Graphical apps
-      gnome.gnome-tweaks
-      gnome.dconf-editor
       meld # Diff and merge tool
       # Rip DVD and Blu-ray; rotate and export videos.
       # Requires gstreamer with plugins to preview encoded video.
@@ -61,9 +56,6 @@
       # Graphical apps
 
       epiphany # Web browser
-      unstable.resources # Resource monitor / task manager
-      #gnome-secrets # Password manager (Native Wayland client), but very slow.
-      keepassxc # Password manager. TODO Wayland: Maybe QT_QPA_PLATFORM defined in ghostwriter.nix fixed blurry fonts?
       tartube-yt-dlp # Video downloader (front-end for yt-dlp)
       rnote # Handwritten notes
       xournalpp # Handwritte notes
@@ -77,7 +69,6 @@
       gnome-solanum  # Pomodoro timer
       jameica # Hibiscus plugin -> HBCI online banking. Sparkasse-Nürnberg https://www.willuhn.de/wiki/doku.php?id=support:list:banken:spk#nuernberg.
       picard # Music tagger by MusicBrainz
-      warp # Fast and secure file transfer
     ];
   };
 }