From 673a1908d20f0d7fcc75caadab96e26cb43079b7 Mon Sep 17 00:00:00 2001 From: m3ta-chiron Date: Sat, 25 Jul 2026 14:54:22 +0200 Subject: [PATCH] chore: flake update --- flake.lock | 303 +++++++++------------------ flake.nix | 8 +- hosts/m3-ares/services/default.nix | 2 +- hosts/m3-atlas/secrets.nix | 3 +- hosts/m3-atlas/services/rustfs.nix | 23 +- hosts/m3-kratos/services/default.nix | 6 +- overlays/default.nix | 28 ++- secrets.nix | 3 +- secrets/m3tam3re-secrets.age | Bin 1832 -> 1905 bytes secrets/rustfs-access-key.age | 31 --- secrets/rustfs-env.age | 26 +++ secrets/rustfs-secret-key.age | 32 --- 12 files changed, 167 insertions(+), 298 deletions(-) delete mode 100644 secrets/rustfs-access-key.age create mode 100644 secrets/rustfs-env.age delete mode 100644 secrets/rustfs-secret-key.age diff --git a/flake.lock b/flake.lock index f33d382..7b6f667 100644 --- a/flake.lock +++ b/flake.lock @@ -190,31 +190,6 @@ "type": "github" } }, - "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": [ @@ -235,11 +210,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": { @@ -322,11 +297,11 @@ ] }, "locked": { - "lastModified": 1783529634, - "narHash": "sha256-zdHsPGPE5MVi/y+uIt548XScTfZjQzdF21dME7ISEJM=", + "lastModified": 1784341117, + "narHash": "sha256-7VjoVZu+8PC41ZDQ3umi/EXsU3sCLNyRfxZrfJKHy+E=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "bdfd565b72cbb416441a9ab828efcac4fd516c70", + "rev": "74896fb87cb9e4bb866dbabcfd754e3e649ad0c7", "type": "github" }, "original": { @@ -344,11 +319,11 @@ ] }, "locked": { - "lastModified": 1783591397, - "narHash": "sha256-e4DDmVAas6IPwwY+gfSDKh3PMzW/FXLCbjyWXOnnnbM=", + "lastModified": 1784857968, + "narHash": "sha256-83haLQzxrk6sCX76iQlloHWQ+TD0RKsK+LdVTMikNwk=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "8b61e8fca730986e673737529fa56802dc9326bb", + "rev": "78d478f34ad6790faea447c37d16bab63e1d3570", "type": "github" }, "original": { @@ -486,20 +461,20 @@ "nixpkgs": "nixpkgs_2", "npm-lockfile-fix": "npm-lockfile-fix", "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix_2", - "uv2nix": "uv2nix_2" + "pyproject-nix": "pyproject-nix", + "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1782936460, - "narHash": "sha256-Wt72AQtA6Eizi7Ubj23JBhwZ7GKYcjY4mcV6upqHOaU=", + "lastModified": 1784572521, + "narHash": "sha256-QJEiBOLAVGeYBym4EUtnDgeIyJyDQWgmat70/yujiz4=", "owner": "NousResearch", "repo": "hermes-agent", - "rev": "7c1a029553d87c43ecff8a3821336bc95872213b", + "rev": "3ef6bbd201263d354fd83ec55b3c306ded2eb72a", "type": "github" }, "original": { "owner": "NousResearch", - "ref": "v2026.7.1", + "ref": "v2026.7.20", "repo": "hermes-agent", "type": "github" } @@ -513,8 +488,8 @@ ], "npm-lockfile-fix": "npm-lockfile-fix_2", "pyproject-build-systems": "pyproject-build-systems_2", - "pyproject-nix": "pyproject-nix_5", - "uv2nix": "uv2nix_4" + "pyproject-nix": "pyproject-nix_3", + "uv2nix": "uv2nix_3" }, "locked": { "lastModified": 1782936460, @@ -559,11 +534,11 @@ ] }, "locked": { - "lastModified": 1783618078, - "narHash": "sha256-F43DGcBoIO8xOZFAfodg3jy0VghB9NGdb6xbTYAIx1A=", + "lastModified": 1784913159, + "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "144f4e36d0186195037da9fce80a727108978070", + "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", "type": "github" }, "original": { @@ -602,11 +577,11 @@ ] }, "locked": { - "lastModified": 1783550008, - "narHash": "sha256-qbbZUk9IG9dLNwCPwdPBs6I5clxwugRpP+1YU+GPK20=", + "lastModified": 1784913159, + "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4d01c1d87c7c2ec909549165d5a8338f1bd3315", + "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", "type": "github" }, "original": { @@ -639,7 +614,6 @@ }, "llm-agents": { "inputs": { - "blueprint": "blueprint", "bun2nix": "bun2nix", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_3", @@ -647,11 +621,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1783669679, - "narHash": "sha256-WDGDMsPXxceC0k1ktqcobmwE4GCTrzzULUKlp1CzSKQ=", + "lastModified": 1784961014, + "narHash": "sha256-Ot9VI5fn7odhq1Him2pRjdFkLAm9CUTUqUz///pTFF8=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "6e9f6664e72433966557ab83a7c3e8c0bbf64a44", + "rev": "d8b00961d99eb93ec852f29ed8be290573cc88e8", "type": "github" }, "original": { @@ -677,11 +651,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1783689486, - "narHash": "sha256-dXHzh9nJTR3sp3le+5GCZVMsrKP4eKr4yDgJUi7+sD4=", + "lastModified": 1784972738, + "narHash": "sha256-Qy596f32vUXkKjEGS5QuPTW7U9a76EZnb/nxvtNfn/M=", "ref": "refs/heads/master", - "rev": "c85600a3b073832d8edf83fd27b35811e36e4688", - "revCount": 89, + "rev": "7b3ef4a2c3f40ff3557544a0cfffdd6278bef1bf", + "revCount": 93, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, @@ -702,11 +676,11 @@ "openspec": "openspec" }, "locked": { - "lastModified": 1783269665, - "narHash": "sha256-bA4PooGV1x3vtmhs6NEprZbWErwaEJdgxoKfAWaH0do=", + "lastModified": 1784972640, + "narHash": "sha256-dx+YMm4R+p8CivoFaZWFye1ZoGEgV/FQBmUXB0Soy/U=", "ref": "refs/heads/master", - "rev": "f279ae9c89d59f3e0deb0fd6307800f4cb993815", - "revCount": 356, + "rev": "30c753f4ca09dd0cfadd84ba31b496e2cbfb48be", + "revCount": 360, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -724,11 +698,11 @@ "openspec": "openspec_2" }, "locked": { - "lastModified": 1783682547, - "narHash": "sha256-usY1tQB2srsjjFPoKA6BRwoRTzP48ChiM2qu3vju85w=", + "lastModified": 1784972640, + "narHash": "sha256-dx+YMm4R+p8CivoFaZWFye1ZoGEgV/FQBmUXB0Soy/U=", "ref": "refs/heads/master", - "rev": "01bede8826fb0b35a0e432d788ce0a8fad2453f1", - "revCount": 358, + "rev": "30c753f4ca09dd0cfadd84ba31b496e2cbfb48be", + "revCount": 360, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -889,11 +863,11 @@ }, "nixpkgs-master_3": { "locked": { - "lastModified": 1783679842, - "narHash": "sha256-hj0C6XNISewIJq80sdINrBo5i/osjQDToi6gS+SOnM0=", + "lastModified": 1784971808, + "narHash": "sha256-pAH6ovmxCQY2SljCmzoOahKMav0JbPOdf2NkudGre2A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e81a14fdbbdb819781f5a396e7253bc2f9016a8b", + "rev": "bfc41e607881dfa30ddd78fc0861750773fc83e6", "type": "github" }, "original": { @@ -953,11 +927,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", + "lastModified": 1784555310, + "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", "type": "github" }, "original": { @@ -1001,11 +975,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1784796856, + "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "github" }, "original": { @@ -1049,11 +1023,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", + "lastModified": 1784812282, + "narHash": "sha256-Na4aTmdz22ovtSvcvNKaRwEWkg801hDyX6t8JqvW+sE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "rev": "6d12004108e0e4a5cfa4bd83b14477f040b15773", "type": "github" }, "original": { @@ -1112,11 +1086,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1783593872, - "narHash": "sha256-KvFRxsi81gBoK7JOTHD2LoR1y2sWobHkrHGPhM3v/NY=", + "lastModified": 1784972645, + "narHash": "sha256-egb2gbUaWMdfx5M2Q316xf5Rll5LgVmWVpoXAl0IYwo=", "owner": "nix-community", "repo": "NUR", - "rev": "73078fa6f0d34686ad26808f90cc74e81039ba9f", + "rev": "76541ccb0ad31d6889ce299ea8dc142a1f84ce21", "type": "github" }, "original": { @@ -1133,11 +1107,11 @@ ] }, "locked": { - "lastModified": 1783680628, - "narHash": "sha256-IpMvSBiDqoz3lHQZxRXZouMRos8ZY/e06vegE/eS4io=", + "lastModified": 1784972645, + "narHash": "sha256-egb2gbUaWMdfx5M2Q316xf5Rll5LgVmWVpoXAl0IYwo=", "owner": "nix-community", "repo": "NUR", - "rev": "c978e0ef4fd585c1d8bbc46bbd0d207e1249ab0b", + "rev": "76541ccb0ad31d6889ce299ea8dc142a1f84ce21", "type": "github" }, "original": { @@ -1195,8 +1169,14 @@ "hermes-agent", "nixpkgs" ], - "pyproject-nix": "pyproject-nix", - "uv2nix": "uv2nix" + "pyproject-nix": [ + "hermes-agent", + "pyproject-nix" + ], + "uv2nix": [ + "hermes-agent", + "uv2nix" + ] }, "locked": { "lastModified": 1772555609, @@ -1219,8 +1199,8 @@ "hermes-agent", "nixpkgs" ], - "pyproject-nix": "pyproject-nix_4", - "uv2nix": "uv2nix_3" + "pyproject-nix": "pyproject-nix_2", + "uv2nix": "uv2nix_2" }, "locked": { "lastModified": 1772555609, @@ -1239,6 +1219,28 @@ "pyproject-nix": { "inputs": { "nixpkgs": [ + "hermes-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772865871, + "narHash": "sha256-/ZTSg97aouL0SlPHaokA4r3iuH9QzHVuWPACD2CUCFY=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "e537db02e72d553cea470976b9733581bcf5b3ed", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, + "pyproject-nix_2": { + "inputs": { + "nixpkgs": [ + "m3ta-home", "hermes-agent", "pyproject-build-systems", "nixpkgs" @@ -1258,9 +1260,10 @@ "type": "github" } }, - "pyproject-nix_2": { + "pyproject-nix_3": { "inputs": { "nixpkgs": [ + "m3ta-home", "hermes-agent", "nixpkgs" ] @@ -1279,74 +1282,7 @@ "type": "github" } }, - "pyproject-nix_3": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "uv2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1771518446, - "narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "pyproject-nix_4": { - "inputs": { - "nixpkgs": [ - "m3ta-home", - "hermes-agent", - "pyproject-build-systems", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769936401, - "narHash": "sha256-kwCOegKLZJM9v/e/7cqwg1p/YjjTAukKPqmxKnAZRgA=", - "owner": "nix-community", - "repo": "pyproject.nix", - "rev": "b0d513eeeebed6d45b4f2e874f9afba2021f7812", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "pyproject.nix", - "type": "github" - } - }, - "pyproject-nix_5": { - "inputs": { - "nixpkgs": [ - "m3ta-home", - "hermes-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772865871, - "narHash": "sha256-/ZTSg97aouL0SlPHaokA4r3iuH9QzHVuWPACD2CUCFY=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "e537db02e72d553cea470976b9733581bcf5b3ed", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, - "pyproject-nix_6": { "inputs": { "nixpkgs": [ "m3ta-home", @@ -1384,8 +1320,7 @@ "nixpkgs-master": "nixpkgs-master_3", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur_2", - "rose-pine-hyprcursor": "rose-pine-hyprcursor", - "rustfs": "rustfs" + "rose-pine-hyprcursor": "rose-pine-hyprcursor" } }, "rose-pine-hyprcursor": { @@ -1408,26 +1343,6 @@ "type": "github" } }, - "rustfs": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781317333, - "narHash": "sha256-qnjeFFELEyOO0vkubMB96WCuFzkvftTZ/LE/VctU+SE=", - "owner": "rustfs", - "repo": "rustfs-flake", - "rev": "1d3ef7296a7b22b4b9849d0766f53a0300bce893", - "type": "github" - }, - "original": { - "owner": "rustfs", - "repo": "rustfs-flake", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1511,11 +1426,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": { @@ -1546,37 +1461,13 @@ "inputs": { "nixpkgs": [ "hermes-agent", - "pyproject-build-systems", "nixpkgs" ], "pyproject-nix": [ "hermes-agent", - "pyproject-build-systems", "pyproject-nix" ] }, - "locked": { - "lastModified": 1770770348, - "narHash": "sha256-A2GzkmzdYvdgmMEu5yxW+xhossP+txrYb7RuzRaqhlg=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "5d1b2cb4fe3158043fbafbbe2e46238abbc954b0", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } - }, - "uv2nix_2": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "nixpkgs" - ], - "pyproject-nix": "pyproject-nix_3" - }, "locked": { "lastModified": 1773039484, "narHash": "sha256-+boo33KYkJDw9KItpeEXXv8+65f7hHv/earxpcyzQ0I=", @@ -1591,7 +1482,7 @@ "type": "github" } }, - "uv2nix_3": { + "uv2nix_2": { "inputs": { "nixpkgs": [ "m3ta-home", @@ -1620,14 +1511,14 @@ "type": "github" } }, - "uv2nix_4": { + "uv2nix_3": { "inputs": { "nixpkgs": [ "m3ta-home", "hermes-agent", "nixpkgs" ], - "pyproject-nix": "pyproject-nix_6" + "pyproject-nix": "pyproject-nix_4" }, "locked": { "lastModified": 1773039484, diff --git a/flake.nix b/flake.nix index a566028..b1056d2 100644 --- a/flake.nix +++ b/flake.nix @@ -51,12 +51,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hermes-agent.url = "github:NousResearch/hermes-agent/v2026.7.1"; - - rustfs = { - url = "github:rustfs/rustfs-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + hermes-agent.url = "github:NousResearch/hermes-agent/v2026.7.20"; }; outputs = { @@ -109,7 +104,6 @@ inputs.disko.nixosModules.disko agenix.nixosModules.default m3ta-nixpkgs.nixosModules.default - inputs.rustfs.nixosModules.rustfs ]; }; m3-kratos = nixpkgs.lib.nixosSystem { diff --git a/hosts/m3-ares/services/default.nix b/hosts/m3-ares/services/default.nix index 4e135e1..8f9f82c 100644 --- a/hosts/m3-ares/services/default.nix +++ b/hosts/m3-ares/services/default.nix @@ -29,7 +29,7 @@ gvfs.enable = true; trezord.enable = true; gnome.gnome-keyring.enable = true; - qdrant.enable = true; + # qdrant.enable = true; # qdrant = { # enable = true; # settings = { diff --git a/hosts/m3-atlas/secrets.nix b/hosts/m3-atlas/secrets.nix index 6de6e46..f4ecf97 100644 --- a/hosts/m3-atlas/secrets.nix +++ b/hosts/m3-atlas/secrets.nix @@ -18,8 +18,7 @@ kestra-env = {file = ../../secrets/kestra-env.age;}; littlelink-m3tam3re = {file = ../../secrets/littlelink-m3tam3re.age;}; minio-root-cred = {file = ../../secrets/minio-root-cred.age;}; - rustfs-access-key = {file = ../../secrets/rustfs-access-key.age;}; - rustfs-secret-key = {file = ../../secrets/rustfs-secret-key.age;}; + rustfs-env = {file = ../../secrets/rustfs-env.age;}; n8n-env = {file = ../../secrets/n8n-env.age;}; netbird-auth-secret = { file = ../../secrets/netbird-auth-secret.age; diff --git a/hosts/m3-atlas/services/rustfs.nix b/hosts/m3-atlas/services/rustfs.nix index d42e37d..aa56f8e 100644 --- a/hosts/m3-atlas/services/rustfs.nix +++ b/hosts/m3-atlas/services/rustfs.nix @@ -6,21 +6,18 @@ }: { services.rustfs = { enable = true; - package = inputs.rustfs.packages.${pkgs.stdenv.hostPlatform.system}.default; + environmentFile = config.age.secrets.rustfs-env.path; + settings = { + # Reuse existing MinIO data directory + RUSTFS_VOLUMES = "/var/storage/s3"; - # Reuse existing MinIO data directory - volumes = "/var/storage/s3"; + # Keep same ports as MinIO to avoid changing Traefik and client configs + RUSTFS_ADDRESS = ":3008"; + RUSTFS_CONSOLE_ENABLE = "true"; + RUSTFS_CONSOLE_ADDRESS = ":3007"; - # Keep same ports as MinIO to avoid changing Traefik and client configs - address = ":3008"; - consoleEnable = true; - consoleAddress = ":3007"; - - # Credentials via agenix - accessKeyFile = config.age.secrets.rustfs-access-key.path; - secretKeyFile = config.age.secrets.rustfs-secret-key.path; - - logLevel = "info"; + RUST_LOG = "info"; + }; }; # Traefik configuration — same routes as before diff --git a/hosts/m3-kratos/services/default.nix b/hosts/m3-kratos/services/default.nix index 5ee617b..74a897a 100644 --- a/hosts/m3-kratos/services/default.nix +++ b/hosts/m3-kratos/services/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { imports = [ ./containers - ./greetd.nix + # ./greetd.nix ./mem0.nix ./n8n.nix ./netbird.nix @@ -20,7 +20,7 @@ gvfs.enable = true; trezord.enable = true; gnome.gnome-keyring.enable = true; - qdrant.enable = true; + # qdrant.enable = true; avahi = { enable = true; nssmdns4 = true; @@ -30,6 +30,6 @@ userServices = true; }; }; - # displayManager.gdm.enable = true; + displayManager.gdm.enable = true; }; } diff --git a/overlays/default.nix b/overlays/default.nix index 0cc38a1..aee2358 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -63,6 +63,32 @@ # Factory: not a proper overlay itself — takes system to avoid the infinite # recursion that occurs when accessing final/prev.system while the fixed-point # is still being computed. Exposed via outputs.lib, not outputs.overlays. + # + # Filters out the 16 internal helpers (marked `passthru.hideFromDocs = true` + # upstream) that would otherwise clobber nixpkgs attributes. Most critically + # this excludes `buildNpmPackage` — llm-agents' buildNpmPackage is a guarded + # re-export whose `__functor`/`override` interaction with makeOverridable + # breaks any package (e.g. nixpkgs' webcord) that calls + # `buildNpmPackage.override { nodejs = ...; }`. See numtide/llm-agents.nix + # commit 40490259 and the wrapper at packages/buildNpmPackage/package.nix. mkLlmAgentsOverlay = system: _final: _prev: - inputs.llm-agents.packages.${system} or {}; + builtins.removeAttrs (inputs.llm-agents.packages.${system} or {}) [ + # Internal helpers from packages/* marked hideFromDocs upstream: + "antigravity" + "auto-claude" + "buildNpmPackage" # ← the culprit; breaks webcord's `buildNpmPackage.override { nodejs = ...; }` + "bun2nix" + "darwinOpenptyHook" + "default" # fzf launcher; collides with nothing in nixpkgs but kept out for hygiene + "dolt" # collides with nixpkgs.dolt (Dolt database); not used in this config + "flake-inputs" + "forge" + "formatelf" + "formatter" # collides conceptually with pkgs.formatter; not used here + "go-bin" + "unpinCargoMsrvHook" + "unpinGoModVersionHook" + "versionCheckHomeHook" + "wrapBuddy" + ]; } diff --git a/secrets.nix b/secrets.nix index 7abcdc8..d784293 100644 --- a/secrets.nix +++ b/secrets.nix @@ -23,8 +23,7 @@ in { "secrets/kestra-config.age".publicKeys = systems ++ users; "secrets/kestra-env.age".publicKeys = systems ++ users; "secrets/minio-root-cred.age".publicKeys = systems ++ users; - "secrets/rustfs-access-key.age".publicKeys = systems ++ users; - "secrets/rustfs-secret-key.age".publicKeys = systems ++ users; + "secrets/rustfs-env.age".publicKeys = systems ++ users; "secrets/n8n-env.age".publicKeys = systems ++ users; "secrets/netbird-auth-secret.age".publicKeys = systems ++ users; "secrets/netbird-db-password.age".publicKeys = systems ++ users; diff --git a/secrets/m3tam3re-secrets.age b/secrets/m3tam3re-secrets.age index c7b3aaed7ebae2b153378284543cd10e5e4be30c..167e6f06b3d6f812a92fe2fc7a589ce25bea8ed4 100644 GIT binary patch delta 1825 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 diff --git a/secrets/rustfs-access-key.age b/secrets/rustfs-access-key.age deleted file mode 100644 index 58e125c..0000000 --- a/secrets/rustfs-access-key.age +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDROTEtydyBnRjhF -SHhTS2YrOHF1OWM1Zm04elkzVWpST0hhN0RhOWZBZGpBYmNTVnk4Cm9SMm5NcWdV -Rnh0TVpqTlFSaGtaMnBrSGorUEhDd1RibWs1VUt5RGtqaVEKLT4gc3NoLWVkMjU1 -MTkgNWt3Y3NBIFV5OWhMU204L25nR3ZLOWl1a1ppZkUvcTNJTDhlNmE3eXpJMjRL -NWdsWDQKNGhVYUhwRWRndjFYVEVIT3N2WE1WVncyV1Q1Q1BoNkhraVU5Q2s4UmtB -OAotPiBzc2gtZWQyNTUxOSA5ZDRZSVEgVkRwdGtHVTlTMUVMOFZrdUNHZHc5UWo3 -WWtRaXJPY0p2QWZOUEtjWDVCYwpYQmh3ejdLOWdmM3dZbWJuRU1EYlRYZ2tJL3VY -OURUKzhRY2dtcVRQZnBnCi0+IHNzaC1lZDI1NTE5IDNCY3IxdyAyOFI4YllyWlox -V09BbERmRm4yd1Y5dlh0UGphK05DMGpsWXJQTmwrVlRVCjdqNE4yVHFKWFV3NXlr -bm40M1BpNGNNNDdJOXMyak5EUWdMa0hrb3lJY3cKLT4gc3NoLWVkMjU1MTkgYzRO -UWxBICsxb3poQit6VGRtWmZXUWUxMmRGWUN6RGVOeUxEZjdvZldTTE5XSFpDRVkK -bFNWLzFpazJLM0Q2R0NKU2FaS25ldEQ1RUZQM2RpektaT1NhRnJtS0JFcwotPiBz -c2gtcnNhIERRbEU3dwpFMVdKYnhiTWF4MCtJMFNHVGtOZGNBdlVDYWRRR252dVd6 -NW1vNFRtbENLbHB2cHo1aE43M3RiZGh1QkVQVzBECjlvRnhYbjlpWWFFTEFFc1cw -NjFVSENsVWJHdWdGV3ZEY2tOcXkvUm9SSFE4VWw5eHVUSnV6SmxCRU9TNUdpRjMK -aGNhdHcvay85N0ZQNksydEhkcXNkc0h6dkRMRXlzUCtNNGM1V2tXb28wQ05valBH -TUdJa3V1bEdYRUZveFNwbwpIbWRnZmtQMDREd08rRkx3OERwRVZZNVlnSXlNNlFH -SkFoQWVEN1NzL0lqeVkvZllPdUkvbWZkU2NxNjQyYTIvCnJ4QmZ1SlpGNkp3UXFD -SUdFMFY5RWVadTd5QmM1U2tIZ3dLQ2ZZKzF0WTE3K09aN3FYWUVBYkErVlNpblNU -QzgKNENEZStFeitaYmE5Q1MyQ0lWSFlZb2hJdlBVNkhUUjBFWkxsWmZqdHNYb3Fk -VVJMMzg2V2xWdnNCNndGSWdpbAoyUHZ1WXR5UG04ZmZOdVluU2J6VUhKZ0xMZ0lS -R3YrY3RIRHJCby8yVWxIMWpGNWlJK1h4eXdRUXExT3pleWc3CnRmQVl1Yk1IUUFJ -blNoUGxVUUlVOG9FSE5CMDVidmZhSWJmWTFsY0lFcWpZU213cmcxNzFvb29XaklC -MnhpSkwKCi0+IHNzaC1lZDI1NTE5IENTTXloZyBOMDNYdGlvL3Y5QUp2YlNlUDZu -RXFyTkFWbFFsN1oweEErSS9Ccmh0WmwwClpzTWw1aXNqVXdaTVFrTTJ6Y0FWbVpR -TXk4cTNUUElkeGF1VUZ0U3RWcEEKLT4gTyUkcSZASGstZ3JlYXNlCnYwSGdsbE5h -d2JLOAotLS0gcjB3WU1rNDhBY1VxalpBNVJRSTJFZ0NhWEZlSW15UHphMnRHTjBj -aGptRQpiZ/2f41GnSHdg+EXeRwxHOHc/RNfEwlKhEB/Weq8tQ2Xf/jJ21WiWsTIm -g7Sq9EO6JyYMTJ/qlccpytfkU/qkouyR+z3prQcP7NWTcg== ------END AGE ENCRYPTED FILE----- diff --git a/secrets/rustfs-env.age b/secrets/rustfs-env.age new file mode 100644 index 0000000..3d9e267 --- /dev/null +++ b/secrets/rustfs-env.age @@ -0,0 +1,26 @@ +age-encryption.org/v1 +-> ssh-ed25519 4NLKrw 4yocYUNwOH2fkSzRbkhJ1DN58fiFHKGQlQY8ljkgykM +68DuFPNFjyD2+avOMlOlRQm3bs43Bk84MIXygS35MtE +-> ssh-ed25519 5kwcsA cC38K7vS4JlkGtSEPn7D6x2m9H08XK4vuhWysJcFNG0 +kKbUBKEfUUkhmnr3g5/Bz8chDouySQf3Mk/+LyNNQls +-> ssh-ed25519 9d4YIQ w3u2BX/R0lVgy35DoFtxUM6f/nYkcNVeAoPDNDSX5yU +XOo2/yrO2r2mn2FTcR+dviKVClU94Pi8Wri17emUsoI +-> ssh-ed25519 3Bcr1w 8ncD6gl8tHVOYO83VW4dXI3XVUNXdfbFoZutCGGykxw +r7k0ltk9XK5q9+gyLwqzaajYbTRgsj3rALJTCnQ0Lyg +-> ssh-ed25519 c4NQlA A8WnqWlC8ljCaQVMa6wJIfe4uA3OQ/q9vJRAF56ovVE +xwh0RE9S+z5Rf+PCW0L/flKy506HRel0dVJJVzyO1M8 +-> ssh-rsa DQlE7w +f5iiDuIUPzKToC7cCUtQUQzkxKPkYsDuHHM+9BHsQmwSOT91Z0J1F4udOlEqUcuE +kUMCbHvhFEQnzfKruEH3+tRnW1YWtqTzhgvW1MvY/gv8PihekM+TSjB/mxwYSC88 +yp3NhNxxonBdIjTUcgYBGijWQjPVCuggZcseqyy+h37rQCUNG6whacU7Q+ELbtTW +ssfofJrKU7l8uBpNuM3ULMK4ZzM9IurZQyqt43n++y21G1hCKVkf7g6q0IQ94SL1 +y6yGyx2JGNnFO8e57vggmAtyFMMv+660plF0bg1pyQfFdmKHrPXmVHFURdQixhrg +dZhcOq1WZIjNE/SALmZj8NkNxCIjne0oIE94RNq1lj7sRFolbyaYTjfa3lnmsjsl +0s7y3QR1igJozNc0InR6koal1/WzykfXDqNwxFNyknfaGT75ZtsXJ8PC2mLbqxvC +YKYHOBledBfLASMFHeJjXx1b+X1X1DzllY51Z2p1c4BeWxuheNCd2zPiCLfzPk0w + +-> ssh-ed25519 CSMyhg /KgSvWyP3WRBq8uKV8VacXZEeGna+HmH3f+4lrJKnBc +PlGjwoekR9PhGTxvxbl81BKkVl4z2JqCH+L68qfoyow +--- CeX80TFkreEFbDMeAGswnT0Y+CVfI9kTdosSCj49Hlk +T"qaꄙ=G-sA Hg&,xաA/%nkbuWR|ph2s2c \ No newline at end of file diff --git a/secrets/rustfs-secret-key.age b/secrets/rustfs-secret-key.age deleted file mode 100644 index f941274..0000000 --- a/secrets/rustfs-secret-key.age +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDROTEtydyBQd3FZ -dUFYOFhoUGdBejZKYjRnVmNvYU85LzdJS1lVZFNRS3pTeS9hT0c4Cndwc3pHdStQ -N1QvU0NSbGJhNEJCOE83eThhSFBrbDJPU0tDbmhIM3lwcjQKLT4gc3NoLWVkMjU1 -MTkgNWt3Y3NBIHdaS3UvRUdFb3pITmZGdTNEaUtXdnlUMWFuNk5ZcFV0VVIwNllN -S2c5Rm8KV0x3Z2NjcUdLWmFEUExDT2EwbjFhQ2Y2TXNoaUc1d052RnJmM3VOSDVr -VQotPiBzc2gtZWQyNTUxOSA5ZDRZSVEgOG1URGlNekltV0YyQ2Y2NFdPL2tSWDlG -UnNLc2wrSllNWFd6aU9LWGN3YwpXUEthT3NNVHZJMUJndiswUVNFNWZjZnBDS3ZH -dXBJV1FSNEpPRGxQd0JrCi0+IHNzaC1lZDI1NTE5IDNCY3IxdyAvSTlFMitYZFVQ -ZER6ZDI5OEorTE5TRTdlcllPSmpkUjU5SkV2N0xQY1JBCmJPNFN5NEovdHBVVDRl -T0czS0g2dEgyTXhIMmtJVFRONDQ3enpLbFhJT3MKLT4gc3NoLWVkMjU1MTkgYzRO -UWxBIDBUV2RYajBTMkZ4WnV4ZUVCeHFZay9vRGR2dkcxaXBPOWxsZ05IZm1KVDAK -am56blp1ajlzc0NSYjY5NFdGNlNzQ0NNQzZPeVRtWTc1Z0lEYzc2TGNFMAotPiBz -c2gtcnNhIERRbEU3dwpOMGowMWFoRzhsTGp0U0RqeHUyckZvQU9EVkQxUXE1b0U0 -N2hPU2NZY2huNm5kREg5SExCZGYzaTUwdWs4MjlsCjhONjVOWnZDZjFRU2k2K2Uz -dnVmWVd5MCt6bFk4UVU3UEdsWXZMOHlZMktzWWR4SFJ6Vzh4dDFpYWNYRVQ2UmsK -aW5iODV0WDYyQWN4K1ROZUVjdE40MGlxZDlXdnZVRVZBc04zdVRaOE9RTUJPUWxa -YnJjZEg3OGcxNHVEVkR0MgpGUWh6NHV4WTcxUEZwUU52QkdsOE5hZy9XWFpjQUFP -bDZzUjd3ZXFTTmpDN3ViZ0dpL3BOTFpBL3k2aUs3Qm9HCkVDeXZ2M0dQcWJwaXdm -N2E1R2pjcWY2V1dYaEFNMVc3MG9ndDRLd0tVdkxHSUxwL2REazE2Unc1Z3JjUHJh -NDgKamVqZjdkU0hCTVhqcjRsL1NtYkxxd3BId0lsRTRRUTNrZ05mcE1ZRkFSUlBW -VVdkd2VSNzJMQVJEM2QyVkMzSQoxRGVOOUtzdGVOMTBLVk8zN2xjT3lvYm0vSXpQ -VElTaS84SUxIekVybGYxV0ttZldVWHhyVVEvdzRFK3RibVFGCjV3bzltRjFTb0pu -bGJQaTJ1Mlgxd0hNN2VvS0p3eDd4WHNkaTkwV3MwWTdLWUxnNzJjLzBBZzZsck5h -Zk1UUDcKCi0+IHNzaC1lZDI1NTE5IENTTXloZyByQ1cwWm50UTY1bkp2NWZFeFVU -T0htZDFWUUFsdlBSOVVNY3RTZnNwdjE0CjBySlExb1dnTGJKZy9MT25Oa2hZdDJZ -Um9PZWlpOVA5bTBRM2wvVHJJaG8KLT4gWS1ncmVhc2UgWydtCnF4dzJjR2luMHBS -S2p3bUE2bVl2R2FaQ2hRK3greGMKLS0tIDhSdFFGaGlGRVV2VFZKcTNWYnNtbUQr -blprSjUyMjJwQkhBbVBCTmVhQ0kKUITtRYOYPDGGQlKrEp/JVUP8jTcptZxVaVcd -AmxviaG76EuXQeK/VgrGKoi+bZwHbpCbXBT2H8DBuSPgXdG3aQDQn2QgZylMnhmM -wzU= ------END AGE ENCRYPTED FILE-----