From 0fb6515f4dd5c53831aa10b18a4b8fe44edc1574 Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan@moebiusband.org>
Date: Sun, 30 Apr 2023 10:02:05 +0200
Subject: [PATCH] Add keepass secret. Fix gruvbox

---
 dot_config/nvim/after/plugin/lsp.lua.tmpl | 188 ----------------------
 dot_config/nvim/init.lua.tmpl             |   2 +-
 2 files changed, 1 insertion(+), 189 deletions(-)
 delete mode 100644 dot_config/nvim/after/plugin/lsp.lua.tmpl

diff --git a/dot_config/nvim/after/plugin/lsp.lua.tmpl b/dot_config/nvim/after/plugin/lsp.lua.tmpl
deleted file mode 100644
index 534e008..0000000
--- a/dot_config/nvim/after/plugin/lsp.lua.tmpl
+++ /dev/null
@@ -1,188 +0,0 @@
-local ok, lsp = pcall(require, 'lspconfig')
-if not ok then
-    return
-end
-
-{{- if ne .chezmoi.os "openbsd" }}
--- See :help mason-settings
-require('mason').setup({
-    ui = { border = 'rounded' }
-})
-
--- See :help mason-lspconfig-settings
-require('mason-lspconfig').setup({
-    ensure_installed = {
-        'clangd',
-        'gopls',
-        'ltex',
-        'svelte',
-        'tsserver',
-        'eslint',
-        'html',
-        'cssls',
-        'lua_ls'
-    }
-})
-{{- end }}
-
-local lsp_defaults = lsp.util.default_config
-
-lsp_defaults.capabilities = vim.tbl_deep_extend(
-    'force',
-    lsp_defaults.capabilities,
-    require('cmp_nvim_lsp').default_capabilities()
-)
-
-local sign = function(opts)
-    -- See :help sign_define()
-    vim.fn.sign_define(opts.name, {
-        texthl = opts.name,
-        text = opts.text,
-        numhl = ''
-    })
-end
-
-sign({ name = 'DiagnosticSignError', text = '✘' })
-sign({ name = 'DiagnosticSignWarn', text = '▲' })
-sign({ name = 'DiagnosticSignHint', text = '⚑' })
-sign({ name = 'DiagnosticSignInfo', text = '' })
-
-vim.diagnostic.config({
-    virtual_text = false,
-    severity_sort = true,
-    float = {
-        border = 'rounded',
-        source = 'always',
-        header = '',
-        prefix = '',
-    },
-})
-
-vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
-    vim.lsp.handlers.hover,
-    { border = 'rounded' }
-)
-
-vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
-    vim.lsp.handlers.signature_help,
-    { border = 'rounded' }
-)
-
-vim.lsp.handlers["workspace/diagnostic/refresh"] = function(_, _, ctx)
-    local ns = vim.lsp.diagnostic.get_namespace(ctx.client_id)
-    pcall(vim.diagnostic.reset, ns)
-    return true
-end
-
-require("lsp-format").setup {}
-
-{{- if ne .chezmoi.os "openbsd" }}
-local group = vim.api.nvim_create_augroup('lsp_cmds', { clear = true })
-
-vim.api.nvim_create_autocmd('LspAttach', {
-    group = group,
-    desc = 'LSP actions',
-    callback = function(args)
-        local bufmap = function(mode, lhs, rhs)
-            local opts = { buffer = true }
-            vim.keymap.set(mode, lhs, rhs, opts)
-        end
-        local client = vim.lsp.get_client_by_id(args.data.client_id)
-        require("lsp-format").on_attach(client)
-
-        bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
-        bufmap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>')
-        bufmap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
-        bufmap('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
-        bufmap('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
-        bufmap('n', 'gA', '<cmd>Telescope diagnostics<cr>')
-        bufmap('n', 'gr', '<cmd>Telescope lsp_references<cr>')
-        bufmap('n', 'gi', '<cmd>Telescope lsp_implementations<cr>')
-        bufmap('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>')
-        bufmap('n', '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<cr>')
-        bufmap('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>')
-        bufmap('x', '<F4>', '<cmd>lua vim.lsp.buf.range_code_action()<cr>')
-        bufmap('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>')
-        bufmap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
-        bufmap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
-    end
-})
-
-require('mason-lspconfig').setup_handlers({
-    function(server)
-        lsp[server].setup({})
-    end,
-    ['tsserver'] = function()
-        lsp.tsserver.setup({
-            settings = {
-                completions = {
-                    completeFunctionCalls = true
-                }
-            }
-        })
-    end,
-    ['lua_ls'] = function()
-        lsp.lua_ls.setup({
-            settings = {
-                Lua = {
-                    diagnostics = {
-                        globals = { 'vim' }
-                    },
-                }
-            }
-        })
-    end
-})
-{{- else }}
-local on_attach = function(client)
-    local bufmap = function(mode, lhs, rhs)
-        local opts = {buffer = true}
-        vim.keymap.set(mode, lhs, rhs, opts)
-    end
-    require("lsp-format").on_attach(client)
-
-    bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
-    bufmap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>')
-    bufmap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
-    bufmap('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
-    bufmap('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
-    bufmap('n', 'gA', '<cmd>Telescope diagnostics<cr>')
-    bufmap('n', 'gr', '<cmd>Telescope lsp_references<cr>')
-    bufmap('n', 'gi', '<cmd>Telescope lsp_implementations<cr>')
-    bufmap('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>')
-    bufmap('n', '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<cr>')
-    bufmap('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>')
-    bufmap('x', '<F4>', '<cmd>lua vim.lsp.buf.range_code_action()<cr>')
-    bufmap('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>')
-    bufmap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
-    bufmap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
-end
-
-lsp.gopls.setup {
-    settings = {
-      gopls = {
-        analyses = {
-          unusedparams = true,
-          unusedvariable = true,
-          shadow = true
-        },
-        staticcheck = true,
-      },
-    },
-    on_attach = on_attach
-}
-lsp.clangd.setup { on_attach = on_attach }
-lsp.ltex.setup { on_attach = on_attach }
-lsp.svelte.setup { on_attach = on_attach }
-lsp.tsserver.setup { on_attach = on_attach }
-lsp.lua_ls.setup {
-    settings = {
-        Lua = {
-            diagnostics = {
-                globals = { 'vim' }
-            },
-        }
-    },
-    on_attach = on_attach
-}
-{{- end }}
diff --git a/dot_config/nvim/init.lua.tmpl b/dot_config/nvim/init.lua.tmpl
index d7867da..fac6034 100644
--- a/dot_config/nvim/init.lua.tmpl
+++ b/dot_config/nvim/init.lua.tmpl
@@ -73,6 +73,7 @@ require('gitsigns').setup()
 require("trouble").setup {}
 require('nvim-autopairs').setup({
     fast_wrap = {},
+    check_ts = true
 })
 
 require('leap').add_default_mappings()
@@ -110,7 +111,6 @@ require('toggleterm').setup({
 })
 
 require("gruvbox").setup {
-    italic = false,
     contrast = "hard"
 }