Bump inputs

flake.lock

@@ -45,11 +45,11 @@
     "shimmeringdarkness": {
       "flake": false,
       "locked": {
-        "lastModified": 1740990076,
-        "narHash": "sha256-UiJbNPcN5qM/q5IeZXOqodT/9K1OoKI5OggvI/l2uC0=",
+        "lastModified": 1744140510,
+        "narHash": "sha256-Z4zKy4UvHLbHGp8gNAI7Xj+8iwIIpKmzeDA9uwx3mJ8=",
         "ref": "refs/heads/main",
-        "rev": "30b81df67a57201a4fa690635554a9fa7dfd7ee8",
-        "revCount": 1,
+        "rev": "7f1e025510a6ff8cf4425151661703dd213b1140",
+        "revCount": 2,
         "type": "git",
         "url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringdarkness.git"
       },
@@ -61,11 +61,11 @@
     "shimmeringvoid": {
       "flake": false,
       "locked": {
-        "lastModified": 1741011219,
-        "narHash": "sha256-nzelIlNadrnMfAWqlF4FwSAjp/Lr7Szehz2X28E/3cM=",
+        "lastModified": 1744140761,
+        "narHash": "sha256-ciOI5UMLxDlAYS4HjTSf6MViEhBgHhUEYjLxP/Xv2G0=",
         "ref": "refs/heads/main",
-        "rev": "d9785a503d59f709e4d0a02fa5f1cfee893bf78d",
-        "revCount": 8,
+        "rev": "890b7973dd522ac175e17fb6ea7d6bd74fec9565",
+        "revCount": 10,
         "type": "git",
         "url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git"
       },

nix/debundled-void.nix

@@ -1,12 +1,12 @@
 {
-  shimmeringvoid,
+  shimmeringextra,
   glass-bundler,
   runCommand,
 }:
 runCommand "debundled-void" { } ''
   mkdir $out
 
-  for file in ${shimmeringvoid}/bundles/*.cb; do
+  for file in ${shimmeringextra}/bundles/*.cb; do
     no_ext="''${file%.cb}"
     meta_file="$no_ext.json"
     ${glass-bundler}/bin/glass-bundler debundle \

nix/fonts.nix

@@ -7,7 +7,6 @@
 }:
 stdenvNoCC.mkDerivation {
   name = "shimmering-fonts";
-
   dontUnpack = true;
 
   installPhase = ''
@@ -19,7 +18,5 @@ stdenvNoCC.mkDerivation {
     cp "${geosans-light}/share/fonts/truetype/GeosansLight.ttf" $out
   '';
 
-  meta = {
-    description = "Collection of fonts required by `shimmeringmoon` at runtime";
-  };
+  meta.description = "Collection of fonts required by `shimmeringmoon` at runtime";
 }

nix/overlay.nix

@@ -2,6 +2,7 @@
 final: prev: {
   shimmeringvoid = inputs.shimmeringvoid.outPath;
   shimmeringdarkness = inputs.shimmeringdarkness.outPath;
+  shimmeringextra = final.callPackage ./shimmeringextra.nix { };
   glass-bundler = final.callPackage ./glass-bundler.nix { };
   debundled-void = final.callPackage ./debundled-void.nix { };
   private-config = final.callPackage ./private-config.nix { };

nix/private-config.nix

@@ -3,8 +3,7 @@
   runCommand,
 }:
 runCommand "shimmering-private-config" { } ''
-  mkdir $out
-  mkdir $out/jackets
+  mkdir -p $out/jackets
 
   for version in $(ls ${debundled-void} | sort -V); do
     source=${debundled-void}/$version/songs

nix/shimmeringextra.nix

@@ -0,0 +1,13 @@
+# Collection combining every file stored in another repo
+{
+  shimmeringdarkness,
+  shimmeringvoid,
+  symlinkJoin,
+}:
+symlinkJoin {
+  name = "shimmeringextra";
+  paths = [
+    shimmeringvoid
+    shimmeringdarkness
+  ];
+}

src/bitmap.rs

@@ -380,7 +380,6 @@ impl BitmapCanvas {
 			pen_x += face.glyph().advance().x >> 6;
 			previous = Some((face_index, glyph_index));
 		}
-
 		// }}}
 		// {{{ Find bounding box
 		let mut x_min = 32000;
@@ -689,7 +688,6 @@ impl LayoutManager {
 	pub fn height(&self, id: LayoutBoxId) -> u32 {
 		self.boxes[id.0].height
 	}
-
 	// }}}
 	// {{{ Alignment
 	#[inline]