From 80b04cadeb0a433071f975f0cf103cb729d3d914 Mon Sep 17 00:00:00 2001
From: dusk <y.bera003.06@protonmail.com>
Date: Sat, 9 Aug 2025 16:10:37 +0300
Subject: [PATCH] nix: dedup appview static files into a package, and use that
 everywhere, including copying before watching appview

Signed-off-by: dusk <y.bera003.06@protonmail.com>
---
 flake.nix                         | 29 +++++++++++++----------------
 nix/pkgs/appview-static-files.nix | 23 +++++++++++++++++++++++
 nix/pkgs/appview.nix              | 18 ++----------------
 3 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 nix/pkgs/appview-static-files.nix

diff --git a/flake.nix b/flake.nix
index 41522b5..047c49f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,9 +75,10 @@
         };
         genjwks = self.callPackage ./nix/pkgs/genjwks.nix {};
         lexgen = self.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;};
-        appview = self.callPackage ./nix/pkgs/appview.nix {
+        appview-static-files = self.callPackage ./nix/pkgs/appview-static-files.nix {
           inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src;
         };
+        appview = self.callPackage ./nix/pkgs/appview.nix {};
         spindle = self.callPackage ./nix/pkgs/spindle.nix {};
         knot-unwrapped = self.callPackage ./nix/pkgs/knot-unwrapped.nix {};
         knot = self.callPackage ./nix/pkgs/knot.nix {};
@@ -93,13 +94,7 @@
       staticPackages = mkPackageSet pkgs.pkgsStatic;
       crossPackages = mkPackageSet pkgs.pkgsCross.gnu64.pkgsStatic;
     in {
-      appview = packages.appview;
-      lexgen = packages.lexgen;
-      knot = packages.knot;
-      knot-unwrapped = packages.knot-unwrapped;
-      spindle = packages.spindle;
-      genjwks = packages.genjwks;
-      sqlite-lib = packages.sqlite-lib;
+      inherit (packages) appview appview-static-files lexgen genjwks spindle knot knot-unwrapped sqlite-lib;
 
       pkgsStatic-appview = staticPackages.appview;
       pkgsStatic-knot = staticPackages.knot;
@@ -132,16 +127,13 @@
           pkgs.tailwindcss
           pkgs.nixos-shell
           pkgs.redis
+          pkgs.coreutils # for those of us who are on systems that use busybox (alpine)
           packages'.lexgen
         ];
         shellHook = ''
-          mkdir -p appview/pages/static/{fonts,icons}
-          cp -f ${htmx-src} appview/pages/static/htmx.min.js
-          cp -f ${htmx-ws-src} appview/pages/static/htmx-ext-ws.min.js
-          cp -rf ${lucide-src}/*.svg appview/pages/static/icons/
-          cp -f ${inter-fonts-src}/web/InterVariable*.woff2 appview/pages/static/fonts/
-          cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/
-          cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 appview/pages/static/fonts/
+          mkdir -p appview/pages/static
+          # no preserve is needed because watch-tailwind will want to be able to overwrite
+          cp -frv --no-preserve=ownership ${packages'.appview-static-files}/* appview/pages/static
           export TANGLED_OAUTH_JWKS="$(${packages'.genjwks}/bin/genjwks)"
         '';
         env.CGO_ENABLED = 1;
@@ -149,6 +141,7 @@
     });
     apps = forAllSystems (system: let
       pkgs = nixpkgsFor."${system}";
+      packages' = self.packages.${system};
       air-watcher = name: arg:
         pkgs.writeShellScriptBin "run"
         ''
@@ -167,7 +160,11 @@
     in {
       watch-appview = {
         type = "app";
-        program = ''${air-watcher "appview" ""}/bin/run'';
+        program = toString (pkgs.writeShellScript "watch-appview" ''
+            echo "copying static files to appview/pages/static..."
+            ${pkgs.coreutils}/bin/cp -frv --no-preserve=ownership ${packages'.appview-static-files}/* appview/pages/static
+            ${air-watcher "appview" ""}/bin/run
+        '');
       };
       watch-knot = {
         type = "app";
diff --git a/nix/pkgs/appview-static-files.nix b/nix/pkgs/appview-static-files.nix
new file mode 100644
index 0000000..3b55bc1
--- /dev/null
+++ b/nix/pkgs/appview-static-files.nix
@@ -0,0 +1,23 @@
+{
+  runCommandLocal,
+  htmx-src,
+  htmx-ws-src,
+  lucide-src,
+  inter-fonts-src,
+  ibm-plex-mono-src,
+  sqlite-lib,
+  tailwindcss,
+  src,
+}:
+runCommandLocal "appview-static-files" {} ''
+  mkdir -p $out/{fonts,icons} && cd $out
+  cp -f ${htmx-src} htmx.min.js
+  cp -f ${htmx-ws-src} htmx-ext-ws.min.js
+  cp -rf ${lucide-src}/*.svg icons/
+  cp -f ${inter-fonts-src}/web/InterVariable*.woff2 fonts/
+  cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 fonts/
+  cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 fonts/
+  # tailwindcss -c $src/tailwind.config.js -i $src/input.css -o tw.css won't work
+  # for whatever reason (produces broken css), so we are doing this instead
+  cd ${src} && ${tailwindcss}/bin/tailwindcss -i input.css -o $out/tw.css
+''
diff --git a/nix/pkgs/appview.nix b/nix/pkgs/appview.nix
index 2d438c5..2699bd7 100644
--- a/nix/pkgs/appview.nix
+++ b/nix/pkgs/appview.nix
@@ -1,12 +1,7 @@
 {
   buildGoApplication,
   modules,
-  htmx-src,
-  htmx-ws-src,
-  lucide-src,
-  inter-fonts-src,
-  ibm-plex-mono-src,
-  tailwindcss,
+  appview-static-files,
   sqlite-lib,
   src,
 }:
@@ -16,16 +11,7 @@ buildGoApplication {
   inherit src modules;
 
   postUnpack = ''
-    pushd source
-    mkdir -p appview/pages/static/{fonts,icons}
-    cp -f ${htmx-src} appview/pages/static/htmx.min.js
-    cp -f ${htmx-ws-src} appview/pages/static/htmx-ext-ws.min.js
-    cp -rf ${lucide-src}/*.svg appview/pages/static/icons/
-    cp -f ${inter-fonts-src}/web/InterVariable*.woff2 appview/pages/static/fonts/
-    cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/
-    cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 appview/pages/static/fonts/
-    ${tailwindcss}/bin/tailwindcss -i input.css -o appview/pages/static/tw.css
-    popd
+    cp -r ${appview-static-files} source/appview/pages/static
   '';
 
   doCheck = false;
-- 
2.43.0