From d869ac7e270729e504349865322f8e31cd2574f6 Mon Sep 17 00:00:00 2001
From: Daniel Fichtinger <daniel@ficd.ca>
Date: Fri, 7 Feb 2025 00:30:03 -0500
Subject: [PATCH] AutoYADM commit: 2025-02-07 00:30:03

---
 .config/nvim/lua/colemak.lua        | 24 ++++++--
 .config/nvim/lua/config/keymaps.lua | 85 ++++++++++++++---------------
 .config/nvim/lua/config/options.lua | 11 ++--
 3 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/.config/nvim/lua/colemak.lua b/.config/nvim/lua/colemak.lua
index 5f08573a..b9f039bc 100644
--- a/.config/nvim/lua/colemak.lua
+++ b/.config/nvim/lua/colemak.lua
@@ -12,16 +12,20 @@ M.map = {
 }
 
 M.modes = {
+  -- "n",
+  -- "x",
+  -- "v",
+  -- "o",
   "n",
-  "x",
   "v",
+  "x",
+  "s",
   "o",
 }
 
 local mods = {
   "<C-",
   "<M-",
-  "<S-",
   "<C-M-",
   "<C-S-",
   "<M-S-",
@@ -39,14 +43,22 @@ local get_permutations = function(key)
   return out
 end
 
-local opts = { noremap = true }
-
 local function set(lhs, rhs)
-  vim.keymap.set(M.modes, lhs, rhs, opts)
+  vim.keymap.set(M.modes, lhs, rhs, { noremap = true })
 end
 
 M.init = function()
+  local out = {}
   for lhs, rhs in pairs(M.map) do
-    local perms = get_lhs_permutations(lhs)
+    local lhs_perms = get_permutations(lhs)
+    local rhs_perms = get_permutations(rhs)
+    for i, l in ipairs(lhs_perms) do
+      local r = rhs_perms[i]
+      out[l] = r
+      set(l, r)
+    end
   end
+  return out
 end
+
+return M
diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index 15d89f9d..7ea966e3 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -62,57 +62,54 @@ map({ "n" }, "<C-n>", "<C-e>", { noremap = true, desc = "Scroll Down" })
 -- Snacks.toggle.zen():map("<leader>uz")
 map({ "n" }, "cl", "vgu", { noremap = true, desc = "Lowercase current char" })
 map({ "n" }, "cu", "vgU", { noremap = true, desc = "Uppercase current char" })
--- Bind arrows to hjkl to my colemak-dh motions work as expected
-map({ "n", "x" }, "<Up>", "k", { desc = "Up", remap = true })
-map({ "n", "x" }, "<Down>", "j", { desc = "Down", remap = true })
-map({ "n", "x" }, "<Left>", "h", { desc = "Left", remap = true })
-map({ "n", "x" }, "<Right>", "l", { desc = "Right", remap = true })
+--
 
--- map({ "n", "t", "i" }, "<C-Left>", "<cmd> TmuxNavigateLeft<CR>", { desc = "Switch Window Left", remap = true })
--- map({ "n", "t", "i" }, "<C-Right>", "<cmd> TmuxNavigateRight<CR>", { desc = "Switch Window Right", remap = true })
--- map({ "n", "t", "i" }, "<C-Up>", "<cmd> TmuxNavigateUp<CR>", { remap = true })
--- map({ "n", "t", "i" }, "<C-Down>", "<cmd> TmuxNavigateDown<CR>", { desc = "Switch Window Down", remap = true })
-map({ "n", "t", "i" }, "<C-Left>", "<C-w>h", { desc = "Switch Window Left", remap = true })
-map({ "n", "t", "i" }, "<C-Right>", "<C-w>l", { desc = "Switch Window Right", remap = true })
-map({ "n", "t", "i" }, "<C-Up>", "<C-w>k", { remap = true })
-map({ "n", "t", "i" }, "<C-Down>", "<C-w>j", { desc = "Switch Window Down", remap = true })
-map({ "n" }, "<C-w>d", "<C-w>q", { desc = "Close window", remap = true })
+local colemak = false
+if colemak then
+  -- Bind arrows to hjkl to my colemak-dh motions work as expected
+  map({ "n", "x" }, "<Up>", "k", { desc = "Up", remap = true })
+  map({ "n", "x" }, "<Down>", "j", { desc = "Down", remap = true })
+  map({ "n", "x" }, "<Left>", "h", { desc = "Left", remap = true })
+  map({ "n", "x" }, "<Right>", "l", { desc = "Right", remap = true })
 
-map({ "x" }, "<M-Left>", "<M-h>", { remap = true })
-map({ "x" }, "<M-Right>", "<M-l>", { remap = true })
-map({ "n", "x", "v" }, "<M-Up>", "<M-k>", { remap = true })
-map({ "n", "x", "v" }, "<M-Down>", "<M-j>", { remap = true })
--- map({ "n" }, "<S-Left>", "[b", { desc = "Previous Buffer", remap = true })
-map({ "n" }, "<S-Left>", "<CMD>BufferLineCyclePrev<CR>", { desc = "Previous Buffer", remap = true })
--- map({ "n" }, "<S-Right>", "]b", { desc = "Next Buffer", remap = true })
-map({ "n" }, "<S-Right>", "<CMD>BufferLineCycleNext<CR>", { desc = "Next Buffer", remap = true })
--- map({ "n" }, "<S-Down>", "5j", { remap = true })
--- map({ "n" }, "<S-Up>", "5k", { remap = true })
-map({ "i" }, "<M-e>", "<Esc>", { desc = "Escape insert mode", remap = true })
+  map({ "n", "t", "i" }, "<C-Left>", "<C-w>h", { desc = "Switch Window Left", remap = true })
+  map({ "n", "t", "i" }, "<C-Right>", "<C-w>l", { desc = "Switch Window Right", remap = true })
+  map({ "n", "t", "i" }, "<C-Up>", "<C-w>k", { remap = true })
+  map({ "n", "t", "i" }, "<C-Down>", "<C-w>j", { desc = "Switch Window Down", remap = true })
+  map({ "n" }, "<C-w>d", "<C-w>q", { desc = "Close window", remap = true })
 
--- better navigation
-map({ "n" }, "<C-u>", "<C-u>zz", { remap = false })
-map({ "n" }, "<C-d>", "<C-d>zz", { remap = false })
-map({ "n" }, "n", "nzz", { remap = false })
-map({ "n" }, "N", "Nzz", { remap = false })
-map({ "n" }, "{", "{zz", { remap = false })
-map({ "n" }, "}", "}zz", { remap = false })
-map({ "n" }, "<PageDown>", "<Down>zz", { remap = false })
-map({ "n" }, "<PageUp>", "<Up>zz", { remap = false })
-map({ "n", "x" }, "<M-i>", "$", { remap = false })
-map({ "n", "x" }, "<M-m>", "0", { remap = false })
+  map({ "x" }, "<M-Left>", "<M-h>", { remap = true })
+  map({ "x" }, "<M-Right>", "<M-l>", { remap = true })
+  map({ "n", "x", "v" }, "<M-Up>", "<M-k>", { remap = true })
+  map({ "n", "x", "v" }, "<M-Down>", "<M-j>", { remap = true })
+  map({ "n" }, "<S-Left>", "<CMD>BufferLineCyclePrev<CR>", { desc = "Previous Buffer", remap = true })
+  map({ "n" }, "<S-Right>", "<CMD>BufferLineCycleNext<CR>", { desc = "Next Buffer", remap = true })
+  map({ "i" }, "<M-e>", "<Esc>", { desc = "Escape insert mode", remap = true })
 
--- easily access null register
--- map({ "n", "x" }, "<leader>n", '"_', { remap = false, silent = true, desc = "Null Register" })
-map({ "n", "x", "v", "o" }, "<BS>", '"_', { remap = false, silent = true, desc = "Null Register" })
+  -- better navigation
+  map({ "n" }, "<C-u>", "<C-u>zz", { remap = false })
+  map({ "n" }, "<C-d>", "<C-d>zz", { remap = false })
+  map({ "n" }, "n", "nzz", { remap = false })
+  map({ "n" }, "N", "Nzz", { remap = false })
+  map({ "n" }, "{", "{zz", { remap = false })
+  map({ "n" }, "}", "}zz", { remap = false })
+  map({ "n" }, "<PageDown>", "<Down>zz", { remap = false })
+  map({ "n" }, "<PageUp>", "<Up>zz", { remap = false })
+  map({ "n", "x" }, "<M-i>", "$", { remap = false })
+  map({ "n", "x" }, "<M-m>", "0", { remap = false })
 
--- remove the default lazyvim, and also swap H and L (for move cursor) to make more sense on colemak
-vim.keymap.del({ "n" }, "<S-h>")
-vim.keymap.del({ "n" }, "<S-l>")
-map({ "n" }, "<S-h>", "L", { remap = false })
-map({ "n" }, "<S-l>", "H", { remap = false })
+  -- easily access null register
+  -- map({ "n", "x" }, "<leader>n", '"_', { remap = false, silent = true, desc = "Null Register" })
+
+  -- remove the default lazyvim, and also swap H and L (for move cursor) to make more sense on colemak
+  vim.keymap.del({ "n" }, "<S-h>")
+  vim.keymap.del({ "n" }, "<S-l>")
+  map({ "n" }, "<S-h>", "L", { remap = false })
+  map({ "n" }, "<S-l>", "H", { remap = false })
+end
 -- better delete and put
 
+map({ "n", "x", "v", "o" }, "<BS>", '"_', { remap = false, silent = true, desc = "Null Register" })
 -- Duplicate and comment line
 map({ "n" }, "<leader>yc", '"zyygcc"zp', { remap = true, silent = true, desc = "Duplicate and comment line" })
 
diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua
index 5a8b2f43..02da706e 100644
--- a/.config/nvim/lua/config/options.lua
+++ b/.config/nvim/lua/config/options.lua
@@ -13,11 +13,12 @@ end
 
 vim.g.maplocalleader = ","
 vim.g.mapleader = " "
-vim.keymap.set("n", "m", "h", { noremap = true })
-vim.keymap.set("n", "<C-S-M>", function()
-  vim.notify("presed")
-end)
-
+vim.keymap.set("n", "<leader>m", "<CMD>echo hi<cr>")
+-- vim.keymap.set("n", "m", "h", { noremap = true })
+-- vim.keymap.set("n", "<C-S-M>", function()
+--   vim.notify("presed")
+-- end)
+require("colemak").init()
 vim.g.lazyvim_python_lsp = "basedpyright"
 -- vim.g.lazyvim_rust_diagnostics = "bacon-ls"
 vim.g.ai_cmp = false