fix lsp

vim/.vim/lua/plugins/lsp.lua

@@ -94,19 +94,6 @@ return {
 			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
 		},
 		config = function()
-			local lsp_status = require("lsp-status")
-			lsp_status.register_progress()
-
-			local capabilities = flags.blink
-					and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
-				or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-			capabilities = vim.tbl_extend("keep", capabilities or {}, lsp_status.capabilities)
-			capabilities.offsetEncoding = { "utf-16" }
-
-			local lspconfig = require("lspconfig")
-			local configs = require("lspconfig.configs")
-
-<<<<<<< HEAD
 			local nvim_lspconfig = require("lspconfig")
 			local lsp_configs = require("lspconfig.configs")
 
@@ -147,39 +134,4 @@ return {
 			vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
 		end,
 	},
-=======
-      if use_google() then
-        local on_attach = function(client, bufnr)
-          -- local ft = vim.bo[bufnr].filetype
-          -- if ft == "cpp" or ft == "c" then
-          --   if client.server_capabilities.semanticTokensProvider ~= nil then
-          --     client.server_capabilities.semanticTokensProvider = nil
-          --   end
-          -- end
-        end
-
-        configs.ciderlsp = {
-          default_config = {
-            cmd = { '/google/bin/releases/cider/ciderlsp/ciderlsp', '--tooltag=nvim-lsp', '--noforward_sync_responses' },
-            filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "typescript" },
-            offset_encoding = 'utf-8',
-            root_dir = lspconfig.util.root_pattern('.citc'),
-            settings = {},
-          }
-        }
-
-        lspconfig.ciderlsp.setup { on_attach = on_attach }
-      end
-
-      -- Godot
-      lspconfig.gdscript.setup({
-        -- flags = {
-        -- 	debounce_text_changes = 2000, -- Wait 5 seconds before sending didChange
-        -- },
-      })
-      vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
-      vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
-    end,
-  },
->>>>>>> 0c7bebc (stuff)
 }