diff --git a/.config/nvim/lua/config/lsp.lua b/.config/nvim/lua/config/lsp.lua
--- a/.config/nvim/lua/config/lsp.lua
+++ b/.config/nvim/lua/config/lsp.lua
@@ -1,10 +1,78 @@
+local diag_threshold = "WARN"
+
 vim.diagnostic.config({
-  virtual_text = { true, severity = "WARN", },
+  underline = { severity = {min = diag_threshold} },
+  virtual_text = { true, severity = {min = diag_threshold} },
+})
+
+-- Some options are more chill in text mode, this unchills them if a LSP is in
+-- play.  Note they're global
+vim.api.nvim_create_autocmd("LspAttach", {
+  once = true,
+  group = "lsp_attach",
+  callback = function(args)
+    vim.opt.number = true
+    vim.opt.updatetime = 250
+  end,
 })
 
 vim.api.nvim_create_autocmd("LspAttach", {
-  once = true,
+  group = "lsp_attach",
   callback = function(args)
-    vim.opt.number = true
-  end,
+    local bufnr = args.buf
+    local client = vim.lsp.get_client_by_id(args.data.client_id)
+
+    -- Enable highlight-under-cursor
+    if client.server_capabilities.documentHighlightProvider then
+      vim.cmd [[
+        hi! LspReferenceRead ctermfg=0 ctermbg=11 guifg=#f0a0c0 guibg=#302028
+        hi! LspReferenceText ctermfg=0 ctermbg=11 guifg=#f0a0c0 guibg=#302028
+        hi! LspReferenceWrite ctermfg=0 ctermbg=11 cterm=underline guifg=#f0a0c0 guibg=#302028 gui=underline
+      ]]
+      vim.api.nvim_create_augroup('lsp_document_highlight', {
+        clear = false
+      })
+      vim.api.nvim_clear_autocmds({
+        buffer = bufnr,
+        group = 'lsp_document_highlight',
+      })
+      vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
+        group = 'lsp_document_highlight',
+        buffer = bufnr,
+        callback = vim.lsp.buf.document_highlight,
+      })
+      vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
+        group = 'lsp_document_highlight',
+        buffer = bufnr,
+        callback = vim.lsp.buf.clear_references,
+      })
+    end
+
+    -- enable auto diags in message area for below threshold
+    vim.api.nvim_create_augroup('lsp_diags', {clear = false})
+
+    vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {
+      group = "lsp_diags",
+      buffer = bufnr,
+      callback = function(opts, bufnr, line_nr, client_id)
+        bufnr = bufnr or 0
+        line_nr = line_nr or (vim.api.nvim_win_get_cursor(0)[1] - 1)
+        opts = opts or {['lnum'] = line_nr}
+
+        local line_diagnostics = vim.diagnostic.get(bufnr, {lnum = line_nr, severity = {max = diag_threshold}})
+        if vim.tbl_isempty(line_diagnostics) then return end
+
+        local diagnostic_message = ""
+        for i, diagnostic in ipairs(line_diagnostics) do
+          diagnostic_message = diagnostic_message .. string.format("%d: %s", i, diagnostic.message or "")
+          print(diagnostic_message)
+          if i ~= #line_diagnostics then
+            diagnostic_message = diagnostic_message .. "\n"
+          end
+        end
+        vim.api.nvim_echo({{diagnostic_message, "Normal"}}, false, {})
+      end,
+    })
+
+  end
 })