From de2e9e90f1117e9a5726c8728c2e196d82d61a1f Mon Sep 17 00:00:00 2001
From: Marcelo Jacobus <marcelo.jacobus@gmail.com>
Date: Mon, 30 Jun 2025 10:55:05 -0300
Subject: [PATCH] More mappings

---
 lua/user/keymaps.lua       | 130 +++++++++++++++++++++++-
 lua/user/options.lua       |   5 +
 old/lua/config/keymaps.lua | 196 -------------------------------------
 3 files changed, 130 insertions(+), 201 deletions(-)
 delete mode 100644 old/lua/config/keymaps.lua

diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 4628780..3a07960 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -26,6 +26,18 @@ map("n", "<leader>q", "<cmd>bdelete<cr>", opts)
 map("n", "<leader>bdd", "<cmd>bdelete!<cr>", opts)
 map("n", "<leader>bda", "<cmd>bufdo %bd!<cr>", opts)
 
+
+-- Alternate file
+map("n", "<leader>af", "<c-^>", { desc = "Alternate file" })
+
+-- Avoid arrow keys in command mode
+map("c", "<C-h>", "<left>", { desc = "Move left" })
+map("c", "<C-j>", "<down>", { desc = "Move down" })
+map("c", "<C-k>", "<up>", { desc = "Move up" })
+map("c", "<C-l>", "<right>", { desc = "Move right" })
+map("c", "<C-x>", "<del>", { desc = "Delete" })
+
+
 -- Notes
 map("n", "<leader>et", ":e ~/.tmp/notes/", opts)
 map("n", "<leader>on", ":e ~/.tmp/notes/notes.md<cr>", opts)
@@ -38,21 +50,22 @@ map("t", "jj", "<C-\\><C-n>", opts)
 -- Search
 map("n", "<leader>f", "<cmd>/", opts)
 map("n", "<leader>F", "<cmd>nohlsearch<cr>", opts)
+map("n", "*", "*N", { desc = "Search and stay" })
 
 -- Quickfix
-map("n", "<leader>gn", ":cnext<CR>", opts)
-map("n", "<leader>gp", ":cprev<CR>", opts)
+map("n", "<leader>gn", ":cnext<CR>", { desc = "Next quickfix occurrency" })
+map("n", "<leader>gp", ":cprev<CR>", { desc = "Previous quickfix occurrency" })
+
 
 -- Buffer navigation
 map("n", "<leader>bn", ":bn<cr>", opts)
 map("n", "<leader>bp", ":bp<cr>", opts)
 map("n", "<leader><leader>b", ":b<space>", opts)
 
--- Select all
-map("n", "<leader>a", "ggVG", opts)
+map("n", "<leader>a", "ggVG", { desc = "Select all" })
 
 -- Tabs
-map("n", "<C-w>t", ":tabnew<cr>", opts)
+map("n", "<c-w>t", ":tabnew<cr>", { desc = "New tab" })
 
 -- Insert helpers
 map("i", ",e", "<Esc>/[\\]})\"']<cr><Esc>:nohlsearch<cr>a", opts)
@@ -70,6 +83,9 @@ map("n", "<Leader>rel", ":e<CR>", opts)
 -- File finder (stub)
 map("n", "<leader>*", ":find<space>", opts)
 
+map("n", "<leader>rm", ":Delete<cr>", { desc = "Delete file" })
+map("n", "<leader>o", "<c-^>", { desc = "Last buffer" })
+
 -- Formatting
 map("v", "Q", "gq", opts)
 map("n", "Q", "gqap", opts)
@@ -126,3 +142,107 @@ end, { desc = "Run test file" })
 map("n", "<leader><leader>st", function()
   require("mj.test_runner").run_shell_test()
 end, { desc = "Run ./shell_test" })
