nvim: updated dictionaries

.config/latexindent/latexindent.yaml

@@ -0,0 +1,24 @@
+defaultIndent: '  '
+indentAfterItems:
+  itemize: 1
+  itemize*: 1
+  enumerate: 1
+  enumerate*: 1
+indentRules:
+  item: 1
+noAdditionalIndentGlobal:
+  item: 1
+indentAfterHeadings:
+  textit:
+    indentAfterThisHeading: 1
+    level: 1
+  footnote:
+    indentAfterThisHeading: 1
+    level: 1
+noAdditionalIndent:
+  textit: 1
+  footnote: 1
+removeTrailingWhitespace:
+  beforeProcessing: 0
+  afterProcessing: 1
+indentPreamble: 1

.config/nvim/lua/dictionaries/dictionary_de-de.txt

@@ -5,6 +5,7 @@ Crowd-Interaction
 Destruction
 Dictation
 Entlebucher Sennenhund
+Formatter
 Französischvokabeln
 Gym
 Homeserver

.config/nvim/lua/dictionaries/dictionary_names.txt

@@ -27,6 +27,7 @@ Eyal
 Forest
 Frevert
 Freverts
+GrapheneOS
 Greater
 Grixis
 Gump
@@ -38,6 +39,7 @@ Higgers
 IFAM
 IFAMs
 IMRaD
+Ikigai
 Ira
 Jeanine
 Kratom
@@ -54,10 +56,12 @@ Matvey
 MiiMii
 Mint
 Nate
+NeoVIM
 Númenor
 Oberweseler
 Overwatch
 Papis
+PfingstAka
 Pluribus
 PopOS
 Precon
@@ -73,6 +77,7 @@ Stina
 TCAV
 Thinkpad
 Tjark
+VIM
 Weizman
 Willenborg
 WinterAka

.config/nvim/lua/plugins/conform.lua

@@ -8,24 +8,13 @@ return {
           lua = { "stylua" },
           markdown = { "mdformat" },
           python = { "isort", "yapf" },
-          sh = { "beautysh" },
+          sh = { "shfmt" },
-          shell = { "beautysh" },
+          bash = { "shfmt" },
+          zsh = { "shfmt" },
           tex = { "latexindent" },
           yaml = { "yamlfmt" },
         },
       })
-      require("conform").formatters.latexindent = {
-        args = require("conform.util").extend_args(
-          require("conform.formatters.latexindent").args,
-          { "-y=defaultIndent: '  '" }
-        ),
-      }
-      require("conform").formatters.beautysh = {
-        args = require("conform.util").extend_args(
-          require("conform.formatters.beautysh").args,
-          { "--indent-size=2", "--force-function-style=fnpar" }
-        ),
-      }
     end,
   },
 }

.config/nvim/lua/plugins/mason.lua

@@ -1,15 +1,15 @@
 return {
   -- lang server installations
   {
-    'williamboman/mason.nvim',
+    "williamboman/mason.nvim",
     dependencies = {
       {
-        'nvimtools/none-ls.nvim',
+        "nvimtools/none-ls.nvim",
         config = function()
           require("null-ls").setup({
             sources = {
-              -- latex
+              -- assembler
-              -- require("null-ls").builtins.formatting.latexindent,
+              require("null-ls").builtins.formatting.asmfmt,
               -- lua
               require("null-ls").builtins.formatting.stylua,
               -- markdown
@@ -18,20 +18,20 @@ return {
               require("null-ls").builtins.formatting.isort,
               require("null-ls").builtins.formatting.yapf,
               -- shell
-              -- require("null-ls").builtins.formatting.beautysh,
+              require("null-ls").builtins.formatting.shfmt,
               -- yaml
               require("null-ls").builtins.formatting.yamlfmt,
-            }
+            },
           })
-        end
+        end,
       },
       {
-        'jay-babu/mason-null-ls.nvim',
+        "jay-babu/mason-null-ls.nvim",
         opts = {
           automatic_installation = true,
           ensure_installed = {
-            -- latex
+            -- assembler
-            "latexindent",
+            "asmfmt",
             -- lua
             "stylua",
             -- markdown
@@ -40,13 +40,13 @@ return {
             "isort",
             "yapf",
             -- shell
-            "beautysh",
+            "shfmt",
             -- yaml
             "yamlfmt",
-          }
+          },
-        }
+        },
       },
     },
-    opts = { ui = { icons = Install_signs } }
+    opts = { ui = { icons = Install_signs } },
-  }
+  },
 }

