From f7db5e35995de7a91fc40e7de79978f30ca4eeff Mon Sep 17 00:00:00 2001
From: Zam Kokott <zam.kokott@bwi.de>
Date: Wed, 12 Nov 2025 14:11:48 +0000
Subject: [PATCH] Add conform for foramtting and mason back for lsp
 installation but nothing more

---
 init.lua                |  2 +-
 lazy-lock.json          |  3 +++
 lua/plugins/conform.lua | 15 +++++++++++++++
 lua/plugins/fidget.lua  |  4 ++++
 lua/plugins/lsp.lua     | 15 ---------------
 lua/plugins/mason.lua   |  4 ++++
 6 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 lua/plugins/conform.lua
 create mode 100644 lua/plugins/fidget.lua
 create mode 100644 lua/plugins/mason.lua

diff --git a/init.lua b/init.lua
index 2dc0d40..5b81f4d 100644
--- a/init.lua
+++ b/init.lua
@@ -51,7 +51,7 @@ vim.keymap.set('n', 'gl', builtin.lsp_references, {})
 vim.keymap.set('n', '<leader>d', builtin.diagnostics, {})
 
 -- Formating
-vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format, {})
+vim.keymap.set("n", "<leader>gf", require("conform").format, {})
 
 -- Filesystem
 vim.keymap.set("n", "<leader>e", ":Oil<CR>", {})
diff --git a/lazy-lock.json b/lazy-lock.json
index 11e9187..c5399a1 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -3,9 +3,12 @@
   "autoclose.nvim": { "branch": "main", "commit": "3f86702b54a861a17d7994b2e32a7c648cb12fb1" },
   "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
   "catppuccin": { "branch": "main", "commit": "234fc048de931a0e42ebcad675bf6559d75e23df" },
+  "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" },
+  "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
   "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
   "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
   "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" },
diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua
new file mode 100644
index 0000000..c2c52c0
--- /dev/null
+++ b/lua/plugins/conform.lua
@@ -0,0 +1,15 @@
+return {
+  "stevearc/conform.nvim",
+  config = function()
+    require("conform").setup {
+      formatters_by_ft = {
+        lua = { "stylua" },
+        python = { "black" }
+      },
+      format_on_save = {
+        timeout_ms = 500,
+        lsp_format = "fallback"
+      }
+    }
+  end
+}
diff --git a/lua/plugins/fidget.lua b/lua/plugins/fidget.lua
new file mode 100644
index 0000000..dc31181
--- /dev/null
+++ b/lua/plugins/fidget.lua
@@ -0,0 +1,4 @@
+return {
+  "j-hui/fidget.nvim",
+  opts = {}
+}
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 167e78a..111c6e9 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -2,20 +2,5 @@ return {
   "neovim/nvim-lspconfig",
   config = function()
     vim.lsp.enable({ "lua_ls", "basedpyright", "gopls", "html", "yamlls", "svelte-language-server", "clangd", "ansiblels" })
-
-    vim.api.nvim_create_autocmd("LspAttach", {
-      group = vim.api.nvim_create_augroup("lsp", { clear = true }),
-      callback = function(args)
-        -- 2
-        vim.api.nvim_create_autocmd("BufWritePre", {
-          -- 3
-          buffer = args.buf,
-          callback = function()
-            -- 4 + 5
-            vim.lsp.buf.format { async = false, id = args.data.client_id }
-          end,
-        })
-      end
-    })
   end
 }
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
new file mode 100644
index 0000000..0d059b1
--- /dev/null
+++ b/lua/plugins/mason.lua
@@ -0,0 +1,4 @@
+return {
+  "mason-org/mason.nvim",
+  opts = {}
+}