diff options
| author | Matthieu Coudron <mcoudron@hotmail.com> | 2021-05-21 12:48:43 +0200 |
|---|---|---|
| committer | Matthieu Coudron <mcoudron@hotmail.com> | 2021-05-25 22:41:08 +0200 |
| commit | 7836469dbe40783c640e2c0fafd2e55248ffea31 (patch) | |
| tree | 24e3147e286403ab290c56f8b410eb0039720755 /pkgs/misc/vim-plugins | |
| parent | abb1e5cd4cc416841c8eaa1f171a3e57198d657c (diff) | |
| download | nixpkgs-7836469dbe40783c640e2c0fafd2e55248ffea31.tar nixpkgs-7836469dbe40783c640e2c0fafd2e55248ffea31.tar.gz nixpkgs-7836469dbe40783c640e2c0fafd2e55248ffea31.tar.bz2 nixpkgs-7836469dbe40783c640e2c0fafd2e55248ffea31.tar.lz nixpkgs-7836469dbe40783c640e2c0fafd2e55248ffea31.tar.xz nixpkgs-7836469dbe40783c640e2c0fafd2e55248ffea31.tar.zst nixpkgs-7836469dbe40783c640e2c0fafd2e55248ffea31.zip | |
neovimUtils: makeNeovimConfig accepts plugins/customRc
mimics home-manager interface and makes it easier to associate configs with plugins. Added a test as well.
Diffstat (limited to 'pkgs/misc/vim-plugins')
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 210e2aee5e3..52bf4341fa5 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); @@ -248,11 +247,11 @@ let 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); |