From 03492ee193fbc3a0db7be735d9aef8cdd8707e5a Mon Sep 17 00:00:00 2001 From: Jannik Buhr Date: Sun, 30 Jun 2024 00:58:22 +0200 Subject: [PATCH] simplify --- init.lua | 6 +++--- lua/config/keymap.lua | 9 +++++++-- lua/plugins/lsp.lua | 16 ++-------------- lua/plugins/quarto.lua | 4 ++-- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/init.lua b/init.lua index 18be247..20e0803 100644 --- a/init.lua +++ b/init.lua @@ -10,6 +10,6 @@ -- (may be outdated with newer versions of the plugins, -- check for yourself if you're interested in using them) -require("config.global") -require("config.lazy") -require("config.autocommands") +require 'config.global' +require 'config.lazy' +require 'config.autocommands' diff --git a/lua/config/keymap.lua b/lua/config/keymap.lua index 025cfc8..5299f90 100644 --- a/lua/config/keymap.lua +++ b/lua/config/keymap.lua @@ -352,14 +352,19 @@ wk.register({ e = { vim.diagnostic.open_float, 'diagnostics (show hover [e]rror)' }, d = { name = '[d]iagnostics', - d = { vim.diagnostic.disable, '[d]isable' }, + d = { + function() + vim.diagnostic.enable(false) + end, + '[d]isable', + }, e = { vim.diagnostic.enable, '[e]nable' }, }, g = { ':Neogen', 'neo[g]en docstring' }, }, o = { name = '[o]tter & c[o]de', - a = { require('otter').dev_setup, 'otter [a]ctivate' }, + a = { require('otter').activate, 'otter [a]ctivate' }, d = { require('otter').deactivate, 'otter [d]eactivate' }, c = { 'O# %%', 'magic [c]omment code chunk # %%' }, r = { insert_r_chunk, '[r] code chunk' }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index ca9ee8e..bd350c4 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -4,26 +4,14 @@ return { -- for lsp features in code cells / embedded code 'jmbuhr/otter.nvim', - dev = true, + dev = false, dependencies = { { 'neovim/nvim-lspconfig', 'nvim-treesitter/nvim-treesitter', - 'hrsh7th/nvim-cmp', }, }, - opts = { - lsp = { - hover = { - border = require('misc.style').border, - }, - }, - buffers = { - set_filetype = true, - write_to_disk = false, - }, - handle_leading_whitespace = true, - }, + opts = {}, }, { diff --git a/lua/plugins/quarto.lua b/lua/plugins/quarto.lua index 4489c3f..3a2a946 100644 --- a/lua/plugins/quarto.lua +++ b/lua/plugins/quarto.lua @@ -4,10 +4,10 @@ return { -- for complete functionality (language features) 'quarto-dev/quarto-nvim', ft = { 'quarto' }, - dev = true, + dev = false, opts = { lspFeatures = { - languages = { 'r', 'python', 'julia', 'bash', 'lua', 'html', 'dot', 'javascript', 'typescript', 'ojs' }, + languages = { 'r', 'python', 'julia', 'bash', 'lua', 'html', 'dot', 'javascript', 'typescript', 'ojs', 'lua' }, }, codeRunner = { enabled = true,