working on custom neovim

1 files changed, 29 insertions, 8 deletions

diff --git a/pkgs/custom-neovim/config/lua/mappings.lua b/pkgs/custom-neovim/config/lua/mappings.lua
index 15a28e5..dcad4b2 100644
--- a/pkgs/custom-neovim/config/lua/mappings.lua
+++ b/pkgs/custom-neovim/config/lua/mappings.lua
@@ -5,14 +5,21 @@ local mapkey = utils.mapkey
 vim.g.mapleader = ' '
 
 -- Pickers
-mapkey("n", "<leader>f", "Open file picker", ":Telescope find_files<cr>")
-mapkey("n", "<leader>c", "Open recent file picker", ":Telescope oldfiles<cr>")
--- mapkey("n", "<leader>e", "Open file explorer", ":Pick explorer<cr>")
-mapkey("n", "<leader>b", "Open buffer picker", ":Telescope buffers<cr>")
-mapkey("n", "<leader>/", "Open live grep picker", ":Telescope live_grep<cr>")
-mapkey("n", "<leader>\\", "Open command palette", ":Telescope commands<cr>")
-mapkey("n", "<leader>?", "Open help picker", ":Telescope help<cr>")
-mapkey("n", "<leader>'", "Open last picker", ":Telescope resume<cr>")
+mapkey("n", "<leader>f", "Open file picker", Snacks.picker.files)
+mapkey("n", "<leader>c", "Open recent file picker", Snacks.picker.recent)
+mapkey("n", "<leader>e", "Open file explorer", Snacks.picker.explorer)
+mapkey("n", "<leader>b", "Open buffer picker", Snacks.picker.buffers)
+mapkey("n", "<leader>B", "Open buffer live grep picker", Snacks.picker.grep_buffers)
+mapkey("n", "<leader>y", "Open clipboard history picker", Snacks.picker.cliphist)
+mapkey("n", "<leader>/", "Open live grep picker", Snacks.picker.grep)
+mapkey("n", "<leader>\\", "Open command palette", Snacks.picker.commands)
+mapkey("n", "<leader>?", "Open help picker", Snacks.picker.help)
+mapkey("n", "<leader>p", "Open picker picker", Snacks.picker.pickers)
+mapkey("n", "<leader>'", "Open last picker", Snacks.picker.resume)
+
+-- Commenting.
+mapkey("n", "<C-c>", "Comment line", ":norm gcc<cr>")
+mapkey("v", "<C-c>", "Comment line", ":norm gc<cr>")
 
 -- Tabs
 mapkey("n", "<leader>t", "Manage tabs", "")
@@ -21,6 +28,10 @@ mapkey("n", "<leader>tq", "Close tab", ":tabclose<cr>")
 mapkey("n", "<leader>tn", "Go to next tab", ":tabnext<cr>")
 mapkey("n", "<leader>tp", "Go to previous tab", ":tabprev<cr>")
 
+-- Sessions
+mapkey("n", "<leader>s", "Manage sessions", "")
+mapkey("n", "<leader>ss", "Open session picker", ":SessionSelect<cr")
+
 -- QOL Keys
 mapkey("t", "<Esc><Esc>", "Exit terminal insert mode", "<C-\\><C-n>")
 vim.keymap.set("c", "<cr>", function()
@@ -28,3 +39,13 @@ vim.keymap.set("c", "<cr>", function()
   return '<cr>'
 end, { expr = true }) -- Make enter complete command.
 mapkey("n", "<esc>", "Clear highlights", ":noh<cr>") -- Make esc clear highlights
+
+-- Visual Movement Keys.
+mapkey({"n", "v"}, "j", "Go down visually", "gj")
+mapkey({"n", "v"}, "k", "Go up visually", "gk")
+
+-- Learn hjkl.
+mapkey({"n", "v"}, "<left>", "Correct the keypress", function() print("Try pressing h instead.") end)
+mapkey({"n", "v"}, "<down>", "Correct the keypress", function() print("Try pressing j instead.") end)
+mapkey({"n", "v"}, "<up>", "Correct the keypress", function() print("Try pressing k instead.") end)
+mapkey({"n", "v"}, "<right>", "Correct the keypress", function() print("Try pressing l instead.") end)