1 files changed, 29 insertions, 33 deletions
diff --git a/.vim/lua/hardmode.lua b/.vim/lua/hardmode.lua
index ed7d4ac..e6fea02 100644
--- a/.vim/lua/hardmode.lua
+++ b/.vim/lua/hardmode.lua
@@ -3,36 +3,32 @@
 -- https://coderoncode.com/posts/vim-is-the-perfect-ide
 
 local cmd = vim.cmd
-local u   = require('utils')
-
-local bail = ':silent! echohl ErrorMsg | echo "HARD MODE: hjkl operation only" | echohl None<CR>'
-
-u.map('n', 'R<up>', ':resize +2<CR>')
-u.map('n', 'R<down>', ':resize -2<CR>')
-u.map('n', 'R<left>', ':vertical resize +2<CR>')
-u.map('n', 'R<right>', ':vertical resize +2<CR>')
-
-u.map('n', 'W<up>', ':wincmd k<CR>')
-u.map('n', 'W<down>', ':wincmd j<CR>')
-u.map('n', 'W<left>', ':wincmd h<CR>')
-u.map('n', 'W<right>', ':wincmd l<CR>')
-
-u.map('n', 'Wm<up>', ':wincmd K<CR>')
-u.map('n', 'Wm<down>', ':wincmd J<CR>')
-u.map('n', 'Wm<left>', ':wincmd H<CR>')
-u.map('n', 'Wm<right>', ':wincmd L<CR>')
-
-u.map('n', '<up>', bail)
-u.map('n', '<down>', bail)
-u.map('n', '<left>', bail)
-u.map('n', '<right>', bail)
-
-u.map('v', '<up>', bail)
-u.map('v', '<down>', bail)
-u.map('v', '<left>', bail)
-u.map('v', '<right>', bail)
-
-u.map('i', '<up>', '<esc>' .. bail)
-u.map('i', '<down>', '<esc>' .. bail)
-u.map('i', '<left>', '<esc>' .. bail)
-u.map('i', '<right>', '<esc>' .. bail)
+local nnoremap = require('astronauta.keymap').nnoremap
+local vnoremap = require('astronauta.keymap').nnoremap
+
+local bail = 'silent! echohl ErrorMsg | echo "HARD MODE: hjkl operation only" | echohl None'
+
+nnoremap { 'R<up>',     function() vim.cmd [[ resize +2 ]] end }
+nnoremap { 'R<down>',   function() vim.cmd [[ resize -2 ]] end }
+nnoremap { 'R<left>',   function() vim.cmd [[ vertical resize +2 ]] end }
+nnoremap { 'R<right>',  function() vim.cmd [[ vertical resize +2 ]] end }
+
+nnoremap { 'W<up>',     function() vim.cmd [[ wincmd k ]] end }
+nnoremap { 'W<down>',   function() vim.cmd [[ wincmd j ]] end }
+nnoremap { 'W<left>',   function() vim.cmd [[ wincmd h ]] end }
+nnoremap { 'W<right>',  function() vim.cmd [[ wincmd l ]] end }
+
+nnoremap { 'Wm<up>',    function() vim.cmd [[ wincmd K ]] end }
+nnoremap { 'Wm<down>',  function() vim.cmd [[ wincmd J ]] end }
+nnoremap { 'Wm<left>',  function() vim.cmd [[ wincmd H ]] end }
+nnoremap { 'Wm<right>', function() vim.cmd [[ wincmd L ]] end }
+
+nnoremap { '<up>',      function() vim.cmd(bail) end }
+nnoremap { '<down>',    function() vim.cmd(bail) end }
+nnoremap { '<left>',    function() vim.cmd(bail) end }
+nnoremap { '<right>',   function() vim.cmd(bail) end }
+
+vnoremap { '<up>',      function() vim.cmd(bail) end }
+vnoremap { '<down>',    function() vim.cmd(bail) end }
+vnoremap { '<left>',    function() vim.cmd(bail) end }
+vnoremap { '<right>',   function() vim.cmd(bail) end }