merge into master

flake.lock

@@ -44,9 +44,7 @@
     },
     "agent-lib": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780681759,
@@ -64,10 +62,7 @@
     },
     "agent-lib_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "nixpkgs"]
-          "m3ta-home",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780157040,
@@ -167,11 +162,7 @@
     },
     "basecamp": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "m3ta-nixpkgs", "nixpkgs"]
-          "m3ta-home",
-          "m3ta-nixpkgs",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1774505501,
@@ -190,10 +181,7 @@
     },
     "basecamp_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-nixpkgs", "nixpkgs"]
-          "m3ta-nixpkgs",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1774505501,
@@ -212,14 +200,8 @@
     },
     "blueprint": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["llm-agents", "nixpkgs"],
-          "llm-agents",
+        "systems": ["llm-agents", "systems"]
-          "nixpkgs"
-        ],
-        "systems": [
-          "llm-agents",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1776249299,
@@ -237,22 +219,10 @@
     },
     "bun2nix": {
       "inputs": {
-        "flake-parts": [
+        "flake-parts": ["llm-agents", "flake-parts"],
-          "llm-agents",
+        "nixpkgs": ["llm-agents", "nixpkgs"],
-          "flake-parts"
+        "systems": ["llm-agents", "systems"],
-        ],
+        "treefmt-nix": ["llm-agents", "treefmt-nix"]
-        "nixpkgs": [
-          "llm-agents",
-          "nixpkgs"
-        ],
-        "systems": [
-          "llm-agents",
-          "systems"
-        ],
-        "treefmt-nix": [
-          "llm-agents",
-          "treefmt-nix"
-        ]
       },
       "locked": {
         "lastModified": 1778446047,
@@ -270,10 +240,7 @@
     },
     "darwin": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["agenix", "nixpkgs"]
-          "agenix",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1744478979,
@@ -292,11 +259,7 @@
     },
     "darwin_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "agenix", "nixpkgs"]
-          "m3ta-home",
-          "agenix",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1744478979,
@@ -315,9 +278,7 @@
     },
     "disko": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780290312,
@@ -335,10 +296,7 @@
     },
     "dms": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "nixpkgs"],
-          "m3ta-home",
-          "nixpkgs"
-        ],
         "quickshell": "quickshell"
       },
       "locked": {
@@ -358,10 +316,7 @@
     },
     "dms-plugin-registry": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "nixpkgs"]
-          "m3ta-home",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780281921,
@@ -379,10 +334,7 @@
     },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": ["hermes-agent", "nixpkgs"]
-          "hermes-agent",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1772408722,
@@ -400,10 +352,7 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": ["llm-agents", "nixpkgs"]
-          "llm-agents",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1778716662,
@@ -421,11 +370,7 @@
     },
     "flake-parts_3": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": ["m3ta-home", "nur", "nixpkgs"]
-          "m3ta-home",
-          "nur",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1733312601,
@@ -443,10 +388,7 @@
     },
     "flake-parts_4": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": ["nur", "nixpkgs"]
-          "nur",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1733312601,
@@ -488,10 +430,7 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["agenix", "nixpkgs"]
-          "agenix",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1745494811,
@@ -509,9 +448,7 @@
     },
     "home-manager_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780593650,
@@ -529,11 +466,7 @@
     },
     "home-manager_3": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "agenix", "nixpkgs"]
-          "m3ta-home",
-          "agenix",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1745494811,
@@ -551,10 +484,7 @@
     },
     "home-manager_4": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "nixpkgs"]
-          "m3ta-home",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780099287,
@@ -572,10 +502,7 @@
     },
     "hyprlang": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["rose-pine-hyprcursor", "nixpkgs"],
