(hopefully) fix things to be proper

Author: molarmanful

.github/workflows/pub.yml

@@ -40,3 +40,8 @@ jobs:
           pnpm publish --no-git-checks
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - run: echo -n ${{ github.ref_name }} > VERSION
+      - name: push
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          file_pattern: VERSION

VERSION

@@ -0,0 +1 @@
+0.0.0

default.nix

@@ -1,11 +1,14 @@
 {
-  pname,
+  pname ? "kirsch",
   version,
-  lib,
-  stdenvNoCC,
-  bited-utils,
+  bdf,
   nerd ? false,
   release ? false,
+
+  lib,
+  stdenvNoCC,
+  bited-build,
+  ...
 }:
 
 stdenvNoCC.mkDerivation {
@@ -15,7 +18,7 @@ stdenvNoCC.mkDerivation {
   buildPhase = ''
     runHook preBuild
     rm -rf out
-    ${bited-utils.bited-build}/bin/bited-build src/${pname}.bdf out \
+    ${bited-build}/bin/bited-build ${bdf} out \
       ${lib.optionalString nerd "--nerd"} \
       ${lib.optionalString release "--release"}
     runHook postBuild

flake.lock

@@ -9,60 +9,45 @@
 
   outputs =
     {
-      self,
       nixpkgs,
       utils,
       bited-utils,
       ...
     }:
 
     let
-      pname = "kirsch";
-      version = self.shortRev or self.dirtyShortRev;
+      name = "kirsch";
+      version = builtins.readFile ./VERSION;
+      bdf = ./src/kirsch.bdf;
     in
 
     utils.lib.eachDefaultSystem (
       system:
       let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [
-            (final: prev: {
-              bited-utils = bited-utils.packages.${system};
-            })
-          ];
+          overlays = [ bited-utils.overlay ];
         };
-        font_pkgs = {
-
-          ${pname} = pkgs.callPackage ./. {
-            inherit pname version;
-          };
+        build = o: pkgs.callPackage ./. ({ inherit version bdf; } // o);
+      in
+      {
 
-          "${pname}-nerd" = pkgs.callPackage ./. {
-            inherit version;
-            pname = "${pname}-nerd";
+        packages = rec {
+          kirsch = build { pname = name; };
+          kirsch-nerd = build {
+            pname = "${name}-nerd";
             nerd = true;
           };
-
-          "${pname}-release" = pkgs.callPackage ./. {
-            inherit version;
-            pname = "${pname}-nerd";
+          kirsch-release = build {
+            pname = "${name}-release";
             nerd = true;
             release = true;
           };
-
-          "${pname}-img" = pkgs.writeShellApplication {
-            inherit version;
-            pname = "${pname}-img";
-            text = "${bited-utils.bited-img}/bin/bited-img src/${pname}.bdf";
+          kirsch-img = pkgs.callPackage ./img.nix {
+            inherit bdf;
+            name = "${name}-img";
           };
-
-        };
-      in
-      {
-
-        packages = font_pkgs // {
-          default = font_pkgs.${pname};
+          default = kirsch;
         };
 
         devShell = pkgs.mkShell {

flake.nix

@@ -0,0 +1,13 @@
+{
+  name,
+  bdf,
+
+  writeShellApplication,
+  bited-img,
+  ...
+}:
+
+writeShellApplication {
+  inherit name;
+  text = "${bited-img}/bin/bited-img ${bdf}";
+}