From 445a58383a1cdc3556235bfea0a56058710201e0 Mon Sep 17 00:00:00 2001 From: MultisampledNight Date: Wed, 10 Jan 2024 23:21:33 +0100 Subject: [PATCH] repo: switch to nu for just --- docs/design/iowo-design.typ | 2 +- docs/design/{ => util}/graphics.typ | 2 +- flake.lock | 38 ++++++++++++++--------------- flake.nix | 4 +-- justfile | 14 +++++++---- 5 files changed, 32 insertions(+), 28 deletions(-) rename docs/design/{ => util}/graphics.typ (99%) diff --git a/docs/design/iowo-design.typ b/docs/design/iowo-design.typ index f8b4316..1feb7d0 100644 --- a/docs/design/iowo-design.typ +++ b/docs/design/iowo-design.typ @@ -1,5 +1,5 @@ #import "../template.typ": conf -#import "graphics.typ" +#import "util/graphics.typ" #import graphics: arrow #show: conf.with( diff --git a/docs/design/graphics.typ b/docs/design/util/graphics.typ similarity index 99% rename from docs/design/graphics.typ rename to docs/design/util/graphics.typ index f14e65e..f097b51 100644 --- a/docs/design/graphics.typ +++ b/docs/design/util/graphics.typ @@ -244,7 +244,7 @@ }) // literally just for standalone display of the graphics alone -#import "../template.typ": conf +#import "../../template.typ": conf #show: conf #set page(width: auto, height: auto) diff --git a/flake.lock b/flake.lock index 0ee4e36..fd2920d 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1699541523, - "narHash": "sha256-Rv0ryuBC5KtA/3YqwIEe58Tabu71qSGnGcGRd67mMUY=", + "lastModified": 1704835383, + "narHash": "sha256-SoC0rYR9iHW0dVOEmxNEfa8vk9dTK86P5iXTgHafmwM=", "owner": "cachix", "repo": "devenv", - "rev": "14fdefc0bb80c3d6f3a18a491e33429b4064c371", + "rev": "18ef9849d1ecac7a9a7920eb4f2e4adcf67a8c3a", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1699510895, - "narHash": "sha256-eaOkJUvHeYNW/xEoRotz0rHkKihKoQdWB1ctX4q1MTQ=", + "lastModified": 1704867811, + "narHash": "sha256-pG4O1vPpNSMjz7p/5x+/OH4tXC0thzAPbJ55kI/W5dU=", "owner": "nix-community", "repo": "fenix", - "rev": "8eeef23f2c8d092227af40eff98afe5b41891e3b", + "rev": "93e89638c15512db65e931f26ce36edf8cfbb4a5", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "type": "github" }, "original": { @@ -202,16 +202,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1699291058, - "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -231,11 +231,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1688056373, - "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", + "lastModified": 1704725188, + "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", + "rev": "ea96f0c05924341c551a797aaba8126334c505d2", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1699451299, - "narHash": "sha256-7HJMyp62fCS6/aCCCASz8MdJM2/M8d1pBNukyLmPdwA=", + "lastModified": 1704833483, + "narHash": "sha256-Ox01mpYmjapNYaqOu4fMS/4Ma9NLd2rVNz6d4rJmcf4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "7059ae2fc2d55fa20d7e2671597b516431129445", + "rev": "ae6e73772432cfe35bb0ff6de6fdcfa908642b67", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c8148c6..ab394bf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default"; devenv.url = "github:cachix/devenv"; fenix.url = "github:nix-community/fenix"; @@ -36,7 +36,7 @@ rustfmt.enable = true; }; - packages = []; + packages = with pkgs; [just nushell typst]; }) ]; }; diff --git a/justfile b/justfile index e0979b3..7870440 100644 --- a/justfile +++ b/justfile @@ -1,6 +1,10 @@ docs: - for doc in $(fd '.typ' './docs' --exclude 'template*' --exclude 'util*'); do \ - typst compile $doc --root=docs; \ - mv "$(dirname $doc)/$(basename $doc .typ).pdf" docs/compiled/; \ - done - + #!/usr/bin/env nu + glob **/*.typ --exclude [**/{template.typ,util/**}] | par-each { |source| + typst compile $source --root=docs + let pdf = ( + (echo $source | path dirname) + | path join (echo $source | path basename | str replace ".typ" ".pdf") + ) + mv $pdf docs/compiled + } | ignore