diff --git a/user/home.nix b/user/home.nix
index 3545c62..ef84225 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -14,9 +14,6 @@
   home.packages = [
     pkgs.spotify
     pkgs.slack
-    pkgs.bitwarden
-    pkgs.ncspot
-    pkgs.terraform
     pkgs.darktable
     pkgs.rawtherapee
     pkgs.signal-desktop
diff --git a/user/programs/bat/default.nix b/user/programs/bat/default.nix
new file mode 100644
index 0000000..0c4aedc
--- /dev/null
+++ b/user/programs/bat/default.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+
+  programs.bat = {
+    enable = true;
+    extraPackages = with pkgs.bat-extras; [
+      batdiff
+      batman
+      batgrep
+      batwatch
+    ];
+    themes = {
+      dracula = builtins.readFile (pkgs.fetchFromGitHub {
+        owner = "dracula";
+        repo = "sublime"; # Bat uses sublime syntax for its themes
+        rev = "26c57ec282abcaa76e57e055f38432bd827ac34e";
+        sha256 = "019hfl4zbn4vm4154hh3bwk6hm7bdxbr1hdww83nabxwjn99ndhv";
+      } + "/Dracula.tmTheme");
+    };
+  };
+}
diff --git a/user/programs/direnv/default.nix b/user/programs/direnv/default.nix
new file mode 100644
index 0000000..a448032
--- /dev/null
+++ b/user/programs/direnv/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+    enableBashIntegration = true;
+  };
+}
diff --git a/user/programs/fzf/default.nix b/user/programs/fzf/default.nix
new file mode 100644
index 0000000..6d874d0
--- /dev/null
+++ b/user/programs/fzf/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  programs.fzf = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/user/programs/gh/default.nix b/user/programs/gh/default.nix
new file mode 100644
index 0000000..cc1da73
--- /dev/null
+++ b/user/programs/gh/default.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  programs.gh = {
+    enable = true;
+  };
+}
diff --git a/user/programs/ssh/default.nix b/user/programs/ssh/default.nix
index 898ae4b..afe13fe 100644
--- a/user/programs/ssh/default.nix
+++ b/user/programs/ssh/default.nix
@@ -1,10 +1,12 @@
 { config, pkgs, ... }:
 
 {
-  home.file = {
-    ".ssh" = {
-      source = ./files;
-      recursive = true;
-    };
+  programs.ssh = {
+    enable = true;
+    controlMaster = "auto";
+    controlPath = "~/controls-ssh-%r@%h:%p";
+    extraConfig = ''
+      IdentityAgent ~/.1password/agent.sock
+    '';
   };
 }
diff --git a/user/programs/ssh/files/authorized_keys b/user/programs/ssh/files/authorized_keys
deleted file mode 100644
index cb773d8..0000000
--- a/user/programs/ssh/files/authorized_keys
+++ /dev/null
@@ -1,4 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCoklnJCZ77Pr9Vd89Wi5jlmRzRGAbGF63lxsRW46C0jwf3BT0B1rFDPr0Opi0uFG5dMbIN9YbXHnh2rVFjxhBqifkWU0zOTRcRNZUI4p28RR0H7wCPohMCOvalkf8NGbNSkBi47nVMUauJ2CASlgyGeSg6kvAtB8y4i/jF0pBsFaOdu2J088itPqoHjqFIlQ3p8lefGm2Fsj5V5g7xtPuhPmR8tvU+K1iPauptLMLbfeqNVlHoMZq0LoGnMkgx0gwFatt3Pyhe91HFJBX+Kd/yN8nkokkEd/abkbiJ2OkeHfF94NMyco9VlgRTXpkxnAldHp7a4OJGdiVh0d+k0B7EEXMQgq9M2+kBBjOBN4f3nw6ftZyJ3hYsK0K9eL/gVV14jDyt1d07xedfkBauLV1HObYd1mSily8nJZkHAQHvpjToktwwfmoNvhHBdIZm11NxoRTz4T6Pn98TCksR4UtT2jOcdlb/agSYoGMLEyw1yvSSu8Q8I3FrjPh/qfA4Ssjk2DD9HqUu1G9EMB3p/3C6LblBK1KJmpjpPFNRw7Qc/ntJ9gtb3xUlDQi7AcOitjNVVR1prvC4dQ0l2O5bXw6wInLXz2JJiyhwTtSl+Du+Ng1JnAL4EXCPrXcPTV5Jqz9h3l/crULEctFZUGQbVSyhjQbb9WxfedQVE+aEetNC2Q==
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZob/qPQN/9Fb+wVF4pcGtQiho5sVkSgr9V6ISSA5MrOTX0C7H6CHZY+2imEyu0wa14UTte03gwXuHR3ibwwHdGWFd6oMmu9C1MpNIdHn7HIT/Z7vFCO0ra/cErKpDRSrkPkqk6VkTZtpj+3xAEhjHIANfA2U0Uedzq9+p7CdO6HIH0z9jxgCb1pyJP0B6XAqiRphwS1h1DIZIfvp2Ffsx4cG7lcn8v4w7RaDVJ2HPnxeUeR9Y0TvBq+JQdwIEFL8vRdKNktzc1wPyLL0/u6qplWEF+t2V3WmTc6VS6TeFsnClEH/voiM5edQy9oZPxuV3OurCE8j8i8ciR2UlgRdy28Rt0b4NGkvlKDVt08aLmWVuLCmdWRctD7M8YqmDB/9TX/wN5Hj03sdF2duQarQMOheBtsL6OvNT1yHn0FveNZfvuxDP1GliOy5lPqp9izPkvGSFEnxiiPUzMpVVZfrI6DucqLms7EAF6RjKPbWE5xELcj+I412eTp56hUy1bXUH2Gx91tGnTNlxaRDDVXN2S+wB0TgAbFwmNfK4J9Th6TakXoyZHmoaTsTmpMRnj40rtp88ZvT8I8gMosXVqben8jccX5ZUWlTSMvaUjpBEMTmvuaHBv7qrH2itF/3ODqA8g2uXmcIkdW6PA9kxWG5IXRMCqmLuDBqhRpgw2jJP6w==
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCz43+8OPbXxTdWOvIzLKTZmXQzTvoE/Nu3K0+HA80m4HmILz9Ypv4G7HYZocw4WqhveWPUVJnjXbMNrQ1K00CeMqlEqUZj0CXfnDYyd2qDEj+eKmoL8tAFyDdEFmUvn9XfM45yanZ3Rhi1tnVMzsfkK+JQTf7jU5br1bC2XU62J/rymC4M13IDcxhqjrc+TlYafRdlSgt1NeZh/cgxMdesTvHCAIoVVqPcTxrOSK8X9lJGBc2+rnllXFBRxokur34DWuKpd4rVqbENzyuCqVvEASZQGoy9m1NEi+FJRoJy98YQXEDyna6/BCrIQ58wMOYCg1gtD5Cih9ht6bmb9iiZcmj6R25vaeqnhGdbMmWcQuv4DPpf2xV1yrY7FebazSHSZQgsc50ReO2jCnMNhun562gPq7q8Ge+xQzLdDICKyQxG1NSnuq+azxzPuXmx/y/hMEOcu4WcrTGgRtKIIMFcqKF0OIw2YGpoYuqOp1yyjp+RDdnXEDNSYR6o9ZiYvXUdqRoWEQlYIqM42M6tLwKMXIPyAwmoq5PruhU/HAppCx3UoMDUE5I+L2BEVglL3iXw+eDgoiltfKKiTul7C9D2aGEi+FRRiKjQUvT6aBnXIit+iU6i4m0WJKvFE4oAX0e7/t3GQW1ycsDj15F5RpcNX8p+pbH0e9B1Uye7TFySSQ==
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCj8wspkAnOpEmipwB/xd8vpEx9aqNbyjD2xzv0msDJvYMn26ZO3cbtbWbMI9Uns55aHcL0bStdbaJQIcL8ZVzvQtKq+spdZYQpN4cFlN16HXKR/UjBYtJEdHVxb2cwb2DM04aLDuAlCAJGChEAqpIQFpvlByyAaxSPwor5Cy5JHmm5fMkvcJEvPtxQOo4yovY8qW9scWlOCrzNSAYtBwTGG8REcRuTaEW9EJlmn8QZA+T+cE7nFdZOlmm752jW9wBCAIKlg6W5gX0rysSxy+MkKB/2ohpLI+0SeWAM8+CEtZjO7GP6xRPXZgrZJssytzQsJoiMTs6rJM5ovHUMVNPGDLCB6+8lWM7Jk4hh0lIQTOC5AMucH2jRJSyQb2AA3kbPuWOwHDDIlSUnNFsI/xUVs1lfx3ikIZEb9oZcKwWBB2PeL/KT6ca7dsI3PyFL+hC5Wi7ll0Aj5w+dBZOxwW1agSo4ujPKO9oIVwqEA+PqoK/GZtIHAx6t/m3DK8T4HAo2GZMqyzRgcqk1bttaCFzX2h074yW1du8+l4yIqWrooqD474V3MT05HUxkA1+9S5ldEwK4J50WfKlhNuZn5YeiHLngisu8WyIGREYDGlkM+1qxwHiJGohigS20kpmTUkKvyLRXItAcvQYBknCV3qb8B1Kj1bvbN3sCaqQAeVWxDw==
diff --git a/user/programs/ssh/files/config b/user/programs/ssh/files/config
deleted file mode 100644
index 71fe870..0000000
--- a/user/programs/ssh/files/config
+++ /dev/null
@@ -1,8 +0,0 @@
-Include ~/.ssh/config.d/*
-
-Host *
-  Controlmaster auto
-  Controlpath ${TMPDIR}/ssh-%r@%h:%p
-  IdentityAgent ~/.1password/agent.sock
-
-
diff --git a/user/programs/ssh/files/config.d b/user/programs/ssh/files/config.d
deleted file mode 120000
index 9e90cea..0000000
--- a/user/programs/ssh/files/config.d
+++ /dev/null
@@ -1 +0,0 @@
-../.dotfiles/git/.ssh/config.d
\ No newline at end of file
diff --git a/user/programs/ssh/files/known_hosts b/user/programs/ssh/files/known_hosts
deleted file mode 100644
index e69de29..0000000
diff --git a/user/programs/terminal/default.nix b/user/programs/terminal/default.nix
index 7437343..3458e8d 100644
--- a/user/programs/terminal/default.nix
+++ b/user/programs/terminal/default.nix
@@ -2,20 +2,19 @@
 
 {
   imports = [
+    ../fzf
+    ../direnv
+    ../gh
     ../tmux
     ../ssh
     ../git
     ../neovim
+    ../bat
   ];
   home.packages = [
     pkgs.eza
-    pkgs.bat
-    pkgs.fzf
     pkgs.fd
     pkgs.curl
-    pkgs.jq
-    pkgs.rustup
-    pkgs.bitwarden-cli
     pkgs.silver-searcher
     pkgs.ripgrep
     pkgs.thefuck
@@ -27,12 +26,14 @@
     pkgs.nodePackages.yarn
     pkgs.nodePackages.yo
     pkgs.python3
-    pkgs.gh
     pkgs.binutils
     pkgs.pkg-config
   ];
 
+  programs.jq.enable = true;
   programs.zsh.enable = true;
+  programs.yt-dlp.enable = true;
+
   home.file = {
     ".env".source = ./files/env;
     ".zshrc".source = ./files/zshrc;
diff --git a/user/programs/terminal/files/shell/rc.d/02-bat.sh b/user/programs/terminal/files/shell/rc.d/02-bat.sh
deleted file mode 100644
index 49ed73a..0000000
--- a/user/programs/terminal/files/shell/rc.d/02-bat.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if hash bat &> /dev/null; then
-  export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-  export BAT_THEME="MonokaiExtended"
-  alias cat="bat"
-fi
-
diff --git a/user/programs/terminal/files/shell/rc.d/03-ssh.sh b/user/programs/terminal/files/shell/rc.d/03-ssh.sh
deleted file mode 100644
index 965cfe9..0000000
--- a/user/programs/terminal/files/shell/rc.d/03-ssh.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-export TMPDIR=${TMPDIR:-/tmp}
-
-if ! pgrep -U "$UID" ssh-agent > /dev/null; then
-    ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
-fi
-if [[ ! "$SSH_AUTH_SOCK" ]]; then
-    eval "$(<"$XDG_RUNTIME_DIR/ssh-agent.env")"
-fi
diff --git a/user/programs/terminal/files/shell/rc.d/10-vault.zsh b/user/programs/terminal/files/shell/rc.d/10-vault.zsh
deleted file mode 100644
index 011a53b..0000000
--- a/user/programs/terminal/files/shell/rc.d/10-vault.zsh
+++ /dev/null
@@ -1,26 +0,0 @@
-function _bw_replace_env() {
-  env | while IFS= read -r line; do
-    value=${line#*=}
-    name=${line%%=*}
-    if [[ $value = bw://* ]]; then;
-      item=${value:5}
-      secret=`bw get password $item`
-      export $name="$secret"
-    fi
-  done
-}
-
-function clam-open() {
-  command=$1
-  if [[ -z "$BW_SESSION" ]]; then;
-    export BW_SESSION=`bw unlock --raw`
-  fi 
-  _bw_replace_env
-  if [[ ! -z "$command" ]]; then;
-    eval $command
-  fi
-}
-
-function clam-close() {
-  unset BW_SESSION
-}