From ff192794370df308837299b53806656068a31d6a Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Mon, 26 Feb 2024 00:24:17 -0800
Subject: [PATCH] more stuff

---
 lazyvim.json                    |  2 --
 lua/plugins/lspconfig.lua       | 13 +++++++++++++
 lua/plugins/nix-workarounds.lua | 25 +++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 lua/plugins/nix-workarounds.lua

diff --git a/lazyvim.json b/lazyvim.json
index 9ee7f34..37c9be6 100644
--- a/lazyvim.json
+++ b/lazyvim.json
@@ -3,12 +3,10 @@
     "lazyvim.plugins.extras.dap.core",
     "lazyvim.plugins.extras.editor.aerial",
     "lazyvim.plugins.extras.formatting.prettier",
-    "lazyvim.plugins.extras.lang.clangd",
     "lazyvim.plugins.extras.lang.elixir",
     "lazyvim.plugins.extras.lang.go",
     "lazyvim.plugins.extras.lang.java",
     "lazyvim.plugins.extras.lang.omnisharp",
-    "lazyvim.plugins.extras.lang.ruby",
     "lazyvim.plugins.extras.lang.rust",
     "lazyvim.plugins.extras.lang.tailwind",
     "lazyvim.plugins.extras.lang.typescript",
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index 2e3936a..6c2366a 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -7,6 +7,19 @@ return {
       -- -@type lspconfig.options
       servers = {
         -- pyright will be automatically installed with mason and loaded with lspconfig
+        nil_ls = {
+          mason = false,
+          settings = {
+            ["nil"] = {
+              formatting = {
+                command = { "nixpkgs-fmt" },
+              },
+            },
+          },
+        },
+        lua_ls = {
+          mason = false,
+        },
         rust_analyzer = {
           mason = false,
           settings = {
diff --git a/lua/plugins/nix-workarounds.lua b/lua/plugins/nix-workarounds.lua
new file mode 100644
index 0000000..7b319a8
--- /dev/null
+++ b/lua/plugins/nix-workarounds.lua
@@ -0,0 +1,25 @@
+return {
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      -- add tsx and treesitter
+      -- vim.list_extend(opts.ensure_installed, {
+      --   "tsx",
+      --   "typescript",
+      -- })
+      opts.ensure_installed = {}
+    end,
+  },
+
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      -- add tsx and treesitter
+      -- vim.list_extend(opts.ensure_installed, {
+      --   "tsx",
+      --   "typescript",
+      -- })
+      opts.ensure_installed = {}
+    end,
+  },
+}