diff --git a/home/modules/baseline/xonsh.nix b/home/modules/baseline/xonsh.nix
index efa29d4..66f5c53 100644
--- a/home/modules/baseline/xonsh.nix
+++ b/home/modules/baseline/xonsh.nix
@@ -1,6 +1,16 @@
 { pkgs, config, ... }:
 
 {
+  # Programs that are used in the settings file
+  home.packages = with pkgs; [
+    bitwarden-cli
+    copier
+    git
+    gnused
+    nix-output-monitor
+    nvd
+  ];
+
   programs.xonsh = {
     enable = true;
 
@@ -49,7 +59,6 @@
       gh-personal = "$GH_CONFIG_DIR=\"${config.home.homeDirectory}/.config/gh/personal\" gh";
       ls = "ls --color";
       ll = "ls -l --color";
-      tf = "terraform";
 
       # Tailscale related ones
       tsup = "sudo tailscale up";
diff --git a/home/modules/baseline/xonsh_footer.xsh b/home/modules/baseline/xonsh_footer.xsh
index 59fb022..1867181 100644
--- a/home/modules/baseline/xonsh_footer.xsh
+++ b/home/modules/baseline/xonsh_footer.xsh
@@ -46,12 +46,6 @@ def _glrestart(args):
     sudo nixos-container run gitlab -- systemctl restart nginx
 aliases['glrestart'] = _glrestart
 
-def _cfetch(args):
-    bw_unlock()
-    $CIRCLECI_CLI_TOKEN=$(bw get password CircleCI)
-    compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache/fetch/cmd/fetch:fetch
-aliases['cfetch'] = _cfetch
-
 def _aws_creds(args):
     $AWS_ACCESS_KEY_ID=$(bw get username "AWS Access Key")
     $AWS_SECRET_ACCESS_KEY=$(bw get password "AWS Access Key")
diff --git a/modules/baseline.nix b/modules/baseline.nix
index af765f2..12c0cd8 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -99,8 +99,6 @@ in
     iperf
     killall
     nano
-    nix-output-monitor
-    nvd
     pciutils
     pwgen
     unzip