From c4446fb3e480570ddbf3fbfe949389b24feecddb Mon Sep 17 00:00:00 2001 From: Isaac Corbrey Date: Sun, 13 Sep 2026 09:14:23 -0400 Subject: [PATCH] flake: Split out `llm-agents` input --- flake.lock | 499 +++++++++++++++++++++++++++++++++++- flake.nix | 29 +++ modules/home/pi/default.nix | 2 +- overlays.nix | 6 +- 4 files changed, 530 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8757a28..aaf4651 100644 --- a/flake.lock +++ b/flake.lock @@ -71,6 +71,82 @@ "type": "github" } }, + "bun2nix-darwin-x64": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": [ + "omp", + "nixpkgs-darwin-x64" + ], + "systems": "systems_4", + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1784665499, + "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", + "owner": "nix-community", + "repo": "bun2nix", + "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "bun2nix", + "type": "github" + } + }, + "bun2nix_2": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "omp", + "nixpkgs" + ], + "systems": "systems_3", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1784665499, + "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", + "owner": "nix-community", + "repo": "bun2nix", + "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "bun2nix", + "type": "github" + } + }, + "bun2nix_3": { + "inputs": { + "flake-parts": "flake-parts_5", + "nixpkgs": [ + "pi", + "nixpkgs" + ], + "systems": [ + "pi", + "systems" + ], + "treefmt-nix": "treefmt-nix_4" + }, + "locked": { + "lastModified": 1778446047, + "narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=", + "owner": "nix-community", + "repo": "bun2nix", + "rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "2.1.0", + "repo": "bun2nix", + "type": "github" + } + }, "claude-code": { "inputs": { "flake-utils": "flake-utils", @@ -149,6 +225,29 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "tuicr", + "naersk", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1752475459, + "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", + "owner": "nix-community", + "repo": "fenix", + "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -191,6 +290,72 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "omp", + "bun2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "omp", + "bun2nix-darwin-x64", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": [ + "pi", + "bun2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -211,7 +376,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -268,6 +433,21 @@ "type": "github" } }, + "jail-nix": { + "locked": { + "lastModified": 1776230864, + "narHash": "sha256-YsEjjdOsGEzTeD+iT7ONh071BqWAOQWpzYVei3okAXE=", + "owner": "~alexdavid", + "repo": "jail.nix", + "rev": "404e7da9da5ab9aa643666682b2ba1312fa5fbe8", + "type": "sourcehut" + }, + "original": { + "owner": "~alexdavid", + "repo": "jail.nix", + "type": "sourcehut" + } + }, "jj-mesh": { "inputs": { "crane": "crane", @@ -312,6 +492,50 @@ "type": "github" } }, + "naersk": { + "inputs": { + "fenix": "fenix", + "nixpkgs": [ + "tuicr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782220280, + "narHash": "sha256-thLTFbp9D5Qknmh8q/v4FRpLGphUSijT3E86cbLYTXo=", + "owner": "nix-community", + "repo": "naersk", + "rev": "9aa07bb0256d300219b30622d2454e85f7f3667e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "naersk", + "type": "github" + } + }, + "nix-bun": { + "inputs": { + "nixpkgs": [ + "omp", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1787372347, + "narHash": "sha256-Foo41OtooHMiBITAFKdOhitmjrMZqcGy1epJNz7sNQ4=", + "owner": "ryoppippi", + "repo": "nix-bun", + "rev": "fee8f233ad9409be44259b4f428f83ecb2812e37", + "type": "github" + }, + "original": { + "owner": "ryoppippi", + "repo": "nix-bun", + "type": "github" + } + }, "nix-colorizer": { "locked": { "lastModified": 1750078528, @@ -343,6 +567,22 @@ "type": "github" } }, + "nixpkgs-darwin-x64": { + "locked": { + "lastModified": 1786527240, + "narHash": "sha256-OLtJPnSXcRy79Rf7BhYaMeXAVF625FpLcd3+Svq641Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e0c84f9d0ad137f076dc957494f5b39885597d4f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-26.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1782723713, @@ -394,6 +634,54 @@ "type": "github" } }, + "omp": { + "inputs": { + "bun2nix": "bun2nix_2", + "bun2nix-darwin-x64": "bun2nix-darwin-x64", + "nix-bun": "nix-bun", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-darwin-x64": "nixpkgs-darwin-x64", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1789293219, + "narHash": "sha256-pYU73CgL3Cwz4+nzMCi2WOr8kSp8Hu8CO8QaGPeDKUA=", + "owner": "can1357", + "repo": "oh-my-pi", + "rev": "165cede8400d833382177a4dfd2901271c9f0a2c", + "type": "github" + }, + "original": { + "owner": "can1357", + "repo": "oh-my-pi", + "type": "github" + } + }, + "pi": { + "inputs": { + "bun2nix": "bun2nix_3", + "jail-nix": "jail-nix", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1788857715, + "narHash": "sha256-QrGCBqM2ZBH0e5g3fxTPVwX/vi5piAzm15T1JT65jbg=", + "owner": "lukasl-dev", + "repo": "pi.nix", + "rev": "f41e1136297ccd039ead5131739da85d0ac4a77c", + "type": "github" + }, + "original": { + "owner": "lukasl-dev", + "repo": "pi.nix", + "type": "github" + } + }, "quickshell": { "inputs": { "nixpkgs": [ @@ -430,7 +718,10 @@ "nix-colorizer": "nix-colorizer", "nixpkgs": "nixpkgs_2", "nur": "nur", + "omp": "omp", + "pi": "pi", "rose": "rose", + "tuicr": "tuicr", "zen-browser": "zen-browser" } }, @@ -440,7 +731,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1787498679, @@ -456,6 +747,23 @@ "url": "https://tangled.org/isaaccorbrey.com/rose" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1752428706, + "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -499,6 +807,27 @@ } }, "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "omp", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1786507911, + "narHash": "sha256-w5aZRLbiu7H6TqsYXVMdRKg0S4DRaJpxyqxx86AwxVk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "39db48099ad16834af7e27485a4babf9c28b3897", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "inputs": { "nixpkgs": [ "rose", @@ -550,6 +879,66 @@ } }, "systems_3": { + "locked": { + "lastModified": 1776166891, + "narHash": "sha256-bI8yrEGjrohR5hkQox7UrxDH7XqrYMwI8SL/LrJ1+S8=", + "owner": "nix-systems", + "repo": "triplet", + "rev": "6de7bc09397911ce03636afbcf6118745ab2cda0", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "triplet", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1680978224, + "narHash": "sha256-+xT9B1ZbhMg/zpJqd00S06UCZb/A2URW9bqqrZ/JTOg=", + "owner": "nix-systems", + "repo": "x86_64-darwin", + "rev": "db0463cce4cd60fb791f33a83d29a1ed53edab9b", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "x86_64-darwin", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -585,6 +974,112 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "omp", + "bun2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784369104, + "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "omp", + "bun2nix-darwin-x64", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784369104, + "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_4": { + "inputs": { + "nixpkgs": [ + "pi", + "bun2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "tuicr": { + "inputs": { + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1789153853, + "narHash": "sha256-ce64dlOctKarF5D+teHsxqFtnKqOmI/UHJG8T6G0xHs=", + "owner": "agavra", + "repo": "tuicr", + "rev": "4a9bda236cf2b0663982fd08ec15968706273c68", + "type": "github" + }, + "original": { + "owner": "agavra", + "repo": "tuicr", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_7" + }, + "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" + } + }, "zen-browser": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9331c24..adc1844 100644 --- a/flake.nix +++ b/flake.nix @@ -30,9 +30,19 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nur.url = "github:nix-community/NUR"; + + inputs.omp.url = "github:can1357/oh-my-pi"; + inputs.omp.inputs.nixpkgs.follows = "nixpkgs"; + + inputs.pi.url = "github:lukasl-dev/pi.nix"; + inputs.pi.inputs.nixpkgs.follows = "nixpkgs"; + inputs.rose.url = "git+https://tangled.org/isaaccorbrey.com/rose"; inputs.rose.inputs.nixpkgs.follows = "nixpkgs"; + inputs.tuicr.url = "github:agavra/tuicr"; + inputs.tuicr.inputs.nixpkgs.follows = "nixpkgs"; + inputs."zen-browser".url = "github:youwen5/zen-browser-flake"; inputs."zen-browser".inputs.nixpkgs.follows = "nixpkgs"; @@ -65,6 +75,24 @@ }; }; + cacheModule = let + mkTrust = sub: keys: { + extra-trusted-public-keys = lib.toList keys; + extra-substituters = lib.toList sub; + }; + in { + nix.settings = lib.mkMerge [ + (mkTrust + "https://nix-community.cachix.org" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ) + (mkTrust + "https://pi.cachix.org" + "pi.cachix.org-1:lGeoGJaZ5ZDabuRzkcD5EBTNnDM4HJ1vqeOxlWk1Flk=" + ) + ]; + }; + pkgsFor = system: import nixpkgs { inherit system; @@ -103,6 +131,7 @@ modules ++ [ (nixpkgsModule system) + cacheModule ]; inherit specialArgs; }; diff --git a/modules/home/pi/default.nix b/modules/home/pi/default.nix index dfd66fc..f1cb374 100644 --- a/modules/home/pi/default.nix +++ b/modules/home/pi/default.nix @@ -109,7 +109,7 @@ in { ); home.packages = - [pkgs.pi] + [(lib.lowPrio pkgs.pi-coding-agent)] ++ (utils.mkIfOptions cfg { omp = pkgs.omp; }); diff --git a/overlays.nix b/overlays.nix index 3715ddf..be6d132 100644 --- a/overlays.nix +++ b/overlays.nix @@ -102,6 +102,8 @@ }; in [ inputs.claude-code.overlays.default + inputs.omp.overlays.default + inputs.pi.overlays.default inputs.nur.overlays.default linuxWallpaperenginePR557 @@ -110,7 +112,5 @@ in [ // badjujuPackage final // helixPackage final // dsearchPackage final - // optionalInputPackage "tuicr" inputs.llm-agents "tuicr" - // optionalInputPackage "pi" inputs.llm-agents "pi" - // optionalInputPackage "omp" inputs.llm-agents "omp") + // optionalInputPackage "tuicr" inputs.tuicr "default") ] -- knotmirror 0.0.1