Fix vim
This commit is contained in:
parent
5455912565
commit
1ac4972841
2 changed files with 28 additions and 32 deletions
|
@ -1,15 +1,14 @@
|
||||||
source ~/.vimrc
|
source ~/.vimrc
|
||||||
|
|
||||||
lua << EOF
|
lua << EOF
|
||||||
require("nvim-lsp-installer").setup {
|
-- require("nvim-lsp-installer").setup {
|
||||||
automatic_installation = true
|
-- automatic_installation = true
|
||||||
}
|
-- }
|
||||||
|
require('impatient')
|
||||||
require('orgmode').setup_ts_grammar()
|
require('orgmode').setup_ts_grammar()
|
||||||
|
|
||||||
local nvim_lsp = require('lspconfig')
|
local nvim_lsp = require('lspconfig')
|
||||||
local lsp_extensions = require('lsp_extensions')
|
local lsp_extensions = require('lsp_extensions')
|
||||||
local coq = require('coq')
|
|
||||||
local null_ls = require('null-ls');
|
|
||||||
|
|
||||||
lsp_extensions.inlay_hints{
|
lsp_extensions.inlay_hints{
|
||||||
highlight = "Comment",
|
highlight = "Comment",
|
||||||
|
@ -19,18 +18,6 @@ lsp_extensions.inlay_hints{
|
||||||
enabled = { "ChainingHint" }
|
enabled = { "ChainingHint" }
|
||||||
}
|
}
|
||||||
|
|
||||||
null_ls.setup{
|
|
||||||
sources = {
|
|
||||||
null_ls.builtins.diagnostics.php,
|
|
||||||
null_ls.builtins.formatting.clang_format,
|
|
||||||
null_ls.builtins.formatting.rustfmt,
|
|
||||||
null_ls.builtins.formatting.eslint,
|
|
||||||
null_ls.builtins.formatting.phpcsfixer,
|
|
||||||
null_ls.builtins.formatting.prettier,
|
|
||||||
null_ls.builtins.formatting.phpcbf,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
require('colorizer').setup{}
|
require('colorizer').setup{}
|
||||||
require('feline').setup{}
|
require('feline').setup{}
|
||||||
require('bufferline').setup{}
|
require('bufferline').setup{}
|
||||||
|
@ -70,14 +57,21 @@ local on_attach = function (client, bufnr)
|
||||||
buf_set_keymap('n', '=', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
buf_set_keymap('n', '=', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- local coq = require('coq')
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
nvim_lsp[lsp].setup(coq.lsp_ensure_capabilities({
|
-- nvim_lsp[lsp].setup(coq.lsp_ensure_capabilities({
|
||||||
|
-- on_attach = on_attach,
|
||||||
|
-- flags = {
|
||||||
|
-- debounce_text_changes = 150,
|
||||||
|
-- }
|
||||||
|
-- }))
|
||||||
|
|
||||||
|
nvim_lsp[lsp].setup({
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = {
|
flags = {
|
||||||
debounce_text_changes = 150,
|
debounce_text_changes = 150,
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
26
.vimrc
26
.vimrc
|
@ -4,33 +4,32 @@ let mapleader=' '
|
||||||
|
|
||||||
call plug#begin('~/.vim/plugged')
|
call plug#begin('~/.vim/plugged')
|
||||||
if has('nvim')
|
if has('nvim')
|
||||||
|
Plug 'nvim-treesitter/nvim-treesitter'
|
||||||
|
Plug 'lewis6991/impatient.nvim'
|
||||||
|
"
|
||||||
Plug 'akinsho/bufferline.nvim'
|
Plug 'akinsho/bufferline.nvim'
|
||||||
Plug 'feline-nvim/feline.nvim'
|
Plug 'feline-nvim/feline.nvim'
|
||||||
Plug 'glepnir/dashboard-nvim'
|
Plug 'glepnir/dashboard-nvim'
|
||||||
Plug 'jose-elias-alvarez/null-ls.nvim'
|
Plug 'ms-jpq/chadtree', {'branch': 'chad', 'do': 'python3 -m chadtree deps'}
|
||||||
Plug 'lewis6991/impatient.nvim'
|
" Plug 'ms-jpq/coq.artifacts'
|
||||||
Plug 'ms-jpq/coq.artifacts'
|
" Plug 'ms-jpq/coq_nvim'
|
||||||
Plug 'ms-jpq/coq_nvim'
|
|
||||||
Plug 'nathom/filetype.nvim'
|
Plug 'nathom/filetype.nvim'
|
||||||
Plug 'neovim/nvim-lspconfig'
|
Plug 'neovim/nvim-lspconfig'
|
||||||
Plug 'norcalli/nvim-colorizer.lua'
|
Plug 'norcalli/nvim-colorizer.lua'
|
||||||
Plug 'nvim-lua/lsp_extensions.nvim'
|
Plug 'nvim-lua/lsp_extensions.nvim'
|
||||||
Plug 'nvim-lua/plenary.nvim'
|
Plug 'nvim-lua/plenary.nvim'
|
||||||
Plug 'nvim-telescope/telescope.nvim'
|
|
||||||
Plug 'nvim-treesitter/nvim-treesitter'
|
|
||||||
Plug 'onsails/lspkind-nvim'
|
|
||||||
Plug 'nvim-orgmode/orgmode'
|
Plug 'nvim-orgmode/orgmode'
|
||||||
|
Plug 'nvim-telescope/telescope.nvim'
|
||||||
|
Plug 'onsails/lspkind-nvim'
|
||||||
Plug 'ray-x/lsp_signature.nvim'
|
Plug 'ray-x/lsp_signature.nvim'
|
||||||
Plug 'williamboman/nvim-lsp-installer'
|
" Plug 'williamboman/nvim-lsp-installer'
|
||||||
Plug 'windwp/nvim-autopairs'
|
Plug 'windwp/nvim-autopairs'
|
||||||
Plug 'ms-jpq/chadtree', {'branch': 'chad', 'do': 'python3 -m chadtree deps'}
|
|
||||||
endif
|
endif
|
||||||
Plug 'SirVer/ultisnips'
|
Plug 'SirVer/ultisnips'
|
||||||
Plug 'honza/vim-snippets'
|
|
||||||
Plug 'adelarsq/vim-matchit'
|
|
||||||
Plug 'alvan/vim-closetag'
|
Plug 'alvan/vim-closetag'
|
||||||
Plug 'andymass/vim-matchup'
|
Plug 'andymass/vim-matchup'
|
||||||
Plug 'ghifarit53/tokyonight-vim'
|
Plug 'ghifarit53/tokyonight-vim'
|
||||||
|
Plug 'honza/vim-snippets'
|
||||||
Plug 'justinmk/vim-sneak'
|
Plug 'justinmk/vim-sneak'
|
||||||
Plug 'mattn/emmet-vim'
|
Plug 'mattn/emmet-vim'
|
||||||
Plug 'mipmip/vim-fluid'
|
Plug 'mipmip/vim-fluid'
|
||||||
|
@ -49,7 +48,6 @@ if has('nvim')
|
||||||
nnoremap <leader>fb <cmd>lua require('telescope.builtin').buffers()<cr>
|
nnoremap <leader>fb <cmd>lua require('telescope.builtin').buffers()<cr>
|
||||||
nnoremap <leader>fh <cmd>lua require('telescope.builtin').help_tags()<cr>
|
nnoremap <leader>fh <cmd>lua require('telescope.builtin').help_tags()<cr>
|
||||||
|
|
||||||
|
|
||||||
"" CHADTree config
|
"" CHADTree config
|
||||||
if &diff
|
if &diff
|
||||||
else
|
else
|
||||||
|
@ -58,6 +56,10 @@ if has('nvim')
|
||||||
nnoremap <leader>v <cmd>CHADopen<cr>
|
nnoremap <leader>v <cmd>CHADopen<cr>
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
"" Emmet
|
||||||
|
let g:user_emmet_mode='n' "only enable normal mode functions.
|
||||||
|
let g:user_emmet_leader_key='<C-Z>'
|
||||||
|
|
||||||
"" Ultrasnips
|
"" Ultrasnips
|
||||||
let g:UltiSnipsExpandTrigger="<tab>"
|
let g:UltiSnipsExpandTrigger="<tab>"
|
||||||
let g:UltiSnipsJumpForwardTrigger="<c-b>"
|
let g:UltiSnipsJumpForwardTrigger="<c-b>"
|
||||||
|
|
Loading…
Reference in a new issue