summary refs log tree commit diff
path: root/.vim/lua/plugins
diff options
context:
space:
mode:
authorRobert Günzler <r@gnzler.io>2021-06-11 13:06:46 +0200
committerRobert Günzler <r@gnzler.io>2021-06-11 13:06:46 +0200
commit77f4a590b498322e5475a1dc20d60ef44a9e2a04 (patch)
tree5d09b7904619f8c812f20d7756f8303b366f06c4 /.vim/lua/plugins
parent7f68dd013f46de0bed23452b89879038110114a6 (diff)
vim: update signify configuration
Diffstat (limited to '.vim/lua/plugins')
-rw-r--r--.vim/lua/plugins/_lsp.lua16
-rw-r--r--.vim/lua/plugins/_signify.lua14
2 files changed, 17 insertions, 13 deletions
diff --git a/.vim/lua/plugins/_lsp.lua b/.vim/lua/plugins/_lsp.lua
index 9c52998..39a10b9 100644
--- a/.vim/lua/plugins/_lsp.lua
+++ b/.vim/lua/plugins/_lsp.lua
@@ -32,9 +32,9 @@ local my_attach = function(client)
 
   u.augroup2 {
     lsp_user = {
-      {'BufWritePre', '*', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
-      {'BufWritePre', '*.go', 'lua vim.lsp.buf.code_action({ source = { organizeImports = true } })'},
-      {'CursorHold', '*', 'lua vim.lsp.diagnostic.show_line_diagnostics()'},
+      {'BufWritePre' , '*'    ,  'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
+      {'BufWritePre' , '*.go' ,  'lua vim.lsp.buf.code_action({ source = { organizeImports = true } })'},
+      -- {'CursorHold'  , '*'    ,  'lua vim.lsp.diagnostic.show_line_diagnostics()'},
     }
   }
 end
@@ -43,10 +43,10 @@ end
 -- configure builtin diagnositcs
 vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( -- {{{
   vim.lsp.diagnostic.on_publish_diagnostics, {
-    virtual_text = false,
-    signs = true,
-    underline = true,
-    update_in_insert = true,
+    virtual_text     = false,
+    signs            = true,
+    underline        = true,
+    update_in_insert = false,
   }
 )
 -- }}}
@@ -148,7 +148,7 @@ lsp.efm.setup{
   on_attach = my_attach,
   root_dir = util.root_pattern('.git', '.editorconfig'),
   init_options = { documentFormatting = true },
-  filetypes = { "sh" },
+  -- filetypes = { "sh", "c" },
   settings = {
     -- rootMarkers = {".git/"},
     languages = {
diff --git a/.vim/lua/plugins/_signify.lua b/.vim/lua/plugins/_signify.lua
index a91ecb6..41ced80 100644
--- a/.vim/lua/plugins/_signify.lua
+++ b/.vim/lua/plugins/_signify.lua
@@ -1,6 +1,10 @@
+local def = require('utils').def
+local nnoremap = require('astronauta.keymap').nnoremap
+
 vim.g.signify_sign_change = '~'
-require('utils').map('n', ']h', '<plug>(signify-next-hunk)', {silent=false})
-require('utils').map('n', '[h', '<plug>(signify-prev-hunk)')
-vim.cmd('hi SignifySignChange guibg=NONE ctermbg=NONE')
-vim.cmd('hi SignifySignAdd guibg=NONE ctermbg=NONE')
-vim.cmd('hi SignifySignDelete guibg=NONE ctermbg=NONE')
+
+nnoremap { ']h', function() vim.fn['sy#jump#next_hunk'](1) end }
+nnoremap { '[h', function() vim.fn['sy#jump#prev_hunk'](1) end }
+
+def("SignifyNextHunk", [[ call sy#jump#next_hunk(1) ]])
+def("SignifyPrevHunk", [[ call sy#jump#prev_hunk(1) ]])