From 8232946b6e6d864b6158353964f6ddfc0972de42 Mon Sep 17 00:00:00 2001 From: Elijah Voigt Date: Sun, 1 Mar 2026 19:47:23 -0800 Subject: [PATCH] Merge development flakes --- .gitignore | 2 + edu/flake.lock | 135 ------------------------------------------------- edu/flake.nix | 46 ----------------- flake.lock | 12 ++--- flake.nix | 3 ++ nbd/TODO.md | 3 ++ 6 files changed, 14 insertions(+), 187 deletions(-) delete mode 100644 edu/flake.lock delete mode 100644 edu/flake.nix diff --git a/.gitignore b/.gitignore index 1ea1e55..be51677 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ Thumbs.db # Added by cargo /target + +worktrees diff --git a/edu/flake.lock b/edu/flake.lock deleted file mode 100644 index eb38968..0000000 --- a/edu/flake.lock +++ /dev/null @@ -1,135 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nbd": { - "inputs": { - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "path": "../nbd", - "type": "path" - }, - "original": { - "path": "../nbd", - "type": "path" - }, - "parent": [] - }, - "nixpkgs": { - "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1772082373, - "narHash": "sha256-wySf8a6hvuqgFdwvvzPPTARBCMLDz7WFAufGkllD1M4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nbd": "nbd", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nbd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1771816254, - "narHash": "sha256-vkp3iTF6QmHMvL+34DI93IiMPjS2lqcMlA1fl7nXVsQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "085bdbf5dde5477538e4c87d1684b6c6df56c0ad", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772247314, - "narHash": "sha256-x6IFQ9bL7YYfW2m2z8D3Em2YtAA3HE8kiCFwai2fwrw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a1ab5e89ab12e1a37c0b264af6386a7472d68a15", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/edu/flake.nix b/edu/flake.nix deleted file mode 100644 index a9b6a03..0000000 --- a/edu/flake.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - description = "Vibed — edu dev shell"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nbd.url = "path:../nbd"; - }; - - outputs = { self, nixpkgs, flake-utils, rust-overlay, nbd }: - flake-utils.lib.eachDefaultSystem (system: - let - overlays = [ (import rust-overlay) ]; - pkgs = import nixpkgs { - inherit system overlays; - }; - - rustToolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = [ "rust-src" "rust-analyzer" "clippy" "rustfmt" ]; - targets = [ "wasm32-unknown-unknown" ]; - }; - in - { - devShells.default = pkgs.mkShell { - buildInputs = [ - # Rust - rustToolchain - - pkgs.mdbook - - nbd.packages.${system}.nbd - - pkgs.jq - ]; - - shellHook = '' - echo "vibed/edu dev shell loaded" - ''; - }; - } - ); -} diff --git a/flake.lock b/flake.lock index 32f6e91..32e04e8 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770843696, - "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", + "lastModified": 1772173633, + "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", + "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6", "type": "github" }, "original": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1771125043, - "narHash": "sha256-ldf/s49n6rOAxl7pYLJGGS1N/assoHkCOWdEdLyNZkc=", + "lastModified": 1772420823, + "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4912f951a26dc8142b176be2c2ad834319dc06e8", + "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7081e8e..56f6b3b 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,9 @@ # OpenAPI Linter pkgs.redocly + + # Build book + pkgs.mdbook ]; shellHook = '' diff --git a/nbd/TODO.md b/nbd/TODO.md index 10bd3fb..5d7dd09 100644 --- a/nbd/TODO.md +++ b/nbd/TODO.md @@ -1,2 +1,5 @@ # Work to be ticketed +should be able to pass a ticket ID to `nbd next` and `nbd ready` that scopes it to the dependency tree of that ticket. +For example `nbd next abc123` should show the highest priority (next) ticket that is a dependency of that project. +`nbd ready abc123` would show all tickets that are ready which unblock that project.