From f6a21cb88b92c5e4cf7a72996a42331b9d5d98df Mon Sep 17 00:00:00 2001
From: Oscar Wallberg <oscar.wallberg@outlook.com>
Date: Fri, 6 Mar 2026 05:47:45 +0100
Subject: [PATCH] feat(lsp): change from eslint/prettier to oxlint/oxfmt

---
 after/lsp/eslint.lua               | 19 -----------------
 after/lsp/oxfmt.lua                |  3 +++
 after/lsp/oxlint.lua               |  3 +++
 lua/core/autocommands.lua          | 34 ++++++++++--------------------
 lua/lsp.lua                        |  3 ++-
 lua/plugins/mason-auto-install.lua |  3 ++-
 6 files changed, 21 insertions(+), 44 deletions(-)
 delete mode 100644 after/lsp/eslint.lua
 create mode 100644 after/lsp/oxfmt.lua
 create mode 100644 after/lsp/oxlint.lua

diff --git a/after/lsp/eslint.lua b/after/lsp/eslint.lua
deleted file mode 100644
index 184b7ad..0000000
--- a/after/lsp/eslint.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local lsp = require("lsp")
-
----@type vim.lsp.Config
-return {
-    on_attach = function(client, bufnr)
-        lsp.on_attach(client, bufnr)
-        vim.keymap.set("n", "<leader>lf", function()
-            vim.lsp.buf.format()
-            require("util").format({
-                buf = bufnr,
-                cmd = {
-                    "prettier",
-                    "--stdin-filepath",
-                    "%file%",
-                },
-            })
-        end, { buffer = bufnr })
-    end,
-}
diff --git a/after/lsp/oxfmt.lua b/after/lsp/oxfmt.lua
new file mode 100644
index 0000000..19bb2fd
--- /dev/null
+++ b/after/lsp/oxfmt.lua
@@ -0,0 +1,3 @@
+---@type vim.lsp.Config
+return {
+}
diff --git a/after/lsp/oxlint.lua b/after/lsp/oxlint.lua
new file mode 100644
index 0000000..19bb2fd
--- /dev/null
+++ b/after/lsp/oxlint.lua
@@ -0,0 +1,3 @@
+---@type vim.lsp.Config
+return {
+}
diff --git a/lua/core/autocommands.lua b/lua/core/autocommands.lua
index 70579c3..c23a2ce 100644
--- a/lua/core/autocommands.lua
+++ b/lua/core/autocommands.lua
@@ -121,9 +121,6 @@ vim.api.nvim_create_autocmd("FileType", {
     desc = "Use two space indent for C++ files",
     pattern = { "cpp" },
     callback = function()
-        vim.bo.tabstop = 2
-        vim.bo.softtabstop = 2
-        vim.bo.shiftwidth = 2
         vim.bo.cinoptions = "g0"
     end,
 })
@@ -178,15 +175,7 @@ vim.api.nvim_create_autocmd("FileType", {
 })
 
 vim.api.nvim_create_autocmd("FileType", {
-    pattern = "xml",
-    callback = function()
-        vim.bo.tabstop = 2
-        vim.bo.softtabstop = 2
-        vim.bo.shiftwidth = 2
-    end,
-})
-
-vim.api.nvim_create_autocmd("FileType", {
+    desc = "2-space indent",
     pattern = {
         "json",
         "jsonc",
@@ -195,17 +184,16 @@ vim.api.nvim_create_autocmd("FileType", {
         "css",
         "scss",
         "less",
+        "typescript",
+        "typescriptreact",
+        "javascript",
+        "javascriptreact",
+        "xml",
+        "cpp",
     },
-    callback = function(ev)
-        vim.keymap.set("n", "<leader>lf", function()
-            require("util").format({
-                buf = ev.buf,
-                cmd = {
-                    "prettier",
-                    "--stdin-filepath",
-                    "%file%",
-                },
-            })
-        end, { buffer = ev.buf })
+    callback = function()
+        vim.bo.tabstop = 2
+        vim.bo.softtabstop = 2
+        vim.bo.shiftwidth = 2
     end,
 })
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 8e42138..4fa2984 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -73,7 +73,6 @@ function M.setup()
         "bashls",
         "clangd",
         "cmake",
-        "eslint",
         "gopls",
         -- "hyprls",
         "intelephense",
@@ -82,6 +81,8 @@ function M.setup()
         -- "xml_ls",
         "lua_ls",
         "mesonlsp",
+        "oxfmt",
+        "oxlint",
         -- "phpactor",
         -- "pyrefly",
         "pyright",
diff --git a/lua/plugins/mason-auto-install.lua b/lua/plugins/mason-auto-install.lua
index 3d02fd2..58e6776 100644
--- a/lua/plugins/mason-auto-install.lua
+++ b/lua/plugins/mason-auto-install.lua
@@ -16,7 +16,6 @@ return {
                 "cmake-language-server",
                 dependencies = { "golines" },
             },
-            "eslint-lsp",
             "gopls",
             "hyprls",
             {
@@ -33,6 +32,8 @@ return {
                 dependencies = { "stylua" },
             },
             "mesonlsp",
+            "oxfmt",
+            "oxlint",
             "ruff",
             "pyright",
             "pyrefly",