diff options
| author | Wael Nasreddine <wael.nasreddine@gmail.com> | 2019-08-13 12:25:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 12:25:06 -0700 |
| commit | a3bf0c2e4005670fd710e7eb42403e0348754e77 (patch) | |
| tree | caaec82a35466ed4ebf644242ee687be518b4a0a | |
| parent | 329e097828de876410d2f82f23126115fcfc28dd (diff) | |
vimPlugins: turn filetype and syntax before sourcing the plugins (#66536)
Vim Terraform expects the `filetypedetect` group to exist. However, since we were enabling the filetype and the syntax *after* loading the plugins, it was exiting with an error preventing us from generating the remote plugins manifest with the plugin enabled. See #65894 for context.
| -rw-r--r-- | pkgs/applications/editors/neovim/wrapper.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index aa1e2a6b5bd7..ec799c0fa49c 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -100,7 +100,7 @@ let # Only display the log on error since it will contain a few normally # irrelevant messages. if ! $out/bin/nvim \ - -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \ + -u ${vimUtils.vimrcFile (configure // { customRC = ""; beforePlugins = ''filetype indent plugin on | syn on''; })} \ -i NONE -n \ -E -V1rplugins.log -s \ +UpdateRemotePlugins +quit! > outfile 2>&1; then diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 2633c43d6992..44bc7ec3ced1 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -188,7 +188,8 @@ let vam ? null, pathogen ? null, plug ? null, - customRC ? "" + customRC ? "", + beforePlugins ? "", }: let @@ -341,6 +342,8 @@ let " minimal setup, generated by NIX set nocompatible + ${beforePlugins} + ${vamImpl} ${pathogenImpl} ${plugImpl} |