From f3403c95fca6779a766763b040b7ae9650f39c33 Mon Sep 17 00:00:00 2001 From: "Vito G. Graffagnino" Date: Thu, 11 Aug 2022 15:34:07 +0100 Subject: Mainly LSP changes, especially concerning latex. Changed from ltex to texlab --- lua/user/lsp/lsp-installer.lua | 10 +++++----- lua/user/lsp/settings/html.lua | 18 +++++++++--------- lua/user/lsp/settings/ltex.lua | 9 --------- lua/user/lsp/settings/perlls.lua | 12 ------------ lua/user/lsp/settings/texlab.lua | 38 ++++++++++++++++++++++++++++++++++++++ lua/user/plugins.lua | 24 +++++++++++++++++++++++- 6 files changed, 75 insertions(+), 36 deletions(-) delete mode 100644 lua/user/lsp/settings/ltex.lua delete mode 100644 lua/user/lsp/settings/perlls.lua create mode 100644 lua/user/lsp/settings/texlab.lua diff --git a/lua/user/lsp/lsp-installer.lua b/lua/user/lsp/lsp-installer.lua index 4fac4ff..12fa050 100644 --- a/lua/user/lsp/lsp-installer.lua +++ b/lua/user/lsp/lsp-installer.lua @@ -56,11 +56,6 @@ lsp_installer.on_server_ready(function(server) opts = vim.tbl_deep_extend("force", html_opts, opts) end - if server.name == "ltex-ls" then - local ltex_opts = require("user.lsp.settings.ltex") - opts = vim.tbl_deep_extend("force", ltex_opts, opts) - end - if server.name == "perlnavigator" then local perlnavigator_opts = require("user.lsp.settings.perlnavigator") opts = vim.tbl_deep_extend("force", perlnavigator_opts, opts) @@ -71,6 +66,11 @@ lsp_installer.on_server_ready(function(server) opts = vim.tbl_deep_extend("force", r_language_server_opts, opts) end + if server.name == "latex" then + local latex_opts = require("user.lsp.settings.texlab") + opts = vim.tbl_deep_extend("force", latex_opts, opts) + end + if server.name == "tsserver" then local typescript_language_server_opts = require("user.lsp.settings.tsserver") opts = vim.tbl_deep_extend("force", typescript_language_server_opts, opts) diff --git a/lua/user/lsp/settings/html.lua b/lua/user/lsp/settings/html.lua index fb161a9..d10da49 100644 --- a/lua/user/lsp/settings/html.lua +++ b/lua/user/lsp/settings/html.lua @@ -3,16 +3,16 @@ return { html = { filetypes = { 'html' }, - init_options = { - configurationSection = {"html", "css", "javascript" }, - embeddedLanguages = { - css = true, - javascript = true, - }, - provideFormatter = true + init_options = { + configurationSection = {"html", "css", "javascript" }, + embeddedLanguages = { + css = true, + javascript = true, + }, + provideFormatter = true }, - single_file_support = true, - } + single_file_support = true, } + } } diff --git a/lua/user/lsp/settings/ltex.lua b/lua/user/lsp/settings/ltex.lua deleted file mode 100644 index cfe080b..0000000 --- a/lua/user/lsp/settings/ltex.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - settings = { - ltex = { - filetypes = { "bib","gitcommit","markdown","plaintex","rst","rnoweb","tex" }, - single_file_support = true, - }, - }, -} - diff --git a/lua/user/lsp/settings/perlls.lua b/lua/user/lsp/settings/perlls.lua deleted file mode 100644 index 480457d..0000000 --- a/lua/user/lsp/settings/perlls.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - settings = { - perl = { - fileFilter ={".pm",".pl"} - ignoreDirs = ".git", - perlCmd = "perl" - perlInc = " " - single_file_support = true, - }, - }, -} - diff --git a/lua/user/lsp/settings/texlab.lua b/lua/user/lsp/settings/texlab.lua new file mode 100644 index 0000000..58e8743 --- /dev/null +++ b/lua/user/lsp/settings/texlab.lua @@ -0,0 +1,38 @@ +return { + + settings = { + + texlab = { + filetype="latex", + auxDirectory = ".", + bibtexFormatter = "texlab", + build = { + args = { "-pdf", "-interaction=nonstopmode", "-synctex=1", "%f" }, + executable = "latexmk", + forwardSearchAfter = true, + onSave = true + }, + chktex = { + onEdit = false, + onOpenAndSave = false + }, + diagnosticsDelay = 300, + formatterLineLength = 80, + forwardSearch = { + executable = 'zathura', + args = { + '--synctex-editor-command', + [[nvim-texlabconfig -file '%{input}' -line %{line}]], + '--synctex-forward', + '%l:1:%f', + '%p', + }, + }, + latexFormatter = "latexindent", + latexindent = { + modifyLineBreaks = false + }, + single_file_support = true, + } +} +} diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 29e5dfa..af30bf5 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -58,12 +58,28 @@ return packer.startup(function(use) use {"windwp/nvim-autopairs", commit = ""} -- Autopairs, integrates with both cmp and treesitter use {"vimwiki/vimwiki", commit = ""} use {"zane-/howdoi.nvim", commit = ""} - use {'nvim-orgmode/orgmode'} -- Colorschemes use {"lunarvim/colorschemes", commit = ""} -- A bunch of colorschemes you can try out use {"lunarvim/darkplus.nvim", commit = ""} use {"tiagovla/tokyodark.nvim", commit = ""} + use({ "lilydjwg/colorizer" }) + use({ "nekonako/xresources-nvim" }) + use({ "EdenEast/nightfox.nvim" }) + use({ "dylanaraps/wal.vim" }) + use({ "tomasiser/vim-code-dark" }) + use({ "AlphaTechnolog/pywal.nvim" }) + use({ "lighthaus-theme/vim-lighthaus" }) + use({ "jacoborus/tender.vim" }) + use({ "mcchrish/zenbones.nvim" }) + use({ "rmehri01/onenord.nvim" }) + use({ "Shatur/neovim-ayu" }) + use({ "rafamadriz/neon" }) + use({ "luisiacc/gruvbox-baby" }) + use({ "folke/tokyonight.nvim" }) + use({ "chriskempson/base16-vim" }) + use({ "flazz/vim-colorschemes" }) + use({ "rose-pine/neovim" }) -- cmp plugins use {"hrsh7th/nvim-cmp", commit = ""} -- The completion plugin @@ -88,6 +104,8 @@ return packer.startup(function(use) -- Telescope use {"nvim-telescope/telescope.nvim", commit = ""} use {"nvim-telescope/telescope-media-files.nvim", commit = ""} + use {"nvim-telescope/telescope-bibtex.nvim", commit = ""} + use {"nvim-telescope/telescope-dap.nvim", commit = ""} -- Treesitter use { @@ -103,6 +121,10 @@ return packer.startup(function(use) use {"p00f/nvim-ts-rainbow", commit = ""} use {"nvim-treesitter/playground", commit = ""} + -- Tex + -- use {"lervag/vimtex", commit = ""} + use {"f3fora/nvim-texlabconfig", commit = "", run ="go build"} + -- DAP use {"mfussenegger/nvim-dap", commit = ""} use {"mfussenegger/nvim-dap-python", commit = ""} -- cgit v1.2.3