+
+
+map("v", "<leader>", function()
+  alternative_file.open("next", "--exists")
+end, { desc = "Open next alternative file" })
+
+local alternative_file = require("mj.alternate_file")
+
+map("n", "<leader>irc", function()
+  require("mj.ruby_utils").insert_ruby_class_based_on_file_path()
+end, { desc = "Insert ruby class" })
+
+-- this is not working correctly
+-- map("v", "<leader>irc", function()
+--   require("mj.ruby_utils").replace_selected_text_with_ruby_class()
+-- end, { desc = "Replace selected text ruby class" })
+
+map("n", "<leader>aj", function()
+  alternative_file.open("prev", "--exists")
+end, { desc = "Open previous alternative file" })
+
+
+map("n", "<leader>j", function()
+  require("mj.utils").close_terminal_buffer(true)
+end, { desc = "Close terminal buffer (true)" })
+
+map("n", "<leader>k", function()
+  require("mj.utils").close_terminal_buffer(false)
+end, { desc = "Close terminal buffer (false)" })
+
+
+-- Alternative file navigation
+map("n", "<leader>ak", function()
+  alternative_file.open("next", "--exists")
+end, { desc = "Next alternative file" })
+map("n", "<leader>aj", function()
+  alternative_file.open("prev", "--exists")
+end, { desc = "Previous alternative file" })
+
+
+map("t", "<esc>", "<C-\\><C-n>", { desc = "Escape terminal mode" })
+map("t", "jj", "<C-\\><C-n>", { desc = "Escape terminal mode with jj" })
+
+
+-- From old, might be dup
+-- -- Jumps to the next position after the closest closing char
+-- map("i", ",e", "<Esc>/[\\]})\"']<cr><Esc>:nohlsearch<cr>a", { desc = "Jump to next closing char" })
+--
+-- -- Adds arrow
+-- map("i", "<C-l>", "<Space>=><Space>", { desc = "Insert arrow" })
+--
+-- -- Rails specific
+-- map(
+--   "v",
+--   "<leader>h",
+--   ':s/\\:\\([a-zA-Z_]\\+\\)\\s\\+=>/\\=printf("%s:", submatch(1))/g<CR><ESC>:let @/ = ""<CR>',
+--   { desc = "Convert hash rocket to symbol" }
+-- )
+-- map("n", "<Leader>qq", "<ESC>:q<cr>", { desc = "Quit" })
+--
+-- -- Reload buffer
+-- map("n", "<Leader>rel", ":e<CR>", { desc = "Reload buffer" })
+--
+-- -- Find
+-- map("n", "<leader>f", "<ESC>/", { desc = "Find" })
+-- map("n", "<leader>*", "<ESC>:find<space>", { desc = "Find file" })
+--
+-- -- Use Q for formatting the current paragraph (or selection)
+-- map("v", "Q", "gq", { desc = "Format selection" })
+-- map("n", "Q", "gqap", { desc = "Format paragraph" })
+--
+-- -- Buffer resizing mappings (shift + arrow key)
+-- map("n", "<Up>", "<c-w>+", { desc = "Resize buffer up" })
+-- map("n", "<Down>", "<c-w>-", { desc = "Resize buffer down" })
+-- map("n", "<Left>", "<c-w><", { desc = "Resize buffer left" })
+-- map("n", "<Right>", "<c-w>>", { desc = "Resize buffer right" })
+--
+-- map("n", "<leader><leader>xx", "<esc>:!chmod +x %<cr>", { desc = "Make file executable" })
+--
+-- map("n", "<leader><leader>b", "<cmd>Telescope current_buffer_fuzzy_find<cr>", { desc = "Search in current buffer" })
+--
+-- -- Marks
+-- map("n", "<leader>mA", "ma", { desc = "Set mark 'a'" })
+-- map("n", "<leader>ma", "'a", { desc = "Go to mark 'a'" })
+-- map("n", "<leader>m1", "'a", { desc = "Go to mark 'a'" })
+--
+-- map("n", "<leader>mB", "mb", { desc = "Set mark 'b'" })
+-- map("n", "<leader>mb", "'b", { desc = "Go to mark 'b'" })
+-- map("n", "<leader>m2", "'b", { desc = "Go to mark 'b'" })
+--
+-- map("n", "<leader>mC", "mc", { desc = "Set mark 'c'" })
+-- map("n", "<leader>mc", "'c", { desc = "Go to mark 'c'" })
+-- map("n", "<leader>m3", "'c", { desc = "Go to mark 'c'" })
+--
+-- map("n", "<leader>mD", "md", { desc = "Set mark 'd'" })
+-- map("n", "<leader>md", "'d", { desc = "Go to mark 'd'" })
+-- map("n", "<leader>m4", "'d", { desc = "Go to mark 'd'" })
+--
+-- map("n", "<leader>mE", "me", { desc = "Set mark 'e'" })
+-- map("n", "<leader>me", "'e", { desc = "Go to mark 'e'" })
+-- map("n", "<leader>m5", "'e", { desc = "Go to mark 'e'" })
+--
+-- -- Notes
+-- map("n", "<leader>no", ":vs ~/.tmp/notes.md<cr>", { desc = "Open notes" })
diff --git a/lua/user/options.lua b/lua/user/options.lua
index a618842..2aff17a 100644
--- a/lua/user/options.lua
+++ b/lua/user/options.lua
@@ -19,3 +19,8 @@ vim.opt.cursorline = true
 vim.opt.signcolumn = "yes"
 vim.opt.updatetime = 300
 vim.opt.scrolloff = 8
