From 7fe2f7b43839a119fe253e01fb5b38b3e740df8d Mon Sep 17 00:00:00 2001 From: h Date: Thu, 14 Nov 2024 03:41:41 -0500 Subject: [PATCH] change2 --- latexmk/latexmkrc | 2 +- nvim/lua/lsp.lua | 45 ++++++++++++++++++++++---------------------- nvim/lua/options.lua | 1 + nvim/lua/plugins.lua | 14 +++++++------- tex/handout.cls | 2 +- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/latexmk/latexmkrc b/latexmk/latexmkrc index 6013a8c..aecdbe7 100644 --- a/latexmk/latexmkrc +++ b/latexmk/latexmkrc @@ -1,2 +1,2 @@ $pdf_previewer = "zathura %O %S"; -$pdflatex = "xelatex -shell-escape %O %S"; +$pdflatex = "xelatex -synctex=1 -shell-escape %O %S"; diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index c8971b7..e634114 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -96,7 +96,7 @@ local lsp_confs = { }, gopls = {}, dartls = {}, - tsserver = { + ts_ls = { root_dir = find_repo_root({ configfiles = { "tsconfig.json", "jsconfig.json", "package.json" } }), @@ -168,16 +168,16 @@ for server, conf in pairs(lsp_confs) do end end -local null_ls = require('null-ls') -null_ls.setup({ - sources = { - null_ls.builtins.diagnostics.chktex, - null_ls.builtins.diagnostics.cppcheck, - null_ls.builtins.diagnostics.shellcheck, - - null_ls.builtins.code_actions.gitsigns, - }, -}) +-- local null_ls = require('null-ls') +-- null_ls.setup({ +-- sources = { +-- -- null_ls.builtins.diagnostics.chktex, +-- null_ls.builtins.diagnostics.cppcheck, +-- null_ls.builtins.diagnostics.shellcheck, +-- +-- null_ls.builtins.code_actions.gitsigns, +-- }, +-- }) vim.diagnostic.config({ severity_sort = true, @@ -226,7 +226,7 @@ M.format_on_save_hook = function() if enabled ~= 0 and enabled ~= false then if vim.bo.filetype ~= "plaintex" and vim.bo.filetype ~= "tex" and vim.bo.filetype ~= "latex" and vim.bo.filetype ~= "qf" and vim.bo.filetype ~= "bib" and vim.bo.filetype ~= "" and vim.bo.filetype ~= "pdf" - and vim.bo.filetype ~= "conf" then + and vim.bo.filetype ~= "conf" and vim.bo.filetype ~= "TelescopePrompt" then vim.lsp.buf.format({ async = false }) end end @@ -241,17 +241,18 @@ vim.cmd [[ augroup END ]] -vim.api.nvim_create_autocmd({ 'FileType', -}, { - pattern = "*", - callback = function() - if vim.bo.filetype ~= "plaintex" and vim.bo.filetype ~= "tex" and vim.bo.filetype ~= "late" and - vim.bo.filetype ~= "qf" and vim.bo.filetype ~= "bib" and vim.bo.filetype ~= "" and vim.bo.filetype ~= "pdf" - and vim.bo.filetype ~= "conf" then - vim.cmd [[ :COQnow -s ]] +vim.api.nvim_create_autocmd( + { 'FileType', + }, { + pattern = "*", + callback = function() + if vim.bo.filetype ~= "plaintex" and vim.bo.filetype ~= "tex" and vim.bo.filetype ~= "latex" and + vim.bo.filetype ~= "qf" and vim.bo.filetype ~= "bib" and vim.bo.filetype ~= "" and vim.bo.filetype ~= "pdf" + and vim.bo.filetype ~= "conf" and vim.bo.filetype ~= "TelescopePrompt" then + vim.cmd [[ :COQnow -s ]] + end end - end -}) + }) -- vim.api.nvim_create_autocmd({ 'FileType', 'BufRead', 'BufReadPre', 'BufReadPost', 'BufWrite', 'BufWritePre', -- 'BufWritePost' }, { diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua index a4e6b5f..56d17cd 100644 --- a/nvim/lua/options.lua +++ b/nvim/lua/options.lua @@ -14,6 +14,7 @@ o.tabstop = 4 o.shiftwidth = 0 o.viminfo = '' vim.g.base16colorspace = 256 +vim.g.vimtex_view_method = "zathura" o.termguicolors = true vim.cmd [[ diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 1532861..bdecfee 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -26,7 +26,7 @@ return require('packer').startup({ run = ':TSUpdate', config = function() require("nvim-treesitter.configs").setup({ - highlight = { enable = true }, + highlight = { enable = true, disable = { "latex" } }, indent = { enable = true }, ensure_installed = "all", }) @@ -177,12 +177,12 @@ return require('packer').startup({ 'ms-jpq/coq.artifacts', }, }, - { - 'jose-elias-alvarez/null-ls.nvim', - requires = { - 'nvim-lua/plenary.nvim', - }, - }, + -- { + -- 'jose-elias-alvarez/null-ls.nvim', + -- requires = { + -- 'nvim-lua/plenary.nvim', + -- }, + -- }, }, config = import('lsp'), } diff --git a/tex/handout.cls b/tex/handout.cls index 1017320..e6fc777 100644 --- a/tex/handout.cls +++ b/tex/handout.cls @@ -23,7 +23,7 @@ \RequirePackage{listings} \RequirePackage{geometry} \RequirePackage{graphicx} -\RequirePackage[usenames,dvipsnames]{xcolor} +\RequirePackage[dvipsnames]{xcolor} \RequirePackage{bm} \RequirePackage{siunitx}[=v2] \RequirePackage{physics}