From bd287a324aec6c90b2c86ca101667c211f14b476 Mon Sep 17 00:00:00 2001 From: Jelle Spreeuwenberg Date: Sat, 10 Oct 2026 12:42:42 +0200 Subject: [PATCH] updates --- docs/current-work.md | 8 ++ flake.lock | 116 +++++++++++++++------------- flake.nix | 4 +- modules/capabilities/ai/default.nix | 1 + modules/capabilities/nix.nix | 6 +- 5 files changed, 80 insertions(+), 55 deletions(-) diff --git a/docs/current-work.md b/docs/current-work.md index b8ef1c7..dd4b854 100644 --- a/docs/current-work.md +++ b/docs/current-work.md @@ -56,6 +56,14 @@ The unedited `~/sync/notes/setup-todo.md` remains an idea inbox, not authorizati reports interruption concisely. Full builds still include the tools-only shell. The devenv cache is now in persistent NixOS Nix settings; the flake cache hint was removed. +- Noctalia tracks upstream's `cachix` branch with its own nixpkgs pin; persistent + Nix settings include the official cache and signing key. The existing 5.2.1 + commit is unchanged. Its resulting x86_64 package has a matching signed cache + entry; the previous package with our nixpkgs pin returned 404. No build or + activation was run. For the first activation, pass the cache URL and key from + `modules/capabilities/nix.nix` as `extra-substituters` and + `extra-trusted-public-keys` options to `nh os switch`; afterward Nix uses the + persistent settings. ## Decisions/provisioning still needed diff --git a/flake.lock b/flake.lock index 9cfbe7f..660916f 100644 --- a/flake.lock +++ b/flake.lock @@ -98,11 +98,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1789991752, - "narHash": "sha256-SiH+H00IutELZBg7BBNo6r5DU6E+DG7DjrbeX5+QLa0=", + "lastModified": 1791388908, + "narHash": "sha256-eqnGuVYIh6u8XU6UXueceaCi3UfSqbvopeuLYgClEDY=", "owner": "cachix", "repo": "devenv", - "rev": "1c57b5dea0d400af97053fdd1a536fca17378f73", + "rev": "27af3b2029a6d1274db8a570fb57292dae5a2551", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1775706155, - "narHash": "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=", + "lastModified": 1790316550, + "narHash": "sha256-Qr/8JQ8zpmmWmZ7UAjhxVdRbSgwQ0uc2r/wUBMe4NBk=", "owner": "abenz1267", "repo": "elephant", - "rev": "376ee71c66db38683daabd57350bf3f6f086eaf8", + "rev": "a0670fb2cf590a3ceed6f799a45947b86a78d5f4", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1788450739, - "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", + "lastModified": 1790898470, + "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", + "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1790080548, - "narHash": "sha256-u4sa7RCbwvk8cZmAGs35F7o0h4IqDc3wsrrnjQvMumk=", + "lastModified": 1791306979, + "narHash": "sha256-KuLePuhwJM9NLt/gTLHzXaOoSZKGoB3m7NfXjiQ98HY=", "owner": "nix-community", "repo": "home-manager", - "rev": "cbcbfa2778e0c5653ef349df3ebae8288efac3c0", + "rev": "fae6e9e42c3b762ab47635cddcfaf6f52374a61b", "type": "github" }, "original": { @@ -318,11 +318,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1790918187, - "narHash": "sha256-F3py52yPDHBSKKkx4CzpTMc5KxzCBT+jLUIRNOYpr4Q=", + "lastModified": 1791440787, + "narHash": "sha256-nRO1wEJmb4wjz+0Mhpg5VWURTqZRBZq3MvMjtPkKuAI=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "20762f12777a611184868a1a4408bc42a014adf1", + "rev": "2109db8971dc18137ff1ac9393627c761609600d", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1788036898, - "narHash": "sha256-3NT3yTvoRT7+rxLDNovpyeTDIJkZlBoO72rcu2x9Y9o=", + "lastModified": 1790176416, + "narHash": "sha256-acP7QvsB+dHghUeL9AwSSZ3qS//skpqjv484aveg1EQ=", "owner": "cachix", "repo": "nix", - "rev": "b9b81726b38469c55b9706d80d37d6c73cc7f76c", + "rev": "bd10d7f563420c6034b9d1dc75c4168fc01e5afc", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1789892076, - "narHash": "sha256-Dkg4VKPmDPqTwaiw2WH5br73tXoL1qrOO0xJnR4TlcA=", + "lastModified": 1791105314, + "narHash": "sha256-oTM7QFgRQ+vxBpMBMc7hEYpqBtpXAzXu2xuB/tru84U=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9ad722673ab3b3f91f02135e53775825b240b869", + "rev": "e740bc4e9d8918d7819a51486d5099930c65c72e", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1788981141, - "narHash": "sha256-7xWS16u13YGlRNKWaAPzRbEyh4OLOXJe31k7h4AnXNU=", + "lastModified": 1791440872, + "narHash": "sha256-PwiSn1VO3/6BD/Gxw/3Ei2sPB3SccyKyJ7nD72Y+WU4=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "1db3c116a6aa61823f8d8f3c47c306846428fc54", + "rev": "d82c328c504648fa952f25fac8332319eb425d4c", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1789978172, - "narHash": "sha256-FIRXajv1pPZ+l6On6ekkmcQ6le0Zi0ncRUoR3nB0vKA=", + "lastModified": 1791373788, + "narHash": "sha256-c3oMt0QoE+4yiRk6u1m2L9ogjaUw0uTGn9yk808KkgE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9ebcb7766700d7e006d9505247bd7ce0426f4232", + "rev": "4bc63156b109ee7b4103e3ec30565c8c92bde435", "type": "github" }, "original": { @@ -479,11 +479,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1788057806, - "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=", + "lastModified": 1790477367, + "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c", + "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", "type": "github" }, "original": { @@ -527,33 +527,45 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1788834054, - "narHash": "sha256-kkWAS4mE+fmi+u3mxwD9/bfX6DGJ49Tv8O9kzN5r0HQ=", - "rev": "e9b9cbecbf6c25ca26c150d78570e6332694a129", + "lastModified": 1791336361, + "narHash": "sha256-7WQwlykef1x8n7aoyw4XP6882i2NRs5F6dVCXZ1NI1g=", + "rev": "7dd199b0e2993e37b4775ed66b1c291699608c9f", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1069601.e9b9cbecbf6c/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1086972.7dd199b0e299/nixexprs.tar.xz" }, "original": { "type": "tarball", "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1790822859, + "narHash": "sha256-VBA0QerzzmL+4wxgtwiCdiLwLpJg2/9xOxhgO3BRJQA=", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1083223.c59305bab206/nixexprs.tar.zst" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" + } + }, "noctalia": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1790104132, - "narHash": "sha256-yvcudrhnWvWSFS2ujWxAJ7CVdgdiZs2BDGbgn38p1l0=", + "lastModified": 1791427429, + "narHash": "sha256-FzM3cunGIn8oDC1afUsXzGdfI/tK5HjPOHzHXFIAVx4=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "61aa22730c434500fd3f2048eba47658b1f20aad", + "rev": "3e059de4aec58ba5b81f6c366b2b234a58f5ab0a", "type": "github" }, "original": { "owner": "noctalia-dev", + "ref": "cachix", "repo": "noctalia", "type": "github" } @@ -603,11 +615,11 @@ ] }, "locked": { - "lastModified": 1789890976, - "narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=", + "lastModified": 1791103873, + "narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7214124c20c1542c90deb54af50e2f53ae02711f", + "rev": "dcd241ba97088c22569d1573286e1b9daad340c0", "type": "github" }, "original": { @@ -618,11 +630,11 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1791244623, + "narHash": "sha256-uuanbkFk8a313Zfrxdcz8Us/yQtaxNnKJtX8v0ZPpd8=", "owner": "nix-systems", "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "rev": "d36eeed142f88b5a636f2e3856a53c61654cf29b", "type": "github" }, "original": { @@ -676,11 +688,11 @@ ] }, "locked": { - "lastModified": 1786901030, - "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", + "lastModified": 1791203292, + "narHash": "sha256-vuzVwvjeucSnwKwMBpyP8r5IzdrMKCHEdwTrRFwUN7I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", + "rev": "03d8ee1bcbc8f9638907bb79edb9673151d0e22b", "type": "github" }, "original": { @@ -698,11 +710,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1784217994, - "narHash": "sha256-gxHJsrJZo2qbKK47Kf/9ho3i/HhRwkL8XvPnczGPd9E=", + "lastModified": 1791441924, + "narHash": "sha256-2SLAXtgtsZgjK+dyzDAV47oQNoip3dsGX+XXrT/udEk=", "owner": "abenz1267", "repo": "walker", - "rev": "42b3ed88abf50bc52638fb2835b7f17e3ea3ac4c", + "rev": "a515085fd39fae80acc086c8fbfd9b7771a9a11d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ff4ced8..00d5b83 100644 --- a/flake.nix +++ b/flake.nix @@ -24,8 +24,8 @@ }; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; noctalia = { - url = "github:noctalia-dev/noctalia"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:noctalia-dev/noctalia/cachix"; + # Keep upstream's nixpkgs pin to match its cached builds. }; sops-nix = { url = "github:Mic92/sops-nix"; diff --git a/modules/capabilities/ai/default.nix b/modules/capabilities/ai/default.nix index ab6f7bf..d6f9c40 100644 --- a/modules/capabilities/ai/default.nix +++ b/modules/capabilities/ai/default.nix @@ -100,6 +100,7 @@ in pkgs.nodejs pkgs.python3 inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.codex + pkgs.bubblewrap inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.chatgpt inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.pi inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.claude-code diff --git a/modules/capabilities/nix.nix b/modules/capabilities/nix.nix index 49d595a..9415f52 100644 --- a/modules/capabilities/nix.nix +++ b/modules/capabilities/nix.nix @@ -14,9 +14,13 @@ in settings = { trusted-users = [ "@wheel" ]; use-xdg-base-directories = true; - extra-substituters = [ "https://devenv.cachix.org" ]; + extra-substituters = [ + "https://devenv.cachix.org" + "https://noctalia.cachix.org" + ]; extra-trusted-public-keys = [ "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" ]; experimental-features = [