Removed copilot for now, updated the lsp config

aHulswitt36 · Feb 20, 2024 · a04e75a · a04e75a
1 parent 30e2811
commit a04e75a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 113 deletions.
diff --git a/lazy-lock.json b/lazy-lock.json
@@ -6,17 +6,15 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "copilot.vim": { "branch": "release", "commit": "315c6d2b16e018cb8020f20aaa7081ebc4070828" },
   "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" },
   "fidget.nvim": { "branch": "main", "commit": "4e854f3299e21d1c18279add340428a97520fc44" },
   "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
-  "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
+  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" },
   "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
   "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" },
-  "nvim-treesitter": { "branch": "master", "commit": "504fe1043298c468f56a6ef6dc61f35b2d69495a" },
-  "plenary": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "nvim-treesitter": { "branch": "master", "commit": "e04ce8bcec4dec3551d7ec4fa6d737d183433bfd" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
   "rose-pine": { "branch": "main", "commit": "f977eeba34b030b37f93ece2fbd792477606203b" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },

diff --git a/lua/kameleon/lazy/init.lua b/lua/kameleon/lazy/init.lua
@@ -1,11 +1,7 @@
 return {
 
-    {
-        "nvim-lua/plenary.nvim",
-            name = "plenary"
-    },
 
-        "github/copilot.vim",
+    -- "github/copilot.vim",
         "eandrju/cellular-automaton.nvim",
         "gpanders/editorconfig.nvim"
 

diff --git a/lua/kameleon/lazy/lsp.lua b/lua/kameleon/lazy/lsp.lua
@@ -1,5 +1,5 @@
 return
-    {   
+    {  
         "neovim/nvim-lspconfig",
         dependencies = {
             "williamboman/mason.nvim",
@@ -24,13 +24,12 @@ return
                 cmp_lsp.default_capabilities())
 
             require("fidget").setup({})
-            require("mason").setup()
+            require("mason").setup({})
             require("mason-lspconfig").setup({
                 ensure_installed = {
-                    "lua_ls",
+                    -- "lua_ls",
                     "rust_analyzer",
                     "tsserver",
-                    "csharp_ls",
                     "omnisharp",
                     "pylsp"
                 },
@@ -39,8 +38,16 @@ return
                         require("lspconfig")[server_name].setup{
                             capabilities = capabilities
                         }
+                    end,
+                    ["omnisharp"] = function()
+                        require("lspconfig").omnisharp.setup{
+                                enable_roslyn_analysers = true,
+                                enable_import_completion = true,
+                                organize_imports_on_format = true,
+                                filetypes = { 'cs', 'vb', 'csproj', 'sln', 'slnx', 'props' },
+                        }
                     end
                 }
             })
-        end 
+        end
     }
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua