diff options
| -rw-r--r-- | applications/nvim/init.vim | 76 |
1 files changed, 59 insertions, 17 deletions
diff --git a/applications/nvim/init.vim b/applications/nvim/init.vim index 6cbd239..6cb3f44 100644 --- a/applications/nvim/init.vim +++ b/applications/nvim/init.vim @@ -16,7 +16,7 @@ Plug 'hrsh7th/nvim-cmp' Plug 'dcampos/nvim-snippy' Plug 'dcampos/cmp-snippy' Plug 'folke/tokyonight.nvim' -Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} +"Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} Plug 'CRAG666/code_runner.nvim' Plug 'CRAG666/betterTerm.nvim' Plug 'rmagatti/auto-session' @@ -29,9 +29,12 @@ Plug 'mhinz/vim-signify' Plug 'lervag/vimtex' Plug 'mfussenegger/nvim-lint' Plug 'kshenoy/vim-signature' +Plug 'eeei3/latex_wordcount' Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']} +Plug 'preservim/nerdtree' +Plug 'sirver/ultisnips' call plug#end() -set completeopt=menu,menuone,preview,noselect,noinsert +set completeopt=menu,menuone,noselect,noinsert let g:ale_completion_enabled = 1 let g:neoformat_cpp_clangformat = { \ 'exe': 'clang-format', @@ -44,6 +47,18 @@ let g:vimtex_view_general_options = '--unique file:@pdf\#src:@line@tex' let g:vimsurround_autoload = { \ 'filetypes': ['python', 'java', 'html', 'c', 'javascript'] \} +let g:mkdp_filetypes = ['markdown'] + +let g:tex_flavor='latex' +let g:vimtex_view_method='zathura' +let g:vimtex_quickfix_mode=0 +set conceallevel=1 +let g:tex_conceal='abdmg' +let g:python3_host_prog='/usr/bin/python' +let g:UltiSnipsExpandTrigger = '<tab>' +let g:UltiSnipsJumpForwardTrigger = '<tab>' +let g:UltiSnipsJumpBackwardTrigger = '<s-tab>' +let g:UltiSnipsSnippetDirectories = [$HOME.'/latexsnips'] colorscheme tokyonight-night " colorscheme ~/.config/alacritty/themes/themes/blood_moon.toml lua <<EOF @@ -56,8 +71,8 @@ lua <<EOF expand = function(args) --vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users. - require('snippy').expand_snippet(args.body) -- For `snippy` users. - -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. + -- require('snippy').expand_snippet(args.body) -- For `snippy` users. + vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. end, }, window = { @@ -75,8 +90,8 @@ lua <<EOF { name = 'nvim_lsp' }, -- { name = 'vsnip' }, -- For vsnip users. -- { name = 'luasnip' }, -- For luasnip users. - -- { name = 'ultisnips' }, -- For ultisnips users. - { name = 'snippy' }, -- For snippy users. + { name = 'ultisnips' }, -- For ultisnips users. + -- { name = 'snippy' }, -- For snippy users. }, { { name = 'buffer' }, }) @@ -110,20 +125,47 @@ lua <<EOF }) -- Set up lspconfig. + -- local capabilities = require('cmp_nvim_lsp').default_capabilities() + -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled. + -- require('lspconfig')['clangd'].setup { + -- capabilities = capabilities + -- } + -- vim.lsp.enable('denols') local capabilities = require('cmp_nvim_lsp').default_capabilities() -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled. - require('lspconfig')['clangd'].setup { - capabilities = capabilities - } - vim.lsp.enable('denols') - -require'nvim-treesitter.configs'.setup { - ensure_installed = {"java", "javascript" }, - highlight= { - enable = true, - additional_vim_regex_highlighting = { 'java', 'javascript' } - } + --require('lspconfig')['clangd'].setup { + -- capabilities = capabilities, + -- } + vim.lsp.config( + 'clangd', { + setup = { + capabilities = capabilities, + } } + ) + + vim.lsp.config('rust_analyzer', { + -- Server-specific settings. See :help lsp-quickstart + settings = { + ['rust-analyzer'] = { + check = { + command = "UtilSnips"; + }, + diagnostics = { + enable = true; + } + } + } + + }) + +-- require'nvim-treesitter.configs'.setup { + --ensure_installed = {"java", "javascript" }, + --highlight= { + --enable = true, + --additional_vim_regex_highlighting = { 'java', 'javascript' } + --} + --} --require('betterTerm').setup() require('code_runner').setup({ filetype = { |