Added TreeSitter plugin, removed YCM
This commit is contained in:
Giulio De Pasquale
parent
54080969b1
commit
49e61bb1e3
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, unstable, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ./zsh.nix ./git.nix ];
|
imports = [ ./zsh.nix ./git.nix ];
|
||||||
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = unstable.neovim-unwrapped;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
nodePackages.prettier
|
nodePackages.prettier
|
||||||
nodePackages.pyright
|
nodePackages.pyright
|
||||||
@ -25,85 +26,168 @@
|
|||||||
rustfmt
|
rustfmt
|
||||||
];
|
];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
" syntax
|
" syntax
|
||||||
syntax enable
|
syntax enable
|
||||||
|
|
||||||
" color themes
|
" color themes
|
||||||
set termguicolors
|
set termguicolors
|
||||||
colorscheme molokai
|
colorscheme molokai
|
||||||
|
|
||||||
" wildcard mode
|
" wildcard mode
|
||||||
set wildmode=longest:full,full
|
set wildmode=longest:full,full
|
||||||
|
|
||||||
" remapping popup menu (command autocompletion)
|
" remapping popup menu (command autocompletion)
|
||||||
" cnoremap <expr> <up> pumvisible() ? "<C-p>" : "<up>
|
" cnoremap <expr> <up> pumvisible() ? "<C-p>" : "<up>
|
||||||
" cnoremap <expr> <down> pumvisible() ? "<C-n>" : "<down>"
|
" cnoremap <expr> <down> pumvisible() ? "<C-n>" : "<down>"
|
||||||
" cnoremap <expr> <CR> pumvisible() ? "<C-e>":"<CR>"
|
" cnoremap <expr> <CR> pumvisible() ? "<C-e>":"<CR>"
|
||||||
" set line numbers
|
" set line numbers
|
||||||
set number
|
set number
|
||||||
|
|
||||||
" YouCompleteMe
|
" enable indent guides
|
||||||
let g:ycm_key_list_stop_completion = ['<C-y>', '<CR>']
|
let g:indent_guides_enable_on_vim_startup = 1
|
||||||
let g:ycm_key_list_select_completion = ['<Up>', '<Down>', '<TAB>']
|
|
||||||
|
|
||||||
" enable indent guides
|
" Exit Vim if NERDTree is the only window left.
|
||||||
let g:indent_guides_enable_on_vim_startup = 1
|
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
|
||||||
|
\ quit | endif
|
||||||
|
|
||||||
" Exit Vim if NERDTree is the only window left.
|
" Start NERDTree. If a file is specified, move the cursor to its window.
|
||||||
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
|
autocmd StdinReadPre * let s:std_in=1
|
||||||
\ quit | endif
|
autocmd VimEnter * NERDTree | if argc() > 0 || exists("s:std_in") | wincmd p | endif
|
||||||
|
|
||||||
" Start NERDTree. If a file is specified, move the cursor to its window.
|
" Start NERDTree when Vim starts with a directory argument.
|
||||||
autocmd StdinReadPre * let s:std_in=1
|
autocmd StdinReadPre * let s:std_in=1
|
||||||
autocmd VimEnter * NERDTree | if argc() > 0 || exists("s:std_in") | wincmd p | endif
|
autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') |
|
||||||
|
\ execute 'NERDTree' argv()[0] | wincmd p | enew | execute 'cd '.argv()[0] | endif
|
||||||
|
|
||||||
" Start NERDTree when Vim starts with a directory argument.
|
" Exit Vim if NERDTree is the only window left.
|
||||||
autocmd StdinReadPre * let s:std_in=1
|
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
|
||||||
autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') |
|
\ quit | endif
|
||||||
\ execute 'NERDTree' argv()[0] | wincmd p | enew | execute 'cd '.argv()[0] | endif
|
|
||||||
|
|
||||||
" Exit Vim if NERDTree is the only window left.
|
" Start interactive EasyAlign in visual mode (e.g. vipga)
|
||||||
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
|
xmap ga <Plug>(EasyAlign)
|
||||||
\ quit | endif
|
|
||||||
|
|
||||||
" Start interactive EasyAlign in visual mode (e.g. vipga)
|
" Start interactive EasyAlign for a motion/text object (e.g. gaip)
|
||||||
xmap ga <Plug>(EasyAlign)
|
nmap ga <Plug>(EasyAlign)
|
||||||
|
|
||||||
" Start interactive EasyAlign for a motion/text object (e.g. gaip)
|
" Highlight row and column
|
||||||
nmap ga <Plug>(EasyAlign)
|
set cul
|
||||||
|
set cuc
|
||||||
|
|
||||||
" Highlight row and column
|
" Fix for code not being aligned if between comment blocks
|
||||||
set cul
|
set cindent cinkeys-=0#
|
||||||
set cuc
|
set expandtab shiftwidth=2 tabstop=2 softtabstop=2
|
||||||
|
|
||||||
" Fix for code not being aligned if between comment blocks
|
" Enable alignment
|
||||||
set cindent cinkeys-=0#
|
let g:neoformat_basic_format_align = 1
|
||||||
set expandtab shiftwidth=2 tabstop=2 softtabstop=2
|
|
||||||
|
|
||||||
" Enable alignment
|
" Enable tab to spaces conversion
|
||||||
let g:neoformat_basic_format_align = 1
|
let g:neoformat_basic_format_retab = 1
|
||||||
|
|
||||||
" Enable tab to spaces conversion
|
" Enable trimmming of trailing whitespace
|
||||||
let g:neoformat_basic_format_retab = 1
|
let g:neoformat_basic_format_trim = 1
|
||||||
|
|
||||||
" Enable trimmming of trailing whitespace
|
lua << EOF
|
||||||
let g:neoformat_basic_format_trim = 1
|
------------------
|
||||||
|
-- Setup nvim-cmp.
|
||||||
|
------------------
|
||||||
|
|
||||||
" lsp servers
|
-- Set completeopt to have a better completion experience
|
||||||
lua << EOF
|
vim.o.completeopt = 'menuone,noselect'
|
||||||
require'lspconfig'.pyright.setup{}
|
|
||||||
require'lspconfig'.rust_analyzer.setup{}
|
local cmp = require'cmp'
|
||||||
require'lspconfig'.rnix.setup{}
|
|
||||||
require'lspconfig'.clangd.setup{}
|
cmp.setup({
|
||||||
|
snippet = {
|
||||||
|
-- REQUIRED - you must specify a snippet engine
|
||||||
|
expand = function(args)
|
||||||
|
vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
mapping = {
|
||||||
|
['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
|
||||||
|
['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
|
||||||
|
['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
|
||||||
|
['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
|
||||||
|
['<C-e>'] = cmp.mapping({
|
||||||
|
i = cmp.mapping.abort(),
|
||||||
|
c = cmp.mapping.close(),
|
||||||
|
}),
|
||||||
|
['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||||
|
},
|
||||||
|
sources = cmp.config.sources({
|
||||||
|
{ name = 'nvim_lsp' },
|
||||||
|
{ name = 'vsnip' }, -- For vsnip users.
|
||||||
|
}, {
|
||||||
|
{ name = 'buffer' },
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
|
||||||
|
cmp.setup.cmdline('/', {
|
||||||
|
sources = {
|
||||||
|
{ name = 'buffer' }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||||
|
cmp.setup.cmdline(':', {
|
||||||
|
sources = cmp.config.sources({
|
||||||
|
{ name = 'path' }
|
||||||
|
}, {
|
||||||
|
{ name = 'cmdline' }
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Setup lspconfig.
|
||||||
|
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
|
|
||||||
|
--------------
|
||||||
|
-- LSP Servers
|
||||||
|
--------------
|
||||||
|
|
||||||
|
require'lspconfig'.pyright.setup{
|
||||||
|
capabilities = capabilities
|
||||||
|
}
|
||||||
|
require'lspconfig'.rust_analyzer.setup{
|
||||||
|
capabilities = capabilities
|
||||||
|
}
|
||||||
|
require'lspconfig'.rnix.setup{
|
||||||
|
capabilities = capabilities
|
||||||
|
}
|
||||||
|
require'lspconfig'.clangd.setup{
|
||||||
|
capabilities = capabilities,
|
||||||
|
cmd = {
|
||||||
|
"clangd",
|
||||||
|
"--background-index",
|
||||||
|
"--clang-tidy",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
-------------------
|
||||||
|
-- TreeSitter setup
|
||||||
|
-------------------
|
||||||
|
require'nvim-treesitter.configs'.setup {
|
||||||
|
highlight = {
|
||||||
|
enable = true,
|
||||||
|
custom_captures = {
|
||||||
|
-- Highlight the @foo.bar capture group with the "Identifier" highlight group.
|
||||||
|
["foo.bar"] = "Identifier",
|
||||||
|
},
|
||||||
|
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
||||||
|
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||||
|
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
||||||
|
-- Instead of true it can also be a list of languages
|
||||||
|
additional_vim_regex_highlighting = false,
|
||||||
|
},
|
||||||
|
}
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
|
|
||||||
viAlias = true;
|
viAlias = true;
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
plugins = with pkgs.vimPlugins; [
|
plugins = with unstable.vimPlugins; [
|
||||||
vim-nix
|
vim-nix
|
||||||
molokai
|
molokai
|
||||||
YouCompleteMe
|
|
||||||
vim-airline
|
vim-airline
|
||||||
vim-airline-themes
|
vim-airline-themes
|
||||||
vim-lsp
|
vim-lsp
|
||||||
@ -115,6 +199,11 @@
|
|||||||
vimtex
|
vimtex
|
||||||
neoformat
|
neoformat
|
||||||
nvim-lspconfig
|
nvim-lspconfig
|
||||||
|
vim-vsnip
|
||||||
|
nvim-cmp
|
||||||
|
cmp-nvim-lsp
|
||||||
|
(nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
|
||||||
|
nvim-treesitter-textobjects
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user