eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-12-25 03:09:47 +01:00
Code Issues Releases Wiki Activity

neovim: suffix path with extraPackages (#1756)

Browse source 
* neovim: suffix path with extraPackages
* neovim: avoid generating empty blocks in config
* fix(neovim): install plugin regardless if there is config
This commit is contained in:
Matthieu Coudron 2021-02-06 20:43:17 +01:00 committed by GitHub
parent d420287583
commit fc87ac92af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/programs/neovim.nix
View file

@ -43,29 +43,28 @@ let
# A function to get the configuration string (if any) from an element of 'plugins' # A function to get the configuration string (if any) from an element of 'plugins'
pluginConfig = p: pluginConfig = p:
if builtins.hasAttr "plugin" p && builtins.hasAttr "config" p then '' if p ? plugin && (p.config or "") != "" then ''
" ${p.plugin.pname} {{{ " ${p.plugin.pname} {{{
${p.config} ${p.config}
" }}} " }}}
'' else '' else
""; "";
moduleConfigure = optionalAttrs (cfg.extraConfig != "" moduleConfigure = {
|| (lib.filter (hasAttr "config") cfg.plugins) != [ ]) {
customRC = cfg.extraConfig
+ pkgs.lib.concatMapStrings pluginConfig cfg.plugins;
packages.home-manager = { packages.home-manager = {
start = filter (f: f != null) (map (x: start = filter (f: f != null) (map
if x ? plugin && x.optional == true then null else (x.plugin or x)) (x: if x ? plugin && x.optional == true then null else (x.plugin or x))
cfg.plugins); cfg.plugins);
opt = filter (f: f != null) opt = filter (f: f != null)
(map (x: if x ? plugin && x.optional == true then x.plugin else null) (map (x: if x ? plugin && x.optional == true then x.plugin else null)
cfg.plugins); cfg.plugins);
}; };
customRC = cfg.extraConfig
+ pkgs.lib.concatMapStrings pluginConfig cfg.plugins;
}; };
extraMakeWrapperArgs = lib.optionalString (cfg.extraPackages != [ ]) extraMakeWrapperArgs = lib.optionalString (cfg.extraPackages != [ ])
''--prefix PATH : "${lib.makeBinPath cfg.extraPackages}"''; ''--suffix PATH : "${lib.makeBinPath cfg.extraPackages}"'';
in { in {
options = { options = {
@ -242,8 +241,6 @@ in {
}; };
config = let config = let
extraMakeWrapperArgs = lib.optionalString (cfg.extraPackages != [ ])
''--prefix PATH : "${lib.makeBinPath cfg.extraPackages}"'';
neovimConfig = pkgs.neovimUtils.makeNeovimConfig { neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
inherit (cfg) inherit (cfg)
extraPython3Packages withPython3 extraPythonPackages withPython extraPython3Packages withPython3 extraPythonPackages withPython