From 4ae2bb0f4823531169029ac882156285df6828a2 Mon Sep 17 00:00:00 2001 From: m3tm3re Date: Sat, 7 Mar 2026 11:44:04 +0100 Subject: [PATCH] chore: flake update --- flake.lock | 265 ++++++++++++++++++++++----- flake.nix | 15 +- home/common/default.nix | 3 +- home/features/coding/default.nix | 13 +- hosts/common/default.nix | 24 ++- hosts/m3-aether/services/default.nix | 6 - hosts/m3-ares/services/default.nix | 6 - hosts/m3-helios/services/default.nix | 6 - hosts/m3-kratos/services/default.nix | 6 - overlays/default.nix | 6 + 10 files changed, 263 insertions(+), 87 deletions(-) diff --git a/flake.lock b/flake.lock index 7603443..fbfa205 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "agents": { "flake": false, "locked": { - "lastModified": 1771432333, - "narHash": "sha256-IkfbQQahxwMBRRUl+FKc03pxSZO1MX2kRxBuCqKuTD4=", + "lastModified": 1772563257, + "narHash": "sha256-hp6Q8TVP9xZeBFgZm51ndCacmVZxucZzLtj12pzD6c0=", "ref": "refs/heads/master", - "rev": "1bc81fb38c20154f0dd77f7da9b9d95439d8d873", - "revCount": 62, + "rev": "39ac89f388532e9a7629808037791c64cd5fc13c", + "revCount": 63, "type": "git", "url": "https://code.m3ta.dev/m3tam3re/AGENTS" }, @@ -53,6 +53,65 @@ "type": "github" } }, + "blueprint": { + "inputs": { + "nixpkgs": [ + "llm-agents", + "nixpkgs" + ], + "systems": [ + "llm-agents", + "systems" + ] + }, + "locked": { + "lastModified": 1771437256, + "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=", + "owner": "numtide", + "repo": "blueprint", + "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "blueprint", + "type": "github" + } + }, + "bun2nix": { + "inputs": { + "flake-parts": [ + "llm-agents", + "flake-parts" + ], + "import-tree": "import-tree", + "nixpkgs": [ + "llm-agents", + "nixpkgs" + ], + "systems": [ + "llm-agents", + "systems" + ], + "treefmt-nix": [ + "llm-agents", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1770895533, + "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=", + "owner": "nix-community", + "repo": "bun2nix", + "rev": "c843f477b15f51151f8c6bcc886954699440a6e1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "bun2nix", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -82,11 +141,11 @@ ] }, "locked": { - "lastModified": 1771881364, - "narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=", + "lastModified": 1772867152, + "narHash": "sha256-RIFgZ4O6Eg+5ysZ8Tqb3YvcqiRaNy440GEY22ltjRrs=", "owner": "nix-community", "repo": "disko", - "rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6", + "rev": "eaafb89b56e948661d618eefd4757d9ea8d77514", "type": "github" }, "original": { @@ -96,6 +155,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "llm-agents", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur", @@ -162,11 +242,11 @@ ] }, "locked": { - "lastModified": 1772164835, - "narHash": "sha256-zRcwrZDeBfYipqv/7K7TqsfPb87LFU6b7JhoNUGSnvQ=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a39b0828bbffce0d73769a61e46e780488d098b", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { @@ -202,7 +282,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1709914708, @@ -238,19 +318,57 @@ "type": "github" } }, + "import-tree": { + "locked": { + "lastModified": 1763762820, + "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", + "owner": "vic", + "repo": "import-tree", + "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "import-tree", + "type": "github" + } + }, + "llm-agents": { + "inputs": { + "blueprint": "blueprint", + "bun2nix": "bun2nix", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_3", + "systems": "systems_3", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1772864581, + "narHash": "sha256-+AiWgqbKkjU1W/S/U7ktSoScMa4+z9APtJx+3gEDcCQ=", + "owner": "numtide", + "repo": "llm-agents.nix", + "rev": "856b24f862d0a19b7764f35ee9a7546309e605a0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "llm-agents.nix", + "type": "github" + } + }, "m3ta-nixpkgs": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "opencode": "opencode", "openspec": "openspec" }, "locked": { - "lastModified": 1772460048, - "narHash": "sha256-qN2a0yrXZplR0z98ZVgWNSwh3hbR600KSJmgHLegjcg=", + "lastModified": 1772876766, + "narHash": "sha256-PiikuOqrjyzTAqUbnUwIKCr9+YvKX0xTRZ4q0srkQKU=", "ref": "refs/heads/master", - "rev": "be401c2ebbf336cb6b443a1e9bbee3adb4c58d13", - "revCount": 141, + "rev": "291e3a0744d4a0192654c8afdbe3d1636c9c0890", + "revCount": 156, "type": "git", "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -296,7 +414,7 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1769813415, @@ -393,11 +511,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1772459199, - "narHash": "sha256-bwbGxsckrQDHihUGkb9Bw9+6RnpPOZ1Uo6h+Dp94Th4=", + "lastModified": 1772847790, + "narHash": "sha256-lEK3FqujT4UPgk31wI90scsZQK+I1GaLa61SOQ2Jirc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f88889dd2451655660dde8700eae20f93a789355", + "rev": "9724b991f92022aafa14b3610840f9742752227d", "type": "github" }, "original": { @@ -409,11 +527,11 @@ }, "nixpkgs-master_2": { "locked": { - "lastModified": 1772174770, - "narHash": "sha256-/9F05YcHccOaI4dIsWk4G9oKEK07Oc3TeK5O7S3Mu8Q=", + "lastModified": 1772874821, + "narHash": "sha256-ehnRKCc/qq0hjyi5aaE/H4RPUPfSDqjndWqAGZFesfY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "337e35331766eb979303e7639914c8a80cc02649", + "rev": "10e7894b40eb0ad14d3a3184d20cc1beace1414d", "type": "github" }, "original": { @@ -425,11 +543,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1771903837, - "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", + "lastModified": 1772598333, + "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", + "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", "type": "github" }, "original": { @@ -457,11 +575,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1772736753, + "narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "917fec990948658ef1ccd07cef2a1ef060786846", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { @@ -471,7 +605,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1736657626, "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", @@ -487,13 +621,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { @@ -503,7 +637,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -521,17 +655,17 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1772169824, - "narHash": "sha256-KF4t5iagvmzUCT/ukiMbKg+hG+raFm+qs4zRWJouho8=", + "lastModified": 1772875192, + "narHash": "sha256-R706OBJ+nMQsVP2Dni+FaG3UDfhlE2zR4rz+YGnEi8I=", "owner": "nix-community", "repo": "NUR", - "rev": "9d6c360577861a5218dbf453b84483075e6b56d2", + "rev": "2b3f4e0a0eea5a32dc78204fefba15ee83d437d3", "type": "github" }, "original": { @@ -548,16 +682,16 @@ ] }, "locked": { - "lastModified": 1772094145, - "narHash": "sha256-26MV9TbyAF0KFqZtIHPYu6wqJwf0pNPdW/D3gDQEUlQ=", + "lastModified": 1772782174, + "narHash": "sha256-FBmF7/uwZYY/qY1252Hz+XhXdE+Qp5axySAy5Jw7XUQ=", "owner": "anomalyco", "repo": "opencode", - "rev": "799b2623cbb1c0f19e045d87c2c8593e83678bc0", + "rev": "6c7d968c4423a0cd6c85099c9377a6066313fa0a", "type": "github" }, "original": { "owner": "anomalyco", - "ref": "v1.2.15", + "ref": "v1.2.20", "repo": "opencode", "type": "github" } @@ -590,10 +724,11 @@ "disko": "disko", "home-manager": "home-manager_2", "hyprpanel": "hyprpanel", + "llm-agents": "llm-agents", "m3ta-nixpkgs": "m3ta-nixpkgs", "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-45570c2": "nixpkgs-45570c2", "nixpkgs-9e58ed7": "nixpkgs-9e58ed7", "nixpkgs-locked": "nixpkgs-locked", @@ -606,7 +741,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "utils": "utils" }, "locked": { @@ -654,6 +789,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -668,7 +818,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -683,9 +833,30 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "llm-agents", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 0584c2a..ee225ef 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; # m3ta-nixpkgs.url = "path:/home/m3tam3re/p/NIX/nixpkgs"; + llm-agents.url = "github:numtide/llm-agents.nix"; + # nur = { url = "github:nix-community/NUR"; @@ -78,6 +80,7 @@ m3-ares = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; + system = "x86_64-linux"; hostname = "m3-ares"; }; modules = [ @@ -87,7 +90,10 @@ ]; }; m3-atlas = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; + specialArgs = { + inherit inputs outputs; + system = "x86_64-linux"; + }; system = "x86_64-linux"; modules = [ ./hosts/m3-atlas @@ -99,6 +105,7 @@ m3-kratos = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; + system = "x86_64-linux"; hostname = "m3-kratos"; }; modules = [ @@ -109,7 +116,10 @@ ]; }; m3-helios = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; + specialArgs = { + inherit inputs outputs; + system = "x86_64-linux"; + }; system = "x86_64-linux"; modules = [ ./hosts/m3-helios @@ -124,6 +134,7 @@ pkgs = nixpkgs.legacyPackages."x86_64-linux"; extraSpecialArgs = { inherit inputs outputs; + system = "x86_64-linux"; hostname = "m3-daedalus"; }; modules = [./home/m3tam3re/m3-daedalus.nix]; diff --git a/home/common/default.nix b/home/common/default.nix index e8aa9de..d6fdf5a 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -3,6 +3,7 @@ lib, outputs, pkgs, + system, ... }: { imports = [ @@ -24,7 +25,7 @@ inputs.nur.overlays.default inputs.m3ta-nixpkgs.overlays.default inputs.m3ta-nixpkgs.overlays.modifications - + (outputs.overlays.mkLlmAgentsOverlay system) # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/home/features/coding/default.nix b/home/features/coding/default.nix index 5ad1653..63ea508 100644 --- a/home/features/coding/default.nix +++ b/home/features/coding/default.nix @@ -5,14 +5,13 @@ home.packages = with pkgs; [ agenix-cli alejandra - beads bc bun - claude-code devpod #devpod-desktop code2prompt - nur.repos.charmbracelet.crush + gnumake + cmake (python3.withPackages (ps: with ps; [ pip @@ -23,10 +22,14 @@ torch srt ])) - opencode-desktop pyrefly nixd - openspec + nodejs + opencode-desktop + (qmd.override { + vulkanSupport = true; + cudaSupport = false; + }) alejandra sidecar tailwindcss diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 4ef8473..c3d6cef 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -1,5 +1,13 @@ # Common configuration for all hosts -{ config, pkgs, lib, inputs, outputs, ... }: { +{ + config, + pkgs, + lib, + inputs, + outputs, + system, + ... +}: { imports = [ ./extraServices ./ports.nix @@ -7,14 +15,13 @@ inputs.home-manager.nixosModules.home-manager ]; - environment.pathsToLink = - [ "/share/xdg-desktop-portal" "/share/applications" ]; + environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"]; home-manager = { useUserPackages = true; extraSpecialArgs = { - inherit inputs outputs; - videoDrivers = config.services.xserver.videoDrivers or [ ]; + inherit inputs outputs system; + videoDrivers = config.services.xserver.videoDrivers or []; }; }; @@ -31,7 +38,7 @@ inputs.m3ta-nixpkgs.overlays.default inputs.m3ta-nixpkgs.overlays.modifications - + (outputs.overlays.mkLlmAgentsOverlay system) # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default @@ -65,9 +72,10 @@ options = "--delete-older-than 30d"; }; optimise.automatic = true; - registry = (lib.mapAttrs (_: flake: { inherit flake; })) + registry = + (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs); - nixPath = [ "/etc/nix/path" ]; + nixPath = ["/etc/nix/path"]; }; users.defaultUserShell = pkgs.nushell; } diff --git a/hosts/m3-aether/services/default.nix b/hosts/m3-aether/services/default.nix index 70456f1..4c0dc5c 100644 --- a/hosts/m3-aether/services/default.nix +++ b/hosts/m3-aether/services/default.nix @@ -2,10 +2,4 @@ imports = [ ./cloud-init.nix ]; - systemd.sleep.extraConfig = '' - AllowSuspend=no - AllowHibernation=no - AllowHybridSleep=no - AllowSuspendThenHibernate=no - ''; } diff --git a/hosts/m3-ares/services/default.nix b/hosts/m3-ares/services/default.nix index 5839b7a..1e89404 100644 --- a/hosts/m3-ares/services/default.nix +++ b/hosts/m3-ares/services/default.nix @@ -49,10 +49,4 @@ }; displayManager.gdm.enable = true; }; - systemd.sleep.extraConfig = '' - AllowSuspend=no - AllowHibernation=no - AllowHybridSleep=no - AllowSuspendThenHibernate=no - ''; } diff --git a/hosts/m3-helios/services/default.nix b/hosts/m3-helios/services/default.nix index ea619e6..1d734c3 100644 --- a/hosts/m3-helios/services/default.nix +++ b/hosts/m3-helios/services/default.nix @@ -4,10 +4,4 @@ ./containers ./traefik.nix ]; - systemd.sleep.extraConfig = '' - AllowSuspend=no - AllowHibernation=no - AllowHybridSleep=no - AllowSuspendThenHibernate=no - ''; } diff --git a/hosts/m3-kratos/services/default.nix b/hosts/m3-kratos/services/default.nix index f29e14d..33eb5ee 100644 --- a/hosts/m3-kratos/services/default.nix +++ b/hosts/m3-kratos/services/default.nix @@ -31,10 +31,4 @@ }; displayManager.gdm.enable = true; }; - systemd.sleep.extraConfig = '' - AllowSuspend=no - AllowHibernation=no - AllowHybridSleep=no - AllowSuspendThenHibernate=no - ''; } diff --git a/overlays/default.nix b/overlays/default.nix index 6b59526..048807c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -59,4 +59,10 @@ config.allowUnfree = true; }; }; + + # Flatten llm-agents packages into top-level pkgs namespace. + # Takes system as parameter to avoid infinite recursion — overlays + # can't safely access final/prev.system when spreading attributes. + mkLlmAgentsOverlay = system: _final: _prev: + inputs.llm-agents.packages.${system} or {}; }