.config/nvim/lua/plugins/nvim-lspconfig.lua

@@ -24,22 +24,40 @@ return {
       require("mason-lspconfig").setup({
         automatic_setup = true,
         ensure_installed = {
-          "bashls",
+          -- assembler
+          "asm_lsp",
+          -- c
           "clangd",
+          -- docker
           "dockerls",
+          -- go
           "gopls",
+          -- html
           "html",
+          -- json
           "jsonls",
+          -- xml
           "lemminx",
+          -- latex
           "ltex",
-          "lua_ls",
-          "marksman",
-          "nimls",
-          "pyright",
-          "r_language_server",
-          "sqlls",
           "texlab",
-          -- "tsserver",
+          -- lua
+          "lua_ls",
+          -- markdown
+          "marksman",
+          -- nim
+          "nimls",
+          -- python
+          "pyright",
+          -- r
+          "r_language_server",
+          -- shell
+          "bashls",
+          -- sql
+          "sqlls",
+          -- typescript / javascript
+          "ts_ls",
+          -- yaml
           "yamlls",
         },
       })

.indentconfig.yaml

@@ -0,0 +1,2 @@
+paths:
+  - /home/user/.config/latexindent/latexindent.yaml

.local/bin/etc/nvim/compiler

@@ -26,27 +26,30 @@ textype() { \
 	}
 
 case "$file" in
-        *\.vpr) $vipercmd "$file" ;;
-	*\.ms) refer -PS -e "$file" | groff -me -ms -kept -T pdf > "$base".pdf ;;
-	*\.mom) refer -PS -e "$file" | groff -mom -kept -T pdf > "$base".pdf ;;
 	*\.[0-9]) refer -PS -e "$file" | groff -mandoc -T pdf > "$base".pdf ;;
-	*\.rmd) echo "require(rmarkdown); render('$file')" | R -q --vanilla ;;
+        *\.bash) bash "$file" ;;
-        *\.m) octave -qW "$file" ;;
-	*\.md) pandoc "$file" --pdf-engine=xelatex -o "$base".pdf ;;
-	*config.h) sudo make install ;;
-        *\.tex) textype "$file" ;;
-        *\.java) java "$file" ;;
-        *\.js) node "$file" ;;
-        *\.c) if [ -f Makefile ]; then make run; else cc "$file" -o "$base" && "$base"; fi ;;
-        *\.nim) nim c -r -d:noColors "$file" ;;
-	*\.py) python3 "$file" ;;
 	*\.go) go run "$file" ;;
 	*\.lua) lua "$file" ;;
+	*\.md) pandoc "$file" --pdf-engine=xelatex -o "$base".pdf ;;
+	*\.mom) refer -PS -e "$file" | groff -mom -kept -T pdf > "$base".pdf ;;
+	*\.ms) refer -PS -e "$file" | groff -me -ms -kept -T pdf > "$base".pdf ;;
+	*\.py) python3 "$file" ;;
+	*\.rmd) echo "require(rmarkdown); render('$file')" | R -q --vanilla ;;
 	*\.sent) setsid sent "$file" 2>/dev/null & ;;
+	*config.h) sudo make install ;;
+        *\.c) if [ -f Makefile ]; then make run; else cc "$file" -o "$base" && "$base"; fi ;;
+        *\.java) java "$file" ;;
+        *\.js) node "$file" ;;
+        *\.m) octave -qW "$file" ;;
+        *\.nim) nim c -r -d:noColors "$file" ;;
         *\.r|*\.R) Rscript "$file" ;;
-        *\.smt2) z3 "$file" ;;
         *\.rs) (cd "$dir" && cargo locate-project >/dev/null 2>&1) \
             && (cd "$(dirname "$(cd "$dir" && cargo locate-project --message-format plain)")" && cargo run) \
             || (rustc "$file" && "./$(basename "${file%.rs}")") ;;
+        *\.sh) dash "$file" ;;
+        *\.smt2) z3 "$file" ;;
+        *\.tex) textype "$file" ;;
+        *\.vpr) $vipercmd "$file" ;;
+        *\.zsh) zsh "$file" ;;
 	*) sed 1q "$file" | grep "^#!/" | sed "s/^#!//" | xargs -r -I % "$file" ;;
 esac