From 839697e21cffe4d49c0af9f17c8741a7fcaef080 Mon Sep 17 00:00:00 2001 From: m3ta-chiron Date: Thu, 24 Sep 2026 12:58:42 +0200 Subject: [PATCH] feat(opencode): pin top-level opencode to v2 from llm-agents - new ai-agents overlay (applied after m3ta-nixpkgs, which re-exports opencode-desktop from its own older v1 flake input): * opencode -> llm-agents.opencode2 (2.0.16), binary renamed back to 'opencode' so keybinds/wrappers keep working * opencode-desktop -> llm-agents.opencode-desktop (1.18.32, newest existing desktop release; no v2 desktop app upstream) - bump llm-agents lock to 8bec0ce1 (opencode2 2.0.16) - m3-hermes keeps llm-agents.opencode (v1) for now --- flake.lock | 389 +++++++++++++++++------------------- hosts/common/default.nix | 15 +- overlays/default.nix | 38 +++- overlays/mods/rofi-pass.nix | 109 ++++++++++ 4 files changed, 343 insertions(+), 208 deletions(-) create mode 100644 overlays/mods/rofi-pass.nix diff --git a/flake.lock b/flake.lock index 84bf9fb..72f90ec 100644 --- a/flake.lock +++ b/flake.lock @@ -24,7 +24,7 @@ "agenix_2": { "inputs": { "darwin": "darwin_2", - "home-manager": "home-manager_3", + "home-manager": "home-manager_4", "nixpkgs": "nixpkgs_4", "systems": "systems_3" }, @@ -210,15 +210,16 @@ ] }, "locked": { - "lastModified": 1784665499, - "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", - "owner": "nix-community", + "lastModified": 1790001035, + "narHash": "sha256-1/SLBjSYBzDdDhvLQ83wrzBakyS/xNGgtxHGNuveOEQ=", + "owner": "Mic92", "repo": "bun2nix", - "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", + "rev": "07a5bfc8ac36c5370199343fa620b69f63186e33", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "Mic92", + "ref": "llm-agents", "repo": "bun2nix", "type": "github" } @@ -234,11 +235,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1785934673, - "narHash": "sha256-U/hMY9kkcdxt497yfGuT7+ytrRmE+E15KF6Sc6VrbZo=", + "lastModified": 1788856318, + "narHash": "sha256-bOLED82KPrzIXTWELw30y3PVI6MBmlY4Y2F2lwrdOnM=", "owner": "mulatta", "repo": "buzz.nix", - "rev": "f4bb77a87f1ec10e5ad51cfe6d0c4fca481c0534", + "rev": "fdd0152c12c6be339fe01d91887122bb10823aaf", "type": "github" }, "original": { @@ -257,11 +258,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1787717826, - "narHash": "sha256-0rWCz6Wc1SqvQFJsqnUF99irDntui4jlnrToPhXKzqI=", + "lastModified": 1788856318, + "narHash": "sha256-bOLED82KPrzIXTWELw30y3PVI6MBmlY4Y2F2lwrdOnM=", "owner": "mulatta", "repo": "buzz.nix", - "rev": "547c646feb2f58b7866bf64d6509a37db17cd863", + "rev": "fdd0152c12c6be339fe01d91887122bb10823aaf", "type": "github" }, "original": { @@ -270,6 +271,22 @@ "type": "github" } }, + "dank-qml-common": { + "flake": false, + "locked": { + "lastModified": 1788376015, + "narHash": "sha256-/tT8rTznLADndTwLBzdgzzgfJH1ZhYQibYo5v/F8U+U=", + "owner": "AvengeMedia", + "repo": "dank-qml-common", + "rev": "26396ce432d6c71c3f5367438f96f4a8d667e160", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "dank-qml-common", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -337,6 +354,7 @@ }, "dms": { "inputs": { + "dank-qml-common": "dank-qml-common", "flake-compat": "flake-compat", "nixpkgs": [ "m3ta-home", @@ -344,11 +362,11 @@ ] }, "locked": { - "lastModified": 1785111455, - "narHash": "sha256-aTNuC9NDBnYAeEtFsleeUwmGX3AZlKOutbl+LQRPkmQ=", + "lastModified": 1788959433, + "narHash": "sha256-MAbxGEomcpGomFfw+WYurNkSKBIh7PKEc1U5OV0X6oU=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "069ddab041c738236a8910e4c39b65d9628d3018", + "rev": "fe293b7379a51f62a4db7043fc09df71f78e72ef", "type": "github" }, "original": { @@ -366,11 +384,11 @@ ] }, "locked": { - "lastModified": 1785375021, - "narHash": "sha256-SV24PP3ctDSAuQjg0LdYAvzN7GEustIrtZfciiSrgRI=", + "lastModified": 1789138529, + "narHash": "sha256-46RwWSOzklur59Plvo8N0YBZYun4M4cwK04+8owhJeo=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "672e213a1e20b980708d81bd82df9bf85c15a590", + "rev": "5e5d72f980f5f16503b8fd0b8b66c4a3441eecdc", "type": "github" }, "original": { @@ -424,11 +442,11 @@ ] }, "locked": { - "lastModified": 1787559586, - "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", + "lastModified": 1788450739, + "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", + "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", "type": "github" }, "original": { @@ -446,11 +464,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -505,6 +523,7 @@ "hermes-agent": { "inputs": { "flake-parts": "flake-parts", + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_2", "npm-lockfile-fix": "npm-lockfile-fix", "pyproject-build-systems": "pyproject-build-systems", @@ -512,16 +531,16 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1785776243, - "narHash": "sha256-S6TSGgpf37N8YgbTv70dT+LaPiiaQ4/lJV+js2hnCPk=", + "lastModified": 1788204567, + "narHash": "sha256-Ii9xP2fKUpvCcwWZuxJ0g3CZ+IL2UZH14pUNvBfdclc=", "owner": "NousResearch", "repo": "hermes-agent", - "rev": "3c27eb6234bf91b8ceee9e9071591b31e9b148cb", + "rev": "29112bef099274229cadff79cdff7bf7b99c4b77", "type": "github" }, "original": { "owner": "NousResearch", - "ref": "v2026.8.3", + "ref": "v2026.8.31", "repo": "hermes-agent", "type": "github" } @@ -529,26 +548,27 @@ "hermes-agent_2": { "inputs": { "flake-parts": "flake-parts_3", + "home-manager": "home-manager_5", "nixpkgs": [ "m3ta-home", "nixpkgs" ], "npm-lockfile-fix": "npm-lockfile-fix_2", "pyproject-build-systems": "pyproject-build-systems_2", - "pyproject-nix": "pyproject-nix_3", - "uv2nix": "uv2nix_3" + "pyproject-nix": "pyproject-nix_2", + "uv2nix": "uv2nix_2" }, "locked": { - "lastModified": 1782936460, - "narHash": "sha256-Wt72AQtA6Eizi7Ubj23JBhwZ7GKYcjY4mcV6upqHOaU=", + "lastModified": 1788204567, + "narHash": "sha256-Ii9xP2fKUpvCcwWZuxJ0g3CZ+IL2UZH14pUNvBfdclc=", "owner": "NousResearch", "repo": "hermes-agent", - "rev": "7c1a029553d87c43ecff8a3821336bc95872213b", + "rev": "29112bef099274229cadff79cdff7bf7b99c4b77", "type": "github" }, "original": { "owner": "NousResearch", - "ref": "v2026.7.1", + "ref": "v2026.8.31", "repo": "hermes-agent", "type": "github" } @@ -577,15 +597,16 @@ "home-manager_2": { "inputs": { "nixpkgs": [ + "hermes-agent", "nixpkgs" ] }, "locked": { - "lastModified": 1788146656, - "narHash": "sha256-XmJmvk9rytTb7dCotO/aqR+YysB8HOqnprlOdv+LAF4=", + "lastModified": 1786487128, + "narHash": "sha256-ad60hrRVhH/bo3Jl1YLzO+QcS3mUNZr9LNJdzhMO2P4=", "owner": "nix-community", "repo": "home-manager", - "rev": "82c265faf4e3161d6015db07c9b0f1ee36a9029b", + "rev": "f404edbfa4117810c96b97048299242fc50e5362", "type": "github" }, "original": { @@ -595,6 +616,26 @@ } }, "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1789695075, + "narHash": "sha256-HREFWgmCTp28ZdMkSFOW2QW8uI17v5CNc04W46h6aPo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "4ac5a2ae9025eab1ebece4f9df8c315fd84a738a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_4": { "inputs": { "nixpkgs": [ "m3ta-home", @@ -616,7 +657,29 @@ "type": "github" } }, - "home-manager_4": { + "home-manager_5": { + "inputs": { + "nixpkgs": [ + "m3ta-home", + "hermes-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1786487128, + "narHash": "sha256-ad60hrRVhH/bo3Jl1YLzO+QcS3mUNZr9LNJdzhMO2P4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f404edbfa4117810c96b97048299242fc50e5362", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_6": { "inputs": { "nixpkgs": [ "m3ta-home", @@ -624,11 +687,11 @@ ] }, "locked": { - "lastModified": 1785306346, - "narHash": "sha256-DScBkW0fOgpGPK2trNoX3ryLTlaC14+gglFo/BhGJ4g=", + "lastModified": 1789136855, + "narHash": "sha256-82D7ADWE8erhfALj3dqxAOeQaoa+Bwlsdcp9v2m/ExM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e705714e918c3b11affcdd15db2cbe3a070420a0", + "rev": "d0fd95e15e0c3baf565a9fd4bc352321e2564ea3", "type": "github" }, "original": { @@ -668,11 +731,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1788173616, - "narHash": "sha256-x/B/7TqgY44sZtp61hyVh6qUf4u8k/jRqN6zowV/BtU=", + "lastModified": 1790241846, + "narHash": "sha256-rmHQtarWvZxm3/dVuIkUWe0HjWfVGX8+OyaJoHIR8Jo=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "f55ce77d0c5a84f80b86a81e7b8231f10e17aa99", + "rev": "8bec0ce1cbb0a39f8f08dc97a7635af847779f99", "type": "github" }, "original": { @@ -689,7 +752,7 @@ "dms": "dms", "dms-plugin-registry": "dms-plugin-registry", "hermes-agent": "hermes-agent_2", - "home-manager": "home-manager_4", + "home-manager": "home-manager_6", "m3ta-nixpkgs": "m3ta-nixpkgs", "nix-colors": "nix-colors", "nixpkgs": [ @@ -698,11 +761,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1788169498, - "narHash": "sha256-XAxkWYFpiK0zuNy6eNvomJMsC9+2WeD0HubdgpZNepE=", + "lastModified": 1789821966, + "narHash": "sha256-/alQujpdiSuDkWpteFkHqSxMfuACmROTlP6b2hJ1Hqo=", "ref": "refs/heads/master", - "rev": "fb3e39f0ce25d9cd4c82c9e8e152e49fd97a3a61", - "revCount": 124, + "rev": "5e902610364099e6bdab393bfb63eeadfc18fd09", + "revCount": 135, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, @@ -721,15 +784,14 @@ "nixpkgs" ], "nixpkgs-master": "nixpkgs-master", - "opencode": "opencode", - "openspec": "openspec" + "opencode": "opencode" }, "locked": { - "lastModified": 1786795567, - "narHash": "sha256-+fc2Zo7Nf6Td+/x5Y8SX5qxPM3hi0nH7i/L0vgosnGI=", + "lastModified": 1789141095, + "narHash": "sha256-f5NLbwOwSQL+tDDelxps1VFh84obOMyw+ox9gcvE7TU=", "ref": "refs/heads/master", - "rev": "b8b541c3329509b0df3b57d384ce5886d3cc0d47", - "revCount": 380, + "rev": "1e0db37c579935b9916c1fcb3d3ed733b4cb3114", + "revCount": 389, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -750,11 +812,11 @@ "opencode": "opencode_2" }, "locked": { - "lastModified": 1788169490, - "narHash": "sha256-lBGzlZvX54QIl/ccPqpimMpVch7nKsbXDgvulMY890k=", + "lastModified": 1789748631, + "narHash": "sha256-XKtTXBsCcou75U5TnqfxL63ujBAGWbettPdW0XaGB80=", "ref": "refs/heads/master", - "rev": "8f2d1beba3c9cbe1df1ca1ee3d16437be7ccf1b2", - "revCount": 386, + "rev": "da3c58993388ad853a2276e72a13f6c38cdf8077", + "revCount": 392, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -883,11 +945,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1785386845, - "narHash": "sha256-CvXXTgWxbwTn6Diev4nLTP5+8tsFtth/SQAtaR9iVY0=", + "lastModified": 1789139724, + "narHash": "sha256-QEoQ8xoSO3H2tmwHNBYFL/5Y8Gt10U+bg5ETMsWXiIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c5a718ce27c9283364d4c664fac4e4a23acdfb4", + "rev": "e27e37949736566430ed2f6157bebcdade8860c5", "type": "github" }, "original": { @@ -899,11 +961,11 @@ }, "nixpkgs-master_2": { "locked": { - "lastModified": 1785386845, - "narHash": "sha256-CvXXTgWxbwTn6Diev4nLTP5+8tsFtth/SQAtaR9iVY0=", + "lastModified": 1789139724, + "narHash": "sha256-QEoQ8xoSO3H2tmwHNBYFL/5Y8Gt10U+bg5ETMsWXiIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c5a718ce27c9283364d4c664fac4e4a23acdfb4", + "rev": "e27e37949736566430ed2f6157bebcdade8860c5", "type": "github" }, "original": { @@ -915,11 +977,11 @@ }, "nixpkgs-master_3": { "locked": { - "lastModified": 1788162580, - "narHash": "sha256-JZd2H5J7PKjtommAesEdNahaFriJOzvzGFjQFzCHZ7U=", + "lastModified": 1789734678, + "narHash": "sha256-0SbNR2FnIbnnyqX5+6kvXL34EwK/XI5dXd28Hx0ZN1I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "45416eca6b7df8e6f4535c5c146eb1f384710ed9", + "rev": "b95fc8a18fe27d39389c28dee407fbac8952ec98", "type": "github" }, "original": { @@ -931,11 +993,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1787962033, - "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=", + "lastModified": 1789654592, + "narHash": "sha256-vrwAiXmz+0hs/IWXZalFG/Ws6xQRcW+gClUDlfvcfjQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5c4a43b0e8056328ec4529f735cabdb8f1942bb", + "rev": "ecc58f32d1069a3e3f8a991e2233d365689f748d", "type": "github" }, "original": { @@ -947,11 +1009,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1787964612, - "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=", + "lastModified": 1789632929, + "narHash": "sha256-RjR8AyvGlWuw16XRj7C1YDEw4E27ciuyPeB2nDMzgTU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8be7818e19ada32105a8af937a6a473b38167ca", + "rev": "a32edd7654519351e48e80372a928df336394670", "type": "github" }, "original": { @@ -995,11 +1057,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1787424095, - "narHash": "sha256-dWLO5AHhKaw6rdWCtTes8hnntT1r0/J5yhQGm0f0ZgU=", + "lastModified": 1790178388, + "narHash": "sha256-kK3t7gwoz4Nx8RF46cs1Xz/skKNcK7y3KYP+gGqX6W8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "174eb786fb68e3a13e4e535a3deea479a0c07a6a", + "rev": "00455b0a3690d3f5dc61e9aef4277dc86235b73f", "type": "github" }, "original": { @@ -1059,11 +1121,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1785318670, - "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", + "lastModified": 1789006805, + "narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5", + "rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe", "type": "github" }, "original": { @@ -1154,11 +1216,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1785395064, - "narHash": "sha256-ZZoXKpTETeIU93xQOxleE27JWT1FcpF9pe1nSPrFbuw=", + "lastModified": 1789141061, + "narHash": "sha256-T2+uq8rR7zvUFh7/R8DQgsf2AGrUO3EPpr1iv7Jby8Y=", "owner": "nix-community", "repo": "NUR", - "rev": "cce2408845d0298ae0dcc42582c1d8b390de105c", + "rev": "4250406d791dcb1db2b1ce7bd223ac3ee120cfe3", "type": "github" }, "original": { @@ -1175,11 +1237,11 @@ ] }, "locked": { - "lastModified": 1788163000, - "narHash": "sha256-oMGyopHLRcU8DbjKKfjIeAxeXeDLEy7WB9FqBJ+BGNw=", + "lastModified": 1789735852, + "narHash": "sha256-SrCXUK3N9jzy1BPg3i3lDgmjqSP1T3x80U18A3P/dCs=", "owner": "nix-community", "repo": "NUR", - "rev": "096f64de19606a581f75ce8c5f1b23c519e2b6f9", + "rev": "fa65dc43e4d45533550ec3030e7bf285450ba5c0", "type": "github" }, "original": { @@ -1193,11 +1255,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1785386452, - "narHash": "sha256-iYfkMmn1ZKbi0cv8XIAXVgPH4idzsVSK4cWyi/KGMJQ=", + "lastModified": 1789132601, + "narHash": "sha256-2+j5RuHoqrsnjssZ4VfIfSKzGdrPNFT4nazJ2QxNdu0=", "owner": "anomalyco", "repo": "opencode", - "rev": "f7204902192624481e526b1852cdedaadb914e24", + "rev": "95daf90670b7c039c436c85537da5fbfe2205b41", "type": "github" }, "original": { @@ -1212,11 +1274,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1785386452, - "narHash": "sha256-iYfkMmn1ZKbi0cv8XIAXVgPH4idzsVSK4cWyi/KGMJQ=", + "lastModified": 1789132601, + "narHash": "sha256-2+j5RuHoqrsnjssZ4VfIfSKzGdrPNFT4nazJ2QxNdu0=", "owner": "anomalyco", "repo": "opencode", - "rev": "f7204902192624481e526b1852cdedaadb914e24", + "rev": "95daf90670b7c039c436c85537da5fbfe2205b41", "type": "github" }, "original": { @@ -1226,28 +1288,6 @@ "type": "github" } }, - "openspec": { - "inputs": { - "nixpkgs": [ - "m3ta-home", - "m3ta-nixpkgs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1785371113, - "narHash": "sha256-r3fwnb5gMTV9UXBj7bqkKpTZIWwF4AgghULOIv2Fr4c=", - "owner": "Fission-AI", - "repo": "OpenSpec", - "rev": "2b3d368539132be6311e55db58899abbf5306b81", - "type": "github" - }, - "original": { - "owner": "Fission-AI", - "repo": "OpenSpec", - "type": "github" - } - }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -1284,15 +1324,23 @@ "hermes-agent", "nixpkgs" ], - "pyproject-nix": "pyproject-nix_2", - "uv2nix": "uv2nix_2" + "pyproject-nix": [ + "m3ta-home", + "hermes-agent", + "pyproject-nix" + ], + "uv2nix": [ + "m3ta-home", + "hermes-agent", + "uv2nix" + ] }, "locked": { - "lastModified": 1772555609, - "narHash": "sha256-3BA3HnUvJSbHJAlJj6XSy0Jmu7RyP2gyB/0fL7XuEDo=", + "lastModified": 1785115949, + "narHash": "sha256-8AM37BfyGaL2v/SZyg4PupRxJ01Y4htvM+WrTjWrPpo=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "c37f66a953535c394244888598947679af231863", + "rev": "62c0d86027edb1c4f39a5facc09876348144f7c9", "type": "github" }, "original": { @@ -1327,61 +1375,15 @@ "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_3": { - "inputs": { - "nixpkgs": [ - "m3ta-home", - "hermes-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772865871, - "narHash": "sha256-/ZTSg97aouL0SlPHaokA4r3iuH9QzHVuWPACD2CUCFY=", + "lastModified": 1784591072, + "narHash": "sha256-zP/WaDxrRu8GANZM61+V2LT/7ycEEdoyLWn7M6WzU7M=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "e537db02e72d553cea470976b9733581bcf5b3ed", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, - "pyproject-nix_4": { - "inputs": { - "nixpkgs": [ - "m3ta-home", - "hermes-agent", - "uv2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1771518446, - "narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937", + "rev": "e3b599ca2e7fcf93d4edf65d7f19bbf6491724f3", "type": "github" }, "original": { @@ -1395,7 +1397,7 @@ "agenix": "agenix", "disko": "disko", "hermes-agent": "hermes-agent", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "llm-agents": "llm-agents", "m3ta-home": "m3ta-home", "m3ta-nixpkgs": "m3ta-nixpkgs_2", @@ -1438,11 +1440,11 @@ ] }, "locked": { - "lastModified": 1785820796, - "narHash": "sha256-sZXy8mzUMi2cOGulhoW4HWAZB6JhXOAx1x8J4auZFWk=", + "lastModified": 1788591095, + "narHash": "sha256-Vh+BeLWfbTT9AecazIsQ/Tkg/RzJeX3lEduANf256WA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b6916ba032e02122d6ed3064f40cabe937363d43", + "rev": "c361047d3a538f547f1617bb6b410411929ac9cc", "type": "github" }, "original": { @@ -1460,11 +1462,11 @@ ] }, "locked": { - "lastModified": 1787367552, - "narHash": "sha256-YT4Fs2k7bi+7YzuLt93EtIRgjpwHK5ZfsQEIh5dEQSk=", + "lastModified": 1788591095, + "narHash": "sha256-Vh+BeLWfbTT9AecazIsQ/Tkg/RzJeX3lEduANf256WA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fd2ebb9cc4323d0c5a1336138dab5c3c5a5d8bd9", + "rev": "c361047d3a538f547f1617bb6b410411929ac9cc", "type": "github" }, "original": { @@ -1579,11 +1581,11 @@ ] }, "locked": { - "lastModified": 1785360170, - "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { @@ -1662,45 +1664,20 @@ "nixpkgs": [ "m3ta-home", "hermes-agent", - "pyproject-build-systems", "nixpkgs" ], "pyproject-nix": [ "m3ta-home", "hermes-agent", - "pyproject-build-systems", "pyproject-nix" ] }, "locked": { - "lastModified": 1770770348, - "narHash": "sha256-A2GzkmzdYvdgmMEu5yxW+xhossP+txrYb7RuzRaqhlg=", + "lastModified": 1785277507, + "narHash": "sha256-9Tq3UDX2hD/aveW/HvkBlAmEwJTOlY5HQXJM+L5BGmE=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "5d1b2cb4fe3158043fbafbbe2e46238abbc954b0", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } - }, - "uv2nix_3": { - "inputs": { - "nixpkgs": [ - "m3ta-home", - "hermes-agent", - "nixpkgs" - ], - "pyproject-nix": "pyproject-nix_4" - }, - "locked": { - "lastModified": 1773039484, - "narHash": "sha256-+boo33KYkJDw9KItpeEXXv8+65f7hHv/earxpcyzQ0I=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "b68be7cfeacbed9a3fa38a2b5adc0cfb81d9bb1f", + "rev": "5a836d395cbf5fc22670eb98dd4aa4fc4d406977", "type": "github" }, "original": { diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 343ad97..9ec04aa 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -40,6 +40,10 @@ inputs.m3ta-nixpkgs.overlays.default # inputs.m3ta-nixpkgs.overlays.modifications + # Top-level pins for opencode/opencode-desktop from llm-agents. Must + # come AFTER m3ta-nixpkgs' overlay, which re-exports opencode-desktop + # from its own (older, v1) `opencode` flake input. + outputs.overlays.ai-agents # llm-agent packages under the `pkgs.llm-agents.*` namespace, built # against this system's nixpkgs (needed for qmd.override cudaSupport # with allowUnfree). Do NOT flatten to top-level attrs — see @@ -64,7 +68,7 @@ nix = { settings = { - experimental-features = "nix-command flakes"; + experimental-features = ["nix-command flakes"]; cores = 2; max-jobs = 8; trusted-users = [ @@ -92,6 +96,15 @@ parent="" [[ -r /proc/$PPID/comm ]] && IFS= read -r parent < /proc/$PPID/comm if [[ "$parent" != "nu" && "$parent" != "bash" ]]; then + # First TTY login -> Hyprland (login-manager replacement). + # Only for non-root users with no graphical session running, + # and only on hosts where start-hyprland exists (desktops). + # Servers/laptops without Hyprland fall through to nushell. + if [[ "$(tty)" == "/dev/tty1" && $EUID -ne 0 \ + && -z "''${WAYLAND_DISPLAY:-}" && -z "''${DISPLAY:-}" ]] \ + && command -v start-hyprland >/dev/null 2>&1; then + exec start-hyprland + fi exec ${pkgs.nushell}/bin/nu --login fi unset parent diff --git a/overlays/default.nix b/overlays/default.nix index c6e8679..94ae32f 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -15,7 +15,43 @@ # font-manager 0.9.4 does not compile against gtk4 4.22 (Vala errors # in Gtk.DragIcon.get_for_drag) — apply the upstream fix from # FontManager/font-manager#468 until our nixpkgs lock carries it. - font-manager = import ./mods/font-manager.nix {inherit prev;}; + # font-manager = import ./mods/font-manager.nix {inherit prev;}; + + # rofi-pass{,-wayland} were removed from nixpkgs on 2026-09-04 + # ("unmaintained upstream"). m3ta-home's rofi module and the Hyprland + # mod+P keybind still use them — resurrect via overlay until a + # maintained replacement is packaged upstream. + rofi-pass = final.callPackage ./mods/rofi-pass.nix {}; + rofi-pass-wayland = final.callPackage ./mods/rofi-pass.nix {backend = "wayland";}; + }; + + # Top-level pins for the OpenCode packages from llm-agents. Applied + # AFTER m3ta-nixpkgs' overlay in hosts/common/default.nix — that overlay + # re-exports `opencode-desktop` from its own `opencode` flake input + # (github:anomalyco/opencode, v1 line), which would clobber a pin placed + # in `modifications`. + ai-agents = final: _prev: { + # OpenCode TUI: nixpkgs' top-level `opencode` still tracks the v1 line + # (1.18.x) and llm-agents' shared-nixpkgs overlay namespaces everything + # under `pkgs.llm-agents.*` by design. Expose the v2 CLI (npm + # @opencode/cli latest) under the canonical top-level attribute so + # home-manager's programs.opencode and m3ta-home pick it up. Upstream + # installs the binary as `opencode2` (so v1/v2 can coexist in the + # llm-agents package set) — rename it back to `opencode` to keep + # keybinds, aliases, and wrappers working. + opencode = final.symlinkJoin { + name = "opencode-${final.llm-agents.opencode2.version}"; + paths = [final.llm-agents.opencode2]; + postBuild = '' + mv $out/bin/opencode2 $out/bin/opencode + ''; + meta = (final.llm-agents.opencode2.meta or {}) // {mainProgram = "opencode";}; + }; + + # OpenCode Desktop: no v2 desktop app exists upstream (anomalyco/opencode + # ends at v1.18.32); track the newest v1 release from llm-agents instead + # of the older m3ta-nixpkgs pin (1.18.30+95daf90). + opencode-desktop = final.llm-agents.opencode-desktop; }; # temp-packages = final: _prev: { diff --git a/overlays/mods/rofi-pass.nix b/overlays/mods/rofi-pass.nix new file mode 100644 index 0000000..ccc6d20 --- /dev/null +++ b/overlays/mods/rofi-pass.nix @@ -0,0 +1,109 @@ +# Resurrected from nixpkgs after upstream removal on 2026-09-04 +# ("rofi-pass has been removed as it is unmaintained upstream"). +# m3ta-home's rofi module (programs.rofi.pass.package) and the Hyprland +# mod+P keybind still rely on it. Pinned resurrection — no updateScript. +{ + lib, + stdenv, + fetchFromGitHub, + makeBinaryWrapper, + coreutils, + util-linuxMinimal, + gnugrep, + libnotify, + pwgen, + findutils, + gawk, + gnused, + rofi, + # wayland-only deps + pass-wayland, + wl-clipboard, + wtype, + # x11-only deps + pass, + xclip, + xdotool, + # backend selector + backend ? "x11", +}: + +assert lib.assertOneOf "backend" backend [ + "x11" + "wayland" +]; + +stdenv.mkDerivation { + pname = "rofi-pass"; + version = "2.0.2-unstable-2024-06-16"; + + src = fetchFromGitHub { + owner = "carnager"; + repo = "rofi-pass"; + rev = "37c4c862deb133a85b7d72989acfdbd2ef16b8ad"; + hash = "sha256-1lPNj47vTPLBK7mVm+PngV8C/ZsjJ2EN4ffXGU2TlQo="; + }; + + nativeBuildInputs = [makeBinaryWrapper]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -a rofi-pass $out/bin/rofi-pass + + mkdir -p $out/share/doc/rofi-pass/ + cp -a config.example $out/share/doc/rofi-pass/config.example + + runHook postInstall + ''; + + wrapperPath = lib.makeBinPath ( + [ + coreutils + findutils + gawk + gnugrep + gnused + libnotify + pwgen + rofi + util-linuxMinimal + ] + ++ lib.optionals (backend == "x11") [ + (pass.withExtensions (ext: [ext.pass-otp])) + xclip + xdotool + ] + ++ lib.optionals (backend == "wayland") [ + (pass-wayland.withExtensions (ext: [ext.pass-otp])) + wl-clipboard + wtype + ] + ); + + fixupPhase = '' + runHook preFixup + + patchShebangs $out/bin + + wrapProgram $out/bin/rofi-pass \ + --prefix PATH : "$wrapperPath" \ + --set-default ROFI_PASS_BACKEND ${if backend == "wayland" then "wtype" else "xdotool"} \ + --set-default ROFI_PASS_CLIPBOARD_BACKEND ${ + if backend == "wayland" then "wl-clipboard" else "xclip" + } + + runHook postFixup + ''; + + meta = { + description = "Script to make rofi work with password-store"; + mainProgram = "rofi-pass"; + homepage = "https://github.com/carnager/rofi-pass"; + license = lib.licenses.gpl3; + platforms = with lib.platforms; linux; + }; +}