diff --git a/home-cli.nix b/home-cli.nix
index 02351c3..3736adf 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -26,6 +26,7 @@ in
     bitwarden-cli
     awscli2
     claude-code
+    claude-code-acp
     opencode # see also: aider; toad;
     fd
     poppler-utils # pdftotext
@@ -76,6 +77,7 @@ in
     inherit (secrets.openai) OPENAI_API_KEY;
     inherit (secrets.gemini) GEMINI_API_KEY;
     inherit (secrets.gemini) GOOGLE_CLOUD_PROJECT;
+    inherit (secrets.anthropic) CLAUDE_CODE_OAUTH_TOKEN;
   };
 
   home.sessionPath = [
@@ -148,9 +150,9 @@ in
   programs.nix-your-shell.enable = true;
   programs.direnv.enable = true;
   programs.starship.enable = true;
-  # programs.television.enable = true; # WAIT config currently broken
-  # programs.nix-search-tv.enable = true;
-  programs.fzf.enable = true; # used by other apps, tmux, etc.
+  programs.television.enable = true; # WAIT config currently broken
+  programs.nix-search-tv.enable = true;
+  # programs.fzf.enable = true; # used by other apps, tmux, etc.
   programs.zoxide.enable = true;
   programs.bat.enable = true;
   programs.ripgrep.enable = true;
diff --git a/home-gui.nix b/home-gui.nix
index bf60e14..8eb44f3 100644
--- a/home-gui.nix
+++ b/home-gui.nix
@@ -1,11 +1,6 @@
 { pkgs, ... }:
 
-# Ghostty not building on my mac at the moment
-let
-  ghostty-mock = pkgs.writeShellScriptBin "gostty-mock" ''
-    true
-    '';
-in {
+{
   fonts.fontconfig.enable = true;
 
   home.packages = with pkgs; [
@@ -29,7 +24,7 @@ in {
   programs.ghostty = {
     enable = true;
     installBatSyntax = false;
-    package = ghostty-mock;
+    package = pkgs.ghostty-bin;
 
     settings = {
       font-family = "Iosevka NFM";
@@ -59,7 +54,6 @@ in {
       };
       buffer_font_size = 16;
       buffer_font_family = "Iosevka Nerd Font Mono";
-      # "ui_font_family": "Iosevka Nerd Font";
       vim = {
         enable_vim_sneak = true;
         use_smartcase_find = true;
diff --git a/home-nvim.nix b/home-nvim.nix
index ad4929c..bb0efd7 100644
--- a/home-nvim.nix
+++ b/home-nvim.nix
@@ -33,16 +33,16 @@
 
     keymaps = [
       { key = "<leader>e"; action = "<cmd>Neotree toggle<cr>"; }
-      { key = "<leader>ff"; action = "<cmd>Telescope find_files<cr>"; }
-      { key = "<leader>fr"; action = "<cmd>Telescope oldfiles<cr>"; }
-      { key = "<leader>/"; action = "<cmd>Telescope live_grep<cr>"; }
+      { key = "<leader>f"; action = "<cmd>Tv files<cr>"; }
+      { key = "<leader>/"; action = "<cmd>Tv text<cr>"; }
       { key = "<leader>bd"; action = "<cmd>bdelete<cr>"; }
+      { key = "<leader>nd"; action = "<cmd>NoiceDismiss<cr>"; }
       { key = "<S-l>"; action = "<cmd>bnext<cr>"; }
       { key = "<S-h>"; action = "<cmd>bprev<cr>"; }
     ];
 
     plugins = {
-      avante.enable = true;
+      # avante.enable = true;
       bufferline.enable = true;
       cmp = {
         enable = true;
@@ -56,9 +56,17 @@
       cmp-nvim-lsp.enable = true;
       cmp-buffer.enable = true;
       cmp-path.enable = true;
+      codecompanion = {
+        enable = true;
+        settings = {
+          strategies = {
+            chat = { adapter = "claude_code"; };
+            inline = { adapter = "claude_code"; };
+          };
+        };
+      };
       commentary.enable = true;
       csvview.enable = true;
-      # conform-nvim.enable = true;
       dashboard.enable = true;
       emmet.enable = true;
       flash.enable = true;
@@ -98,7 +106,6 @@
       nix.enable = true;
       noice.enable = true;
       nvim-autopairs.enable = true;
-      oil.enable = true;
       orgmode = {
         enable = true;
         settings.org_agenda_files = "~/Sync/Notes/*";
@@ -106,7 +113,6 @@
       };
       persistence.enable = true;
       vim-surround.enable = true;
-      telescope.enable = true;
       tmux-navigator.enable = true;
       todo-comments.enable = true;
       treesitter.enable = true;
@@ -119,6 +125,7 @@
       };
       trouble.enable = true;
       ts-autotag.enable = true;
+      tv.enable = true;
       web-devicons.enable = true;
       which-key.enable = true;
     };