From 55db6c317c146a26b3e614d665744f5dcf502f0b Mon Sep 17 00:00:00 2001
From: Ethan Girouard <ethan@girouard.com>
Date: Tue, 4 Aug 2026 20:12:00 -0400
Subject: [PATCH] Use tailwindcss-with-pkgs flake

---
 flake.lock | 18 +++++++++++++++++-
 flake.nix  | 10 ++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9e0d611..5e08dda 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,7 +54,8 @@
         "daisyui": "daisyui",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay",
+        "tailwindcss-with-pkgs": "tailwindcss-with-pkgs"
       }
     },
     "rust-overlay": {
@@ -91,6 +92,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "tailwindcss-with-pkgs": {
+      "locked": {
+        "lastModified": 1785801205,
+        "narHash": "sha256-yfKa3/wK/m1Gwjc923Fvpa/k44MjQOOR3eUfjqLn+qI=",
+        "ref": "refs/heads/main",
+        "rev": "f28fd97c86f37a6078599338fa9c6a0327821b9d",
+        "revCount": 3,
+        "type": "git",
+        "url": "https://git.mregirouard.com/nix/tailwindcss-with-pkgs.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.mregirouard.com/nix/tailwindcss-with-pkgs.git"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index ebb5a52..6a1649d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,8 @@
     };
 
     daisyui.url = "git+https://git.mregirouard.com/nix/daisyui.git";
+
+    tailwindcss-with-pkgs.url = "git+https://git.mregirouard.com/nix/tailwindcss-with-pkgs.git";
   };
 
   outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }@inputs:
@@ -38,6 +40,7 @@
             (import rust-overlay)
             wasm-bindgen-overlay
             inputs.daisyui.overlays.default
+            inputs.tailwindcss-with-pkgs.overlays.default
           ];
         };
 
@@ -51,7 +54,7 @@
           wasm-bindgen-cli_0_2_123
           binaryen
           lld
-          tailwindcss_4
+          (tailwindcss_4.withPackages [daisyui daisyui-theme])
           postgresql
         ];
 
@@ -59,9 +62,6 @@
       in
       rec {
         devShells.default = pkgs.mkShell {
-          DAISYUI_PATH = "${pkgs.daisyui}";
-          DAISYUI_THEME_PATH = "${pkgs.daisyui-theme}";
-
           buildInputs = with pkgs; [
             diesel-cli
           ] ++ build-pkgs;
@@ -73,8 +73,6 @@
           name = "libretunes";
           src = ./.;
 
-          DAISYUI_PATH = "${pkgs.daisyui}";
-          DAISYUI_THEME_PATH = "${pkgs.daisyui-theme}";
           GIT_REV = rev;
 
           cargoLock.lockFile = ./Cargo.lock;