diff --git a/tools/fish/.gitignore b/tools/fish/.gitignore
index cafc8ed..1784bfc 100644
--- a/tools/fish/.gitignore
+++ b/tools/fish/.gitignore
@@ -1,3 +1,4 @@
 fish_variables
 completions
 functions/br.fish
+functions/dotenv.fish
diff --git a/tools/kitty/kitty.conf b/tools/kitty/kitty.conf
index e7b86d0..e9393a4 100644
--- a/tools/kitty/kitty.conf
+++ b/tools/kitty/kitty.conf
@@ -3,10 +3,10 @@
 # Fonts {{{
 
 # Family
-font_family         family="Sarasa Term SC Nerd Font"
-bold_font           auto
-italic_font         auto
-bold_italic_font    auto
+font_family      family="Maple Mono NF CN"
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
 
 # Ligature
 disable_ligatures   never
@@ -79,9 +79,3 @@ map ctrl+shift+enter toggle_layout stack
 # }}}
 
 
-# BEGIN_KITTY_FONTS
-font_family      family="Sarasa Term SC Nerd Font"
-bold_font        auto
-italic_font      auto
-bold_italic_font auto
-# END_KITTY_FONTS
diff --git a/tools/nvim/lua/keymaps/lspkeys.lua b/tools/nvim/lua/keymaps/lspkeys.lua
index 737d4fe..e972217 100644
--- a/tools/nvim/lua/keymaps/lspkeys.lua
+++ b/tools/nvim/lua/keymaps/lspkeys.lua
@@ -7,6 +7,37 @@ local M = {
   { keys = "<leader>,", cmd = vim.lsp.buf.code_action, opts = { desc = "Code Action" } },
   { keys = "ga", cmd = vim.lsp.buf.code_action, opts = { desc = "Code Action" } },
   { keys = "gh", cmd = vim.lsp.buf.hover, opts = { desc = "Show hover" } },
+  -- [c]hange [d]efinition
+  { keys = "cd", cmd = vim.lsp.buf.rename, opts = { desc = "Rename symbol under cursor" } },
 }
 
+-- local function smart_split_definition()
+--   local width = vim.api.nvim_win_get_width(0)
+--   if width > 80 then -- Adjust 80 to your preference
+--     vim.api.nvim_command("vsp")
+--   else
+--     vim.api.nvim_command("sp")
+--   end
+--   vim.lsp.buf.definition()
+-- end
+-- vim.keymap.set("n", "<C-w>d", smart_split_definition, { desc = "Go to Definition (Smart Split)" })
+
+local function smart_split(func)
+  local width = vim.api.nvim_win_get_width(0)
+  if width > 80 then
+    vim.api.nvim_command("vsp")
+  else
+    vim.api.nvim_command("sp")
+  end
+  func()
+end
+
+vim.keymap.set("n", "<C-w>d", function()
+  smart_split(vim.lsp.buf.definition)
+end, { desc = "Go to Definition (Smart Split)" })
+
+vim.keymap.set("n", "<C-w>D", function()
+  smart_split(vim.lsp.buf.declaration)
+end, { desc = "Go to Declaration (Smart Split)" })
+
 return M
diff --git a/tools/vscode/vscode.vimrc b/tools/vscode/vscode.vimrc
index 2ced56a..0578a25 100644
--- a/tools/vscode/vscode.vimrc
+++ b/tools/vscode/vscode.vimrc
@@ -59,6 +59,8 @@ noremap gr editor.action.goToReferences
 noremap gpr editor.action.referenceSearch.trigger
 noremap ga editor.action.quickFix
 
+" Rename, or [c]hange [d]efinition
+noremap cd editor.action.rename
 
 " Requires matchit by redguardtoo
 " nnoremap % extension.matchitJumpItems
diff --git a/tools/zed/keymap.json b/tools/zed/keymap.json
index 5d66f96..516848a 100644
--- a/tools/zed/keymap.json
+++ b/tools/zed/keymap.json
@@ -47,7 +47,21 @@
     "bindings": {
       "N": "vim::JoinLines",
       "l": "vim::InsertBefore",
-      "L": "vim::InsertFirstNonWhitespace",
+      "L": "vim::InsertFirstNonWhitespace"
+    }
+  },
+  {
+    "context": "vim_mode == visual || vim_mode == operator",
+
+    "bindings": {
+      "H": "vim::StartOfLine",
+      "I": "vim::EndOfLine"
+    }
+  },
+  {
+    "context": "vim_mode == normal",
+
+    "bindings": {
       "H": "pane::ActivatePrevItem",
       "I": "pane::ActivateNextItem"
     }
diff --git a/tools/zed/settings.json b/tools/zed/settings.json
index fc127f3..af1df69 100644
--- a/tools/zed/settings.json
+++ b/tools/zed/settings.json
@@ -18,6 +18,9 @@
 // custom settings, run `zed: open default settings` from the
 // command palette (cmd-shift-p / ctrl-shift-p)
 {
+  "outline_panel": {
+    "dock": "right"
+  },
   "edit_predictions": {
     "disabled_globs": ["*.bean"],
     "mode": "eager_preview",