+
+
+-- Diagnostic config
+-- TODO: Do I still need this?
+-- vim.diagnostic.config({ virtual_text = false })
diff --git a/old/lua/config/keymaps.lua b/old/lua/config/keymaps.lua
deleted file mode 100644
index c42d958..0000000
--- a/old/lua/config/keymaps.lua
+++ /dev/null
@@ -1,196 +0,0 @@
--- Keymaps are automatically loaded on the VeryLazy event
--- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
--- Add any additional keymaps here
-
--- TODO: There are mappings that I did not port yet
--- For instance: https://github.com/mjacobus/lvim/tree/main/after/ftplugin
--- https://github.com/mjacobus/lvim/tree/main/after/plugin
--- https://github.com/mjacobus/lvim/tree/main/autoload
--- https://github.com/mjacobus/lvim/blob/main/after/plugin/legacy_setup.vim#L179-L212
--- Maybe some here: https://github.com/mjacobus/lvim/blob/main/lua/config/mappings.lua
--- And here
-
-vim.keymap.del("n", "<leader>ff") -- conflicts with <leader>f<f>word
-
-local map = LazyVim.safe_keymap_set
-
--- better up/down
-map("i", "jj", "<Esc>", { desc = "Go to normal mode" })
-map("n", "<leader>w", "<cmd>write<cr>", { desc = "Save file" })
-
-map("v", "<leader>", function()
-  alternative_file.open("next", "--exists")
-end, { desc = "Open next alternative file" })
-
-local alternative_file = require("mj.alternate_file")
-
-map("n", "<leader>irc", function()
-  require("mj.ruby_utils").insert_ruby_class_based_on_file_path()
-end, { desc = "Insert ruby class" })
-
--- this is not working correctly
--- map("v", "<leader>irc", function()
---   require("mj.ruby_utils").replace_selected_text_with_ruby_class()
--- end, { desc = "Replace selected text ruby class" })
-
-map("n", "<leader>aj", function()
-  alternative_file.open("prev", "--exists")
-end, { desc = "Open previous alternative file" })
-
--- Key mappings
-map("n", "<leader>Q", "<cmd>q!<cr>", { desc = "Quit" })
-map("n", "<leader>q", "<cmd>bdelete<cr>", { desc = "Close buffer" })
-map("n", "<leader>bdd", "<cmd>bdelete!<cr>", { desc = "Close buffer!" })
-map("n", "<leader>bda", "<cmd>bufdo %bd!<cr>", { desc = "Close all buffers!" })
-
--- Notes
-map("n", "<leader>et", ":e ~/.tmp/notes/", { desc = "Edit notes" })
-map("n", "<leader>on", ":e ~/.tmp/notes/notes.md<cr>", { desc = "Open notes" })
-map("n", "<leader>con", ":e ~/.tmp/notes/notes.md<cr>", { desc = "Open notes" })
-
-map("n", "<leader>j", function()
-  require("mj.utils").close_terminal_buffer(true)
-end, { desc = "Close terminal buffer (true)" })
-
-map("n", "<leader>k", function()
-  require("mj.utils").close_terminal_buffer(false)
-end, { desc = "Close terminal buffer (false)" })
-
--- Search mappings
-map("n", "<leader>f", "<cmd>/", { desc = "Search alias" })
-map("n", "<leader>F", "<cmd>nohlsearch<cr>", { desc = "Remove search highlight" })
-
--- Alternative file
-map("n", "<leader>af", "<c-^>", { desc = "Alternative file" })
-
--- Avoid arrow keys in command mode
-map("c", "<C-h>", "<left>", { desc = "Move left" })
-map("c", "<C-j>", "<down>", { desc = "Move down" })
-map("c", "<C-k>", "<up>", { desc = "Move up" })
-map("c", "<C-l>", "<right>", { desc = "Move right" })
-map("c", "<C-x>", "<del>", { desc = "Delete" })
-
--- Alternative file navigation
-map("n", "<leader>ak", function()
-  alternative_file.open("next", "--exists")
-end, { desc = "Next alternative file" })
-map("n", "<leader>aj", function()
-  alternative_file.open("prev", "--exists")
-end, { desc = "Previous alternative file" })
-
--- Diagnostic config
-vim.diagnostic.config({ virtual_text = false })
-
--- Running tests
-map("n", "<Leader><leader>at", function()
-  require("mj.test_runner").run_all_tests()
-end, { desc = "Run all tests" })
-
-map("n", "<Leader><leader>t", function()
-  require("mj.test_runner").test_line()
-end, { desc = "Run test for current line" })
-
-map("n", "<Leader>t", function()
-  require("mj.test_runner").test_line()
-end, { desc = "Run test for current line" })
-
-map("n", "<Leader>T", function()
-  require("mj.test_runner").run_test_file()
-end, { desc = "Run test file" })
-
-map("n", "<leader><leader>st", function()
-  require("mj.test_runner").run_shell_test()
-end, { desc = "Run ./shell_test" })
-
--- quick fix
-map("n", "<leader>gn", ":cnext<CR>", { desc = "Next quickfix occurrency" })
-map("n", "<leader>gp", ":cprev<CR>", { desc = "Previous quickfix occurrency" })
-
--- rm file
-map("n", "<leader>rm", ":Delete<cr>", { desc = "Delete file" })
-
--- Last buffer
-map("n", "<leader>o", "<c-^>", { desc = "Last buffer" })
-
--- Escape terminal mode with jj
-map("t", "<esc>", "<C-\\><C-n>", { desc = "Escape terminal mode" })
-map("t", "jj", "<C-\\><C-n>", { desc = "Escape terminal mode with jj" })
-
--- Buffer changing
-map("n", "<leader>bn", ":bn<cr>", { desc = "Next buffer" })
-map("n", "<leader>bp", ":bp<cr>", { desc = "Previous buffer" })
-
--- Find buffer file
-map("n", "<leader><leader>b", ":b<space>", { desc = "Find buffer file" })
-
--- Search
-map("n", "*", "*N", { desc = "Search and stay" })
-
--- Select all
-map("n", "<leader>a", "ggVG", { desc = "Select all" })
-
--- New tab
-map("n", "<c-w>t", ":tabnew<cr>", { desc = "New tab" })
-
--- Jumps to the next position after the closest closing char
-map("i", ",e", "<Esc>/[\\]})\"']<cr><Esc>:nohlsearch<cr>a", { desc = "Jump to next closing char" })
-
--- Adds arrow
-map("i", "<C-l>", "<Space>=><Space>", { desc = "Insert arrow" })
-
--- Rails specific
-map(
-  "v",
-  "<leader>h",
-  ':s/\\:\\([a-zA-Z_]\\+\\)\\s\\+=>/\\=printf("%s:", submatch(1))/g<CR><ESC>:let @/ = ""<CR>',
-  { desc = "Convert hash rocket to symbol" }
-)
-map("n", "<Leader>qq", "<ESC>:q<cr>", { desc = "Quit" })
-
--- Reload buffer
-map("n", "<Leader>rel", ":e<CR>", { desc = "Reload buffer" })
-
--- Find
-map("n", "<leader>f", "<ESC>/", { desc = "Find" })
-map("n", "<leader>*", "<ESC>:find<space>", { desc = "Find file" })
-
--- Use Q for formatting the current paragraph (or selection)
-map("v", "Q", "gq", { desc = "Format selection" })
-map("n", "Q", "gqap", { desc = "Format paragraph" })
-
--- Buffer resizing mappings (shift + arrow key)
-map("n", "<Up>", "<c-w>+", { desc = "Resize buffer up" })
-map("n", "<Down>", "<c-w>-", { desc = "Resize buffer down" })
-map("n", "<Left>", "<c-w><", { desc = "Resize buffer left" })
-map("n", "<Right>", "<c-w>>", { desc = "Resize buffer right" })
-
-map("n", "<leader><leader>xx", "<esc>:!chmod +x %<cr>", { desc = "Make file executable" })
-
-map("n", "<leader><leader>b", "<cmd>Telescope current_buffer_fuzzy_find<cr>", { desc = "Search in current buffer" })
-
--- Marks
-map("n", "<leader>mA", "ma", { desc = "Set mark 'a'" })
-map("n", "<leader>ma", "'a", { desc = "Go to mark 'a'" })
-map("n", "<leader>m1", "'a", { desc = "Go to mark 'a'" })
-
-map("n", "<leader>mB", "mb", { desc = "Set mark 'b'" })
-map("n", "<leader>mb", "'b", { desc = "Go to mark 'b'" })
-map("n", "<leader>m2", "'b", { desc = "Go to mark 'b'" })
-
-map("n", "<leader>mC", "mc", { desc = "Set mark 'c'" })
-map("n", "<leader>mc", "'c", { desc = "Go to mark 'c'" })
-map("n", "<leader>m3", "'c", { desc = "Go to mark 'c'" })
-
-map("n", "<leader>mD", "md", { desc = "Set mark 'd'" })
-map("n", "<leader>md", "'d", { desc = "Go to mark 'd'" })
-map("n", "<leader>m4", "'d", { desc = "Go to mark 'd'" })
-
-map("n", "<leader>mE", "me", { desc = "Set mark 'e'" })
-map("n", "<leader>me", "'e", { desc = "Go to mark 'e'" })
-map("n", "<leader>m5", "'e", { desc = "Go to mark 'e'" })
-
--- Notes
-map("n", "<leader>no", ":vs ~/.tmp/notes.md<cr>", { desc = "Open notes" })
-
--- shell_test
-map("n", "<leader><leader>1", ":e shell_test<cr>", { desc = "Open shell_test" })