diff --git a/flake.lock b/flake.lock index bccf5a6..4e51a23 100644 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,5 @@ { "nodes": { - "blueprint": { - "inputs": { - "nixpkgs": [ - "llm-agents", - "nixpkgs" - ], - "systems": [ - "llm-agents", - "systems" - ] - }, - "locked": { - "lastModified": 1776249299, - "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", - "owner": "numtide", - "repo": "blueprint", - "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "blueprint", - "type": "github" - } - }, "bun2nix": { "inputs": { "flake-parts": [ @@ -45,11 +20,11 @@ ] }, "locked": { - "lastModified": 1782772816, - "narHash": "sha256-s9BuFv0mRuZx9C1MF8qPHRdcAK14ONi0A5m6E2wqOoM=", + "lastModified": 1784665499, + "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", "owner": "nix-community", "repo": "bun2nix", - "rev": "5a39d717029e94163ac223aee8d5c9946cafed1c", + "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", "type": "github" }, "original": { @@ -122,11 +97,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1783538213, - "narHash": "sha256-jNjKlmrejUrBgVAeiavlMLlkmC7ZEv1D9nhfuwMW5Q8=", + "lastModified": 1784758116, + "narHash": "sha256-vcjRSkJHM5/2rLmtCZBhms/WDJpyPNXW9Gi6xeSfc/Y=", "owner": "cachix", "repo": "devenv", - "rev": "d1fb321e73048d0e1e2b523580268ebb3df2ae90", + "rev": "9767a1f458fbd99b487dbb600a130917d4cd2b13", "type": "github" }, "original": { @@ -163,11 +138,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1781164160, - "narHash": "sha256-dxo3aPnfaQJt9K/3NhgKfu2Q9B42z4d4Or9Izoug+68=", + "lastModified": 1784365424, + "narHash": "sha256-kJO1Tww/GkvLq5amrV4BKidYGr5YumM+cH/xYALAiw4=", "owner": "abenz1267", "repo": "elephant", - "rev": "3296842820d04d5ec774afc7528492fcbb3c01f2", + "rev": "23f37238367355cf46843015ad5e94706200176a", "type": "github" }, "original": { @@ -255,11 +230,11 @@ "ghostty": { "flake": false, "locked": { - "lastModified": 1782866021, - "narHash": "sha256-BOLtzL5iAHmtCOg9/DXtcfw+K86QWol088K72chJB04=", + "lastModified": 1784602798, + "narHash": "sha256-298x90knBUWX5GHGXh2SKsAKvStjU2ri9UgOGoF79/8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "e1d31deaaed21aa9225afca78d778fb373c95852", + "rev": "88b4cd047fa627cdca6781bc7e7dc8b75a2cecb9", "type": "github" }, "original": { @@ -300,11 +275,11 @@ ] }, "locked": { - "lastModified": 1783689750, - "narHash": "sha256-iMO/Ypany7DPXD6D7sQgH7METtEUihnOvdb+A9ehn8k=", + "lastModified": 1784789275, + "narHash": "sha256-cgRTWuG+u1tBPhm01JrId2k0Bni09phVJ1Q0BZlRd7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "79e6082586b3680ff32c8e75127545058f074fa4", + "rev": "3b0e6bbd65869af1beadf5963a99befc179d209f", "type": "github" }, "original": { @@ -315,11 +290,11 @@ }, "import-tree": { "locked": { - "lastModified": 1778781969, - "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", + "lastModified": 1784254960, + "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=", "owner": "vic", "repo": "import-tree", - "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", + "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69", "type": "github" }, "original": { @@ -330,7 +305,6 @@ }, "llm-agents": { "inputs": { - "blueprint": "blueprint", "bun2nix": "bun2nix", "flake-parts": "flake-parts_2", "nixpkgs": [ @@ -340,11 +314,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1783669679, - "narHash": "sha256-WDGDMsPXxceC0k1ktqcobmwE4GCTrzzULUKlp1CzSKQ=", + "lastModified": 1784790164, + "narHash": "sha256-woSpbXXGmy1zUnetetY6WiVdXz0WFGAsxHgCc+87oqU=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "6e9f6664e72433966557ab83a7c3e8c0bbf64a44", + "rev": "de9fa923ea0ebed9093f758468d7ed7c5da09739", "type": "github" }, "original": { @@ -382,11 +356,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1783526091, - "narHash": "sha256-Zkkil0e8Wg5BcBmJkWJwBXlETefYQbYKw72xJUIBPLE=", + "lastModified": 1784686714, + "narHash": "sha256-6HCWRBQq/U2NPY2msnnysnWczZYzEzhS1UZURmrr2f0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a24d4c0dce53fd8dbeb9ad20411e282c7b9875f1", + "rev": "4dfd38bad6150c07be6cc3fd7682787765092eea", "type": "github" }, "original": { @@ -415,11 +389,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1783522755, - "narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", + "lastModified": 1784570726, + "narHash": "sha256-9EMn69JBcFWFgUM7f0VBAX+jBby5b9H3M59U75+5yI4=", "owner": "YaLTeR", "repo": "niri", - "rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", + "rev": "7f26c3ee804fb6ed458ef7fb0e3c794f14e0b3bc", "type": "github" }, "original": { @@ -475,11 +449,11 @@ ] }, "locked": { - "lastModified": 1783414108, - "narHash": "sha256-RY8e+gR2/DhXsYDxGDL6Hhe9+POD9u4+llwxMBqMQDs=", + "lastModified": 1784440659, + "narHash": "sha256-Q5kNLlWngt7TaIIZoxDKWMHjiSaNRVqr70FqWCRRfr4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "96d6de10eb281b98f5cfcd1841394c03da5df77c", + "rev": "4f8d52a3598b0dc7db7a5e7b419e3edd9d1ecfdb", "type": "github" }, "original": { @@ -521,11 +495,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1780381423, - "narHash": "sha256-S1BIJiQF4lRtJUKak0e97JwNvbe69/LW78YJJuB18Qk=", + "lastModified": 1783935112, + "narHash": "sha256-IAQ14nteIKXAz4cd75UcZrsHGEVJ7QNrkUwX9rmeZ/Y=", "owner": "nix-community", "repo": "nixd", - "rev": "0e07c08c448a2995e7793d1098437b29bbe80b02", + "rev": "a64cd33e53b316b6b092ea0a966640cd2309bf3d", "type": "github" }, "original": { @@ -539,11 +513,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1783673680, - "narHash": "sha256-ardRVG+ipnyyxVdIsbLMy5foO6gDqN/yIi8v10HTJqs=", + "lastModified": 1784723954, + "narHash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0b655af52b5b89bcceb88737efdc3a7498e751ee", + "rev": "a017f5b72210026af5b3ac5949f08d94380a6fbd", "type": "github" }, "original": { @@ -620,6 +594,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1784432872, + "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1772173633, @@ -638,11 +628,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1784497964, + "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", "type": "github" }, "original": { @@ -667,11 +657,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-2l8yOB5aYd+05Q9V9Y1YhgbSa1j1o5QX+nvYs5FL80A=", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "lastModified": 1784555310, + "narHash": "sha256-x8Suc10wDlysPVmLWoyifgL7p2wDoQbqRXU5r+qiTgo=", + "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1028110.f205b5574fd0/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1038038.421eebfd0ec7/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -680,11 +670,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "lastModified": 1784356753, + "narHash": "sha256-zupdTm41be2fY8cexroEOGjopl3F2Gqs3gk7ieqaM3s=", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1027867.d407951447dc/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1036777.61b7c44c4073/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -696,11 +686,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1783689056, - "narHash": "sha256-K9/7C/Dwwe80jF1xhbV8/rHzJsujXulA1vFftgyF6Ok=", + "lastModified": 1784768158, + "narHash": "sha256-GhrQw9jeHxNc8nWcfl37hg82Ta1acLwrJPksBi8xkrI=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "1b7a17a5df40cf782dbb92f37c94516932427f56", + "rev": "79530a6290fbf5ba5e34db61d4729abc7eea3920", "type": "github" }, "original": { @@ -727,6 +717,7 @@ "nix-wrapper-modules": "nix-wrapper-modules", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2", "noctalia": "noctalia", "sops-nix": "sops-nix", "walker": "walker" @@ -848,11 +839,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1784369104, + "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", "type": "github" }, "original": { @@ -872,11 +863,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1781164128, - "narHash": "sha256-xPcYrHdDXWykIi5/XXkLvliBArRnfzvs+atB9El1qhI=", + "lastModified": 1784217994, + "narHash": "sha256-gxHJsrJZo2qbKK47Kf/9ho3i/HhRwkL8XvPnczGPd9E=", "owner": "abenz1267", "repo": "walker", - "rev": "aa1e4b7d59237e8c43dde58636bae476f23d9bfb", + "rev": "42b3ed88abf50bc52638fb2835b7f17e3ea3ac4c", "type": "github" }, "original": { @@ -905,11 +896,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1781226823, - "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=", + "lastModified": 1784679892, + "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e", + "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 81c397d..8ee0381 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,7 @@ }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-26.05"; noctalia.url = "github:noctalia-dev/noctalia"; sops-nix = { url = "github:Mic92/sops-nix"; diff --git a/modules/capabilities/ai.nix b/modules/capabilities/ai.nix index 0f83440..b85e5c4 100644 --- a/modules/capabilities/ai.nix +++ b/modules/capabilities/ai.nix @@ -8,7 +8,7 @@ in { home-manager.sharedModules = [ hmModules.ai ]; - nixpkgs.overlays = [ inputs.llm-agents.overlays.default ]; + nixpkgs.overlays = [ inputs.llm-agents.overlays.shared-nixpkgs ]; nix.settings = { extra-substituters = [ "https://cache.numtide.com" ]; diff --git a/modules/capabilities/dev-tools.nix b/modules/capabilities/dev-tools.nix index 160d02b..cf027ee 100644 --- a/modules/capabilities/dev-tools.nix +++ b/modules/capabilities/dev-tools.nix @@ -2,6 +2,14 @@ { flake.modules.homeManager.dev-tools = { config, pkgs, ... }: + let + stablePkgs = import inputs.nixpkgs-stable { + inherit (pkgs.stdenv.hostPlatform) system; + config = { + inherit (pkgs.config) allowUnfree; + }; + }; + in { home.sessionVariables.CARGO_HOME = "${config.xdg.dataHome}/cargo"; home.packages = with pkgs; [ @@ -12,7 +20,7 @@ resterm inputs.devenv.packages.${pkgs.stdenv.hostPlatform.system}.default kubectl - mongodb-compass + stablePkgs.mongodb-compass scc ];