1 files changed, 38 insertions, 42 deletions

diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 824cfb4..5fbd2a6 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -49,37 +49,56 @@ return require('packer').startup({function()
   -- manage packer itself
   use {'wbthomason/packer.nvim'}
 
+  -- improve startup time by optimizing lua `require`
+  use {'lewis6991/impatient.nvim'}
+
   -- git status in the sign column
-  use {'mhinz/vim-signify', -- {{{
+  use {'lewis6991/gitsigns.nvim', --- {{{
+    requires = {'nvim-lua/plenary.nvim'},
     config = function()
-      local nnoremap = require('astronauta.keymap').nnoremap
-
-      vim.g.signify_sign_change = '~'
-
-      nnoremap { ']h', function() vim.fn['sy#jump#next_hunk'](1) end }
-      nnoremap { '[h', function() vim.fn['sy#jump#prev_hunk'](1) end }
+      require('gitsigns').setup {
+        signs = {
+          change       = {hl='GitSignsChange', text='│', numhl='GitSignsChangeLn'},
+          add          = {hl='GitSignsAdd',    text='│', numhl='GitSignsAddLn'},
+          delete       = {hl='GitSignsDelete', text='_', numhl='GitSignsDeleteLn'},
+          topdelete    = {hl='GitSignsDelete', text='‾', numhl='GitSignsDeleteLn'},
+          changedelete = {hl='GitSignsChange', text='~', numhl='GitSignsChangeLn'},
+        },
+        signcolumn = true,
+        numhl = true,
+        linehl = true,
+        word_diff = true,
+        keymaps = {
+          noremap = true,
+          ['n ]h'] = { '<cmd>Gitsigns next_hunk<cr>'},
+          ['n [h'] = { '<cmd>Gitsigns prev_hunk<cr>'},
+          -- text objects
+          -- ['o ih'] = ':<c-u>Gitsigns select_hunk<cr>',
+          -- ['x ih'] = ':<c-u>Gitsigns select_hunk<cr>'
+        }
+      }
     end} -- }}}
 
-  use {'numToStr/Comment.nvim',
+  use {'numToStr/Comment.nvim', -- {{{
     config = function()
       require('Comment').setup {
         opleader = {
           block = 'gC',
         }
       }
-    end}
+    end} -- }}}
 
-  use {'windwp/nvim-autopairs',
+  use {'windwp/nvim-autopairs', -- {{{
     config = function()
       require('nvim-autopairs').setup()
-    end}
+    end} -- }}}
 
   use {'tpope/vim-surround'}     -- edit surroundings in pairs
 
   use {'justinmk/vim-dirvish',
     config = function()
       -- vim.cmd [[ call dirvish#add_icon_fn({ p -> p[-1:]=='/'?'':' '}) ]]
-    end}   -- folder browser
+    end}
 
   use {'ggandor/lightspeed.nvim', disable = true,
     config = function()
@@ -130,11 +149,11 @@ return require('packer').startup({function()
       }
     end} -- }}}
 
-  use {'neovim/nvim-lspconfig',
+  use {'neovim/nvim-lspconfig', -- {{{
     requires = {'~/devel/projects/spinner.nvim'},
     config = function()
       require('lsp').setup()
-    end}
+    end} -- }}}
 
   use {'kosayoda/nvim-lightbulb', -- {{{
     -- branch = 'virtual-text-column',
@@ -171,9 +190,9 @@ return require('packer').startup({function()
       }
     end} -- }}}
 
-  use {'weilbith/nvim-code-action-menu',
+  use {'weilbith/nvim-code-action-menu', -- {{{
     cmd = 'CodeActionMenu',
-  }
+  } -- }}}
 
   use {'nvim-treesitter/nvim-treesitter', -- {{{
     run = ':TSUpdate',
@@ -401,7 +420,7 @@ return require('packer').startup({function()
   use {'tjdevries/astronauta.nvim'}
 
   -- snippets
-  use {'dcampos/nvim-snippy', -- {{{}
+  use {'dcampos/nvim-snippy', -- {{{
     requires = {
       'honza/vim-snippets'
     },
@@ -471,33 +490,10 @@ return require('packer').startup({function()
       require('astronauta.keymap').nnoremap { '<leader>gm', function() vim.cmd [[GitMessenger]] end }
     end} -- }}}
 
-  -- use {'TimUntersberger/neogit',
-  --   config = "require('astronauta.keymap').nnoremap { '<leader>gg', function() require('neogit').open({ kind = 'split' }) end }"
-  -- }
-
   use {'liuchengxu/vista.vim'}
   use {'rhysd/conflict-marker.vim', disable = true}
   use {'kassio/neoterm', disable = true}
 
-  -- zettelkasten via neuron
-  use {'oberblastmeister/neuron.nvim', -- {{{
-    branch = 'unstable',
-    requires = {'nvim-telescope/telescope.nvim'},
-    config = function()
-      require('neuron').setup {
-        virtual_titles = true,
-        mappings = true,
-        run = nil,
-        neuron_dir = "$HOME/Documents/zettelkasten",
-        leader = "gz",
-      }
-
-      vim.cmd [[ command! NeuronServe lua require('neuron').rib {address = "127.0.0.1:8200", verbose = true} ]]
-      vim.cmd [[ command! NeuronZettels lua require('neuron.telescope').find_zettels {insert = false} ]]
-      vim.cmd [[ command! NeuronZettelsInsert lua require('neuron.telescope').find_zettels {insert = true} ]]
-      vim.cmd [[ command! NeuronTags lua require('neuron.telescope').find_tags() ]]
-    end} -- }}}
-
   use {'kristijanhusak/orgmode.nvim', -- {{{
     ft = {'org'},
     config = function()
@@ -736,13 +732,13 @@ return require('packer').startup({function()
       }
     end} -- }}}
 
-  use {'lewis6991/spellsitter.nvim', disable = true,
+  use {'lewis6991/spellsitter.nvim', disable = true, -- {{{
     config = function()
       require('spellsitter').setup {
         enable = true,
         spellchecker = 'ffi'
       }
-    end}
+    end} -- }}}
 
   use {'rktjmp/lush.nvim'}