3 files changed, 49 insertions, 37 deletions

diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua
index 9f15bbb..06231dc 100644
--- a/.config/nvim/lua/plugins/conform.lua
+++ b/.config/nvim/lua/plugins/conform.lua
@@ -2,16 +2,22 @@ return {
     {
         'stevearc/conform.nvim',
         opts = {
+            format_on_save = {
+                -- These options will be passed to conform.format()
+                timeout_ms = 500,
+                lsp_format = "fallback",
+            },
             formatters_by_ft = {
                 lua = { "stylua" },
                 -- Conform will run multiple formatters sequentially
-                python = { "isort", "black" },
                 -- You can customize some of the format options for the filetype (:help conform.format)
                 rust = { "rustfmt", lsp_format = "fallback" },
                 -- Conform will run the first available formatter
                 javascript = { "prettierd", "prettier", stop_after_first = true },
                 -- latex
                 tex = { "tex-fmt" },
+                -- sql
+                sql = { "sqruff" },
             },
         }
     },
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index e710fd7..b10aa58 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -12,37 +12,38 @@ return {
             local map = require("helpers.keys").map
 
             map('n', '<leader>e', vim.diagnostic.open_float, "lsp: open diagnostics float")
-            map('n', '[d', vim.diagnostic.goto_prev, "lsp: goto previous diagnostic")
-            map('n', ']d', vim.diagnostic.goto_next, "lsp: goto next diagnostic")
+            map('n', '[d', function() vim.diagnostic.jump({ count = -1, float = true }) end,
+                "lsp: goto previous diagnostic")
+            map('n', ']d', function() vim.diagnostic.jump({ count = 1, float = true }) end, "lsp: goto next diagnostic")
 
-            -- set up cool signs for diagnostics
-            local signs = { Error = " ", Warn = "", Hint = "", Info = "" }
-            for type, icon in pairs(signs) do
-                local hl = "DiagnosticSign" .. type
-                vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-            end
-
-            -- Diagnostic config
-            local config = {
-                virtual_text = false,
+            vim.diagnostic.config({
+                underline = true,
                 signs = {
-                    active = signs,
+                    active = true,
+                    text = {
+                        [vim.diagnostic.severity.ERROR] = "",
+                        [vim.diagnostic.severity.WARN]  = "",
+                        [vim.diagnostic.severity.HINT]  = "󰟃",
+                        [vim.diagnostic.severity.INFO]  = "",
+                    },
                 },
-                update_in_insert = true,
-                underline = true,
-                severity_sort = true,
+                virtual_text = false,
                 float = {
-                    focusable = true,
-                    style = "minimal",
-                    border = "rounded",
-                    source = "always",
                     header = "",
-                    prefix = "",
+                    border = "rounded",
+                    format = function(diagnostic)
+                        return string.format(
+                            "%s (%s) [%s]",
+                            diagnostic.message,
+                            diagnostic.source,
+                            diagnostic.code or diagnostic.user_data.lsp.code
+                        )
+                    end,
                 },
-            }
-            vim.diagnostic.config(config)
 
-            -- this function gets run when an lsp connects to a particular buffer.
+            })
+
+            -- This function gets run when an LSP connects to a particular buffer.
             local on_attach = function(_, bufnr)
                 map = require("helpers.keys").lsp_map
 
@@ -71,17 +72,16 @@ return {
             capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
 
             -- misc.
-            local lspconfig = require('lspconfig')
-            local servers = { 'ts_ls', 'jsonls', 'eslint', 'cssls', 'html', 'vala_ls', 'gopls' }
+            local servers = { 'ts_ls', 'jsonls', 'eslint', 'cssls', 'html', 'vala_ls', 'gopls', 'clangd' }
             for _, lsp in pairs(servers) do
-                lspconfig[lsp].setup {
+                vim.lsp.config(lsp, {
                     on_attach = on_attach,
                     capabilites = capabilities,
-                }
+                })
             end
 
             -- typst/tinymist
-            require("lspconfig")["tinymist"].setup({
+            vim.lsp.config("tinymist", {
                 on_attach = on_attach,
                 capabilities = capabilities,
                 single_file_support = true,
@@ -94,7 +94,7 @@ return {
             })
 
             -- lua
-            require("lspconfig")["lua_ls"].setup({
+            vim.lsp.config("lua_ls", {
                 on_attach = on_attach,
                 capabilities = capabilities,
                 settings = {
@@ -116,7 +116,7 @@ return {
             })
 
             -- python
-            require("lspconfig")["pylsp"].setup({
+            vim.lsp.config("pylsp", {
                 on_attach = on_attach,
                 capabilities = capabilities,
                 settings = {
@@ -139,7 +139,7 @@ return {
             })
 
             -- efm
-            require("lspconfig")["efm"].setup({
+            vim.lsp.config("efm", {
                 on_attach = on_attach,
                 settings = {
                     initializationOptions = {
@@ -155,7 +155,7 @@ return {
                 filetypes = { 'sh', 'tex' },
             })
 
-            require("lspconfig")["harper_ls"].setup {
+            vim.lsp.config("harper_ls", {
                 on_attach = on_attach,
                 capabilities = capabilities,
                 settings = {
@@ -185,17 +185,17 @@ return {
                 root_dir = function(fname)
                     return vim.fs.dirname(vim.fs.find('.git', { path = fname, upward = true })[1])
                 end,
-            }
+            })
 
             -- ltex
-            require("lspconfig")["ltex"].setup({
+            vim.lsp.config("ltex", {
                 capabilities = capabilities,
                 on_attach = function(client, bufnr)
                     on_attach(client, bufnr)
                     require("ltex_extra").setup {
                         load_langs = { "en-GB" },
                         init_check = true,
-                        log_level = "none",
+                        log_level = "warn",
                     }
                 end,
                 filetypes = { "bib", "gitcommit", "markdown", "org", "plaintex", "rst", "rnoweb", "tex", "pandoc", "quarto", "rmd", "context", "mail", "text" },
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index bfda4aa..24f820d 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -12,10 +12,16 @@ return {
             "gbprod/yanky.nvim",
         },
         config = function()
+            local open_with_trouble = require("trouble.sources.telescope").open
+
             require('telescope').setup({
                 defaults = {
                     path_display = { "truncate" },
                     prompt_prefix = " ",
+                    mappings = {
+                        i = { ["<leader>xt"] = open_with_trouble },
+                        n = { ["<leader>xt"] = open_with_trouble },
+                    },
                 },
                 extensions = {
                     fzf = {