prescientmoon/shimmeringmoon
prescientmoon/shimmeringmoon
1
Fork 0
Code Activity

Bump inputs

Browse source
This commit is contained in:
prescientmoon 2025-04-08 21:42:51 +02:00
parent 24d86478fc
commit 42d7de0bb1
Signed by: prescientmoon
SSH key fingerprint: SHA256:UUF9JT2s8Xfyv76b8ZuVL7XrmimH4o49p4b+iexbVH4
7 changed files with 26 additions and 18 deletions

16
flake.lock
View file

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

4
nix/debundled-void.nix
View file

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

5
nix/fonts.nix
View file

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

1
nix/overlay.nix
View file

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

3
nix/private-config.nix
View file

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

13
nix/shimmeringextra.nix Normal file
View file

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

2
src/bitmap.rs
View file

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