From b5cab2b19f47e7e63c7f8de9d0edf890b5946d56 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Fri, 21 Jan 2022 10:45:37 +0100 Subject: [PATCH] More latex stuff --- nvim/.config/nvim/fnl/dots/plugins/lsp.fnl | 4 +- .../.config/nvim/fnl/dots/plugins/ltex-ls.fnl | 123 ++++++++++-------- nvim/.config/nvim/fnl/dots/plugins/vimtex.fnl | 1 + zathura/.config/zathura/zathurarc | 8 +- 4 files changed, 80 insertions(+), 56 deletions(-) diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl index a885a40..cdabe87 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl @@ -4,12 +4,11 @@ lsp lspconfig lsp-configs lspconfig/configs utils dots.utils + ltex-ls dots.plugins.ltex-ls cmp_nvim_lsp cmp_nvim_lsp} require-macros [macros]}) -(require dots.plugins.ltex-ls) - ; TODO check https://github.com/neovim/nvim-lspconfig/blob/master/ADVANCED_README.md for default config for all of them (tset vim.lsp.handlers :textDocument/publishDiagnostics @@ -81,6 +80,7 @@ (init-lsp :powershell_es {:bundle_path "/home/leon/powershell"}) +(ltex-ls.init) diff --git a/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl b/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl index fec6d40..4c30217 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/ltex-ls.fnl @@ -8,9 +8,23 @@ cmp_nvim_lsp cmp_nvim_lsp}}) -(local Dictionary-file {:de-DE [(.. (vim.fn.getenv "HOME") "/.config/ltex-ls/dictionary.txt")]}) -(local Disabled-rules-file {:de-DE [(.. (vim.fn.getenv "HOME") "/.config/ltex-ls/disable.txt")]}) -(local False-positives-file {:de-DE [(.. (vim.fn.getenv "HOME") "/.config/ltex-ls/false.txt")]}) +(def latex-command-settings + {:dummy ["\\texttt{}"]}) + + + +(def Dictionary-file {:de-DE [(.. (vim.fn.getenv "HOME") "/.config/ltex-ls/dictionary.txt")]}) +(def Disabled-rules-file {:de-DE [(.. (vim.fn.getenv "HOME") "/.config/ltex-ls/disable.txt")]}) +(def False-positives-file {:de-DE [(.. (vim.fn.getenv "HOME") "/.config/ltex-ls/false.txt")]}) + + +(def latex-command-settings-formatted + (let [tbl {}] + (each [option commands (pairs latex-command-settings)] + (each [_ command (ipairs commands)] + (tset tbl command option)))) + (tbl)) + (fn read-files [files] (let [dict {}] @@ -87,55 +101,58 @@ (lua "return nil"))) (add-to-file filetype lang file value))) -(set configs.ltex - {:default_config {:cmd [:ltex-ls] - :filetypes [:tex :bib :md] - :root_dir (fn [filename] (lsputil.path.dirname filename)) - :settings {:ltex {:enabled [:latex :tex :bib :md] - :language "de-DE" - :checkFrequency "save" - :diagnosticSeverity "information" - :setenceCacheSize 5000 - :additionalRules {:enablePickyRules true - :motherTongue "de-DE"} - :dictionary {:de-DE (read-files (. Dictionary-file :de-DE))} - :disabledRules {:de-DE (read-files (. Disabled-rules-file :de-DE))} - :hiddenFalsePositives {:de-DE (read-files (. False-positives-file :de-DE))}}}}}) -(lsp.ltex.setup {:settings {:ltex {:enabled [:latex :tex :bib :md] - :language "de-DE" - :checkFrequency "save" - :diagnosticSeverity "information" - :setenceCacheSize 5000 - :additionalRules {:enablePickyRules true - :motherTongue "de-DE"} - :dictionary {:de-DE (read-files (. Dictionary-file :de-DE))} - :disabledRules {:de-DE (read-files (. Disabled-rules-file :de-DE))} - :hiddenFalsePositives {:de-DE (read-files (. False-positives-file :de-DE))}}}}) - -(set lsp.ltex.dictionary_file Dictionary-file) -(set lsp.ltex.disabledrules_file Disabled-rules-file) -(set lsp.ltex.falsepostivies_file False-positives-file) -(local orig-execute-command vim.lsp.buf.execute_command) +(defn init [] + (set configs.ltex + {:default_config {:cmd [:ltex-ls] + :filetypes [:tex :bib :md] + :root_dir (fn [filename] (lsputil.path.dirname filename)) + :settings {:ltex {:enabled [:latex :tex :bib :md] + :language "de-DE" + :checkFrequency "save" + :diagnosticSeverity "information" + :setenceCacheSize 5000 + :additionalRules {:enablePickyRules true + :motherTongue "de-DE"} + :dictionary {:de-DE (read-files (. Dictionary-file :de-DE))} + :disabledRules {:de-DE (read-files (. Disabled-rules-file :de-DE))} + :hiddenFalsePositives {:de-DE (read-files (. False-positives-file :de-DE))} + :latex {:commands latex-command-settings-formatted}}}}}) -(set vim.lsp.buf.execute_command - (fn [command] - (if (= command.command :_ltex.addToDictionary) - (let [arg (. (. command.arguments 1) :words)] - (each [lang words (pairs arg)] - (each [_ word (ipairs words)] - (local filetype :dictionary) - (add-to filetype lang (find-ltex-files filetype lang) word)))) - (= command.command :_ltex.disableRules) - (let [arg (. (. command.arguments 1) :ruleIds)] - (each [lang rules (pairs arg)] - (each [_ rule (ipairs rules)] - (local filetype :disable) - (add-to filetype lang (find-ltex-files filetype lang) rule)))) - (= command.command :_ltex.hideFalsePositives) - (let [arg (. (. command.arguments 1) :falsePositives)] - (each [lang rules (pairs arg)] - (each [_ rule (ipairs rules)] - (local filetype :falsePositive) - (add-to filetype lang (find-ltex-files filetype lang) rule)))) - (orig-execute-command command)))) + (lsp.ltex.setup {:settings {:ltex {:enabled [:latex :tex :bib :md] + :language "de-DE" + :checkFrequency "save" + :diagnosticSeverity "information" + :setenceCacheSize 5000 + :additionalRules {:enablePickyRules true + :motherTongue "de-DE"} + :dictionary {:de-DE (read-files (. Dictionary-file :de-DE))} + :disabledRules {:de-DE (read-files (. Disabled-rules-file :de-DE))} + :hiddenFalsePositives {:de-DE (read-files (. False-positives-file :de-DE))}}}}) + + (set lsp.ltex.dictionary_file Dictionary-file) + (set lsp.ltex.disabledrules_file Disabled-rules-file) + (set lsp.ltex.falsepostivies_file False-positives-file) + (local orig-execute-command vim.lsp.buf.execute_command) + + (set vim.lsp.buf.execute_command + (fn [command] + (if (= command.command :_ltex.addToDictionary) + (let [arg (. (. command.arguments 1) :words)] + (each [lang words (pairs arg)] + (each [_ word (ipairs words)] + (local filetype :dictionary) + (add-to filetype lang (find-ltex-files filetype lang) word)))) + (= command.command :_ltex.disableRules) + (let [arg (. (. command.arguments 1) :ruleIds)] + (each [lang rules (pairs arg)] + (each [_ rule (ipairs rules)] + (local filetype :disable) + (add-to filetype lang (find-ltex-files filetype lang) rule)))) + (= command.command :_ltex.hideFalsePositives) + (let [arg (. (. command.arguments 1) :falsePositives)] + (each [lang rules (pairs arg)] + (each [_ rule (ipairs rules)] + (local filetype :falsePositive) + (add-to filetype lang (find-ltex-files filetype lang) rule)))) + (orig-execute-command command))))) diff --git a/nvim/.config/nvim/fnl/dots/plugins/vimtex.fnl b/nvim/.config/nvim/fnl/dots/plugins/vimtex.fnl index 6d88dee..a8dd4e7 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/vimtex.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/vimtex.fnl @@ -6,6 +6,7 @@ (set vim.g.vimtex_view_method "general") ;(set vim.g.vimtex_view_general_viewer "okular") (set vim.g.vimtex_view_general_viewer "zathura") +(set vim.g.vimtex_view_general_options "--synctex-forward @line:1:@tex @pdf") ;(set vim.g.vimtex_view_general_options "--unique file:@pdf#src:@line@tex") (set vim.g.vimtex_quickfix_method "pplatex") (set vim.g.vimtex_quickfix_mode 2) diff --git a/zathura/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc index 55c8c8b..52a4b0e 100644 --- a/zathura/.config/zathura/zathurarc +++ b/zathura/.config/zathura/zathurarc @@ -1,4 +1,4 @@ -set default-bg "#282828" +set default-bg "#1d2021" set recolor true set recolor-lightcolor "#282828" set recolor-darkcolor "#ebdbb2" @@ -7,3 +7,9 @@ set inputbar-bg "#1d2021" set inputbar-fg "#ebdbb2" set statusbar-bg "#1d2021" set statusbar-fg "#ebdbb2" + + + +set synctex true +set synctex-editor-command "nvim --headless -c \"VimtexInverseSearch %{line} '%{input}'\"" +set highlight-transparency 0