From ff89bf4d6baa477e5ae48c04c302ac2bdef7ff00 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <code@jdkaplan.dev>
Date: Thu, 23 Apr 2026 15:36:40 -0400
Subject: [PATCH] neovim: Clean up some old bindings

---
 neovim/init.lua | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/neovim/init.lua b/neovim/init.lua
index cbacf83..1ec13e2 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -16,13 +16,9 @@ require("lazy").setup("plugins", {
   },
 })
 
-theme = "jdkaplan-temp"
-
 vim.o.number = true
 vim.o.hidden = true
 
-vim.cmd.colorscheme(theme)
-
 vim.o.expandtab = true
 vim.o.tabstop = 4
 vim.o.softtabstop = 4
@@ -73,10 +69,10 @@ vim.opt.completeopt = "menu,menuone,noselect"
 vim.o.secure = true
 
 vim.keymap.set("", "<Space>w", "<C-w>", { remap = true })
-vim.keymap.set("", '<Space>w"', ":split<CR>")
-vim.keymap.set("", "<Space>w%", ":vsplit<CR>")
 
 vim.keymap.set("", "<Leader>w", ":w<CR>")
+vim.keymap.set("", "<Leader><Leader>", ":w<CR>")
+vim.keymap.set("", "<Space>s", ":w<CR>")
 
 vim.keymap.set("n", "<C-w>]", function()
   if vim.api.nvim_win_get_width(0) > 2 * 80 then
@@ -86,17 +82,8 @@ vim.keymap.set("n", "<C-w>]", function()
   end
 end)
 
--- TODO: Delete these ; fake-leader bindings
-vim.keymap.set("", ";w", ":w<CR>")
-
--- TODO: Delete these ; fake-leader bindings
-vim.keymap.set("", ";;", ";")
-
 vim.keymap.set("", "<Space><Space>", ":nohlsearch<CR>")
 
--- TODO: Delete these ; fake-leader bindings
-vim.keymap.set("", ";<Space>", ":nohlsearch<CR>")
-
 vim.keymap.set("n", "<Space>cc", ':let @+=expand("%")<CR>')
 vim.keymap.set("n", "<Space>cl", ':let @+=join([expand("%"), line(".")], ":")<CR>')
 vim.keymap.set("n", "<Space>cp", ':let @+=expand("%:p")<CR>')
@@ -125,6 +112,9 @@ autocmd FileType text     setlocal spell
 ]])
 vim.opt.spellcapcheck = ""
 
+theme = "jdkaplan-temp"
+vim.cmd.colorscheme(theme)
+
 -- CTRL-L usually clears and redraws the screen.  Might as well use it to reset
 -- the colorscheme too!
 vim.keymap.set("n", "<C-l>", function()
@@ -145,6 +135,9 @@ function auto_correct(mode, old, new, scale, limit, cmd)
   end)
 end
 
+-- TODO: Delete these ; fake-leader bindings
+vim.keymap.set("", ";;", ";")
+
 auto_correct("n", ';"', "<C-w>s", 100, 1000, vim.cmd.split)
 auto_correct("n", ";%", "<C-w>v", 100, 1000, vim.cmd.vsplit)
 auto_correct("n", ";0", "<C-w>c", 100, 1000, vim.cmd.close)
@@ -160,3 +153,6 @@ end)
 auto_correct("n", ";l", "<C-w>l", 10, 500, function()
   vim.cmd.wincmd("l")
 end)
+
+auto_correct("n", ";w", "<Space>s", 100, 1000, vim.cmd.write)
+auto_correct("n", ";<Space>", "<Space><Space>", 100, 1000, vim.cmd.nohlsearch)