diff --git a/neovim/coc-settings.json b/neovim/coc-settings.json deleted file mode 100644 index 617187a..0000000 --- a/neovim/coc-settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "coc.preferences.formatOnSaveFiletypes": ["rust"], - "rust-analyzer.enable": false, - "rust-analyzer.diagnostics.enableExperimental": false, - "rust-analyzer.inlayHints.enable": false, - "rust-analyzer.procMacro.enable": true, - "rust-analyzer.updates.channel": "nightly" -} diff --git a/neovim/coc/.gitignore b/neovim/coc/.gitignore deleted file mode 100644 index 5b04a14..0000000 --- a/neovim/coc/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/list-extensions-history.json -/list-location-history.json -/commands diff --git a/neovim/coc/extensions/.gitignore b/neovim/coc/extensions/.gitignore deleted file mode 100644 index 4f5b9f9..0000000 --- a/neovim/coc/extensions/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/coc-rust-analyzer-data -/package-lock.json diff --git a/neovim/coc/extensions/db.json b/neovim/coc/extensions/db.json deleted file mode 100644 index 9e26dfe..0000000 --- a/neovim/coc/extensions/db.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/neovim/coc/extensions/package.json b/neovim/coc/extensions/package.json deleted file mode 100644 index d6fdbdc..0000000 --- a/neovim/coc/extensions/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "coc-json": ">=1.3.4", - "coc-rls": ">=1.1.6", - "coc-rust-analyzer": ">=0.46.0", - "coc-tsserver": ">=1.8.1" - } -} \ No newline at end of file diff --git a/neovim/coc/memos.json b/neovim/coc/memos.json deleted file mode 100644 index 17051c6..0000000 --- a/neovim/coc/memos.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "coc-rust-analyzer|global": { - "release": "nightly 2021-06-05" - } -} \ No newline at end of file diff --git a/neovim/init.vim b/neovim/init.vim index 3383cb1..cc13e8c 100644 --- a/neovim/init.vim +++ b/neovim/init.vim @@ -32,7 +32,7 @@ Plug 'ledger/vim-ledger' Plug 'LnL7/vim-nix' Plug 'MarcWeber/vim-addon-local-vimrc' Plug 'mxw/vim-jsx' -Plug 'neoclide/coc.nvim', {'branch': 'release'} +Plug 'neovim/nvim-lspconfig' Plug 'ntpeters/vim-better-whitespace' Plug 'pangloss/vim-javascript' Plug 'plasticboy/vim-markdown' @@ -328,5 +328,41 @@ endfun command ResetScreen call s:ResetScreen() nnoremap :ResetScreen -nmap j (coc-diagnostic-next) -nmap k (coc-diagnostic-prev) +lua < + buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + local opts = { noremap=true, silent=true } + + buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) + buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) + buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) + buf_set_keymap('n', 'R', 'lua vim.lsp.buf.rename()', opts) + buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'd', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) + buf_set_keymap('n', 'j', 'lua vim.lsp.diagnostic.goto_prev()', opts) + buf_set_keymap('n', 'k', 'lua vim.lsp.diagnostic.goto_next()', opts) + buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) + buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) + + vim.api.nvim_command [[autocmd BufWritePre lua vim.lsp.buf.formatting_seq_sync()]] +end + +local servers = { 'rust_analyzer' } +for _, lsp in ipairs(servers) do + nvim_lsp[lsp].setup { + on_attach = on_attach, + } +end +LSPCONFIG diff --git a/neovim/neosnippets/ruby.snippets b/neovim/neosnippets/ruby.snippets deleted file mode 100644 index bafc470..0000000 --- a/neovim/neosnippets/ruby.snippets +++ /dev/null @@ -1,15 +0,0 @@ -snippet sigp -abbr sig { params(...).returns(...) } - sig { params(${1}).returns(${2}) }${0} - -snippet sigdo -abbr sig do params(...).returns(...) end - sig do - params( - ${1} - ).returns(${2}) - end${0} - -snippet sigv -abbr sig { params(...).void} - sig { params(${1}).void }${0}