From 454f688e8086e5d4c9248916b78b19cb82b411ee Mon Sep 17 00:00:00 2001
From: Andy Teijelo <ateijelo@gmail.com>
Date: Mon, 7 Nov 2022 09:16:43 -0500
Subject: [PATCH] Add vala plugin; several keymaps

---
 lua/user/keymaps.lua      | 29 ++++++++++++++++++++++++-----
 lua/user/lsp/handlers.lua |  1 +
 lua/user/plugins.lua      |  2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 564eb51..7d0b457 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -98,9 +98,28 @@ keymap("n", "<F17>", "<cmd>lua require'dap'.terminate()<cr>", opts) -- Shift+F5
 --keymap("n", "<F41>", "<Plug>VimspectorRestart", opts)  -- Ctrl+Shift+F5
 --keymap("n", "<leader>di", "<Plug>VimspectorBalloonEval", opts)
 
--- move.vim
-vim.keymap.set('n', '<A-j>', '<cmd>MoveLine(1)<cr>', opts)
-vim.keymap.set('n', '<A-k>', '<cmd>MoveLine(-1)<cr>', opts)
-vim.keymap.set('v', '<A-j>', '<cmd>MoveBlock(1)<cr>', opts)
-vim.keymap.set('v', '<A-k>', '<cmd>MoveBlock(-1)<cr>', opts)
+-- move.nvim
+vim.keymap.set('n', '<M-j>', ':MoveLine(1)<cr>', opts)
+vim.keymap.set('n', '<M-k>', ':MoveLine(-1)<cr>', opts)
+vim.keymap.set('x', '<M-j>', ':MoveBlock(1)<cr>', opts)
+vim.keymap.set('x', '<M-k>', ':MoveBlock(-1)<cr>', opts)
 
+-- disable arrow keys
+keymap("n", "<Right>", "<Nop>", opts)
+keymap("n", "<Left>", "<Nop>", opts)
+keymap("n", "<Up>", "<Nop>", opts)
+keymap("n", "<Down>", "<Nop>", opts)
+keymap("i", "<Right>", "<Nop>", opts)
+keymap("i", "<Left>", "<Nop>", opts)
+keymap("i", "<Up>", "<Nop>", opts)
+keymap("i", "<Down>", "<Nop>", opts)
+
+-- move through wrapped lines
+keymap("n", "j", "gj")
+keymap("n", "k", "gk")
+
+-- use Alt + ijkl to move in insert mode
+keymap("i", "<M-l>", "<Right>", opts)
+keymap("i", "<M-h>", "<Left>", opts)
+keymap("i", "<M-j>", "<C-o>gj", opts)
+keymap("i", "<M-k>", "<C-o>gk", opts)
diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua
index b9fcf89..66ebb31 100644
--- a/lua/user/lsp/handlers.lua
+++ b/lua/user/lsp/handlers.lua
@@ -68,6 +68,7 @@ local function lsp_keymaps(bufnr)
     keymap(bufnr, "n", "<leader>li", "<cmd>LspInfo<cr>", opts)
     keymap(bufnr, "n", "<leader>lI", "<cmd>LspInstallInfo<cr>", opts)
     keymap(bufnr, "n", "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
+    keymap(bufnr, "n", "<M-.>", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
     keymap(bufnr, "n", "<leader>lj", "<cmd>lua vim.diagnostic.goto_next({buffer=0})<cr>", opts)
     keymap(bufnr, "n", "<leader>lk", "<cmd>lua vim.diagnostic.goto_prev({buffer=0})<cr>", opts)
     keymap(bufnr, "n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>", opts)
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index 2357ca7..839d309 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -116,6 +116,8 @@ return packer.startup(function(use)
   use { "j-hui/fidget.nvim", commit = "2cf9997d3bde2323a1a0934826ec553423005a26" }
   use { "mg979/vim-visual-multi" }
 
+  use { 'vala-lang/vala.vim' }
+
   -- Automatically set up your configuration after cloning packer.nvim
   -- Put this at the end after all plugins
   if PACKER_BOOTSTRAP then