summaryrefslogtreecommitdiff
path: root/.config/nvim/lua/getchoo/lsp
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua/getchoo/lsp')
-rw-r--r--.config/nvim/lua/getchoo/lsp/config/init.lua35
-rw-r--r--.config/nvim/lua/getchoo/lsp/init.lua2
-rw-r--r--.config/nvim/lua/getchoo/lsp/keymap.lua19
-rw-r--r--.config/nvim/lua/getchoo/lsp/server.lua10
4 files changed, 6 insertions, 60 deletions
diff --git a/.config/nvim/lua/getchoo/lsp/config/init.lua b/.config/nvim/lua/getchoo/lsp/config/init.lua
index 7cb2cbb..be6c357 100644
--- a/.config/nvim/lua/getchoo/lsp/config/init.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/init.lua
@@ -6,39 +6,6 @@ local null_ls = require("getchoo.lsp.config.null_ls")
local M = {}
-M.bufferline = {
- animation = true,
- auto_hide = true,
- icons = true,
- maximum_padding = 2,
- semantic_letters = true,
-}
-
-local db = require("dashboard")
-db.custom_center = {
- {
- desc = "find a file",
- action = "Telescope fd",
- },
- {
- desc = "update plugins",
- action = "PackerSync",
- },
- {
- desc = "update treesitter parsers",
- actions = "TSUpdate",
- },
-}
-
-db.custom_header = {
- " ███╗ ██╗ ███████╗ ██████╗ ██╗ ██╗ ██╗ ███╗ ███╗",
- " ████╗ ██║ ██╔════╝██╔═══██╗ ██║ ██║ ██║ ████╗ ████║",
- " ██╔██╗ ██║ █████╗ ██║ ██║ ██║ ██║ ██║ ██╔████╔██║",
- " ██║╚██╗██║ ██╔══╝ ██║ ██║ ╚██╗ ██╔╝ ██║ ██║╚██╔╝██║",
- " ██║ ╚████║ ███████╗╚██████╔╝ ╚████╔╝ ██║ ██║ ╚═╝ ██║",
- " ╚═╝ ╚═══╝ ╚══════╝ ╚═════╝ ╚═══╝ ╚═╝ ╚═╝ ╚═╝",
-}
-
M.cmp = cmp.config
M.lsp_servers = lsp_config.servers
@@ -48,8 +15,6 @@ M.mason_lspconfig = mason.mason_lspconfig
M.null_ls = null_ls.config
-M.tree = {}
-
M.treesitter = {
auto_install = true,
highlight = {
diff --git a/.config/nvim/lua/getchoo/lsp/init.lua b/.config/nvim/lua/getchoo/lsp/init.lua
index a2ef780..aa3dde5 100644
--- a/.config/nvim/lua/getchoo/lsp/init.lua
+++ b/.config/nvim/lua/getchoo/lsp/init.lua
@@ -5,8 +5,6 @@ require("getchoo.lsp.server")
require("getchoo.lsp.keymap")
local config = require("getchoo.lsp.config")
-require("bufferline").setup(config.bufferline)
require("gitsigns").setup()
-require("nvim-tree").setup(config.tree)
require("nvim-treesitter.configs").setup(config.treesitter)
require("trouble").setup(config.trouble)
diff --git a/.config/nvim/lua/getchoo/lsp/keymap.lua b/.config/nvim/lua/getchoo/lsp/keymap.lua
index 0df41d2..0a93db8 100644
--- a/.config/nvim/lua/getchoo/lsp/keymap.lua
+++ b/.config/nvim/lua/getchoo/lsp/keymap.lua
@@ -16,25 +16,6 @@ set("n", "<space>f", function()
vim.cmd("Telescope")
end)
-set("n", "<leader>t", function()
- vim.cmd("NvimTreeToggle")
-end)
-
set("n", "<space>t", function()
vim.cmd("TroubleToggle")
end)
-
-for i = 1, 9 do
- set("n", "<leader>" .. i, function()
- local cmd = "BufferGoto " .. i
- vim.cmd(cmd)
- end)
-end
-
-set("n", "<leader>p", function()
- vim.cmd("BufferPick")
-end)
-
-set("n", "<leader>q", function()
- vim.cmd("BufferClose")
-end)
diff --git a/.config/nvim/lua/getchoo/lsp/server.lua b/.config/nvim/lua/getchoo/lsp/server.lua
index 9c35aaf..c4ff20b 100644
--- a/.config/nvim/lua/getchoo/lsp/server.lua
+++ b/.config/nvim/lua/getchoo/lsp/server.lua
@@ -7,10 +7,12 @@ local lspconfig = require("lspconfig")
local null_ls = require("null-ls")
local config = require("getchoo.lsp.config")
-require("mason").setup()
-require("mason-lspconfig").setup(config.mason_lspconfig)
-require("mason-tool-installer").setup(config.mason_tool_installer)
-vim.opt.runtimepath:append("~/.local/share/nvim/mason/bin/")
+if vim.g.use_mason then
+ require("mason").setup()
+ require("mason-lspconfig").setup(config.mason_lspconfig)
+ require("mason-tool-installer").setup(config.mason_tool_installer)
+ vim.opt.runtimepath:append("~/.local/share/nvim/mason/bin/")
+end
null_ls.setup(config.null_ls)
cmp.setup(config.cmp)