From deff3ce9c2da894280461f2dac5e8f0259431b93 Mon Sep 17 00:00:00 2001
From: Brooklyn Zelenka <hello@brooklynzelenka.com>
Date: Fri, 23 Jan 2026 19:40:07 -0800
Subject: [PATCH] Fix flake

---
 flake.lock | 12 ++++++------
 flake.nix  | 35 ++++++++++++++---------------------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index f66e389..08a25e7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,10 +6,10 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1769213192,
-        "narHash": "sha256-Lab3bFspz1ZTWZFwRWjMsDqTv8dXXNCQtQix+drJngM=",
+        "lastModified": 1769220798,
+        "narHash": "sha256-ulD8bbh5eV4rUH61JC4gS8Ik0R2hBEEyCom3f8w2vXE=",
         "ref": "refs/heads/main",
-        "rev": "80de3c66b7810667fc932dc3a16537db16d66a2f",
+        "rev": "6c72a70e0241a5af26ba664ab63f3e2d89c45cd0",
         "revCount": 5,
         "type": "git",
         "url": "https://codeberg.org/expede/nix-command-utils"
@@ -99,11 +99,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769136478,
-        "narHash": "sha256-8UNd5lmGf8phCr/aKxagJ4kNsF0pCHLish2G4ZKCFFY=",
+        "lastModified": 1769222645,
+        "narHash": "sha256-gu6oZ86zLudBZMq8LL1qdtYt/S69GV5keQVXdvBrVSU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "470ee44393bb19887056b557ea2c03fc5230bd5a",
+        "rev": "22da29e7f3d8cff75009cbbcf992c7cb66920cfd",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e52e649..9658bd8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
 
         rustVersion = "1.90.0";
 
-        rust-toolchain = pkgs.rust-bin.stable.${rustVersion}.default.override {
+        rust-toolchain = (pkgs.rust-bin.stable.${rustVersion}.default.override {
           extensions = [
             "cargo"
             "clippy"
@@ -51,7 +51,9 @@
             "wasm32-unknown-unknown"
             "thumbv6m-none-eabi"
           ];
-        };
+        }).overrideAttrs (old: {
+          meta = (old.meta or {}) // { mainProgram = "cargo"; };
+        });
 
         format-pkgs = with pkgs; [
           nixpkgs-fmt
@@ -68,25 +70,19 @@
           cargo-component
         ];
 
-        # Command binary paths
-        cargo' = "${rust-toolchain}/bin/cargo";
-        cargo-audit' = "${pkgs.cargo-audit}/bin/cargo-audit";
-        cargo-semver-checks' = "${pkgs.cargo-semver-checks}/bin/cargo-semver-checks";
-        cargo-watch' = "${pkgs.cargo-watch}/bin/cargo-watch";
-
         # Command utils
         rust = command-utils.rust.${system};
 
         menu = command-utils.commands.${system} [
-          (rust.test { cargo = cargo'; cargo-watch = cargo-watch'; })
-          (rust.lint { cargo = cargo'; })
-          (rust.fmt { cargo = cargo'; })
-          (rust.build { cargo = cargo'; })
-          (rust.doc { cargo = cargo'; })
-          (rust.watch { cargo-watch = cargo-watch'; })
-          (rust.audit { cargo-audit = cargo-audit'; })
-          (rust.semver { cargo-semver-checks = cargo-semver-checks'; })
-          (rust.ci { cargo = cargo'; })
+          (rust.test { cargo = rust-toolchain; cargo-watch = pkgs.cargo-watch; })
+          (rust.lint { cargo = rust-toolchain; })
+          (rust.fmt { cargo = rust-toolchain; })
+          (rust.build { cargo = rust-toolchain; })
+          (rust.doc { cargo = rust-toolchain; })
+          (rust.watch { cargo-watch = pkgs.cargo-watch; })
+          (rust.audit { cargo-audit = pkgs.cargo-audit; })
+          (rust.semver { cargo-semver-checks = pkgs.cargo-semver-checks; })
+          (rust.ci { cargo = rust-toolchain; })
         ];
 
       in rec {
@@ -97,11 +93,8 @@
             [
               rust-toolchain
               rust-analyzer
-              cargo-watch
-              cargo-audit
-              cargo-semver-checks
             ]
-            ++ (builtins.filter builtins.isAttrs menu)
+            ++ menu
             ++ format-pkgs
             ++ cargo-installs;
 
-- 
knotmirror 0.0.1