mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 08:35:43 +02:00
set colorscheme before setting globals (#46)
This commit is contained in:
parent
4adcb35851
commit
a38d531bf4
1 changed files with 13 additions and 8 deletions
|
@ -75,13 +75,18 @@ in
|
||||||
|
|
||||||
config =
|
config =
|
||||||
let
|
let
|
||||||
customRC = config.extraConfigVim + (optionalString (config.extraConfigLua != "" || config.extraConfigLuaPre != "" || config.extraConfigLuaPost != "") ''
|
customRC =
|
||||||
lua <<EOF
|
(optionalString (config.extraConfigLuaPre != "") ''
|
||||||
${config.extraConfigLuaPre}
|
lua <<EOF
|
||||||
${config.extraConfigLua}
|
${config.extraConfigLuaPre}
|
||||||
${config.extraConfigLuaPost}
|
EOF
|
||||||
EOF
|
'') +
|
||||||
'');
|
config.extraConfigVim + (optionalString (config.extraConfigLuaPre != "" || config.extraConfigLuaPost != "") ''
|
||||||
|
lua <<EOF
|
||||||
|
${config.extraConfigLua}
|
||||||
|
${config.extraConfigLuaPost}
|
||||||
|
EOF
|
||||||
|
'');
|
||||||
|
|
||||||
defaultPlugin = {
|
defaultPlugin = {
|
||||||
plugin = null;
|
plugin = null;
|
||||||
|
@ -100,7 +105,7 @@ in
|
||||||
# cda1f8ae468 - neovim: pass packpath via the wrapper
|
# cda1f8ae468 - neovim: pass packpath via the wrapper
|
||||||
// optionalAttrs (functionArgs pkgs.neovimUtils.makeNeovimConfig ? configure) {
|
// optionalAttrs (functionArgs pkgs.neovimUtils.makeNeovimConfig ? configure) {
|
||||||
configure.packages =
|
configure.packages =
|
||||||
{ nixvim = { start = map (x: x.plugin) normalizedPlugins; opt = []; }; };
|
{ nixvim = { start = map (x: x.plugin) normalizedPlugins; opt = [ ]; }; };
|
||||||
});
|
});
|
||||||
|
|
||||||
extraWrapperArgs = optionalString (config.extraPackages != [ ])
|
extraWrapperArgs = optionalString (config.extraPackages != [ ])
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue