From a38d531bf4d02974d9e3088146cbaf896f2fcb00 Mon Sep 17 00:00:00 2001
From: Pedro Alves <pta2002@pta2002.com>
Date: Mon, 17 Oct 2022 10:21:37 +0100
Subject: [PATCH] set colorscheme before setting globals (#46)

---
 modules/output.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/modules/output.nix b/modules/output.nix
index 21e45657..2f2fc297 100644
--- a/modules/output.nix
+++ b/modules/output.nix
@@ -75,13 +75,18 @@ in
 
   config =
     let
-      customRC = config.extraConfigVim + (optionalString (config.extraConfigLua != "" || config.extraConfigLuaPre != "" || config.extraConfigLuaPost != "") ''
-        lua <<EOF
-        ${config.extraConfigLuaPre}
-        ${config.extraConfigLua}
-        ${config.extraConfigLuaPost}
-        EOF
-      '');
+      customRC =
+        (optionalString (config.extraConfigLuaPre != "") ''
+          lua <<EOF
+          ${config.extraConfigLuaPre}
+          EOF
+        '') +
+        config.extraConfigVim + (optionalString (config.extraConfigLuaPre != "" || config.extraConfigLuaPost != "") ''
+          lua <<EOF
+          ${config.extraConfigLua}
+          ${config.extraConfigLuaPost}
+          EOF
+        '');
 
       defaultPlugin = {
         plugin = null;
@@ -100,7 +105,7 @@ in
       # cda1f8ae468 - neovim: pass packpath via the wrapper
       // optionalAttrs (functionArgs pkgs.neovimUtils.makeNeovimConfig ? configure) {
         configure.packages =
-          { nixvim = { start = map (x: x.plugin) normalizedPlugins; opt = []; }; };
+          { nixvim = { start = map (x: x.plugin) normalizedPlugins; opt = [ ]; }; };
       });
 
       extraWrapperArgs = optionalString (config.extraPackages != [ ])