set colorscheme before setting globals (#46)

This commit is contained in:
Pedro Alves 2022-10-17 10:21:37 +01:00
parent 4adcb35851
commit a38d531bf4

View file

@ -75,9 +75,14 @@ in
config = config =
let let
customRC = config.extraConfigVim + (optionalString (config.extraConfigLua != "" || config.extraConfigLuaPre != "" || config.extraConfigLuaPost != "") '' customRC =
(optionalString (config.extraConfigLuaPre != "") ''
lua <<EOF lua <<EOF
${config.extraConfigLuaPre} ${config.extraConfigLuaPre}
EOF
'') +
config.extraConfigVim + (optionalString (config.extraConfigLuaPre != "" || config.extraConfigLuaPost != "") ''
lua <<EOF
${config.extraConfigLua} ${config.extraConfigLua}
${config.extraConfigLuaPost} ${config.extraConfigLuaPost}
EOF EOF
@ -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 != [ ])