feat(neovim): update config
This commit is contained in:
parent
ed488d1612
commit
1c98609022
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
neovim-unwrapped = pkgs.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
|
neovim-unwrapped = pkgs.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
|
||||||
version = "2020-11-20";
|
version = "2020-11-26";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "neovim";
|
owner = "neovim";
|
||||||
repo = "neovim";
|
repo = "neovim";
|
||||||
rev = "9e405c44b94872923be29c5e736d12d266155a4b";
|
rev = "10a5f40f9e020c28df471d5380869ac63d8474a7";
|
||||||
sha256 = "0k2bbrfd7xwj07d5gj35r3adrm56567jk62p7hq4xyjy2xwc9yjh";
|
sha256 = "1ghdhkbznhh9n3mp39ydnsc1l94yrs4a5fbdm0hircqgz4wndh4y";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = oldAttrs.nativeBuildInputs
|
nativeBuildInputs = oldAttrs.nativeBuildInputs
|
||||||
++ [ pkgs.utf8proc pkgs.tree-sitter ];
|
++ [ pkgs.utf8proc pkgs.tree-sitter ];
|
||||||
|
@ -58,6 +58,8 @@ in {
|
||||||
vim-gitgutter
|
vim-gitgutter
|
||||||
vim-fugitive
|
vim-fugitive
|
||||||
vim-test
|
vim-test
|
||||||
|
vim-closetag
|
||||||
|
auto-pairs
|
||||||
camelcasemotion
|
camelcasemotion
|
||||||
argtextobj-vim
|
argtextobj-vim
|
||||||
wmgraphviz-vim
|
wmgraphviz-vim
|
||||||
|
|
|
@ -101,3 +101,6 @@ tnoremap <A-t> <C-\><C-n>:call TermToggle(12)<CR>
|
||||||
|
|
||||||
" Terminal go back to normal mode
|
" Terminal go back to normal mode
|
||||||
tnoremap :q! <C-\><C-n>:q!<CR>
|
tnoremap :q! <C-\><C-n>:q!<CR>
|
||||||
|
|
||||||
|
" vim-closetag
|
||||||
|
let g:closetag_filenames = "*.html,*.jsx,*.tsx,*.vue,*.xhml,*.xml"
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
local nvim_lsp = require'nvim_lsp'
|
local config = require'lspconfig'
|
||||||
local configs = require'nvim_lsp/configs'
|
|
||||||
local util = require'nvim_lsp/util'
|
|
||||||
|
|
||||||
-- format on save
|
-- format on save
|
||||||
-- TODO often takes way longer to save than 1000 ms (e.g. 7000 ms in fitnesspilot-web)
|
-- TODO often takes way longer to save than 1000 ms (e.g. 7000 ms in fitnesspilot-web)
|
||||||
|
@ -8,25 +6,28 @@ local diagnosticls_on_attach = function(_, bufnr)
|
||||||
vim.api.nvim_command("au BufWritePre <buffer> lua vim.lsp.buf.formatting_sync(nil, 1000)")
|
vim.api.nvim_command("au BufWritePre <buffer> lua vim.lsp.buf.formatting_sync(nil, 1000)")
|
||||||
end
|
end
|
||||||
|
|
||||||
nvim_lsp.bashls.setup{}
|
local pid = vim.fn.getpid()
|
||||||
nvim_lsp.jsonls.setup{}
|
|
||||||
nvim_lsp.yamlls.setup{}
|
config.bashls.setup{}
|
||||||
nvim_lsp.html.setup{}
|
config.jsonls.setup{}
|
||||||
nvim_lsp.cssls.setup{}
|
config.yamlls.setup{}
|
||||||
nvim_lsp.vimls.setup{}
|
config.html.setup{}
|
||||||
nvim_lsp.dockerls.setup{}
|
config.cssls.setup{}
|
||||||
nvim_lsp.rnix.setup{}
|
config.vimls.setup{}
|
||||||
nvim_lsp.tsserver.setup{}
|
config.dockerls.setup{}
|
||||||
nvim_lsp.omnisharp.setup{
|
config.rnix.setup{}
|
||||||
cmd = {"omnisharp", "--languageserver"};
|
config.tsserver.setup{}
|
||||||
|
config.omnisharp.setup{
|
||||||
|
cmd = {"omnisharp", "--languageserver", "--hostPID", tostring(pid)};
|
||||||
}
|
}
|
||||||
nvim_lsp.pyls.setup{}
|
config.pyls.setup{}
|
||||||
nvim_lsp.terraformls.setup{}
|
config.terraformls.setup{}
|
||||||
nvim_lsp.hls.setup{}
|
config.hls.setup{}
|
||||||
|
|
||||||
-- based on: https://github.com/mikew/vimrc/blob/master/src/nvim/coc-settings.json
|
-- based on: https://github.com/mikew/vimrc/blob/master/src/nvim/coc-settings.json
|
||||||
-- TODO breaks auto-completion when using with other lsp
|
-- TODO breaks auto-completion when using with other lsp
|
||||||
-- nvim_lsp.diagnosticls.setup{
|
-- TODO some ts projects are using tsc eslint plugin
|
||||||
|
-- config.diagnosticls.setup{
|
||||||
-- on_attach = diagnosticls_on_attach;
|
-- on_attach = diagnosticls_on_attach;
|
||||||
-- filetypes = {
|
-- filetypes = {
|
||||||
-- "javascript",
|
-- "javascript",
|
||||||
|
|
|
@ -37,5 +37,5 @@ nnoremap <silent> <leader>sw <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
|
||||||
nnoremap <silent> <leader>f <cmd>lua vim.lsp.buf.formatting()<CR>
|
nnoremap <silent> <leader>f <cmd>lua vim.lsp.buf.formatting()<CR>
|
||||||
nnoremap <silent> <leader>a <cmd>lua vim.lsp.buf.code_action()<CR>
|
nnoremap <silent> <leader>a <cmd>lua vim.lsp.buf.code_action()<CR>
|
||||||
nnoremap <silent> <leader>r <cmd>lua vim.lsp.buf.rename()<CR>
|
nnoremap <silent> <leader>r <cmd>lua vim.lsp.buf.rename()<CR>
|
||||||
nnoremap <silent> <leader>d <cmd>lua vim.lsp.util.show_line_diagnostics()<CR>
|
nnoremap <silent> <leader>d <cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue