diff --git a/machine/backyard/default.nix b/machine/backyard/default.nix
index 58eb05f..a3df489 100644
--- a/machine/backyard/default.nix
+++ b/machine/backyard/default.nix
@@ -31,12 +31,6 @@
   };
   users.groups.tvb = {};
 
-  environment.systemPackages = with pkgs; [
-    vim
-    git
-  ];
-
-  # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
   # Open ports in the firewall.
diff --git a/modules/beatific.nix b/modules/beatific.nix
index 5061d68..70a6d8f 100644
--- a/modules/beatific.nix
+++ b/modules/beatific.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  inherit (lib) mkDefault mkIf mkMerge mkOption types;
+  inherit (lib) mkDefault mkIf mkMerge mkOption mkOverride types;
   cfg = config.beatific;
 in {
   options = {
@@ -30,6 +30,12 @@ in {
           description = "Default locale settings";
           default = true;
         };
+
+        programs = mkOption {
+          type = types.bool;
+          description = "Default installed programs";
+          default = true;
+        };
       };
     };
   };
@@ -63,5 +69,18 @@ in {
         LC_TIME = "en_US.UTF-8";
       };
     })
+
+    (mkIf cfg.defaults.programs {
+      environment.systemPackages = with pkgs; [
+        curl
+        git
+        htop
+        python3
+        vim
+        wget
+      ];
+      # The nixpkgs default is "nano", so we go one priority higher
+      environment.variables.EDITOR = mkOverride 999 "vim";
+    })
   ];
 }