vim: update plugins.lua

1 files changed, 19 insertions, 12 deletions

diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 2e9c51a..33199f4 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -63,7 +63,10 @@ return require('packer').startup({function()
 
   use {'tpope/vim-surround'}     -- edit surroundings in pairs
 
-  use {'justinmk/vim-dirvish'}   -- folder browser
+  use {'justinmk/vim-dirvish',
+    config = function()
+      -- vim.cmd [[ call dirvish#add_icon_fn({ p -> p[-1:]=='/'?'':' '}) ]]
+    end}   -- folder browser
 
   use {'ggandor/lightspeed.nvim'}
 
@@ -73,13 +76,13 @@ return require('packer').startup({function()
       local nls = require('null-ls')
       nls.config {
         sources = {
-          nls.builtins.formatting.clang_format, -- c*
-          nls.builtins.formatting.gofumpt, -- go
-          nls.builtins.formatting.json_tool, -- json
+          nls.builtins.diagnostics.shellcheck, -- *sh
+          -- nls.builtins.formatting.clang_format, -- c*
+          -- nls.builtins.formatting.gofumpt, -- go
+          -- nls.builtins.formatting.json_tool, -- json
           nls.builtins.formatting.rustfmt, -- rust
           nls.builtins.formatting.shfmt, -- *sh
           nls.builtins.formatting.yapf, -- python
-          nls.builtins.diagnostics.shellcheck, -- *sh
         }
       }
 
@@ -357,7 +360,10 @@ return require('packer').startup({function()
 
   use {'lukas-reineke/indent-blankline.nvim',
     config = function()
-      vim.g.indent_blankline_char = '▏'
+      require('indent_blankline').setup {
+        char = '▏',
+        show_end_of_line = true,
+      }
     end}
 
   use {'tpope/vim-repeat'} -- extend '.' to plugins
@@ -381,6 +387,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 }
     end} -- }}}
 
   -- use {'TimUntersberger/neogit',
@@ -400,7 +407,7 @@ return require('packer').startup({function()
         virtual_titles = true,
         mappings = true,
         run = nil,
-        neuron_dir = "~/.zk",
+        neuron_dir = "$HOME/Documents/zettelkasten",
         leader = "gz",
       }
 
@@ -415,9 +422,9 @@ return require('packer').startup({function()
       local nnoremap = require('astronauta.keymap').nnoremap
 
       require('orgmode').setup {
-        org_agenda_files = {'$HOME/.zk/.orgmode/*.org'},
-        org_default_notes_file = '$HOME/.zk/.orgmode/todo.org',
-        org_todo_keywords = {'TODO', 'NEXT', 'WIP', 'DONE'},
+        org_agenda_files = {'$HOME/Documents/org/*.org'},
+        org_default_notes_file = '$HOME/Documents/org/todo.org',
+        org_todo_keywords = {'TODO', 'DONE'},
         org_indent_mode = 'noindent',
         org_agenda_templates = {
           t = {
@@ -427,7 +434,7 @@ return require('packer').startup({function()
           n = {
             description = 'Note',
             template = '* %?',
-            target = '$HOME/.zk/.orgmode/notes.org',
+            target = '$HOME/Documents/org/notes.org',
           },
         },
       }
@@ -485,7 +492,7 @@ return require('packer').startup({function()
       vim.g.vim_markdown_conceal_code_blocks = true
     end} -- }}}
 
-  use {'masukomi/vim-markdown-folding', ft = {'markdown'}}
+  -- use {'masukomi/vim-markdown-folding', ft = {'markdown'}}
   use {'jjo/vim-cue', ft = {'cue'}}
   use {'gentoo/gentoo-syntax'}