diff --git a/init.lua b/init.lua index b58786b..c5b67cb 100644 --- a/init.lua +++ b/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", "x", "source %") -- Can't do this with lazy.nvim apparently -vim.keymap.set("n", "x", ":.lua") -vim.keymap.set("v", "x", ":lua") +vim.keymap.set("n", "x", ":.lua") +vim.keymap.set("v", "x", ":lua") vim.api.nvim_set_keymap('t', '', [[]], {noremap = true}) --- vim.api.nvim_set_keymap('i', '', [[]], {noremap = true}) --- Harpoon Setup and Settings -local harpoon = require("harpoon") -harpoon:setup() -vim.keymap.set("n", "n", function() harpoon:list():add() end) -vim.keymap.set("n", "h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) -vim.keymap.set("n", "d", function() harpoon:list():remove() end) -vim.keymap.set("n", "j", function() harpoon:list():select(1) end) -vim.keymap.set("n", "k", function() harpoon:list():select(2) end) -vim.keymap.set("n", "l", function() harpoon:list():select(3) end) -vim.keymap.set("n", ";", 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") +local lspconfig = require('lspconfig') +lspconfig.pylsp.setup{} +lspconfig.clangd.setup{} +lspconfig.gopls.setup{} +--lspconfig.dcm.setup{} +lspconfig.ols.setup{} diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index fda5bde..bb44a52 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -11,4 +11,4 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -require("lazy").setup("plugins") +require("lazy").setup("plugins") diff --git a/lua/plugins/firenvim.lua b/lua/plugins/firenvim.lua deleted file mode 100644 index 4dfcdb0..0000000 --- a/lua/plugins/firenvim.lua +++ /dev/null @@ -1 +0,0 @@ -return { 'glacambre/firenvim', build = ":call firenvim#install(0)" } diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua deleted file mode 100644 index 204f183..0000000 --- a/lua/plugins/harpoon.lua +++ /dev/null @@ -1,5 +0,0 @@ -return {{ - "ThePrimeagen/harpoon", - branch = "harpoon2", - dependencies = { "nvim-lua/plenary.nvim" } -}}