nvim: trouble and null ls

3 files changed, 50 insertions, 20 deletions

diff --git a/nvim/lua/feline_style.lua b/nvim/lua/feline_style.lua
index a211832..5159759 100644
--- a/nvim/lua/feline_style.lua
+++ b/nvim/lua/feline_style.lua
@@ -60,7 +60,7 @@ local comps = {
     vi_mode = {
         left = {
             provider = function()
-              return '  ' .. vi_mode_utils.get_vim_mode()
+              return vi_mode_utils.get_vim_mode()
             end,
             hl = function()
                 local val = {
@@ -72,19 +72,6 @@ local comps = {
             end,
             right_sep = ' '
         },
-        right = {
-            -- provider = '▊',
-            provider = '' ,
-            hl = function()
-                local val = {
-                    name = vi_mode_utils.get_mode_highlight_name(),
-                    fg = vi_mode_utils.get_mode_color()
-                }
-                return val
-            end,
-            left_sep = ' ',
-            right_sep = ' '
-        }
     },
     file = {
         info = {
@@ -220,6 +207,7 @@ local comps = {
         },
         change = {
             provider = 'git_diff_changed',
+            icon = '  ',
             hl = {
                 fg = colors.orange
             }
diff --git a/nvim/lua/git.lua b/nvim/lua/git.lua
index 4a39d19..bc9ea8f 100644
--- a/nvim/lua/git.lua
+++ b/nvim/lua/git.lua
@@ -7,7 +7,7 @@ require('gitsigns').setup {
     changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
   },
   signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
-  numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
+  numhl      = true, -- Toggle with `:Gitsigns toggle_numhl`
   linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
   word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
   keymaps = {
@@ -22,7 +22,7 @@ require('gitsigns').setup {
     ['n hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
     ['n hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
     ['n hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
-    ['n hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
+    ['n hB'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
   },
   watch_gitdir = {
     interval = 1000,
diff --git a/nvim/lua/lsp_conf.lua b/nvim/lua/lsp_conf.lua
index a63b761..ba574d6 100644
--- a/nvim/lua/lsp_conf.lua
+++ b/nvim/lua/lsp_conf.lua
@@ -1,5 +1,18 @@
 local nvim_lsp = require('lspconfig')
 local coq = require('coq')
+local null_ls = require("null-ls")
+local trouble = require("trouble")
+
+-- Redefine sign.
+local signs = { Error = ' ', Warning = ' ', Hint = ' ', Information = ' ' }
+
+for type, icon in pairs(signs) do
+  local hl = 'LspDiagnosticsSign' .. type
+  vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = '' })
+end
+
+local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+local opts = { noremap=true, silent=true }
 
 local on_attach = function(client, bufnr)
   local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
@@ -12,18 +25,31 @@ local on_attach = function(client, bufnr)
   buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
   buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
   buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-  buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
   buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
   buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
-  buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
-  buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
 end
 
+null_ls.config({
+    debug = false,
+    sources = {
+        -- Python
+        null_ls.builtins.formatting.black,
+        null_ls.builtins.formatting.isort,
+        null_ls.builtins.diagnostics.flake8,
+        -- Rust
+        null_ls.builtins.formatting.rustfmt,
+        -- C
+        null_ls.builtins.formatting.clang_format,
+        -- JS/TS
+        null_ls.builtins.formatting.prettier,
+    }
+})
+
 -- Setup lspconfig. 
  
 --- Use a loop to conveniently call 'setup' on multiple servers and
 -- map buffer local keybindings when the language server attaches
-local servers = { 'jedi_language_server', 'rust_analyzer', 'tsserver', 'clangd' }
+local servers = { 'pyright', 'rust_analyzer', 'tsserver', 'clangd' }
 for _, lsp in ipairs(servers) do
   nvim_lsp[lsp].setup {
     capabilities = coq.lsp_ensure_capabilities(),
@@ -33,3 +59,19 @@ for _, lsp in ipairs(servers) do
     }
   }
 end
+
+nvim_lsp["null-ls"].setup({
+    on_attach =  function(client, bufnr)
+        -- Format on save.
+        if client.resolved_capabilities.document_formatting then
+            buf_set_keymap('n', '<leader>fs', '<cmd>lua vim.lsp.buf.formatting_sync()<cr>', opts)
+            vim.cmd 'autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()'
+        end
+    end
+})
+
+trouble.setup({
+    use_lsp_diagnostic_signs = true,
+    auto_close = true,
+    auto_open = true
+})