diff --git a/modules/home-manager/terminal/default.nix b/modules/home-manager/terminal/default.nix
index b0e0182..02341fd 100644
--- a/modules/home-manager/terminal/default.nix
+++ b/modules/home-manager/terminal/default.nix
@@ -46,9 +46,6 @@
     ./voice.nix
     ./nvim
     ./zellij
-    ./tiny-irc.nix
-    ./pass.nix
-    ./gpg.nix
   ];
 
   programs = {
@@ -65,5 +62,5 @@
     };
   };
 
-  services.syncthing.enable = true;
+  services.ssh-agent.enable = true;
 }
diff --git a/modules/home-manager/terminal/gpg.nix b/modules/home-manager/terminal/gpg.nix
deleted file mode 100644
index ff5f8eb..0000000
--- a/modules/home-manager/terminal/gpg.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  programs.gpg.enable = true;
-
-  services.gpg-agent={
-    enable=true;
-    enableSshSupport = true;
-  };
-}
diff --git a/modules/home-manager/terminal/nushell/default.nix b/modules/home-manager/terminal/nushell/default.nix
index a1680ad..9a4543f 100644
--- a/modules/home-manager/terminal/nushell/default.nix
+++ b/modules/home-manager/terminal/nushell/default.nix
@@ -22,7 +22,6 @@
     enableNushellIntegration = true;
   };
   programs.direnv.enableNushellIntegration = true;
-  services.gpg-agent.enableNushellIntegration = true;
 
   services.pueue = {
     enable = true;
diff --git a/modules/home-manager/terminal/nushell/env.nu b/modules/home-manager/terminal/nushell/env.nu
index 2b3b764..ec4c366 100644
--- a/modules/home-manager/terminal/nushell/env.nu
+++ b/modules/home-manager/terminal/nushell/env.nu
@@ -21,8 +21,7 @@ $env.EDITOR = nvim
 $env.VISUAL = nvim
 $env.PIPENV_VENV_IN_PROJECT = 1
 $env.POETRY_VIRTUALENVS_IN_PROJECT = 1
-$env.XDG_DATA_HOME = ( $env.HOME | path join ".local" "share" )
-$env.PASSWORD_STORE_DIR = ($env.XDG_DATA_HOME | path join "password-store")
+$env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/ssh-agent"
 
 $env.NU_LIB_DIRS = [
     ...
diff --git a/modules/home-manager/terminal/nvim/toggleterm.nix b/modules/home-manager/terminal/nvim/toggleterm.nix
index 77b2547..7f75e5e 100644
--- a/modules/home-manager/terminal/nvim/toggleterm.nix
+++ b/modules/home-manager/terminal/nvim/toggleterm.nix
@@ -8,8 +8,6 @@
       enable = true;
       direction = "horizontal";
       insertMappings = false;
-      openMapping = ''<c-\>'';
-      terminalMappings = false;
     };
     keymaps = [
       {
diff --git a/modules/home-manager/terminal/pass.nix b/modules/home-manager/terminal/pass.nix
deleted file mode 100644
index c05ed3a..0000000
--- a/modules/home-manager/terminal/pass.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  programs.password-store = {
-    enable = true;
-  };
-
-  home.packages = with pkgs; [
-    ripasso-cursive
-  ];
-}
diff --git a/modules/home-manager/terminal/tiny-irc.nix b/modules/home-manager/terminal/tiny-irc.nix
deleted file mode 100644
index e650ec4..0000000
--- a/modules/home-manager/terminal/tiny-irc.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  programs.tiny = {
-    enable = true;
-    settings = {
-      servers = [
-        {
-          addr = "irc.libera.chat";
-          port = 6697;
-          tls = true;
-          realname = "Gabe Venberg";
-          nicks = ["toric"];
-          join = [
-            "#libera"
-            "#linux"
-            "#lobsters"
-            "#nixos"
-          ];
-          sasl = {
-            username="toric";
-            password={
-              command= "pass show libera";
-            };
-          };
-        }
-      ];
-      defaults = {
-        nicks = ["toric"];
-        realname = "Gabe Venberg";
-        tls = true;
-      };
-    };
-  };
-}
diff --git a/modules/home-manager/terminal/zsh.nix b/modules/home-manager/terminal/zsh.nix
index a96dca9..c77dbb4 100644
--- a/modules/home-manager/terminal/zsh.nix
+++ b/modules/home-manager/terminal/zsh.nix
@@ -10,7 +10,6 @@
   programs.carapace.enableZshIntegration = true;
   programs.direnv.enableZshIntegration = true;
   programs.kitty.shellIntegration.enableZshIntegration = true;
-  services.gpg-agent.enableZshIntegration = true;
   programs.zsh = {
     enable = true;
     enableCompletion = true;