-          "rose-pine-hyprcursor",
-          "nixpkgs"
-        ],
         "systems": "systems_4"
       },
       "locked": {
@@ -625,9 +552,7 @@
         "home-manager": "home-manager_4",
         "m3ta-nixpkgs": "m3ta-nixpkgs",
         "nix-colors": "nix-colors",
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"],
-          "nixpkgs"
-        ],
         "nur": "nur"
       },
       "locked": {
@@ -648,10 +573,7 @@
       "inputs": {
         "agents": "agents_2",
         "basecamp": "basecamp",
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "nixpkgs"],
-          "m3ta-home",
-          "nixpkgs"
-        ],
         "nixpkgs-master": "nixpkgs-master",
         "openspec": "openspec"
       },
@@ -1067,10 +989,7 @@
     },
     "npm-lockfile-fix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hermes-agent", "nixpkgs"]
-          "hermes-agent",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1775903712,
@@ -1108,9 +1027,7 @@
     "nur_2": {
       "inputs": {
         "flake-parts": "flake-parts_4",
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780667345,
@@ -1128,11 +1045,7 @@
     },
     "openspec": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "m3ta-nixpkgs", "nixpkgs"]
-          "m3ta-home",
-          "m3ta-nixpkgs",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1779302169,
@@ -1150,10 +1063,7 @@
     },
     "openspec_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-nixpkgs", "nixpkgs"]
-          "m3ta-nixpkgs",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1779302169,
@@ -1171,10 +1081,7 @@
     },
     "pyproject-build-systems": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hermes-agent", "nixpkgs"],
-          "hermes-agent",
-          "nixpkgs"
-        ],
         "pyproject-nix": "pyproject-nix",
         "uv2nix": "uv2nix"
       },
@@ -1194,11 +1101,7 @@
     },
     "pyproject-nix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hermes-agent", "pyproject-build-systems", "nixpkgs"]
-          "hermes-agent",
-          "pyproject-build-systems",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1769936401,
@@ -1216,10 +1119,7 @@
     },
     "pyproject-nix_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hermes-agent", "nixpkgs"]
-          "hermes-agent",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1772865871,
@@ -1237,11 +1137,7 @@
     },
     "pyproject-nix_3": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hermes-agent", "uv2nix", "nixpkgs"]
-          "hermes-agent",
-          "uv2nix",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1771518446,
@@ -1259,11 +1155,7 @@
     },
     "quickshell": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["m3ta-home", "dms", "nixpkgs"]
-          "m3ta-home",
-          "dms",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1776854048,
@@ -1283,7 +1175,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "agent-lib": "agent-lib",
         "disko": "disko",
         "hermes-agent": "hermes-agent",
         "home-manager": "home-manager_2",
@@ -1325,9 +1216,7 @@
     },
     "rustfs": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780564157,
@@ -1420,10 +1309,7 @@
     },
     "treefmt-nix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["llm-agents", "nixpkgs"]
-          "llm-agents",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1780220602,
@@ -1459,11 +1345,7 @@
     },
     "uv2nix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hermes-agent", "pyproject-build-systems", "nixpkgs"],
-          "hermes-agent",
-          "pyproject-build-systems",
-          "nixpkgs"
-        ],
         "pyproject-nix": [
           "hermes-agent",
           "pyproject-build-systems",
@@ -1486,10 +1368,7 @@
     },
     "uv2nix_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hermes-agent", "nixpkgs"],
-          "hermes-agent",
-          "nixpkgs"
-        ],
         "pyproject-nix": "pyproject-nix_3"
       },
       "locked": {

flake.nix

@@ -45,11 +45,22 @@
     m3ta-home = {
       url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home";
       # url = "path:/home/m3tam3re/p/NIX/m3ta-home";
+<<<<<<< HEAD
+||||||| a9ffe3e
+      # url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home";
+      url = "path:/home/m3tam3re/p/NIX/m3ta-home";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    agent-lib = {
+      url = "path:/home/m3tam3re/p/NIX/agent-lib";
+=======
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     agent-lib = {
       url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib";
+>>>>>>> feature/agent-lib-m3-kratos
       inputs.nixpkgs.follows = "nixpkgs";
     };