FIXED MY LSP

4 files changed, 22 insertions, 82 deletions

diff --git a/nixos/games/default.nix b/nixos/games/default.nix
index d54cae2..9c0b66e 100644
--- a/nixos/games/default.nix
+++ b/nixos/games/default.nix
@@ -4,6 +4,7 @@
     (if games.minecraft then [ ./minecraft.nix ] else []);
   programs.steam.enable = true;
   programs.steam.protontricks.enable = true;
+  programs.gamemode.enable = true;
   programs.steam.extraCompatPackages = with pkgs; [
     proton-ge-bin
   ];
diff --git a/nixos/languages/c.nix b/nixos/languages/c.nix
index 0bc2e6a..d483029 100644
--- a/nixos/languages/c.nix
+++ b/nixos/languages/c.nix
@@ -8,6 +8,7 @@
     clang-tools
     pkg-config
     gf
+    gcc-arm-embedded
     llvmPackages_21.clang-unwrapped
     llvmPackages_21.bintools-unwrapped
     llvmPackages_21.llvm.out
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index ccaacd5..63dd0b6 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,5 +1,5 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "a62e1083a3cfe8b6b206e7d3d33a51091df25357" },
+  "LuaSnip": { "branch": "master", "commit": "0abc8f390b278c3b4aabc4c004ac8a088b65cf24" },
   "NvChad": { "branch": "v2.5", "commit": "d042cc975247c2aa55fcb228e5d146dc1dc6c648" },
   "base46": { "branch": "v3.0", "commit": "884b990dcdbe07520a0892da6ba3e8d202b46337" },
   "cmp-async-path": { "branch": "main", "commit": "f8af3f726e07f2e9d37672eaa9102581aefce149" },
@@ -7,23 +7,23 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
   "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
+  "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" },
+  "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "mason.nvim": { "branch": "main", "commit": "12ddd182d9efbdc848b540f16484a583d52da0fb" },
+  "mason.nvim": { "branch": "main", "commit": "bb639d4bf385a4d89f478b83af4d770be05ab7eb" },
   "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
   "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
-  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
+  "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
   "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
-  "nvim-lspconfig": { "branch": "master", "commit": "e146efacbafed3789ac568abcc5a981c5decaa58" },
-  "nvim-tree.lua": { "branch": "master", "commit": "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a4ed4e761c400849e8c9f8bda33e5083f890268c" },
+  "nvim-tree.lua": { "branch": "master", "commit": "07f541fcaa4a5ae019598240362449ab7e9812b3" },
   "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
+  "nvim-web-devicons": { "branch": "master", "commit": "0d7d35fa946837b8738b17c18d1faa1ac351e7f9" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
-  "telescope.nvim": { "branch": "master", "commit": "028d9a0695a0cc4cfa893889f8c408ed7ccc8adc" },
-  "ui": { "branch": "v3.0", "commit": "cb75908a86720172594b30de147272c1b3a7f452" },
+  "telescope.nvim": { "branch": "master", "commit": "7d324792b7943e4aa16ad007212e6acc6f9fe335" },
+  "ui": { "branch": "v3.0", "commit": "3e67e9d5325fd47fdbc90ca00a147db2f3525754" },
   "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" },
   "vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" },
   "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua
index 0a5520d..d72020d 100644
--- a/nvim/lua/configs/lspconfig.lua
+++ b/nvim/lua/configs/lspconfig.lua
@@ -1,77 +1,15 @@
 require("nvchad.configs.lspconfig").defaults()
 
-local servers = { "html", "cssls", "rust_analyzer", "zls" }
+-- NOTE: DO NOT USE MASON TO INSTALL LSPs, THEY CONFLICT WITH THESE, IF YOU
+-- HAVE ANY INSTALLED, REMOVE THEM
+local servers = { "html", "cssls", "rust_analyzer", "zls", "ts_ls", "pylsp" }
 vim.lsp.enable(servers)
 
-local lspconfig = vim.lsp.config--require("lspconfig")
+vim.lsp.config("clangd", {
+  cmd = {
+    "clangd",
+    "--query-driver=/run/current-system/sw/bin/arm-none-eabi-gcc",
+  },
+})
 
--- Zig
--- lspconfig.zls.setup{
---   cmd = { "zls" },
---   filetypes = { "zig", "zir" },
-  -- root_dir = lspconfig.util.root_pattern("build.zig", "zls.json", ".git")
--- }
-
--- TS/JS
--- lspconfig.ts_ls.setup {
---   cmd = { "typescript-language-server", "--stdio" },
---   filetypes = {
---     "javascript", "javascriptreact",
---     "typescript", "typescriptreact",
---     "javascript.jsx", "typescript.tsx"
---   },
---   -- root_dir = lspconfig.util.root_pattern("package.json", "tsconfig.json", ".git")
--- }
---
--- -- Python
--- lspconfig.pylsp.setup {
---   cmd = { "pylsp" },
---   filetypes = { "python" },
---   settings = {
---     pylsp = {
---       plugins = {
---         black = { enabled = true },
---         ruff = { enabled = true },
---         flake8 = { enabled = true },
---         isort = { enabled = true }
---       }
---     }
---   }
--- }
---
--- -- Elixir
--- lspconfig.elixirls.setup {
---   cmd = { "elixir-ls" },
---   filetypes = { "elixir" },
--- }
---
--- -- Erlang
--- lspconfig.erlangls.setup {
---   cmd = { "erlang-ls" },
---   filetypes = { "erlang" },
--- }
---
--- -- C/C++
--- lspconfig.clangd.setup {
---   cmd = { "clangd" },
---   filetypes = { "c", "cpp" }
--- }
---
--- -- Gopls
--- lspconfig.gopls.setup {
---   cmd = { "gopls" },
---   filetype = { "go" }
--- }
---
--- -- Dart / Flutter
--- lspconfig.dartls.setup({
---   cmd = { "dart", "language-server", "--protocol=lsp" },
---   filetypes = { "dart" },
---   -- root_dir = lspconfig.util.root_pattern("pubspec.yaml"),
---   settings = {
---     dart = {
---       completeFunctionCalls = true,
---       showTodos = true,
---     },
---   },
--- })
+vim.lsp.enable("clangd")