From 4e8a537c329a53aa4b5fb847b6f14122b7fd5096 Mon Sep 17 00:00:00 2001
From: tiyn <tiyn@posteo.eu>
Date: Sat, 31 Jan 2026 09:14:04 +0100
Subject: [PATCH] nvim: updated formatters

---
 .config/nvim/lua/plugins/conform.lua        | 17 ++---------
 .config/nvim/lua/plugins/mason.lua          | 30 +++++++++----------
 .config/nvim/lua/plugins/nvim-lspconfig.lua | 32 ++++++++++++++++-----
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua
index 0ceb713..e26f28b 100644
--- a/.config/nvim/lua/plugins/conform.lua
+++ b/.config/nvim/lua/plugins/conform.lua
@@ -8,24 +8,13 @@ return {
           lua = { "stylua" },
           markdown = { "mdformat" },
           python = { "isort", "yapf" },
-          sh = { "beautysh" },
-          shell = { "beautysh" },
+          sh = { "shfmt" },
+          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,
   },
 }
diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua
index fa1beda..2c7a280 100644
--- a/.config/nvim/lua/plugins/mason.lua
+++ b/.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
-              -- require("null-ls").builtins.formatting.latexindent,
+              -- assembler
+              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
-            "latexindent",
+            -- assembler
+            "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 } },
+  },
 }
diff --git a/.config/nvim/lua/plugins/nvim-lspconfig.lua b/.config/nvim/lua/plugins/nvim-lspconfig.lua
index 7a2bf07..92657a2 100644
--- a/.config/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/.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",
+          -- lua
+          "lua_ls",
+          -- markdown
+          "marksman",
+          -- nim
+          "nimls",
+          -- python
+          "pyright",
+          -- r
+          "r_language_server",
+          -- shell
+          "bashls",
+          -- sql
+          "sqlls",
+          -- typescript / javascript
           "ts_ls",
+          -- yaml
           "yamlls",
         },
       })