From 35df7b482f30883b6246b71e5872fc201f84e508 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sat, 30 Aug 2025 22:58:57 +1000
Subject: [PATCH] added theme config

---
 templates/rde/flake.lock | 12 ++++++------
 templates/rde/flake.nix  | 39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock
index da99989..d9a39ee 100644
--- a/templates/rde/flake.lock
+++ b/templates/rde/flake.lock
@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756388494,
-        "narHash": "sha256-Y06QA/XZ8+4nmjwZfFUWMf80slfIxOnylLn8GCmXjew=",
+        "lastModified": 1756550918,
+        "narHash": "sha256-mo6XrElAe5n7TZNWtRfEoBuQ5W79aCp8sl5uW9a9B/Q=",
         "owner": "dwinkler1",
         "repo": "nixCatsConfig",
-        "rev": "c1aa16d681ac53298477e78097fefabdaacc16a7",
+        "rev": "939026aba71b37e01040502d7af6dc58500f9097",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     },
     "nixCats_2": {
       "locked": {
-        "lastModified": 1756094250,
-        "narHash": "sha256-Bkghd2NdQqQfKwSftABMDjnfRMFTJXA/XvvfKVonV/Q=",
+        "lastModified": 1756502529,
+        "narHash": "sha256-IPhN1a/DecHCJKugq51TnPqcMkwHU7qrQXagR2k1KwA=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "7496b06144a15e44301aacea31c3e1ccdb81546e",
+        "rev": "b262211fc80bf5909f9b6642a7930fee907e3e8d",
         "type": "github"
       },
       "original": {
diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix
index 0f8a7df..1f63aa5 100644
--- a/templates/rde/flake.nix
+++ b/templates/rde/flake.nix
@@ -53,9 +53,28 @@
         ### You can use your own R installation and just enable the plugin
         gitPlugins = enabledLanguages.r;
       };
+      theme = rec {
+        ## set colortheme and background here
+        ### "cyberdream", "ondeark", and "tokyonight" are pre-installed
+        colorscheme = "kanagawa";
+        background = "dark";
+        ## Add other colortheme packages and config here
+        ## The default is a best guess
+        extraColorschemePackage = rec {
+          name = colorscheme;
+          extraLua = ''
+            vim.notify("Loading ${colorscheme} with extra config...")
+            require('${name}').setup({
+              commentStyle = {italic = false},
+              keywordStyle = {italic = false},
+              theme = 'dragon'
+            })
+          '';
+          plugin = name + "-nvim";
+        };
+      };
     };
     # R packages
-    rixOverlay = final: prev: {rpkgs = inputs.rixpkgs.legacyPackages.${prev.system};};
     rOverlay = final: prev: let
       reqPkgs = with final.rpkgs.rPackages; [
         broom
@@ -94,6 +113,20 @@
     ## ⬆️ BASIC CONFIG ABOVE HERE ⬆️ ##
     ###################################
 
+    rixOverlay = final: prev: {rpkgs = inputs.rixpkgs.legacyPackages.${prev.system};};
+
+    extraPkgOverlay = final: prev: let
+      extraTheme = {
+        plugin = prev.vimPlugins."${config.theme.extraColorschemePackage.plugin}";
+        name = config.theme.extraColorschemePackage.name;
+        config = {
+          lua = config.theme.extraColorschemePackage.extraLua;
+        };
+      };
+    in {
+      inherit extraTheme;
+    };
+
     projectScriptsOverlay = final: prev: let
       initPython = ''
         #!/usr/bin/env bash
@@ -256,6 +289,7 @@
             prev.dependencyOverlays
             ++ [
               (utils.standardPluginOverlay inputs)
+              extraPkgOverlay
               rixOverlay
               rOverlay
               pythonOverlay
@@ -292,6 +326,7 @@
 
               startupPlugins = {
                 project = with pkgs.vimPlugins; [
+                  pkgs.extraTheme
                 ];
                 gitPlugins = with pkgs.neovimPlugins; [
                   {
@@ -516,6 +551,8 @@
                     r = config.enabledLanguages.r;
                     project = true;
                     gitPlugins = config.enabledPackages.gitPlugins;
+                    background = config.theme.background;
+                    colorscheme = config.theme.colorscheme;
                   };
                 }
               );