diff --git a/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix b/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix
index b5b3417..2ec47f2 100755
--- a/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix
+++ b/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix
@@ -35,6 +35,7 @@ in
         nvim = enabled;
         opencode = enabled;
         pi = enabled;
+        zk = enabled;
       };
     };
 
diff --git a/modules/home/programs/terminal/bash/default.nix b/modules/home/programs/terminal/bash/default.nix
index 0eeeb3f..3f4644b 100755
--- a/modules/home/programs/terminal/bash/default.nix
+++ b/modules/home/programs/terminal/bash/default.nix
@@ -37,6 +37,8 @@ in
         bind "set show-mode-in-prompt on"
 
         set -o vi || true
+        source <(fzf --bash)
+
         VISUAL=vim
         EDITOR="$VISUAL"
 
@@ -72,6 +74,8 @@ in
       '';
     };
 
+    programs.fzf.enable = true;
+
     home.packages = with pkgs; [
       bashInteractive
       fastfetch
diff --git a/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua b/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua
index c8c873c..9dd7ded 100755
--- a/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua
@@ -189,7 +189,6 @@ setup_lsp("gopls", {
 			callback = organize_go_imports,
 		})
 	end,
-	cmd = { nix_vars.gopls },
 	filetypes = { "go" },
 	settings = {
 		gopls = {
diff --git a/modules/home/programs/terminal/nvim/default.nix b/modules/home/programs/terminal/nvim/default.nix
index b528e9b..ed56421 100755
--- a/modules/home/programs/terminal/nvim/default.nix
+++ b/modules/home/programs/terminal/nvim/default.nix
@@ -133,7 +133,6 @@ in
         go
         golangci-lint
         golangci-lint-langserver
-        gopls
         lua-language-server
         nil
         nodePackages.eslint
@@ -176,7 +175,6 @@ in
           bash = "${pkgs.bashInteractive}/bin/bash",
           clangd = "${pkgs.clang-tools}/bin/clangd",
           golintls = "${pkgs.golangci-lint-langserver}/bin/golangci-lint-langserver",
-          gopls = "${pkgs.gopls}/bin/gopls",
           luals = "${pkgs.lua-language-server}/bin/lua-language-server",
           sveltels = "${pkgs.nodePackages.svelte-language-server}/bin/svelteserver",
           tsls = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server",
diff --git a/modules/home/programs/terminal/zk/default.nix b/modules/home/programs/terminal/zk/default.nix
new file mode 100755
index 0000000..b69232a
--- /dev/null
+++ b/modules/home/programs/terminal/zk/default.nix
@@ -0,0 +1,22 @@
+{ lib
+, config
+, namespace
+, ...
+}:
+let
+  inherit (lib) mkIf;
+
+  cfg = config.${namespace}.programs.terminal.zk;
+in
+{
+  options.${namespace}.programs.terminal.zk = {
+    enable = lib.mkEnableOption "enable zk";
+  };
+
+  config = mkIf cfg.enable {
+    programs.zk = {
+      enable = true;
+    };
+    programs.fzf.enable = true;
+  };
+}