Remove easyalign, nerdtree and other unused plugins. Reordered vim plugins, added leap
This commit is contained in:
parent
bb5bf44156
commit
71f8e1e11e
@ -3,18 +3,20 @@
|
||||
{
|
||||
imports = [ ./zsh.nix ./git.nix ];
|
||||
|
||||
|
||||
home = {
|
||||
stateVersion = "21.05";
|
||||
sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
VISUAL = "nvim";
|
||||
};
|
||||
|
||||
packages = with pkgs; [ rizin sshfs nixfmt victor-mono ];
|
||||
};
|
||||
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
extraPackages = with pkgs; [
|
||||
nodePackages.prettier
|
||||
nodePackages.pyright
|
||||
@ -24,6 +26,26 @@
|
||||
clang-tools
|
||||
rustfmt
|
||||
];
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
vim-nix
|
||||
molokai
|
||||
vim-airline
|
||||
vim-airline-themes
|
||||
vim-lsp
|
||||
vim-indent-guides
|
||||
vim-signify
|
||||
vim-fugitive
|
||||
vimtex
|
||||
neoformat
|
||||
nvim-lspconfig
|
||||
vim-vsnip
|
||||
nvim-cmp
|
||||
cmp-nvim-lsp
|
||||
(nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
|
||||
nvim-treesitter-textobjects
|
||||
pkgs.vimExtraPlugins.leap-nvim
|
||||
];
|
||||
|
||||
extraConfig = ''
|
||||
" syntax
|
||||
syntax enable
|
||||
@ -36,38 +58,16 @@
|
||||
set wildmode=longest:full,full
|
||||
|
||||
" remapping popup menu (command autocompletion)
|
||||
" cnoremap <expr> <up> pumvisible() ? "<C-p>" : "<up>
|
||||
" cnoremap <expr> <down> pumvisible() ? "<C-n>" : "<down>"
|
||||
" cnoremap <expr> <CR> pumvisible() ? "<C-e>":"<CR>"
|
||||
cnoremap <expr> <up> pumvisible() ? "<C-p>" : "<up>
|
||||
cnoremap <expr> <down> pumvisible() ? "<C-n>" : "<down>"
|
||||
cnoremap <expr> <CR> pumvisible() ? "<C-e>":"<CR>"
|
||||
|
||||
" set line numbers
|
||||
set number
|
||||
|
||||
" enable indent guides
|
||||
let g:indent_guides_enable_on_vim_startup = 1
|
||||
|
||||
" Exit Vim if NERDTree is the only window left.
|
||||
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
|
||||
\ quit | endif
|
||||
|
||||
" Start NERDTree. If a file is specified, move the cursor to its window.
|
||||
autocmd StdinReadPre * let s:std_in=1
|
||||
autocmd VimEnter * NERDTree | if argc() > 0 || exists("s:std_in") | wincmd p | endif
|
||||
|
||||
" Start NERDTree when Vim starts with a directory argument.
|
||||
autocmd StdinReadPre * let s:std_in=1
|
||||
autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') |
|
||||
\ execute 'NERDTree' argv()[0] | wincmd p | enew | execute 'cd '.argv()[0] | endif
|
||||
|
||||
" Exit Vim if NERDTree is the only window left.
|
||||
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
|
||||
\ quit | endif
|
||||
|
||||
" Start interactive EasyAlign in visual mode (e.g. vipga)
|
||||
xmap ga <Plug>(EasyAlign)
|
||||
|
||||
" Start interactive EasyAlign for a motion/text object (e.g. gaip)
|
||||
nmap ga <Plug>(EasyAlign)
|
||||
|
||||
" Highlight row and column
|
||||
set cul
|
||||
set cuc
|
||||
@ -86,6 +86,10 @@
|
||||
let g:neoformat_basic_format_trim = 1
|
||||
|
||||
lua << EOF
|
||||
|
||||
-- Setup leap-nvim keymappings
|
||||
require('leap').add_default_mappings()
|
||||
|
||||
------------------
|
||||
-- Setup nvim-cmp.
|
||||
------------------
|
||||
@ -182,27 +186,5 @@
|
||||
EOF
|
||||
'';
|
||||
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
vim-nix
|
||||
molokai
|
||||
vim-airline
|
||||
vim-airline-themes
|
||||
vim-lsp
|
||||
vim-indent-guides
|
||||
vim-signify
|
||||
nerdtree
|
||||
vim-easy-align
|
||||
vim-fugitive
|
||||
vimtex
|
||||
neoformat
|
||||
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