diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 9dcbefd..22c7394 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -62,7 +62,7 @@ Plug 'tpope/vim-fugitive' Plug 'tpope/vim-surround' Plug 'lambdalisue/suda.vim' - +Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} Plug 'nvim-lua/plenary.nvim' Plug 'nvim-telescope/telescope.nvim' @@ -79,6 +79,8 @@ Plug 'ms-jpq/coq.thirdparty', {'branch': '3p'} Plug 'christoomey/vim-system-copy' +Plug 'neovim/nvim-lspconfig' + " Initialize plugin system call plug#end() @@ -114,6 +116,7 @@ autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in let g:airline_powerline_fonts = 1 +let g:coq_settings = {'clients.tabnine.enabled' : v:false} filetype plugin on let g:syntastic_python_python_exec = 'python3' let g:syntastic_python_checkers = ['bandit', 'python'] @@ -130,6 +133,78 @@ imap "+y imap "+gP + +lua << EOF +local lsp = require "lspconfig" +local coq = require "coq" -- add this + + +-- Mappings. +-- See `:help vim.diagnostic.*` for documentation on any of the below functions +local opts = { noremap=true, silent=true } +vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) + +-- Use an on_attach function to only map the following keys +-- after the language server attaches to the current buffer +local on_attach = function(client, bufnr) + -- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap=true, silent=true, buffer=bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) +end + +local lsp_flags = { + -- This is the default in Nvim 0.7+ + debounce_text_changes = 150, +} + +--lsp..setup() -- before +--lsp..setup(coq.lsp_ensure_capabilities()) -- after + +lsp.pyright.setup(coq.lsp_ensure_capabilities({})) +lsp.rust_analyzer.setup(coq.lsp_ensure_capabilities({ + settings = { + ["rust-analyzer"] = { + imports = { + granularity = { + group = "module", + }, + prefix = "self", + }, + cargo = { + buildScripts = { + enable = true, + }, + }, + procMacro = { + enable = true + }, + } + } +})) + +EOF + let g:catppuccin_flavour = "macchiato" " latte, frappe, macchiato, mocha lua require("catppuccin").setup()