Merge pull request 'Dev' (#9) from dev into main

Reviewed-on: #9

flake.nix

@@ -28,30 +28,31 @@
       # at build time (librsvg), so the theme is hermetic and resolution-
       # independent. The .plymouth file's /usr paths are rewritten to $out
       # (the NixOS module's initrd fixup rewrites store paths again).
-      radiantwavePlymouth = pkgs.stdenv.mkDerivation {
-        pname = "radiantwave-plymouth";
-        version = "1.0.0";
+      mkRadiantwavePlymouth = targetPkgs:
+        targetPkgs.stdenv.mkDerivation {
+          pname = "radiantwave-plymouth";
+          version = "1.0.0";
 
-        nativeBuildInputs = [ pkgs.librsvg ];
+          nativeBuildInputs = [ targetPkgs.librsvg ];
 
-        src = ./assets/RWT-Circular-Color-ForOnDark.svg;
-        dontUnpack = true;
+          src = ./assets/RWT-Circular-Color-ForOnDark.svg;
+          dontUnpack = true;
 
-        buildPhase = ''
-          mkdir -p $out/share/plymouth/themes/radiantwave
-          rsvg-convert \
-            --keep-aspect-ratio \
-            --background-color=#111318 \
-            --width=1280 \
-            --height=720 \
-            --output=$out/share/plymouth/themes/radiantwave/splash.png \
-            $src
-          sed 's,/usr/,'"$out"'/,g' ${./plymouth-theme/radiantwave.plymouth} \
-            > $out/share/plymouth/themes/radiantwave/radiantwave.plymouth
-          cp ${./plymouth-theme/radiantwave.script} \
-            $out/share/plymouth/themes/radiantwave/radiantwave.script
-        '';
-      };
+          buildPhase = ''
+            mkdir -p $out/share/plymouth/themes/radiantwave
+            rsvg-convert \
+              --keep-aspect-ratio \
+              --background-color=#111318 \
+              --width=1280 \
+              --height=720 \
+              --output=$out/share/plymouth/themes/radiantwave/splash.png \
+              $src
+            sed 's,/usr/,'"$out"'/,g' ${./plymouth-theme/radiantwave.plymouth} \
+              > $out/share/plymouth/themes/radiantwave/radiantwave.plymouth
+            cp ${./plymouth-theme/radiantwave.script} \
+              $out/share/plymouth/themes/radiantwave/radiantwave.script
+          '';
+        };
 
       revision = self.rev or self.dirtyRev or null;
 
@@ -109,7 +110,7 @@
           specialArgs = {
             inherit radiantwave;
             inherit upgradeFlakeRef;
-            inherit radiantwavePlymouth;
+            radiantwavePlymouth = mkRadiantwavePlymouth;
           };
 
           modules = [
@@ -144,7 +145,7 @@
           specialArgs = {
             inherit radiantwave upgradeFlakeRef;
             inherit nixos-raspberrypi;
-            inherit radiantwavePlymouth;
+            radiantwavePlymouth = mkRadiantwavePlymouth;
           };
 
           modules = [