diff --git a/flake.nix b/flake.nix
index b3a6699..b845f02 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,7 +115,6 @@
           # Export custom packages
           inherit
             (pkgs)
-            goose-cli
             keyboard-switch
             wl-clipedit
             wl-lockscreen
diff --git a/hm/helix.nix b/hm/helix.nix
index 190cdce..337dc0c 100644
--- a/hm/helix.nix
+++ b/hm/helix.nix
@@ -6,6 +6,7 @@
       inherit (pkgs) nil; # Nix language server
       # inherit desktopItem;
     };
+    sessionVariables = { EDITOR = "hx"; };
   };
   programs.helix = {
     enable = true;
diff --git a/hm/vim.nix b/hm/vim.nix
index 8436f71..bde9277 100644
--- a/hm/vim.nix
+++ b/hm/vim.nix
@@ -1,23 +1,10 @@
 { pkgs, ... }:
 let
   vp = pkgs.vimPlugins;
-  goose-nvim = pkgs.vimUtils.buildVimPlugin rec {
-    pname = "goose-nvim";
-    version = src.rev;
-    src = pkgs.fetchFromGitHub {
-      owner = "azorng";
-      repo = "goose.nvim";
-      rev = "v1.0.4";
-      sha256 = "sha256-C51y0a11zV/yHHo3mo9SyZunbcPNXxrzT3xxo0GnWms=";
-    };
-    dependencies = [ vp.plenary-nvim ];
-    meta.homepage = "https://github.com/azorng/goose.nvim";
-  };
 in
 {
   home.packages = [
     pkgs.nodePackages.prettier
-    pkgs.goose-cli
     pkgs.gemini-cli
   ];
   programs.neovim = {
@@ -395,84 +382,6 @@ in
           ollama.setup(conf)
         '';
       }
-
-      {
-        plugin = goose-nvim;
-        type = "lua";
-        config = ''
-          require('goose').setup({
-            prefered_picker = nil,                     -- 'telescope', 'fzf', 'mini.pick', 'snacks', if nil, it will use the best available picker
-            default_global_keymaps = true,             -- If false, disables all default global keymaps
-            keymap = {
-              global = {
-                toggle = '<leader>gg',                 -- Open goose. Close if opened
-                open_input = '<leader>gi',             -- Opens and focuses on input window on insert mode
-                open_input_new_session = '<leader>gI', -- Opens and focuses on input window on insert mode. Creates a new session
-                open_output = '<leader>go',            -- Opens and focuses on output window
-                toggle_focus = '<leader>gt',           -- Toggle focus between goose and last window
-                close = '<leader>gq',                  -- Close UI windows
-                toggle_fullscreen = '<leader>gf',      -- Toggle between normal and fullscreen mode
-                select_session = '<leader>gs',         -- Select and load a goose session
-                goose_mode_chat = '<leader>gmc',       -- Set goose mode to `chat`. (Tool calling disabled. No editor context besides selections)
-                goose_mode_auto = '<leader>gma',       -- Set goose mode to `auto`. (Default mode with full agent capabilities)
-                configure_provider = '<leader>gp',     -- Quick provider and model switch from predefined list
-                diff_open = '<leader>gd',              -- Opens a diff tab of a modified file since the last goose prompt
-                diff_next = '<leader>g]',              -- Navigate to next file diff
-                diff_prev = '<leader>g[',              -- Navigate to previous file diff
-                diff_close = '<leader>gc',             -- Close diff view tab and return to normal editing
-                diff_revert_all = '<leader>gra',       -- Revert all file changes since the last goose prompt
-                diff_revert_this = '<leader>grt',      -- Revert current file changes since the last goose prompt
-              },
-              window = {
-                submit = '<cr>',                     -- Submit prompt (normal mode)
-                submit_insert = '<cr>',              -- Submit prompt (insert mode)
-                close = '<esc>',                     -- Close UI windows
-                stop = '<C-c>',                      -- Stop goose while it is running
-                next_message = ']]',                 -- Navigate to next message in the conversation
-                prev_message = '[[',                 -- Navigate to previous message in the conversation
-                mention_file = '@',                  -- Pick a file and add to context. See File Mentions section
-                toggle_pane = '<tab>',               -- Toggle between input and output panes
-                prev_prompt_history = '<up>',        -- Navigate to previous prompt in history
-                next_prompt_history = '<down>'       -- Navigate to next prompt in history
-              }
-            },
-            ui = {
-              window_width = 0.35,                   -- Width as percentage of editor width
-              input_height = 0.15,                   -- Input height as percentage of window height
-              fullscreen = false,                    -- Start in fullscreen mode (default: false)
-              layout = "right",                      -- Options: "center" or "right"
-              floating_height = 0.8,                 -- Height as percentage of editor height for "center" layout
-              display_model = true,                  -- Display model name on top winbar
-              display_goose_mode = true              -- Display mode on top winbar: auto|chat
-            },
-            providers = {
-              --[[
-              Define available providers and their models for quick model switching
-              anthropic|azure|bedrock|databricks|google|groq|ollama|openai|openrouter
-              Example:
-              -- openrouter = {
-              --   "anthropic/claude-3.5-sonnet",
-              --   "openai/gpt-4.1",
-              -- },
-              --]]
-              ollama = {
-                "gpt-oss:20b-cloud",
-                "embeddinggemma:latest",
-                "codegemma:2b",
-                "gemma3:latest",
-                "granite4:tiny-h",
-                "deepseek-r1:7b",
-                "codegemma:latest",
-                "codegemma:7b",
-                "qwen3:latest",
-                "gemma3:12b",
-                "deepseek-r1:14b",
-                "qwen3:14b"
-              }
-            }
-          })
-        '';
-      }
     ];
 
     # settings = { ignorecase = true; };