summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.vim/init.lua11
-rw-r--r--.vim/lua/plugins.lua13
2 files changed, 5 insertions, 19 deletions
diff --git a/.vim/init.lua b/.vim/init.lua
index 7dcf373..73a9a4b 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -121,19 +121,12 @@ vim.diagnostic.config {
   --   prefix = '',
   -- },
   signs            = true,
-  float            = { scope = 'line' },
+  float            = true,
   virtual_lines    = { prefix = '⬐  ' },
 
   update_in_insert = false,
   severity_sort    = true,
 }
-do
-  local group = vim.api.nvim_create_augroup('DiagnosticOpenFloat', { clear = true })
-  vim.api.nvim_create_autocmd('CursorHold', { callback = function()
-    if not _G.diagnostic_hidden then vim.diagnostic.open_float(nil, {focus=false}) end
-  end, group = group })
-end
-
 vim.fn.sign_define({
   {name='DiagnosticSignError', text='✗', texthl='DiagnosticSignError'},
   -- {name='DiagnosticSignWarn',  text='⚡', texthl='DiagnosticSignWarn'},
@@ -143,7 +136,7 @@ vim.fn.sign_define({
 })
 vim.keymap.set('n',  ']d', vim.diagnostic.goto_next)
 vim.keymap.set('n',  '[d', vim.diagnostic.goto_prev)
-vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float)
+vim.keymap.set('n',  '<localleader>d', vim.diagnostic.open_float)
 vim.keymap.set('n', '<leader>D', function()
     if not _G.diagnostic_hidden then
       vim.diagnostic.hide()
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index cd61821..17fd879 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -655,9 +655,9 @@ return require('packer').startup({function()
       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', ';d', require('telescope.builtin').diagnostics)
+      -- vim.keymap.set('n', ';s', require('telescope.builtin').lsp_workspace_symbols)
+      -- vim.keymap.set('n', ';r', require('telescope.builtin').lsp_references)
       vim.keymap.set('n', ';v', function()
           require('telescope.builtin').find_files({
             prompt_title = 'vimrc',
@@ -666,13 +666,6 @@ return require('packer').startup({function()
           })
         end)
 
-      vim.keymap.set('n', ';d', require('telescope.builtin').diagnostics)
-
-      -- LSP stuff
-      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)
-
       -- do
       --   local group = vim.api.nvim_create_augroup('Telescope', { clear = true })
       --   vim.api.nvim_create_autocmd('QuickFixCmdPost', {