more neovim lsp improvements
This commit is contained in:
parent
d1a61d882d
commit
1a509d6e84
6 changed files with 68 additions and 16 deletions
|
@ -1,18 +1,19 @@
|
||||||
local opts = { noremap = true, silent = true }
|
local opts = { noremap = true, silent = true }
|
||||||
local keymap = vim.api.nvim_set_keymap
|
local keymap = vim.keymap.set
|
||||||
|
local builtin = require('telescope.builtin')
|
||||||
|
|
||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = ' '
|
||||||
vim.g.maplocalleader = ' '
|
vim.g.maplocalleader = ' '
|
||||||
|
|
||||||
keymap('', '<leader>', '<Nop>', opts)
|
keymap('', '<leader>', '<Nop>', opts)
|
||||||
keymap('n', '<leader>e', ':NvimTreeToggle %<CR>', opts)
|
keymap('n', '<leader>e', vim.cmd.NvimTreeToggle)
|
||||||
|
keymap('n', '<leader>m', vim.cmd.Mason)
|
||||||
local builtin = require('telescope.builtin')
|
keymap('n', '<leader>h', vim.cmd.noh)
|
||||||
local keymap = vim.keymap.set
|
keymap('n', '<leader>p', vim.cmd.PlugUpdate)
|
||||||
|
|
||||||
keymap('n', '<leader>ff', builtin.find_files, {})
|
keymap('n', '<leader>ff', builtin.find_files, {})
|
||||||
keymap('n', '<leader>fg', builtin.live_grep, {})
|
keymap('n', '<leader>fg', builtin.live_grep, {})
|
||||||
keymap('n', '<leader>fb', builtin.buffers, {})
|
keymap('n', '<leader>fb', builtin.buffers, {})
|
||||||
keymap('n', '<leader>fh', builtin.help_tags, {})
|
keymap('n', '<leader>fh', builtin.help_tags, {})
|
||||||
keymap('n', '<leader>u', vim.cmd.UndotreeToggle)
|
keymap('n', '<leader>u', vim.cmd.UndotreeToggle)
|
||||||
keymap('n', '<leader>gs', vim.cmd.Git)
|
keymap('n', '<leader>gs', vim.cmd.Git)
|
||||||
|
keymap('n', '<leader>t', function() require('trouble').toggle() end)
|
||||||
|
|
|
@ -71,3 +71,6 @@ lsp.setup()
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
virtual_text = true
|
virtual_text = true
|
||||||
})
|
})
|
||||||
|
|
||||||
|
require("neodev").setup()
|
||||||
|
require("nvim-surround").setup()
|
||||||
|
|
|
@ -24,5 +24,14 @@ Plug('L3MON4D3/LuaSnip')
|
||||||
Plug('williamboman/mason.nvim')
|
Plug('williamboman/mason.nvim')
|
||||||
Plug('williamboman/mason-lspconfig.nvim')
|
Plug('williamboman/mason-lspconfig.nvim')
|
||||||
Plug('VonHeikemen/lsp-zero.nvim', { branch = 'v3.x' })
|
Plug('VonHeikemen/lsp-zero.nvim', { branch = 'v3.x' })
|
||||||
|
Plug('akinsho/bufferline.nvim', { tag = '*' })
|
||||||
|
Plug('folke/neodev.nvim')
|
||||||
|
Plug('RRethy/vim-illuminate')
|
||||||
|
Plug('SmiteshP/nvim-navic')
|
||||||
|
Plug('utilyre/barbecue.nvim')
|
||||||
|
Plug('j-hui/fidget.nvim', { tag = 'legacy' })
|
||||||
|
Plug('rcarriga/nvim-notify')
|
||||||
|
Plug('folke/trouble.nvim')
|
||||||
|
Plug('kylechui/nvim-surround')
|
||||||
|
|
||||||
vim.call('plug#end')
|
vim.call('plug#end')
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
local options = {
|
|
||||||
termguicolors = true
|
|
||||||
}
|
|
||||||
|
|
||||||
local catppuccin = require('catppuccin')
|
local catppuccin = require('catppuccin')
|
||||||
|
|
||||||
catppuccin.setup({
|
catppuccin.setup({
|
||||||
|
@ -10,6 +6,21 @@ catppuccin.setup({
|
||||||
cmp = true,
|
cmp = true,
|
||||||
nvimtree = true,
|
nvimtree = true,
|
||||||
treesitter = true,
|
treesitter = true,
|
||||||
|
illuminate = {
|
||||||
|
enabled = true,
|
||||||
|
lsp = false
|
||||||
|
},
|
||||||
|
barbecue = {
|
||||||
|
dim_dirname = true, -- directory name is dimmed by default
|
||||||
|
bold_basename = true,
|
||||||
|
dim_context = false,
|
||||||
|
alt_background = false,
|
||||||
|
},
|
||||||
|
coc_nvim = true,
|
||||||
|
fidget = true,
|
||||||
|
markdown = true,
|
||||||
|
notify = true,
|
||||||
|
lsp_trouble = true,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -32,3 +43,13 @@ require('lualine').setup {
|
||||||
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
|
vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
|
||||||
|
|
||||||
|
vim.opt.termguicolors = true
|
||||||
|
require("bufferline").setup{}
|
||||||
|
require("barbecue").setup()
|
||||||
|
require("barbecue.ui").toggle(true)
|
||||||
|
require("fidget").setup {
|
||||||
|
window = {
|
||||||
|
blend = 0,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
|
@ -29,7 +29,26 @@ end
|
||||||
require("nvim-tree").setup({
|
require("nvim-tree").setup({
|
||||||
sort_by = "case_sensitive",
|
sort_by = "case_sensitive",
|
||||||
view = {
|
view = {
|
||||||
|
adaptive_size = false,
|
||||||
|
centralize_selection = true,
|
||||||
width = 30,
|
width = 30,
|
||||||
|
side = "left",
|
||||||
|
preserve_window_proportions = false,
|
||||||
|
number = false,
|
||||||
|
relativenumber = false,
|
||||||
|
signcolumn = "yes",
|
||||||
|
float = {
|
||||||
|
enable = false,
|
||||||
|
quit_on_focus_loss = true,
|
||||||
|
open_win_config = {
|
||||||
|
relative = "editor",
|
||||||
|
border = "rounded",
|
||||||
|
width = 30,
|
||||||
|
height = 30,
|
||||||
|
row = 1,
|
||||||
|
col = 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
renderer = {
|
renderer = {
|
||||||
group_empty = true,
|
group_empty = true,
|
||||||
|
|
|
@ -7,7 +7,6 @@ set.clipboard = "unnamedplus"
|
||||||
set.hlsearch = true
|
set.hlsearch = true
|
||||||
set.autoindent = true
|
set.autoindent = true
|
||||||
set.ttyfast = true
|
set.ttyfast = true
|
||||||
set.cc = '80'
|
|
||||||
set.number = true
|
set.number = true
|
||||||
set.relativenumber = true
|
set.relativenumber = true
|
||||||
set.rnu = true
|
set.rnu = true
|
||||||
|
|
Loading…
Reference in a new issue