1 files changed, 34 insertions, 32 deletions

diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index d5d5ebb..c55e650 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -393,33 +393,36 @@ return require('packer').startup({function()
         }
       }
 
-      nnoremap { ';Q', require('telescope.builtin').quickfix }
-      nnoremap { ';C', require('telescope.builtin').loclist }
-
-      nnoremap { ';H', require('telescope.builtin').help_tags }
-      nnoremap { ';b', require('telescope.builtin').buffers }
-      nnoremap { ';c', require('telescope.builtin').commands }
-      nnoremap { ';f', require('telescope.builtin').fd }
-      nnoremap { ';g', require('telescope.builtin').live_grep }
-      nnoremap { ';h', require('telescope.builtin').command_history }
-      nnoremap { ';l', require('telescope.builtin').current_buffer_fuzzy_find }
-      nnoremap { ';o', require('telescope.builtin').oldfiles }
-      nnoremap { ';t', require('telescope.builtin').tags }
-      nnoremap { ';w', require('telescope.builtin').file_browser }
-
-      nnoremap { ';v', function()
+      -- required to get fzf-native working
+      require('telescope').load_extension('fzf')
+      require('telescope').load_extension('ui-select')
+
+      vim.keymap.set('n', ';Q', require('telescope.builtin').quickfix)
+      vim.keymap.set('n', ';C', require('telescope.builtin').loclist)
+
+      vim.keymap.set('n', ';H', require('telescope.builtin').help_tags)
+      vim.keymap.set('n', ';b', require('telescope.builtin').buffers)
+      vim.keymap.set('n', ';c', require('telescope.builtin').commands)
+      vim.keymap.set('n', ';f', require('telescope.builtin').fd)
+      vim.keymap.set('n', ';g', require('telescope.builtin').live_grep)
+      vim.keymap.set('n', ';h', require('telescope.builtin').command_history)
+      vim.keymap.set('n', ';l', require('telescope.builtin').current_buffer_fuzzy_find)
+      vim.keymap.set('n', ';o', require('telescope.builtin').oldfiles)
+      vim.keymap.set('n', ';t', require('telescope.builtin').tags)
+      -- vim.keymap.set('n', ';w', require('telescope.builtin').file_browser)
+
+      vim.keymap.set('n', ';v', function()
           require('telescope.builtin').find_files({
             prompt_title = 'vimrc',
             previewer = false,
             cwd = vim.fn.stdpath('config'),
           })
-        end }
+        end)
 
       -- LSP stuff
-      nnoremap { ';s', require('telescope.builtin').lsp_workspace_symbols }
-      nnoremap { ';a', require('telescope.builtin').lsp_code_actions }
-      nnoremap { ';d', require('telescope.builtin').lsp_workspace_diagnostics }
-      nnoremap { ';r', require('telescope.builtin').lsp_references }
+      vim.keymap.set('n', ';s', require('telescope.builtin').lsp_workspace_symbols)
+      vim.keymap.set('n', ';a', require('telescope.builtin').lsp_code_actions)
+      vim.keymap.set('n', ';r', require('telescope.builtin').lsp_references)
     end} -- }}}
 
   -- TODO(robert): look into this more
@@ -428,9 +431,6 @@ return require('packer').startup({function()
     config = function()
     end}
 
-  -- polyfill for some missing stuff
-  use {'tjdevries/astronauta.nvim'}
-
   -- snippets
   use {'dcampos/nvim-snippy', -- {{{
     requires = {
@@ -438,14 +438,16 @@ return require('packer').startup({function()
     },
     config = function()
       local S = require('snippy')
-      local K = require('astronauta.keymap')
-      K.inoremap { '<C-j>', function() if S.can_jump(1) then S.next() else return '<C-j>' end end }
-      K.inoremap { '<C-k>', function() if S.can_jump(-1) then S.previous() else return '<C-k>' end end }
-      K.snoremap { '<C-j>', function() if S.can_jump(1) then S.next() else return '<C-j>' end end }
-      K.snoremap { '<C-k>', function() if S.can_jump(-1) then S.previous() else return '<C-k>' end end }
+      vim.keymap.set('i', '<C-j>', function() if S.can_jump(1) then S.next() else return '<C-j>' end end)
+      vim.keymap.set('i', '<C-k>', function() if S.can_jump(-1) then S.previous() else return '<C-k>' end end)
+      vim.keymap.set('s', '<C-j>', function() if S.can_jump(1) then S.next() else return '<C-j>' end end)
+      vim.keymap.set('s', '<C-k>', function() if S.can_jump(-1) then S.previous() else return '<C-k>' end end)
     end} -- }}}
 
-  use {'junegunn/vim-easy-align'}
+  use {'junegunn/vim-easy-align', cmd = {'EasyAligh', 'LiveEasyAlign'}, -- {{{
+    config = function()
+      vim.keymap.set('v', '<enter>', ':LiveEasyAlign<cr>')
+    end} -- }}}
 
   use {'editorconfig/editorconfig-vim', -- {{{
     config = function()
@@ -499,7 +501,7 @@ return require('packer').startup({function()
       vim.g.git_messenger_always_into_popup = true
       vim.g.git_messenger_close_on_cursor_moved = true
       vim.g.git_messenger_no_default_mappings = true
-      require('astronauta.keymap').nnoremap { '<leader>gm', function() vim.cmd [[GitMessenger]] end }
+      vim.keymap.set('n', '<leader>gm', function() vim.cmd [[GitMessenger]] end)
     end} -- }}}
 
   use {'liuchengxu/vista.vim'}
@@ -535,12 +537,12 @@ return require('packer').startup({function()
       local pickers = require('telescope.pickers')
       local finders = require('telescope.finders')
 
-      require('astronauta.keymap').nnoremap { ';O', function()
+      vim.keymap.set('s', ';O', function()
           pickers.new(opts, {
             prompt_title = 'Orgmode',
             finder = finders.new_table(require('orgmode.config'):get_all_files()),
           }):find()
-        end }
+        end)
 
       -- vim.cmd [[ command! Orgmode lua require('orgmode').action('agenda.prompt') ]]
       -- vim.cmd [[ command! OrgmodeCapture lua require('orgmode').action('capture.refile') ]]