From 62c80aa9122ae094c19875ee078c00ec4ae84dbe Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Mon, 15 Jul 2024 13:07:45 +0200
Subject: [PATCH] plugins/theme: fix fixed theme DAG place

---
 modules/plugins/theme/theme.nix | 4 ++--
 modules/wrapper/rc/config.nix   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/plugins/theme/theme.nix b/modules/plugins/theme/theme.nix
index 929c40b..bcc476b 100644
--- a/modules/plugins/theme/theme.nix
+++ b/modules/plugins/theme/theme.nix
@@ -7,7 +7,7 @@
   inherit (lib.attrsets) attrNames;
   inherit (lib.types) bool lines enum;
   inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryBetween;
+  inherit (lib.nvim.dag) entryAfter;
 
   cfg = config.vim.theme;
   supportedThemes = import ./supported-themes.nix {
@@ -45,7 +45,7 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = [cfg.name];
-      luaConfigRC.theme = entryBetween ["basic"] ["pluginConfigs"] ''
+      luaConfigRC.theme = entryAfter ["basic"] ''
         ${cfg.extraConfig}
         ${supportedThemes.${cfg.name}.setup {inherit (cfg) style transparent;}}
       '';
diff --git a/modules/wrapper/rc/config.nix b/modules/wrapper/rc/config.nix
index 7161b6f..49a3ae9 100644
--- a/modules/wrapper/rc/config.nix
+++ b/modules/wrapper/rc/config.nix
@@ -134,9 +134,8 @@ in {
     vim = {
       luaConfigRC = {
         globalsScript = concatLines globalsScript;
-        # basic comes after globalsScript,
-        # but it's defined modules/neovim/init/basic.nix
-        pluginConfigs = entryAfter ["basic"] pluginConfigs;
+        # basic, theme
+        pluginConfigs = entryAfter ["theme"] pluginConfigs;
         extraPluginConfigs = entryAfter ["pluginConfigs"] extraPluginConfigs;
         mappings = entryAfter ["extraPluginConfigs"] mappings;
       };