nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vim: Allow setting init.vim config alongside plugins + neovim test (#876)

Browse source 
* neovim: allow setting init.vim config alongside plugins
* neovim: add test for neovim plugins
* neovim: make pluginWithConfigType a have type submodule
This commit is contained in:
Joe Hermaszewski 2020-09-25 08:08:39 +08:00 • committed by GitHub
parent 43ab2f40b9
commit abfb4cde51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 100 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

46
modules/programs/neovim.nix
View file

@ -24,12 +24,35 @@ let
merge = mergeOneOption;
};
pluginWithConfigType = types.submodule {
options = {
plugin = mkOption {
type = types.package;
description = "vim plugin";
};
config = mkOption {
type = types.lines;
description = "vimscript for this plugin to be placed in init.vim";
default = "";
};
};
};
# A function to get the configuration string (if any) from an element of 'plugins'
pluginConfig = p:
if builtins.hasAttr "plugin" p && builtins.hasAttr "config" p then ''
" ${p.plugin.pname} {{{
${p.config}
" }}}
'' else "";
moduleConfigure =
optionalAttrs (cfg.extraConfig != "") {
customRC = cfg.extraConfig;
optionalAttrs (cfg.extraConfig != "" || (lib.filter (hasAttr "config") cfg.plugins) != []) {
customRC = cfg.extraConfig +
pkgs.lib.concatMapStrings pluginConfig cfg.plugins;
}
// optionalAttrs (cfg.plugins != []) {
packages.home-manager.start = cfg.plugins;
// optionalAttrs (cfg.plugins != [] ) {
packages.home-manager.start = map (x: x.plugin or x) cfg.plugins;
};
in
@ -178,11 +201,20 @@ in
};
plugins = mkOption {
type = with types; listOf package;
type = with types; listOf (either package pluginWithConfigType);
default = [ ];
example = literalExample "[ pkgs.vimPlugins.yankring ]";
example = literalExample ''
with pkgs.vimPlugins; [
yankring
vim-nix
{ plugin = vim-startify;
config = "let g:startify_change_to_vcs_root = 0";
}
]
'';
description = ''
List of vim plugins to install.
List of vim plugins to install optionally associated with
configuration to be placed in init.vim.
</para><para>