diff --git a/flake.nix b/flake.nix
index a7c4f34..67b88fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,7 +99,6 @@
     hercules-ci-effects = {
       url = "github:hercules-ci/hercules-ci-effects";
       inputs.flake-parts.follows = "flake-parts";
-      inputs.hercules-ci-agent.follows = "hercules-ci-agent";
     };
     nh = {
       url = "github:viperML/nh";
diff --git a/hosts/default.nix b/hosts/default.nix
index 948d479..2e7b9c4 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -15,6 +15,7 @@
   ];
 
   builders = let
+    # FIXME: Move to common
     sharedOptions = {
       inputs',
       lib,
@@ -37,10 +38,9 @@
           enable = true;
           config = {
             home.packages = let
-              wrappers = lib.attrValues inputs'.settei.packages;
               extraPkgs = [inputs'.nh.packages.default];
             in
-              wrappers ++ extraPkgs;
+              [inputs'.settei.packages.base-packages] ++ extraPkgs;
 
             programs.git.enable = true;
             home.sessionVariables.EDITOR = "hx";
diff --git a/modules/nixos/settei/sane-defaults.nix b/modules/nixos/settei/sane-defaults.nix
index 09c8064..8b9ea0a 100644
--- a/modules/nixos/settei/sane-defaults.nix
+++ b/modules/nixos/settei/sane-defaults.nix
@@ -21,7 +21,7 @@ in {
         home = "/home/${username}";
         group = username;
         extraGroups = ["wheel"];
-        # TODO: Probably move this out into common
+        # FIXME: Move to common
         openssh.authorizedKeys.keys = let
           configName' =
             args.configurationName
@@ -38,6 +38,7 @@ in {
     security.sudo.wheelNeedsPassword = false;
 
     # When NetworkManager isn't in use, add tailscale DNS address manually
+    # FIXME: Move to common
     networking = lib.mkIf (!nmEnabled && config.services.tailscale.enable && cfg.tailnet != null) {
       nameservers = [
         "100.100.100.100"
diff --git a/modules/shared/settei/sane-defaults.nix b/modules/shared/settei/sane-defaults.nix
index e87a092..99966d5 100644
--- a/modules/shared/settei/sane-defaults.nix
+++ b/modules/shared/settei/sane-defaults.nix
@@ -29,6 +29,7 @@
       username = lib.mkDefault username;
     };
 
+    # FIXME: Move to common
     services.tailscale.enable = true;
 
     networking.hostName = lib.mkDefault (
diff --git a/wrappers/default.nix b/wrappers/default.nix
index 06e4100..01c477d 100644
--- a/wrappers/default.nix
+++ b/wrappers/default.nix
@@ -20,7 +20,17 @@
         ./rash
       ];
     };
+    all-packages = wrapped.config.build.packages;
+    base-packages = pkgs.symlinkJoin {
+      name = "settei-base";
+      paths = with all-packages; [
+        rash
+        helix
+      ];
+    };
   in {
-    inherit (wrapped.config.build) packages;
+    packages = all-packages // {
+      inherit base-packages;
+    };
   };
 }
diff --git a/wrappers/rash/default.nix b/wrappers/rash/default.nix
index 8ee625e..3390ac5 100644
--- a/wrappers/rash/default.nix
+++ b/wrappers/rash/default.nix
@@ -40,9 +40,10 @@
       buildInputs = with pkgs; [readline];
     };
   in {
-    basePackage = pkgs.writeShellScriptBin "rash" ''
+    basePackage = pkgs.writeShellScriptBin "rash-repl" ''
       exec "${racket-with-libs}/bin/rash-repl" "$@"
     '';
+    # TODO: Shell shouldn't overwrite this variable. Probably
     env.XDG_CONFIG_HOME = {
       value = pkgs.linkFarm "rash-config" {
         "rash/rashrc" = ./rashrc;