diff --git a/base/default.nix b/base/default.nix
index 03d0b3d..3331a09 100644
--- a/base/default.nix
+++ b/base/default.nix
@@ -3,6 +3,7 @@
   imports = [
     ./networking.nix
     ./nix.nix
+    ./programs.nix
     ./users.nix
   ];
 }
diff --git a/base/programs.nix b/base/programs.nix
new file mode 100644
index 0000000..8fbb19b
--- /dev/null
+++ b/base/programs.nix
@@ -0,0 +1,30 @@
+{ pkgs, ... }:
+{
+  programs = {
+    fish.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+      pinentryFlavor = "curses";
+    };
+    mosh.enable = true;
+    tmux.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    # shell usage
+    bat
+    ripgrep
+    wget
+
+    # development
+    git
+    gnupg
+    pinentry-curses
+    vim
+
+    # terminal utilities
+    htop
+    stow
+  ];
+}
diff --git a/hosts/poseidon/default.nix b/hosts/poseidon/default.nix
index 4d07c16..d8da552 100644
--- a/hosts/poseidon/default.nix
+++ b/hosts/poseidon/default.nix
@@ -43,34 +43,6 @@ in
   ];
   my.networking.externalInterface = "eno1";
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    bat
-    fish
-    git
-    gnupg
-    htop
-    pinentry-curses
-    ripgrep
-    stow
-    vim
-    wget
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  programs = {
-    fish.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-      pinentryFlavor = "curses";
-    };
-    mosh.enable = true;
-    tmux.enable = true;
-  };
-
   # List services that you want to enable:
   my.services = {
     bitwarden_rs = {