fix(neovim): fix `s` and `S` keybinds

.config/nvim/init.lua

@@ -45,6 +45,16 @@ vim.opt.expandtab = true
 vim.opt.tabstop = 4
 vim.opt.shiftwidth = 4
 
+-- === === === === === === === === === === === === === === === === === === ===
+--
+-- Leader
+--
+-- === === === === === === === === === === === === === === === === === === ===
+vim.keymap.set({'n', 'v'}, 's', '<Nop>', { noremap = true, silent = true })
+vim.keymap.set({'n', 'v'}, 'S', '<Nop>', { noremap = true, silent = true })
+vim.g.mapleader = 's'
+vim.g.maplocalleader = vim.g.mapleader
+
 -- === === === === === === === === === === === === === === === === === === ===
 --
 -- Lazy.nvim Configuration

.config/nvim/lua/plugins/command-palette.lua

@@ -28,9 +28,9 @@ return {
                 }
                 }
             })
-            vim.keymap.set("n", "sP", palette.open)
-            vim.keymap.set("n", "sp", palette.open_full)
-            vim.keymap.set("n", "sL", function()
+            vim.keymap.set("n", "<Leader>P", palette.open)
+            vim.keymap.set("n", "<Leader>p", palette.open_full)
+            vim.keymap.set("n", "<Leader>L", function()
                 palette.open({}, "LSP Finders", {
                     { "Treesitter",         "", ":Telescope treesitter" },
                     { "LSP References",     "", ":Telescope lsp_references" },
@@ -68,11 +68,11 @@ return {
         vim.keymap.set("n", "n", bitbrowser.next)
         vim.keymap.set("n", "N", bitbrowser.prev)
         for i, v in pairs({ 'e', 'w', 'i', 'd', 's', 'g' }) do
-            vim.keymap.set("n", "sn" .. v, function()
+            vim.keymap.set("n", "<Leader>n" .. v, function()
                 bitbrowser.set_target(i);
                 bitbrowser.next()
             end)
-            vim.keymap.set("n", "sN" .. v, function()
+            vim.keymap.set("n", "<Leader>N" .. v, function()
                 bitbrowser.set_target(i);
                 bitbrowser.prev()
             end)

.config/nvim/lua/plugins/floatingterminal.lua

@@ -14,7 +14,7 @@ return {
             -- resizing and redrawing flaky programs' windows.
             function MakeTerm(shortcut, name, command, flaky)
                 lab.create_term(name, command)
-                vim.keymap.set("n", shortcut, function()
+                vim.keymap.set("n", "<Leader>"..shortcut, function()
                     if flaky then
                         local flaky_redraw_time = 10
                         vim.api.nvim_create_autocmd({ "BufEnter" },
@@ -78,14 +78,14 @@ return {
                             end)
                     end
                 })
-            MakeTerm("stt", "Alpha", "zsh")
-            MakeTerm("sts", "Beta", "zsh")
-            MakeTerm("str", "Gamma", "zsh")
-            MakeTerm("sta", "Delta", "zsh")
-            MakeTerm("stn", "Epsilon", "gemini --model gemini-2.5-pro")
-            MakeTerm("ste", "Zeta", "/bin/zsh $DOTFILES_DIR/.scripts/omniscratch.zsh")
-            MakeTerm("sti", "Eta", "lazydocker", true)
-            MakeTerm("sto", "Theta", "lazygit", true)
+            MakeTerm("tt", "Alpha", "zsh")
+            MakeTerm("ts", "Beta", "zsh")
+            MakeTerm("tr", "Gamma", "zsh")
+            MakeTerm("ta", "Delta", "zsh")
+            MakeTerm("tn", "Epsilon", "gemini --model gemini-2.5-pro")
+            MakeTerm("te", "Zeta", "/bin/zsh $DOTFILES_DIR/.scripts/omniscratch.zsh")
+            MakeTerm("ti", "Eta", "lazydocker", true)
+            MakeTerm("to", "Theta", "lazygit", true)
 
             -- Keymaps
             vim.keymap.set("t", "<C-S-t>", "<C-\\><C-n>")

.config/nvim/lua/plugins/telescope.lua

@@ -35,7 +35,7 @@ return {
                     }
                 }
             })
-            vim.keymap.set("n", "sf", function()
+            vim.keymap.set("n", "<Leader>f", function()
                 require("telescope").extensions.file_browser.file_browser({
                     select_buffer = true,
                     grouped = true,
@@ -45,21 +45,21 @@ return {
                     path = vim.fn.expand("%:p:h")
                 })
             end, {})
-            vim.keymap.set("n", "ss", builtin.resume)
-            vim.keymap.set("n", "sS", builtin.pickers)
-            vim.keymap.set("n", "sT", builtin.treesitter)
-            vim.keymap.set("n", "sa", builtin.find_files)
-            vim.keymap.set("n", "sg", builtin.git_files)
-            vim.keymap.set("n", "sG", builtin.git_status)
-            vim.keymap.set("n", "sb", builtin.buffers)
-            vim.keymap.set("n", "sj", builtin.jumplist)
-            vim.keymap.set("n", "sw", builtin.grep_string)
-            vim.keymap.set("n", "sld", builtin.lsp_definitions)
-            vim.keymap.set("n", "slt", builtin.lsp_type_definitions)
-            vim.keymap.set("n", "slr", builtin.lsp_references)
-            vim.keymap.set("n", "sli", builtin.lsp_implementations)
-            vim.keymap.set("n", "sls", builtin.lsp_document_symbols)
-            vim.keymap.set("n", "slS", builtin.lsp_workspace_symbols)
+            vim.keymap.set("n", "<Leader>s", builtin.resume)
+            vim.keymap.set("n", "<Leader>S", builtin.pickers)
+            vim.keymap.set("n", "<Leader>T", builtin.treesitter)
+            vim.keymap.set("n", "<Leader>a", builtin.find_files)
+            vim.keymap.set("n", "<Leader>g", builtin.git_files)
+            vim.keymap.set("n", "<Leader>G", builtin.git_status)
+            vim.keymap.set("n", "<Leader>b", builtin.buffers)
+            vim.keymap.set("n", "<Leader>j", builtin.jumplist)
+            vim.keymap.set("n", "<Leader>w", builtin.grep_string)
+            vim.keymap.set("n", "<Leader>ld", builtin.lsp_definitions)
+            vim.keymap.set("n", "<Leader>lt", builtin.lsp_type_definitions)
+            vim.keymap.set("n", "<Leader>lr", builtin.lsp_references)
+            vim.keymap.set("n", "<Leader>li", builtin.lsp_implementations)
+            vim.keymap.set("n", "<Leader>ls", builtin.lsp_document_symbols)
+            vim.keymap.set("n", "<Leader>lS", builtin.lsp_workspace_symbols)
             require("telescope").load_extension("ui-select")
             require("telescope").load_extension("file_browser")
         end
@@ -105,8 +105,8 @@ return {
                 "Open default", "Set the default filters", shroud.open_default }, {
                 "Open narrow", "Set the default filters", shroud.open_narrow } } }
         })
-        vim.keymap.set("n", "si", shroud.open_default)
-        vim.keymap.set("n", "sI", shroud.open_narrow)
+        vim.keymap.set("n", "<Leader>i", shroud.open_default)
+        vim.keymap.set("n", "<Leader>I", shroud.open_narrow)
     end
 }
 }

.config/nvim/lua/plugins/treesitter.lua

@@ -49,7 +49,7 @@ return {
         })
         vim.api.nvim_set_hl(0, "TreesitterContextSeparator",
             { link = "WinSeparator" })
-        vim.keymap.set("n", "sc", function()
+        vim.keymap.set("n", "<Leader>c", function()
             require("treesitter-context").go_to_context(vim.v.count1)
         end, { silent = true })
     end