From 57e115339d00a2a8afe09dba6f83009cc5a02e99 Mon Sep 17 00:00:00 2001
From: "Anna (navi) Figueiredo Gomes" <navi@vlhl.dev>
Date: Mon, 10 Apr 2023 16:38:26 -0300
Subject: nvim update, semi-refactor

---
 .config/nvim/lua/keymaps.lua | 82 ++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 56 deletions(-)
 mode change 100755 => 100644 .config/nvim/lua/keymaps.lua

(limited to '.config/nvim/lua/keymaps.lua')

diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
old mode 100755
new mode 100644
index 16de10f..4c09fd2
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -1,68 +1,38 @@
 vim.g.mapleader = " "
-local function keymap(mode, lhs, rhs, opts)
-	opts = opts or { noremap = true, silent = true }
-	vim.keymap.set(mode, lhs, rhs, opts)
-end
 
-keymap('n', '<leader><leader>',
-	function() require('luasnip').jump(1) end,
-	{noremap = true, silent = true})
+local opts = { noremap = true, silent = true }
 
 -- Map leader + s and v/h to open split 
-keymap('n', '<leader>sp', ':sp<CR>')
-keymap('n', '<leader>sv', ':vsp<CR>')
+vim.keymap.set('n', '<leader>sp', ':sp<CR>', opts)
+vim.keymap.set('n', '<leader>sv', ':vsp<CR>', opts)
 
-keymap('n', '<leader>q', ':q<CR>')
+vim.keymap.set('n', '<leader>q', ':q<CR>', opts)
 
-keymap('n', '<C-q>', ':mksession!<space>nvim-session<Enter>:wqa<Enter>')
-keymap('n', '<C-s>', ':wa<Enter>:mksession!<space>nvim-session<Enter>')
-keymap('n', '<C-p>', ':source<space>nvim-session<Enter>')
+vim.keymap.set('n', '<leader>y', '"+y', opts)
+vim.keymap.set('n', '<leader>d', '"+d', opts)
+vim.keymap.set('n', '<leader>p', '"+p', opts)
+vim.keymap.set('n', '<leader>Y', '"+Y', opts)
+vim.keymap.set('n', '<leader>D', '"+D', opts)
+vim.keymap.set('n', '<leader>P', '"+P', opts)
 
-keymap('n', '<leader>y', '"+y')
-keymap('n', '<leader>d', '"+d')
-keymap('n', '<leader>p', '"+p')
-keymap('n', '<leader>Y', '"+Y')
-keymap('n', '<leader>D', '"+D')
-keymap('n', '<leader>P', '"+P')
+vim.keymap.set('v', '<leader>y', '"+y', opts)
+vim.keymap.set('v', '<leader>d', '"+d', opts)
+vim.keymap.set('v', '<leader>p', '"+p', opts)
+vim.keymap.set('v', '<leader>Y', '"+Y', opts)
+vim.keymap.set('v', '<leader>D', '"+D', opts)
+vim.keymap.set('v', '<leader>P', '"+P', opts)
 
-keymap('v', '<leader>y', '"+y')
-keymap('v', '<leader>d', '"+d')
-keymap('v', '<leader>p', '"+p')
-keymap('v', '<leader>Y', '"+Y')
-keymap('v', '<leader>D', '"+D')
-keymap('v', '<leader>P', '"+P')
+vim.keymap.set('n', '<M-h>', '<C-w>h', opts)
+vim.keymap.set('n', '<M-k>', '<C-w>k', opts)
+vim.keymap.set('n', '<M-j>', '<C-w>j', opts)
+vim.keymap.set('n', '<M-l>', '<C-w>l', opts)
 
-keymap('n', '<M-h>', '<C-w>h')
-keymap('n', '<M-k>', '<C-w>k')
-keymap('n', '<M-j>', '<C-w>j')
-keymap('n', '<M-l>', '<C-w>l')
+vim.keymap.set('n', '<C-n>', ':cn<Enter>', opts)
+vim.keymap.set('n', '<C-p>', ':cp<Enter>', opts)
 
-keymap('v', '<', '<gv')
-keymap('v', '>', '>gv')
+vim.keymap.set('v', '<', '<gv', opts)
+vim.keymap.set('v', '>', '>gv', opts)
 
-keymap('i', '<C-BS>', '<C-w>')
+vim.keymap.set('i', '<C-BS>', '<C-w>', opts)
 
-vim.api.nvim_create_autocmd('User', {
-	pattern = 'LspAttached',
-	desc = 'LSP Keymaps',
-	callback = function()
-		local function bufmap(mode, lhs, rhs)
-			keymap(mode, lhs, rhs, { silent = true, noremap = true, buffer = true })
-		end
-
-		bufmap('n', 'gD', vim.lsp.buf.declaration)
-		bufmap('n', 'gd', vim.lsp.buf.definition)
-		bufmap('n', 'K', vim.lsp.buf.hover)
-		bufmap('n', 'gi', vim.lsp.buf.implementation)
-		bufmap('n', '<C-k>', vim.lsp.buf.signature_help)
-		bufmap('n', '<leader>wa', vim.lsp.buf.add_workspace_folder)
-		bufmap('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder)
-		bufmap('n', '<leader>wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end)
-		bufmap('n', '<leader>D', vim.lsp.buf.type_definition)
-		bufmap('n', '<leader>rn', vim.lsp.buf.rename)
-		bufmap('n', '<leader>ca', vim.lsp.buf.code_action)
-		bufmap('n', 'gr', vim.lsp.buf.references)
-		bufmap('n', '<leader>f', vim.lsp.buf.formatting)
-		bufmap('n', '<leader>e', vim.diagnostic.open_float)
-	end
-})
+vim.keymap.set('n', 'gp', require('utils').lsp_peek, opts)
-- 
cgit v1.2.3