From d6cd8535202f39919f5c5deb310ad1efd055afb1 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Fri, 14 Jun 2024 11:17:06 +0200
Subject: [PATCH] modules/theme: fix dag location

---
 docs/release-notes/rl-0.7.md    |  4 ++++
 modules/plugins/theme/theme.nix | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
index 5d15013..8aab123 100644
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@@ -49,3 +49,7 @@ Release notes for release 0.7
 - Add [ocaml-lsp](https://github.com/ocaml/ocaml-lsp) support.
 
 - Fix Emac typo
+
+[diniamo](https://github.com/diniamo):
+
+- Move the `theme` dag entry to before `luaScript`.
diff --git a/modules/plugins/theme/theme.nix b/modules/plugins/theme/theme.nix
index 9426378..a1157a0 100644
--- a/modules/plugins/theme/theme.nix
+++ b/modules/plugins/theme/theme.nix
@@ -45,10 +45,12 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = [cfg.name];
-      luaConfigRC = {
-        themeSetup = entryBefore ["theme"] cfg.extraConfig;
-        theme = supported_themes.${cfg.name}.setup (with cfg; {inherit style transparent;});
-      };
+      configRC.theme = entryBefore ["luaScript"] ''
+        lua << EOF
+        ${cfg.extraConfig}
+        ${supported_themes.${cfg.name}.setup (with cfg; {inherit style transparent;})}
+        EOF
+      '';
     };
   };
 }