diff --git a/.vimrc.plugins-settings b/.vimrc.plugins-settings index 314526b7..89d109b6 100644 --- a/.vimrc.plugins-settings +++ b/.vimrc.plugins-settings @@ -19,6 +19,9 @@ let g:ctrlp_show_hidden = 1 autocmd StdinReadPre * let s:std_in=1 autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | endif +" rainbow +let g:rainbow_active = 1 + " coc set updatetime=300 diff --git a/nixos/programs/vim.nix b/nixos/programs/vim.nix index 0ceab7a7..b8054323 100644 --- a/nixos/programs/vim.nix +++ b/nixos/programs/vim.nix @@ -1,49 +1,45 @@ { config, pkgs, ... }: { home.file.".vimrc".source = ~/dev/dotfiles/.vimrc.nixos; - home.packages = with pkgs; [ - unstable.rust-analyzer - nodejs - ( - neovim.override { - vimAlias = true; - configure = { - customRC = '' - if filereadable($HOME . "/.vimrc") - source $HOME/.vimrc - endif - ''; + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + vimdiffAlias = true; + withNodeJs = true; + withPython3 = true; + withRuby = true; - vam.knownPlugins = vimPlugins; - vam.pluginDictionaries = [ - { names = [ - "ack-vim" - "coc-highlight" - "coc-nvim" - "coc-tabnine" - "ctrlp-vim" - "editorconfig-vim" - "fzf-vim" - "nerdtree" - "nerdtree-git-plugin" - "rust-vim" - "tabular" - "vim-airline" - "vim-airline-themes" - "vim-autoformat" - "vim-colors-solarized" - "vim-dirdiff" - "vim-dispatch" - "vim-fugitive" - "vim-gitgutter" - "vim-markdown" - "vim-nix" - "vim-sensible" - "vim-startify" - "vim-surround" - "vim-toml" - ];}]; - };}) - - ]; - } + plugins = with pkgs.vimPlugins; [ + coc-highlight + coc-nvim + coc-tabnine + ctrlp-vim + editorconfig-vim + fzf-vim + nerdtree + nerdtree-git-plugin + rainbow + tabular + vim-airline + vim-airline-themes + vim-autoformat + vim-colors-solarized + vim-dirdiff + vim-dispatch + vim-fugitive + vim-gitgutter + vim-markdown + vim-nix + vim-sensible + vim-startify + vim-surround + vim-toml + ]; + extraConfig = '' + if filereadable($HOME . "/.vimrc") + source $HOME/.vimrc + endif + ''; + }; +}