diff options
| author | Matthieu Coudron <teto@users.noreply.github.com> | 2021-05-26 18:35:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 18:35:36 +0200 |
| commit | bffd12a4c7d15ac3fbed965e222e9b5e86c72021 (patch) | |
| tree | f7e1bcc908917aff5ac4d4a05c13b528ebf5b6e0 /pkgs/misc | |
| parent | 4aa2e32246c6b9d765191baba60969a27d484ccf (diff) | |
| parent | 4a860879ea76c2be86a696cb885cc51bfe8f61fa (diff) | |
| download | nixlib-bffd12a4c7d15ac3fbed965e222e9b5e86c72021.tar nixlib-bffd12a4c7d15ac3fbed965e222e9b5e86c72021.tar.gz nixlib-bffd12a4c7d15ac3fbed965e222e9b5e86c72021.tar.bz2 nixlib-bffd12a4c7d15ac3fbed965e222e9b5e86c72021.tar.lz nixlib-bffd12a4c7d15ac3fbed965e222e9b5e86c72021.tar.xz nixlib-bffd12a4c7d15ac3fbed965e222e9b5e86c72021.tar.zst nixlib-bffd12a4c7d15ac3fbed965e222e9b5e86c72021.zip | |
Merge pull request #120445 from teto/vim-plugins-dict
neovimUtils: pass plugin config with plugin
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index c55e8aa0a011..52bf4341fa5b 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -232,8 +232,7 @@ let let /* pathogen mostly can set &rtp at startup time. Its used very commonly. */ - pathogenImpl = lib.optionalString (pathogen != null) - (let + pathogenImpl = let knownPlugins = pathogen.knownPlugins or vimPlugins; plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); @@ -244,15 +243,15 @@ let }; in '' - let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.pathogen.rtp}" + let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.vim-pathogen.rtp}" execute pathogen#infect('${pluginsEnv}/{}') filetype indent plugin on | syn on - ''); + ''; /* vim-plug is an extremely popular vim plugin manager. */ - plugImpl = lib.optionalString (plug != null) + plugImpl = ('' source ${vimPlugins.vim-plug.rtp}/plug.vim call plug#begin('/dev/null') @@ -340,10 +339,12 @@ let entries = [ beforePlugins - vamImpl pathogenImpl plugImpl + vamImpl (nativeImpl packages) customRC - ]; + ] + ++ lib.optional (pathogen != null) pathogenImpl + ++ lib.optional (plug != null) plugImpl; in lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries); |