init.lua

@@ -1,5 +1,3 @@
-vim.g.mapleader = " "
-
 require("config.lazy")
 
 require("mason").setup()
@@ -7,9 +5,9 @@ require("mason-lspconfig").setup({
 	ensure_installed = {
 		"pylsp",
 		"clangd",
+		"gopls",
+		-- "dcm",
 		"ols",
-		"ts_ls",
-		"vue_ls"
 	},
 })
 
@@ -26,31 +24,13 @@ vim.cmd([[colorscheme everforest]])
 
 -- My custom keybinds
 -- vim.keymap.set("n", "<space><space>x", "<cmd>source %<CR>") -- Can't do this with lazy.nvim apparently
-vim.keymap.set("n", "<Leader>x", ":.lua<CR>")
+vim.keymap.set("n", "<space>x", ":.lua<CR>")
-vim.keymap.set("v", "<Leader>x", ":lua<CR>")
+vim.keymap.set("v", "<space>x", ":lua<CR>")
 vim.api.nvim_set_keymap('t', '<ESC>', [[<C-\><C-n>]], {noremap = true})
--- vim.api.nvim_set_keymap('i', '<C-k>', [[<C-x><C-o>]], {noremap = true})
 
--- Harpoon Setup and Settings
+local lspconfig = require('lspconfig')
-local harpoon = require("harpoon")
+lspconfig.pylsp.setup{}
-harpoon:setup()
+lspconfig.clangd.setup{}
-vim.keymap.set("n", "<Leader>n", function() harpoon:list():add() end)
+lspconfig.gopls.setup{}
-vim.keymap.set("n", "<Leader>h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+--lspconfig.dcm.setup{}
-vim.keymap.set("n", "<Leader>d", function() harpoon:list():remove() end)
+lspconfig.ols.setup{}
-vim.keymap.set("n", "<Leader>j", function() harpoon:list():select(1) end)
-vim.keymap.set("n", "<Leader>k", function() harpoon:list():select(2) end)
-vim.keymap.set("n", "<Leader>l", function() harpoon:list():select(3) end)
-vim.keymap.set("n", "<Leader>;", function() harpoon:list():select(4) end)
-
-
---local lspconfig = require('lspconfig')
-local lspconfig = vim.lsp.config
-local lspenable = vim.lsp.enable
-lspconfig("ts_ls", {
-  filetypes = {'js', 'ts', 'vue'},
-})
-lspenable("pylsp")
-lspenable("clangd")
-lspenable("ols")
-lspenable("ts_ls")
-lspenable("vue_ls")

lua/plugins/firenvim.lua

@@ -1 +0,0 @@
-return { 'glacambre/firenvim', build = ":call firenvim#install(0)" }

lua/plugins/harpoon.lua

@@ -1,5 +0,0 @@
-return {{
-  "ThePrimeagen/harpoon",
-  branch = "harpoon2",
-  dependencies = { "nvim-lua/plenary.nvim" }
-}}