flake update

README.md

@@ -177,6 +177,7 @@ base.secrets.enable             # pass-wayland, pinentry
 desktop.wm.hyprland.enable      # Hyprland window manager
 desktop.wm.rofi.enable          # Rofi launcher
 desktop.wm.wayland.enable       # Wayland tools (grim, slurp, etc.)
+desktop.wm.dms.enable           # DankMaterialShell desktop shell
 desktop.apps.obsidian.enable    # Obsidian
 desktop.apps.office.enable      # LibreOffice
 desktop.apps.crypto.enable      # Bisq2, Monero, Trezor
@@ -244,9 +245,11 @@ source = "${config."m3ta-home".paths.srcRoot}/assets/wallpapers";
 | `nixpkgs`      | Package set (follows nixos-config's nixpkgs)                    |
 | `home-manager` | Home-Manager modules                                            |
 | `nix-colors`   | Dracula theme palette (used everywhere)                         |
-| `m3ta-nixpkgs` | Custom packages (zellij-ps, rofi-project-opener) and HM modules |
-| `agenix`       | Secret management                                               |
-| `NUR`          | Additional packages                                             |
+| `m3ta-nixpkgs`        | Custom packages (zellij-ps, rofi-project-opener) and HM modules |
+| `dms`                 | DankMaterialShell Home-Manager module and package               |
+| `dms-plugin-registry` | DankMaterialShell plugin sources                                |
+| `agenix`              | Secret management                                               |
+| `NUR`                 | Additional packages                                             |
 
 ## Important Notes
 

flake.lock

@@ -21,14 +21,52 @@
         "type": "github"
       }
     },
+    "agent-lib": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1781348569,
+        "narHash": "sha256-1BJtmKSqtD0CD753ZE37RgxvCJK6Iw3iKLDDaS8trY4=",
+        "ref": "refs/heads/master",
+        "rev": "75a2ed2533b4d6d8e4a34acd37e83d98d81a5fb0",
+        "revCount": 30,
+        "type": "git",
+        "url": "ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib"
+      }
+    },
     "agents": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1780133320,
+        "narHash": "sha256-8AiN9tV9PBb5xblJiPlhumBbKj61qLjzqXXFtkj3vvY=",
+        "ref": "refs/heads/master",
+        "rev": "920c00313ae242bd93275c30131b9ab1e52ee2fb",
+        "revCount": 88,
+        "type": "git",
+        "url": "ssh://gitea@code.m3ta.dev/m3tam3re/AGENTS"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://gitea@code.m3ta.dev/m3tam3re/AGENTS"
+      }
+    },
+    "agents_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1777399938,
-        "narHash": "sha256-xXPqUQezDdDtF8MbpZnwD1HkybOYwF92evx8rJ6OXCU=",
+        "lastModified": 1780133320,
+        "narHash": "sha256-8AiN9tV9PBb5xblJiPlhumBbKj61qLjzqXXFtkj3vvY=",
         "ref": "refs/heads/master",
-        "rev": "9a91f1ee0cf011a7eaf1f16a9e17610b0457e055",
-        "revCount": 85,
+        "rev": "920c00313ae242bd93275c30131b9ab1e52ee2fb",
+        "revCount": 88,
         "type": "git",
         "url": "https://code.m3ta.dev/m3tam3re/AGENTS"
       },
@@ -97,7 +135,70 @@
         "type": "github"
       }
     },
+    "dms": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": "quickshell"
+      },
+      "locked": {
+        "lastModified": 1777431599,
+        "narHash": "sha256-g6r/Gx8PTDzO3jCNzzySA+Ff1lmLF9nDlMCNyyoQjoE=",
+        "owner": "AvengeMedia",
+        "repo": "DankMaterialShell",
+        "rev": "eb5afcdc40ea5446c27e18552ff4a19f9daf9484",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AvengeMedia",
+        "ref": "stable",
+        "repo": "DankMaterialShell",
+        "type": "github"
+      }
+    },
+    "dms-plugin-registry": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1781317940,
+        "narHash": "sha256-uMVOhV6pVPgm2hn1WGEbIcJRWjnsyWKy8PHCUn0++iI=",
+        "owner": "AvengeMedia",
+        "repo": "dms-plugin-registry",
+        "rev": "4ab59f3da3df33bf106045b856db8de875cc42c6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AvengeMedia",
+        "repo": "dms-plugin-registry",
+        "type": "github"
+      }
+    },
     "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "hermes-agent",
+          "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",
@@ -118,6 +219,31 @@
         "type": "github"
       }
     },
+    "hermes-agent": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "npm-lockfile-fix": "npm-lockfile-fix",
+        "pyproject-build-systems": "pyproject-build-systems",
+        "pyproject-nix": "pyproject-nix_2",
+        "uv2nix": "uv2nix_2"
+      },
+      "locked": {
+        "lastModified": 1781346807,
+        "narHash": "sha256-ytT4ojx0qFW4b/oYeW+MkmaA3b/BZ9pqkPmpAg8j1gg=",
+        "owner": "NousResearch",
+        "repo": "hermes-agent",
+        "rev": "2a5dc0ef3df433a36abed9ee544ea067d807c438",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NousResearch",
+        "repo": "hermes-agent",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -146,11 +272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779113444,
-        "narHash": "sha256-/L61sT1PIKmGWIQpIh0uJGH/ANvcsf6y4alxtb9kelg=",
+        "lastModified": 1781305496,
+        "narHash": "sha256-g8Vv4Qfc7n+lgov97REu3X6BeJtvYY0hlSUZR1GrGQQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "74f170c62d57f90e656841f1f699e6bdf40f0a24",
+        "rev": "c87a39aa979acc4848016d2220c6238390d84779",
         "type": "github"
       },
       "original": {
@@ -161,7 +287,7 @@
     },
     "m3ta-nixpkgs": {
       "inputs": {
-        "agents": "agents",
+        "agents": "agents_2",
         "basecamp": "basecamp",
         "nixpkgs": [
           "nixpkgs"
@@ -170,11 +296,11 @@
         "openspec": "openspec"
       },
       "locked": {
-        "lastModified": 1778508052,
-        "narHash": "sha256-kxzZvJv757TGfHReR21aX6N/jkGMWzGSy9GQEclYD4Y=",
+        "lastModified": 1781153970,
+        "narHash": "sha256-OtC89zreW6Api7wpF5u76Jvkn8uQJiM+0yFFn/r+rj8=",
         "ref": "refs/heads/master",
-        "rev": "8113723a48c4afa016881ccd5bc4be3fad2c7d5f",
-        "revCount": 294,
+        "rev": "8fae0726a53ecabb04f4a0931a17a25de6a05fbf",
+        "revCount": 324,
         "type": "git",
         "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
       },
@@ -235,11 +361,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1778507606,
-        "narHash": "sha256-6Yc2dIhijc8G+dbMNocyclxF19dUrjaT+EeXGrXmXlg=",
+        "lastModified": 1781153468,
+        "narHash": "sha256-ZBRmjFtJn/XmHBV230OSabKQqxOoOJunJmBtSt1sLs0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "39a7b8d815fcc8b689d56fc4a3fa8de4ef93d169",
+        "rev": "cd265fd6b43f2ec1257c2e400f648895d2ad7ccd",
         "type": "github"
       },
       "original": {
@@ -251,27 +377,43 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1772479524,
+        "narHash": "sha256-u7nCaNiMjqvKpE+uZz9hE7pgXXTmm5yvdtFaqzSzUQI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "4215e62dc2cd3bc705b0a423b9719ff6be378a43",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1781074563,
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1781074563,
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -281,17 +423,38 @@
         "type": "github"
       }
     },
-    "nur": {
+    "npm-lockfile-fix": {
       "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "hermes-agent",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1778506944,
-        "narHash": "sha256-lU0Bleh0reE+WU7j8Uiqsu6ekPav50L8sXsgOvEQS+0=",
+        "lastModified": 1775903712,
+        "narHash": "sha256-2GV79U6iVH4gKAPWYrxUReB0S41ty/Y3dBLquU8AlaA=",
+        "owner": "jeslie0",
+        "repo": "npm-lockfile-fix",
+        "rev": "c6093acb0c0548e0f9b8b3d82918823721930fe8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jeslie0",
+        "repo": "npm-lockfile-fix",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1781346642,
+        "narHash": "sha256-o92OOSMAB08HQgG7pW2BZVIO53Pkv4oAjLk4Iol3Iko=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0166493cfe4e0e9927435c1cfbf5505cfb0d10d1",
+        "rev": "6e4e8d731fbb3831296607d5f88de727cf7bf6de",
         "type": "github"
       },
       "original": {
@@ -308,11 +471,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778120451,
-        "narHash": "sha256-MUSPD16+hoFBfQWYahtNLN2BIFEAlFFo2KNofrc947g=",
+        "lastModified": 1780479100,
+        "narHash": "sha256-VZZ/ukjciXqiebwei2JizyOnxx0T3IeoowFWElKec4o=",
         "owner": "Fission-AI",
         "repo": "OpenSpec",
-        "rev": "053d8a59d587f3c027a06ad80503a6b43d4f2a92",
+        "rev": "1b06fddd59d8e592d5b5794a1970b22867e85b1f",
         "type": "github"
       },
       "original": {
@@ -321,13 +484,128 @@
         "type": "github"
       }
     },
+    "pyproject-build-systems": {
+      "inputs": {
+        "nixpkgs": [
+          "hermes-agent",
+          "nixpkgs"
+        ],
+        "pyproject-nix": "pyproject-nix",
+        "uv2nix": "uv2nix"
+      },
+      "locked": {
+        "lastModified": 1772555609,
+        "narHash": "sha256-3BA3HnUvJSbHJAlJj6XSy0Jmu7RyP2gyB/0fL7XuEDo=",
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "rev": "c37f66a953535c394244888598947679af231863",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "type": "github"
+      }
+    },
+    "pyproject-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "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_2": {
+      "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_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"
+      }
+    },
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "dms",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776854048,
+        "narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=",
+        "ref": "refs/heads/master",
+        "rev": "783c953987dc56ff0601abe6845ed96f1d00495a",
+        "revCount": 806,
+        "type": "git",
+        "url": "https://git.outfoxxed.me/quickshell/quickshell"
+      },
+      "original": {
+        "rev": "783c953987dc56ff0601abe6845ed96f1d00495a",
+        "type": "git",
+        "url": "https://git.outfoxxed.me/quickshell/quickshell"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "agent-lib": "agent-lib",
+        "agents": "agents",
+        "dms": "dms",
+        "dms-plugin-registry": "dms-plugin-registry",
+        "hermes-agent": "hermes-agent",
         "home-manager": "home-manager_2",
         "m3ta-nixpkgs": "m3ta-nixpkgs",
         "nix-colors": "nix-colors",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nur": "nur"
       }
     },
@@ -345,6 +623,55 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "uv2nix": {
+      "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=",
+        "owner": "pyproject-nix",
+        "repo": "uv2nix",
+        "rev": "b68be7cfeacbed9a3fa38a2b5adc0cfb81d9bb1f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "uv2nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -16,26 +16,52 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    agents = {
+      # url = "path:/home/m3tam3re/p/AI/AGENTS";
+      url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/AGENTS";
+    };
+
+    agent-lib = {
+      # url = "path:/home/m3tam3re/p/NIX/agent-lib";
+      url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    hermes-agent = {
+      url = "github:NousResearch/hermes-agent";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    dms = {
+      url = "github:AvengeMedia/DankMaterialShell/stable";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    dms-plugin-registry = {
+      url = "github:AvengeMedia/dms-plugin-registry";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     agenix.url = "github:ryantm/agenix";
 
     nur.url = "github:nix-community/NUR";
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-    ...
-  } @ inputs: let
-    lib = nixpkgs.lib;
-  in {
+  outputs = {self, ...} @ inputs: {
     # Home-Manager modules — import in nixos-config via:
     #   imports = [ inputs.m3ta-home.homeManagerModules.default ];
-    homeManagerModules = import ./modules { inherit inputs; selfPath = self.outPath; };
+    homeManagerModules = import ./modules {
+      inherit inputs;
+      selfPath = self.outPath;
+    };
 
     # Library functions — use in nixos-config via:
     #   m3ta-lib = inputs.m3ta-home.lib;
     #   imports = [ (m3ta-lib.mkHome { ... }) ];
-    lib = import ./lib {inherit inputs; selfPath = self.outPath;};
+    lib = import ./lib {
+      inherit inputs;
+      selfPath = self.outPath;
+    };
 
     # Overlays (re-exports from m3ta-nixpkgs)
     overlays = inputs.m3ta-nixpkgs.overlays;

lib/default.nix

@@ -1,5 +1,16 @@
 # lib/default.nix — Entry point for m3ta-home library functions.
 #
 # Called by flake.nix: import ./lib { inherit inputs; selfPath = self.outPath; }
-# Re-exports mkHome and future library functions.
-{inputs, selfPath}: import ./mkHome.nix {inherit inputs selfPath;}
+# Re-exports mkHome and focused helpers for consumers that should not depend on
+# m3ta-home's implementation inputs directly.
+{
+  inputs,
+  selfPath,
+}: let
+  mkHomeLib = import ./mkHome.nix {inherit inputs selfPath;};
+in
+  mkHomeLib
+  // {
+    mkHermesSkillsDir = {system, ...} @ args:
+      inputs.agent-lib.lib.${system}.mkHermesSkillsDir (builtins.removeAttrs args ["system"]);
+  }

lib/mkHome.nix

@@ -19,7 +19,10 @@
 #   m3ta.home.sets.coding.languages.python.extra = true;
 #   wayland.windowManager.hyprland.settings.monitor = [ ... ];
 #
-{inputs, selfPath}: let
+{
+  inputs,
+  selfPath,
+}: let
   lib = inputs.nixpkgs.lib;
 in {
   mkHome = {
@@ -80,6 +83,13 @@ in {
   in {
     imports =
       [
+        # External Home Manager modules required by selectable profiles
+        inputs.agent-lib.homeManagerModules.default
+        inputs.dms.homeModules.default
+        inputs.dms-plugin-registry.homeModules.default
+        inputs.nix-colors.homeManagerModules.default
+        inputs.m3ta-nixpkgs.homeManagerModules.default
+
         # Paths module — must be first, provides m3taHome.paths.srcRoot
         ../modules/paths.nix
         baseModule
@@ -89,6 +99,8 @@ in {
       ++ contextImport
       ++ setImports;
 
+    _module.args.m3taHomeInputs = inputs;
+
     # Set the flake source root for asset path resolution
     "m3ta-home".paths.srcRoot = selfPath;
 

modules/default.nix

@@ -8,11 +8,15 @@
 {
   inputs,
   selfPath,
-}: let
-  lib = inputs.nixpkgs.lib;
-in {
+}: {
   default = {
     imports = [
+      # External modules
+      inputs.agent-lib.homeManagerModules.default
+      inputs.dms.homeModules.default
+      inputs.dms-plugin-registry.homeModules.default
+      inputs.nix-colors.homeManagerModules.default
+      inputs.m3ta-nixpkgs.homeManagerModules.default
       # Paths — must be first, provides "m3ta-home".paths.srcRoot
       ./paths.nix
 
@@ -30,6 +34,8 @@ in {
       ./../users/m3tam3re/identities/work.nix
     ];
 
+    _module.args.m3taHomeInputs = inputs;
+
     # Set the source root for asset path resolution
     "m3ta-home".paths.srcRoot = selfPath;
   };

profiles/base/default.nix

@@ -1,7 +1,6 @@
 # profiles/base/default.nix — Always loaded on every host.
 #
 # Provides:
-#   - nix-colors and m3ta-nixpkgs HM module imports
 #   - Shell (nushell, fish, starship) with enable options
 #   - CLI tools (bat, carapace, direnv, eza, fzf, lf, nitch, television, zellij, zoxide)
 #   - Secrets management (pass-wayland)
@@ -9,21 +8,19 @@
 #   - Base packages
 #
 # NOTE: Overlays are NOT set here. The consuming flake (nixos-config) handles
-# overlays at the NixOS level via nixpkgs.overlays. This module only imports
-# HM modules and sets user-level preferences.
+# overlays at the NixOS level via nixpkgs.overlays. External HM modules are
+# imported by mkHome/modules/default.nix. This module only imports base profile
+# submodules and sets user-level preferences.
 #
 # When used standalone (not through NixOS), overlays should be set by the
 # standalone HM configuration or by the consuming flake.
 {
-  inputs,
   lib,
+  m3taHomeInputs,
   pkgs,
   ...
 }: {
   imports = [
-    inputs.nix-colors.homeManagerModules.default
-    inputs.m3ta-nixpkgs.homeManagerModules.default
-
     ./shell
     ./cli-tools
     ./secrets
@@ -44,7 +41,7 @@
   };
 
   # ── Color scheme ──
-  colorScheme = inputs.nix-colors.colorSchemes.dracula;
+  colorScheme = m3taHomeInputs.nix-colors.colorSchemes.dracula;
 
   # ── Base packages ──
   home.packages = with pkgs; [

profiles/base/shell/nushell.nix

@@ -41,6 +41,16 @@ in {
               | transpose -r -d
               | load-env
           }
+
+          # Load m3tam3re secrets from agenix. The secret file is Nushell code
+          # containing a `load-env { ... }` block, not KEY=VALUE lines.
+          # `source` resolves literal paths at parse time, so use `null` when absent.
+          const m3tam3re_secrets_file = if ("/run/agenix/m3tam3re-secrets" | path exists) {
+            "/run/agenix/m3tam3re-secrets"
+          } else {
+            null
+          }
+          source $m3tam3re_secrets_file
       '';
 
       configFile.text = ''

profiles/contexts/desktop/default.nix

@@ -1,7 +1,7 @@
 # Desktop environment aggregator — only loaded when context=desktop.
 # Includes window manager, applications, theming, and desktop session config.
 {
-  config,
+  m3taHomeInputs,
   pkgs,
   ...
 }: {
@@ -38,22 +38,56 @@
     };
   };
 
-  home.sessionVariables = {
-    WEBKIT_DISABLE_COMPOSITING_MODE = "1";
-    NIXOS_OZONE_WL = "1";
-    TERMINAL = "ghostty";
-    QT_QPA_PLATFORM = "wayland";
-    XDG_CURRENT_DESKTOP = "Hyprland";
-    XDG_SESSION_TYPE = "wayland";
-    XDG_SESSION_DESKTOP = "Hyprland";
-  };
+  home = {
+    sessionVariables = {
+      WEBKIT_DISABLE_COMPOSITING_MODE = "1";
+      NIXOS_OZONE_WL = "1";
+      TERMINAL = "ghostty";
+      QT_QPA_PLATFORM = "wayland";
+      XDG_CURRENT_DESKTOP = "Hyprland";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP = "Hyprland";
+    };
 
-  home.sessionPath = [
-    "\${XDG_BIN_HOME}"
-    "\${HOME}/.cargo/bin"
-    "$HOME/.npm-global/bin"
-    "$HOME/.cache/.bun/bin"
-  ];
+    sessionPath = [
+      "\${XDG_BIN_HOME}"
+      "\${HOME}/.cargo/bin"
+      "$HOME/.npm-global/bin"
+      "$HOME/.cache/.bun/bin"
+    ];
+
+    pointerCursor = {
+      gtk.enable = true;
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+      size = 20;
+    };
+
+    packages = with pkgs; [
+      appimage-run
+      bemoji
+      google-chrome
+      dconf
+      (element-desktop.override {
+        commandLineArgs = "--password-store=gnome-libsecret";
+      })
+      m3taHomeInputs.hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.desktop
+      launch-webapp
+      file-roller
+      gsettings-desktop-schemas
+      seahorse
+      sushi
+      ksnip
+      nwg-look
+      qt6Packages.qt6ct
+      rose-pine-hyprcursor
+      remmina
+      slack
+      vivaldi
+      vivaldi-ffmpeg-codecs
+      vibetyper
+    ];
+  };
 
   fonts.fontconfig.enable = true;
 
@@ -64,59 +98,30 @@
     settings = {
       font-family = "Fira Code";
       copy-on-select = "clipboard";
-      foreground = "#${config.colorScheme.palette.base05}";
-      background = "#${config.colorScheme.palette.base00}";
-      selection-foreground = "#${config.colorScheme.palette.base07}";
-      selection-background = "#${config.colorScheme.palette.base02}";
-      cursor-color = "#${config.colorScheme.palette.base05}";
-      palette = [
-        "0=#${config.colorScheme.palette.base01}"
-        "1=#${config.colorScheme.palette.base08}"
-        "2=#${config.colorScheme.palette.base0B}"
-        "3=#${config.colorScheme.palette.base0A}"
-        "4=#${config.colorScheme.palette.base0D}"
-        "5=#${config.colorScheme.palette.base0E}"
-        "6=#${config.colorScheme.palette.base0C}"
-        "7=#${config.colorScheme.palette.base05}"
-        "8=#${config.colorScheme.palette.base03}"
-        "9=#${config.colorScheme.palette.base08}"
-        "10=#${config.colorScheme.palette.base0B}"
-        "11=#${config.colorScheme.palette.base0A}"
-        "12=#${config.colorScheme.palette.base0D}"
-        "13=#${config.colorScheme.palette.base0E}"
-        "14=#${config.colorScheme.palette.base0C}"
-        "15=#${config.colorScheme.palette.base07}"
-      ];
+      theme = "dankcolors";
+      # foreground = "#${config.colorScheme.palette.base05}";
+      # background = "#${config.colorScheme.palette.base00}";
+      # selection-foreground = "#${config.colorScheme.palette.base07}";
+      # selection-background = "#${config.colorScheme.palette.base02}";
+      # cursor-color = "#${config.colorScheme.palette.base05}";
+      # palette = [
+      #   "0=#${config.colorScheme.palette.base01}"
+      #   "1=#${config.colorScheme.palette.base08}"
+      #   "2=#${config.colorScheme.palette.base0B}"
+      #   "3=#${config.colorScheme.palette.base0A}"
+      #   "4=#${config.colorScheme.palette.base0D}"
+      #   "5=#${config.colorScheme.palette.base0E}"
+      #   "6=#${config.colorScheme.palette.base0C}"
+      #   "7=#${config.colorScheme.palette.base05}"
+      #   "8=#${config.colorScheme.palette.base03}"
+      #   "9=#${config.colorScheme.palette.base08}"
+      #   "10=#${config.colorScheme.palette.base0B}"
+      #   "11=#${config.colorScheme.palette.base0A}"
+      #   "12=#${config.colorScheme.palette.base0D}"
+      #   "13=#${config.colorScheme.palette.base0E}"
+      #   "14=#${config.colorScheme.palette.base0C}"
+      #   "15=#${config.colorScheme.palette.base07}"
+      # ];
     };
   };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Ice";
-    size = 20;
-  };
-
-  home.packages = with pkgs; [
-    appimage-run
-    bemoji
-    eigent
-    (element-desktop.override {
-      commandLineArgs = "--password-store=gnome-libsecret";
-    })
-    launch-webapp
-    file-roller
-    hyprpanel
-    hyprpaper-random
-    seahorse
-    sushi
-    ksnip
-    nwg-look
-    rose-pine-hyprcursor
-    remmina
-    slack
-    vivaldi
-    vivaldi-ffmpeg-codecs
-    vibetyper
-  ];
 }

profiles/contexts/desktop/theme/theme.nix

@@ -1,4 +1,4 @@
-# GTK and Qt theming — Dracula theme with matching icons and cursor.
+# GTK and Qt theming — system-wide dark Adwaita/libadwaita-compatible theme.
 {
   pkgs,
   config,
@@ -11,13 +11,14 @@
 
   gtk = {
     enable = true;
+    colorScheme = "dark";
     theme = {
-      name = "Dracula";
-      package = pkgs.dracula-theme;
+      name = "adw-gtk3-dark";
+      package = pkgs.adw-gtk3;
     };
     iconTheme = {
-      name = "Dracula";
-      package = pkgs.dracula-icon-theme;
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
     };
     gtk4.theme = config.gtk.theme;
   };

profiles/contexts/desktop/wm/default.nix

@@ -4,5 +4,6 @@
     ./hyprland.nix
     ./wayland.nix
     ./rofi.nix
+    ./dms.nix
   ];
 }

profiles/contexts/desktop/wm/dms.nix

@@ -0,0 +1,29 @@
+# DankMaterialShell user-session configuration.
+# External DMS Home-Manager modules are imported by mkHome/modules/default.nix
+# so this file only owns the m3ta-home feature flag and desired defaults.
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.desktop.wm.dms;
+in {
+  options.desktop.wm.dms.enable = mkEnableOption "DankMaterialShell desktop shell";
+
+  config = mkIf cfg.enable {
+    programs.dank-material-shell = {
+      enable = true;
+      systemd.enable = true;
+      enableDynamicTheming = true;
+      enableClipboardPaste = true;
+
+      plugins = {
+        dankBatteryAlerts.enable = true;
+        emojiLauncher.enable = true;
+        dankPomodoroTimer.enable = true;
+        dankVault.enable = true;
+      };
+    };
+  };
+}

profiles/contexts/desktop/wm/hyprland.nix

@@ -1,6 +1,4 @@
-# Hyprland window manager — Lua config for Hyprland 0.55+
-# Home-Manager configType = "lua" generates hyprland.lua using hl.* API.
-# API reference: https://wiki.hypr.land/Configuring/Start/
+# Hyprland window manager with keybindings, window rules, idle/lock, and hyprpaper.
 {
   config,
   lib,
@@ -8,312 +6,312 @@
 }:
 with lib; let
   cfg = config.desktop.wm.hyprland;
-  p = config.colorScheme.palette;
 in {
   options.desktop.wm.hyprland.enable = mkEnableOption "Hyprland window manager";
 
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland = {
-      configType = "lua";
-
+      configType = "hyprlang";
       settings = {
-        # ── Lua local variables (rendered as: local mainMod = "SUPER") ──
-        mainMod = {_var = "SUPER";};
-        terminal = {_var = "ghostty";};
-
-        # ── Config sections (rendered as: hl.config({...})) ──
-        config = {
-          xwayland = {force_zero_scaling = true;};
-
-          input = {
-            kb_layout = "de,us";
-            kb_variant = "";
-            kb_model = "";
-            kb_rules = "";
-            kb_options = "ctrl:nocaps";
-            follow_mouse = 1;
-          };
-
-          general = {
-            gaps_in = 5;
-            gaps_out = 5;
-            border_size = 1;
-            col = {
-              active_border = {colors = ["rgba(9742b5ee)" "rgba(9742b5ee)"]; angle = 45;};
-              inactive_border = "rgba(${p.base03}aa)";
-            };
-            layout = "dwindle";
-          };
-
-          decoration = {
-            shadow = {
-              enabled = true;
-              range = 60;
-              render_power = 3;
-              color = "rgba(${p.base00}66)";
-              scale = 0.97;
-            };
-            rounding = 8;
-            blur = {
-              enabled = true;
-              size = 3;
-              passes = 3;
-            };
-            active_opacity = 0.9;
-            inactive_opacity = 0.5;
-          };
-
-          animations = {enabled = true;};
-
-          dwindle = {
-            pseudotile = true;
-            preserve_split = true;
-          };
-
-          master = {new_status = "master";};
+        xwayland = {
+          force_zero_scaling = true;
         };
+        source = [
+          "~/.config/hypr/dms/colors.conf"
+          "~/.config/hypr/dms/layout.conf"
+          "~/.config/hypr/monitors.conf"
+        ];
+        exec-once = [
+          "vibetyper"
+        ];
 
-        # ── Environment variables (rendered as: hl.env("KEY", "VALUE")) ──
         env = [
-          { _args = ["XCURSOR_SIZE" "32"]; }
-          { _args = ["HYPRCURSOR_THEME" "Bibata-Modern-Ice"]; }
-          { _args = ["WLR_NO_HARDWARE_CURSORS" "1"]; }
-          { _args = ["GTK_THEME" "Dracula"]; }
-          { _args = ["XDG_CURRENT_DESKTOP" "Hyprland"]; }
-          { _args = ["XDG_SESSION_TYPE" "wayland"]; }
-          { _args = ["XDG_SESSION_DESKTOP" "Hyprland"]; }
-          { _args = ["XKB_DEFAULT_LAYOUT" "de"]; }
-          { _args = ["NIXOS_OZONE_WL" "1"]; }
+          "XCURSOR_SIZE,32"
+          "HYPRCURSOR_THEME,Bibata-Modern-Ice"
+          "WLR_NO_HARDWARE_CURSORS,1"
+          "XDG_CURRENT_DESKTOP,Hyprland"
+          "XDG_SESSION_TYPE,wayland"
+          "XDG_SESSION_DESKTOP,Hyprland"
+          "XKB_DEFAULT_LAYOUT,de"
+          "NIXOS_OZONE_WL,1"
+          "QT_QPA_PLATFORM,wayland;xcb"
+          "QT_QPA_PLATFORMTHEME,gtk3"
+          "QT_QPA_PLATFORMTHEME_QT6,gtk3"
         ];
 
-        # ── Per-device config (rendered as: hl.device({...})) ──
+        input = {
+          kb_layout = "de,us";
+          kb_variant = "";
+          kb_model = "";
+          kb_rules = "";
+          kb_options = "ctrl:nocaps";
+          follow_mouse = 1;
+        };
+
+        general = {
+          gaps_in = 5;
+          gaps_out = 5;
+          border_size = 1;
+          layout = "dwindle";
+        };
+
+        decoration = {
+          shadow = {
+            enabled = true;
+            range = 60;
+            render_power = 3;
+            # color = "rgba(${config.colorScheme.palette.base00}66)";
+            offset = "1 2";
+            scale = 0.97;
+          };
+          rounding = 8;
+          blur = {
+            enabled = true;
+            size = 3;
+            passes = 3;
+          };
+          active_opacity = 0.9;
+          inactive_opacity = 0.5;
+        };
+
+        animations = {
+          enabled = true;
+          bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+          animation = [
+            "windows, 1, 7, myBezier"
+            "windowsOut, 1, 7, default, popin 80%"
+            "border, 1, 10, default"
+            "borderangle, 1, 8, default"
+            "fade, 1, 7, default"
+            "workspaces, 1, 6, default"
+          ];
+        };
+
+        dwindle = {
+          # pseudotile = true; # TODO
+          preserve_split = true;
+        };
+
+        master = {
+          new_status = "master";
+        };
+
         device = [
-          {name = "epic-mouse-v1"; sensitivity = -0.5;}
-          {name = "zsa-technology-labs-moonlander-mark-i"; kb_layout = "us";}
-          {name = "keychron-keychron-k7"; kb_layout = "us";}
+          {
+            name = "zsa-technology-labs-moonlander-mark-i";
+            kb_layout = "us";
+          }
+          {
+            name = "vibe-typer-virtual-keyboard";
+            kb_layout = "de";
+          }
+          {
+            name = "keychron-keychron-k7";
+            kb_layout = "us";
+          }
         ];
-      };
 
-      # ── Complex Lua: curves, animations, binds, window rules, startup ──
-      extraConfig = ''
-        -- Bezier curves
-        hl.curve("myBezier", { type = "bezier", points = { {0.05, 0.9}, {0.1, 1.05} } })
+        windowrule = [
+          "match:class file_progress, float on"
+          "match:class confirm, float on"
+          "match:class dialog, float on"
+          "match:class download, float on"
+          "match:class notification, float on"
+          "match:class error, float on"
+          "match:class splash, float on"
+          "match:class confirmreset, float on"
+          "match:title Open File, float on"
+          "match:title branchdialog, float on"
+          "match:class pavucontrol-qt, float on"
+          "match:class pavucontrol, float on"
+          "match:class class:^(espanso)$, float on"
+          "match:class wlogout, fullscreen on"
+          "match:title wlogout, float on"
+          "match:title wlogout, fullscreen on"
+          "match:class mpv, float on"
+          "match:class mpv, idle_inhibit focus"
+          "match:class mpv, opacity 1.0 override"
+          "match:title ^(Media viewer)$, float on"
+          "match:title ^(Volume Control)$, float on"
+          "match:title ^(Picture-in-Picture)$, float on"
+          "match:title ^(floating-pomodoro)$, float on"
+          "match:title ^(floating-pomodoro)$, size 250 50"
+          "match:title ^(floating-pomodoro)$, move 12 (monitor_h-150)"
+          "match:title ^(floating-pomodoro)$, pin on"
+          "match:initial_title .*streamlabs.com.*, float on"
+          "match:initial_title .*streamlabs.com.*, pin on"
+          "match:initial_title .*streamlabs.com.*, size 800 400"
+          "match:initial_title .*alert-box.*, move 100%-820 102"
+          "match:initial_title .*chat-box.*, move 100%-820 512"
+          "match:initial_title .*streamlabs.com.*, opacity 0.5 override"
+          "match:initial_title .*streamlabs.com.*, idle_inhibit focus"
+          "match:initial_title .*streamlabs.com.*, no_anim on"
+          "match:initial_title .*streamlabs.com.*, decorate off"
+          "match:initial_title .*streamlabs.com.*, no_shadow on"
+          "match:initial_title .*streamlabs.com.*, no_blur on"
+          "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_blur on"
+          "border_color rgb(ffffff), match:xwayland 1"
+        ];
 
-        -- Animations
-        hl.animation({ leaf = "windows",      enabled = true, speed = 7,  bezier = "myBezier" })
-        hl.animation({ leaf = "windowsOut",   enabled = true, speed = 7,  bezier = "default", style = "popin 80%" })
-        hl.animation({ leaf = "border",       enabled = true, speed = 10, bezier = "default" })
-        hl.animation({ leaf = "borderangle",  enabled = true, speed = 8,  bezier = "default" })
-        hl.animation({ leaf = "fade",         enabled = true, speed = 7,  bezier = "default" })
-        hl.animation({ leaf = "workspaces",   enabled = true, speed = 6,  bezier = "default" })
+        "$mainMod" = "SUPER";
+        "$terminal" = "ghostty";
 
-        -- Keybinds: terminals & editors
-        hl.bind(mainMod .. " + Return",      hl.dsp.exec_cmd(terminal .. " nu -c zellij-ps"))
-        hl.bind(mainMod .. " + T",           hl.dsp.exec_cmd(terminal .. " -e nu -c 'nitch; exec nu'"))
-        hl.bind(mainMod .. " + Shift + T",   hl.dsp.exec_cmd("launch-timer"))
-        hl.bind(mainMod .. " + N",           hl.dsp.exec_cmd(terminal .. " -e nvim"))
-        hl.bind(mainMod .. " + Z",           hl.dsp.exec_cmd("uwsm app -- zeditor"))
+        bind = [
+          "$mainMod, return, exec, $terminal nu -c zellij-ps"
+          "$mainMod, t, exec, $terminal -e nu -c 'nitch; exec nu'"
+          "$mainMod SHIFT, t, exec, launch-timer"
+          "$mainMod, n, exec, $terminal -e nvim"
+          "$mainMod, z, exec, uwsm app -- zeditor"
+          "$mainMod, o, exec, hyprctl dispatch setprop activewindow opaque toggle"
+          "$mainMod, r, exec, hyprctl dispatch focuswindow \"initialtitle:.*alert-box.*\" && hyprctl dispatch moveactive exact 4300 102 && hyprctl dispatch focuswindow \"initialtitle:.*chat-box.*\" && hyprctl dispatch moveactive exact 4300 512"
+          "$mainMod, b, exec, uwsm app -- thunar"
+          "$mainMod SHIFT, B, exec, uwsm app -- vivaldi"
+          "$mainMod, Escape, exec, uwsm app -- dms ipc call powermenu toggle"
+          # "$mainMod, Space, togglefloating"
+          "$mainMod, q, killactive"
+          "$mainMod, M, exit"
+          "$mainMod, F, fullscreen"
+          "$mainMod SHIFT, V, togglefloating"
+          "$mainMod, D, exec, uwsm app -- dms ipc call spotlight toggle"
+          "$mainMod, V, exec, uwsm app -- dms ipc call clipboard toggle"
+          "$mainMod, C, exec, bash -c 'FILE=/tmp/screenshot_$(date +%s).png; grim -g \"$(slurp)\" \"$FILE\" && ksnip \"$FILE\"'"
+          "$mainMod SHIFT, S, exec, uwsm app -- rofi -show emoji"
+          "$mainMod, P, exec, uwsm app -- rofi-pass"
+          "$mainMod SHIFT, P, pseudo"
+          "$mainMod, R, exec, stt-ptt start"
+          "$mainMod, S, exec, stt-ptt start"
+          # "$mainMod, J, togglesplit" # TODO
+          "$mainMod, h, movefocus, l"
+          "$mainMod, l, movefocus, r"
+          "$mainMod, k, movefocus, u"
+          "$mainMod, j, movefocus, d"
+          "$mainMod, 1, workspace, 1"
+          "$mainMod, 2, workspace, 2"
+          "$mainMod, 3, workspace, 3"
+          "$mainMod, 4, workspace, 4"
+          "$mainMod, 5, workspace, 5"
+          "$mainMod, 6, workspace, 6"
+          "$mainMod, 7, workspace, 7"
+          "$mainMod, 8, workspace, 8"
+          "$mainMod, 9, workspace, 9"
+          "$mainMod, 0, workspace, 10"
+          "$mainMod SHIFT, 1, movetoworkspace, 1"
+          "$mainMod SHIFT, 2, movetoworkspace, 2"
+          "$mainMod SHIFT, 3, movetoworkspace, 3"
+          "$mainMod SHIFT, 4, movetoworkspace, 4"
+          "$mainMod SHIFT, 5, movetoworkspace, 5"
+          "$mainMod SHIFT, 6, movetoworkspace, 6"
+          "$mainMod SHIFT, 7, movetoworkspace, 7"
+          "$mainMod SHIFT, 8, movetoworkspace, 8"
+          "$mainMod SHIFT, 9, movetoworkspace, 9"
+          "$mainMod SHIFT, 0, movetoworkspace, 10"
+          "$mainMod, mouse_down, workspace, e+1"
+          "$mainMod, mouse_up, workspace, e-1"
+        ];
 
-        -- Keybinds: misc
-        hl.bind(mainMod .. " + O",           hl.dsp.exec_cmd("hyprctl dispatch setprop activewindow opaque toggle"))
-        hl.bind(mainMod .. " + B",           hl.dsp.exec_cmd("uwsm app -- thunar"))
-        hl.bind(mainMod .. " + Shift + B",   hl.dsp.exec_cmd("uwsm app -- vivaldi"))
-        hl.bind(mainMod .. " + Escape",      hl.dsp.exec_cmd("uwsm app -- wlogout -p layer-shell"))
+        bindr = [
+        ];
 
-        -- Keybinds: window management
-        hl.bind(mainMod .. " + Space",       hl.dsp.window.float({ action = "toggle" }))
-        hl.bind(mainMod .. " + Q",           hl.dsp.window.close())
-        hl.bind(mainMod .. " + M",           hl.dsp.exit())
-        hl.bind(mainMod .. " + F",           hl.dsp.window.fullscreen())
-        hl.bind(mainMod .. " + Shift + V",   hl.dsp.window.float({ action = "toggle" }))
-
-        -- Keybinds: launchers
-        hl.bind(mainMod .. " + D",           hl.dsp.exec_cmd('uwsm app -- rofi -show drun -run-command "uwsm app -- {cmd}"'))
-        hl.bind(mainMod .. " + V",           hl.dsp.exec_cmd("uwsm app -- cliphist list | rofi -dmenu | cliphist decode | wl-copy"))
-        hl.bind(mainMod .. " + C",           hl.dsp.exec_cmd("bash -c 'FILE=/tmp/screenshot_$(date +%s).png; grim -g \"$(slurp)\" \"$FILE\" && ksnip \"$FILE\"'"))
-        hl.bind(mainMod .. " + Shift + S",   hl.dsp.exec_cmd("uwsm app -- rofi -show emoji"))
-        hl.bind(mainMod .. " + P",           hl.dsp.exec_cmd("uwsm app -- rofi-pass"))
-        hl.bind(mainMod .. " + Shift + P",   hl.dsp.window.pseudo())
-
-        -- Keybinds: STT push-to-talk
-        hl.bind(mainMod .. " + R",           hl.dsp.exec_cmd("stt-ptt start"))
-        hl.bind(mainMod .. " + R",           hl.dsp.exec_cmd("stt-ptt stop"),    { release = true })
-        hl.bind(mainMod .. " + S",           hl.dsp.exec_cmd("stt-ptt start"))
-        hl.bind(mainMod .. " + S",           hl.dsp.exec_cmd("stt-ptt format-stop"), { release = true })
-
-        -- Keybinds: focus
-        hl.bind(mainMod .. " + H",           hl.dsp.focus({ direction = "left" }))
-        hl.bind(mainMod .. " + L",           hl.dsp.focus({ direction = "right" }))
-        hl.bind(mainMod .. " + K",           hl.dsp.focus({ direction = "up" }))
-        hl.bind(mainMod .. " + J",           hl.dsp.focus({ direction = "down" }))
-
-        -- Keybinds: workspaces (1-10)
-        for i = 1, 10 do
-          local key = i % 10
-          hl.bind(mainMod .. " + " .. key,             hl.dsp.focus({ workspace = i }))
-          hl.bind(mainMod .. " + Shift + " .. key,     hl.dsp.window.move({ workspace = i }))
-        end
-        hl.bind(mainMod .. " + mouse_down",  hl.dsp.focus({ workspace = "e+1" }))
-        hl.bind(mainMod .. " + mouse_up",    hl.dsp.focus({ workspace = "e-1" }))
-
-        -- Keybinds: mouse (drag & resize)
-        hl.bind(mainMod .. " + mouse:272",   hl.dsp.window.drag(),    { mouse = true })
-        hl.bind(mainMod .. " + mouse:273",   hl.dsp.window.resize(),  { mouse = true })
-
-        -- Window rules: floating dialogs
-        for _, cls in ipairs({
-          "file_progress", "confirm", "dialog", "download",
-          "notification", "error", "splash", "confirmreset",
-        }) do
-          hl.window_rule({ match = { class = cls }, float = true })
-        end
-
-        -- Window rules: title-based floating
-        hl.window_rule({ match = { title = "Open File" },    float = true })
-        hl.window_rule({ match = { title = "branchdialog" }, float = true })
-
-        -- Window rules: audio/video
-        hl.window_rule({ match = { class = "pavucontrol-qt" }, float = true })
-        hl.window_rule({ match = { class = "pavucontrol" },    float = true })
-        hl.window_rule({ match = { class = "^espanso$" },      float = true })
-
-        -- Window rules: wlogout
-        hl.window_rule({ match = { class = "wlogout" }, fullscreen = true })
-        hl.window_rule({ match = { title = "wlogout" }, float = true, fullscreen = true })
-
-        -- Window rules: mpv
-        hl.window_rule({ match = { class = "mpv" }, float = true, idle_inhibit = "focus", opacity = 1.0 })
-
-        -- Window rules: misc floating
-        hl.window_rule({ match = { title = "^Media viewer$" },       float = true })
-        hl.window_rule({ match = { title = "^Volume Control$" },     float = true })
-        hl.window_rule({ match = { title = "^Picture-in-Picture$" }, float = true })
-
-        -- Window rules: pomodoro (consolidated)
-        hl.window_rule({
-          match = { title = "^floating-pomodoro$" },
-          float = true, size = { 250, 50 }, move = { 12, "monitor_h-150" }, pin = true,
-        })
-
-        -- Window rules: streamlabs (consolidated)
-        hl.window_rule({
-          match = { initial_title = ".*streamlabs.com.*" },
-          float = true, pin = true, size = { 800, 400 }, opacity = 0.5,
-          idle_inhibit = "focus", no_anim = true, decorate = false, no_shadow = true, no_blur = true,
-        })
-        hl.window_rule({ match = { initial_title = ".*alert-box.*" }, move = { "100%-820", 102 } })
-        hl.window_rule({ match = { initial_title = ".*chat-box.*" },  move = { "100%-820", 512 } })
-
-        -- Window rules: vibe-typer
-        hl.window_rule({ match = { class = "^vibe-typer$", title = "^Recording Indicator$" }, no_blur = true })
-
-        -- Window rules: xwayland border
-        hl.window_rule({ match = { xwayland = true }, border_color = "rgb(ffffff)" })
-
-        -- Startup commands
-        hl.on("hyprland.start", function()
-          hl.exec_cmd("hyprpanel")
-          hl.exec_cmd("while ! hyprpaper-random; do sleep 0.5; done")
-          hl.exec_cmd("wl-paste --type text --watch cliphist store")
-          hl.exec_cmd("wl-paste --type image --watch cliphist store")
-          hl.exec_cmd("vibetyper")
-        end)
-      '';
-    };
-
-    services.hypridle = {
-      enable = true;
-      settings = {
-        general = {
-          before_sleep_cmd = "hyprlock";
-          after_sleep_cmd = "hyprctl dispatch dpms on";
-          inhibit_sleep = 3;
-        };
-        listener = [
-          {
-            timeout = 300;
-            on-timeout = "hyprlock";
-          }
-          {
-            timeout = 420;
-            on-timeout = "hyprctl dispatch dpms off";
-            on-resume = "hyprctl dispatch dpms on";
-          }
+        bindm = [
+          "$mainMod, mouse:272, movewindow"
+          "$mainMod, mouse:273, resizewindow"
         ];
       };
     };
 
-    services.hyprpaper.enable = true;
+    # services.hypridle = {
+    #   enable = true;
+    #   settings = {
+    #     general = {
+    #       before_sleep_cmd = "hyprlock";
+    #       after_sleep_cmd = "hyprctl dispatch dpms on";
+    #       inhibit_sleep = 3;
+    #     };
+    #     listener = [
+    #       {
+    #         timeout = 300;
+    #         on-timeout = "hyprlock";
+    #       }
+    #       {
+    #         timeout = 420;
+    #         on-timeout = "hyprctl dispatch dpms off";
+    #         on-resume = "hyprctl dispatch dpms on";
+    #       }
+    #     ];
+    #   };
+    # };
 
-    programs.hyprlock = {
-      enable = true;
-      settings = {
-        "$font" = "JetBrainsMono Nerd Font";
-        "$base" = "rgb(${p.base00})";
-        "$text" = "rgb(${p.base05})";
-        "$textAlpha" = "${p.base05}";
-        "$accentAlpha" = "${p.base0D}";
-        "$red" = "rgb(${p.base08})";
-        "$yellow" = "rgb(${p.base0A})";
+    # services.hyprpaper.enable = true;
 
-        general = {
-          hide_cursor = true;
-        };
+    # programs.hyprlock = {
+    #   enable = true;
+    #   settings = {
+    #     "$font" = "JetBrainsMono Nerd Font";
+    #     "$base" = "rgb(${config.colorScheme.palette.base00})";
+    #     "$text" = "rgb(${config.colorScheme.palette.base05})";
+    #     "$textAlpha" = "${config.colorScheme.palette.base05}";
+    #     "$accentAlpha" = "${config.colorScheme.palette.base0D}";
+    #     "$red" = "rgb(${config.colorScheme.palette.base08})";
+    #     "$yellow" = "rgb(${config.colorScheme.palette.base0A})";
 
-        background = {
-          monitor = "";
-          path = "${config.home.homeDirectory}/.config/hypr/wallpapers/wallhaven-lmmo8r.jpg";
-          blur_passes = 0;
-          color = "rgb(${p.base00})";
-        };
+    #     general = {
+    #       hide_cursor = true;
+    #     };
 
-        label = [
-          {
-            monitor = "";
-            text = "$TIME";
-            color = "$text";
-            font_size = 90;
-            font_family = "$font";
-            position = "30, 0";
-            halign = "left";
-            valign = "top";
-          }
-          {
-            monitor = "";
-            text = ''cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"'';
-            color = "$text";
-            font_size = 25;
-            font_family = "$font";
-            position = "30, -150";
-            halign = "left";
-            valign = "top";
-          }
-        ];
+    #     background = {
+    #       monitor = "";
+    #       path = "${config.home.homeDirectory}/.config/hypr/wallpapers/wallhaven-lmmo8r.jpg";
+    #       blur_passes = 0;
+    #       color = "rgb(${config.colorScheme.palette.base00})";
+    #     };
 
-        input-field = [
-          {
-            monitor = "";
-            size = "300, 60";
-            outline_thickness = 4;
-            dots_size = 0.2;
-            dots_spacing = 0.2;
-            dots_center = true;
-            outer_color = "rgb(${p.base0D})";
-            inner_color = "rgb(${p.base00})";
-            font_color = "rgb(${p.base05})";
-            fade_on_empty = false;
-            placeholder_text = ''<span foreground="##${p.base05}">󰌾  Logged in as <span foreground="##${p.base0D}">$USER</span></span>'';
-            hide_input = false;
-            check_color = "rgb(${p.base0D})";
-            fail_color = "rgb(${p.base08})";
-            fail_text = ''<i>$FAIL <b>($ATTEMPTS)</b></i>'';
-            capslock_color = "rgb(${p.base0A})";
-            position = "0, -35";
-            halign = "center";
-            valign = "center";
-          }
-        ];
-      };
-    };
+    #     label = [
+    #       {
+    #         monitor = "";
+    #         text = "$TIME";
+    #         color = "$text";
+    #         font_size = 90;
+    #         font_family = "$font";
+    #         position = "30, 0";
+    #         halign = "left";
+    #         valign = "top";
+    #       }
+    #       {
+    #         monitor = "";
+    #         text = ''cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"'';
+    #         color = "$text";
+    #         font_size = 25;
+    #         font_family = "$font";
+    #         position = "30, -150";
+    #         halign = "left";
+    #         valign = "top";
+    #       }
+    #     ];
+
+    #     input-field = [
+    #       {
+    #         monitor = "";
+    #         size = "300, 60";
+    #         outline_thickness = 4;
+    #         dots_size = 0.2;
+    #         dots_spacing = 0.2;
+    #         dots_center = true;
+    #         outer_color = "rgb(${config.colorScheme.palette.base0D})";
+    #         inner_color = "rgb(${config.colorScheme.palette.base00})";
+    #         font_color = "rgb(${config.colorScheme.palette.base05})";
+    #         fade_on_empty = false;
+    #         placeholder_text = ''<span foreground="##${config.colorScheme.palette.base05}">󰌾  Logged in as <span foreground="##${config.colorScheme.palette.base0D}">$USER</span></span>'';
+    #         hide_input = false;
+    #         check_color = "rgb(${config.colorScheme.palette.base0D})";
+    #         fail_color = "rgb(${config.colorScheme.palette.base08})";
+    #         fail_text = ''<i>$FAIL <b>($ATTEMPTS)</b></i>'';
+    #         capslock_color = "rgb(${config.colorScheme.palette.base0A})";
+    #         position = "0, -35";
+    #         halign = "center";
+    #         valign = "center";
+    #       }
+    #     ];
+    #   };
+    # };
   };
 }

profiles/sets/coding/agents/agents-lib.nix

@@ -0,0 +1,36 @@
+{config, ...}: {
+  programs.agent-lib = {
+    enable = true;
+    lockFile = config."m3ta-home".paths.srcRoot + "/agent-sources.lock.json";
+
+    targets.pi.enable = true;
+    targets.opencode.enable = true;
+
+    profiles.default = {
+      sources = {
+        m3ta-agents = {
+          agents = {
+            all = true;
+          };
+          skills = {
+            all = true;
+            exclude = ["brainstorming" "pdf" "systematic-debugging" "xlsx"];
+          };
+        };
+        anthropic.skills = {
+          all = true;
+          exclude = ["skill-creator"];
+        };
+        basecamp.skills.all = true;
+        kestra.skills.all = true;
+        mattpocock.skills = {
+          all = true;
+        };
+        superpowers.skills = {
+          all = true;
+        };
+        vercel.skills.all = true;
+      };
+    };
+  };
+}

profiles/sets/coding/agents/agents.nix

@@ -1,10 +1,8 @@
 # AI agent system — OpenCode, Pi, and MCP server configuration.
 # Relies on coding.agents options provided by home/common/default.nix
-# (inputs.m3ta-nixpkgs.homeManagerModules.default).
+# (m3taHomeInputs.m3ta-nixpkgs.homeManagerModules.default).
 {
-  config,
-  inputs,
-  lib,
+  m3taHomeInputs,
   pkgs,
   videoDrivers ? [],
   ...
@@ -19,24 +17,14 @@
   };
 
   imports = [
-    # OpenCode and Pi agent configurations
+    # OpenCode, Pi, and Babysitter agent configurations
+    ./agents-lib.nix
+    ./babysitter.nix
     ./opencode.nix
     ./pi.nix
   ];
 
-  coding.agents.skills = {
-    agentsInput = inputs.agents;
-    externalSkills = [
-      {
-        src = inputs.skills-anthropic;
-        selectSkills = ["pdf" "docx" "frontend-design"];
-      }
-      {src = inputs.skills-superpowers;}
-      {src = inputs.skills-vercel;}
-      {src = inputs.skills-basecamp;}
-      {src = inputs.skills-kestra;}
-    ];
-  };
+  coding.agents.babysitter.enable = true;
 
   programs.mcp = {
     enable = true;
@@ -66,12 +54,17 @@
           ''exec bunx mcp-remote@latest https://mcp.honcho.dev --header "Authorization:Bearer $(cat /run/agenix/honcho-key)" --header "X-Honcho-User-Name:m3tam3re"''
         ];
       };
+      Playwright = {
+        command = "bash";
+        args = ["-c" "exec bunx @playwright/mcp@latest"];
+      };
     };
   };
 
   home.packages = with pkgs; [
     agenix-cli
     agent-browser
+    m3taHomeInputs.agent-lib.packages.${pkgs.stdenv.hostPlatform.system}.agent-lib-cli
     beads
     pi-coding-agent
     (qmd.override {

profiles/sets/coding/agents/babysitter.nix

@@ -0,0 +1,142 @@
+# Babysitter user profile for Pi/agent workflows.
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.coding.agents.babysitter;
+  defaultTimestamp = "2026-05-29T00:00:00.000Z";
+
+  defaultUserProfile = {
+    name = config.home.username;
+    specialties = [
+      {
+        domain = "declarative-system-configuration";
+        subdomains = ["nix" "home-manager" "agents"];
+      }
+    ];
+    expertiseLevels = {};
+    goals = [
+      {
+        id = "goal-agents-declarative-profile";
+        description = "Keep Babysitter user preferences declarative and reproducible across systems.";
+        category = "agents";
+        priority = "medium";
+        status = "active";
+      }
+    ];
+    preferences = {
+      verbosity = "concise";
+      autonomyLevel = "semi-autonomous";
+      riskTolerance = "conservative";
+    };
+    toolPreferences = {
+      packageManagers = ["nix"];
+      languages = ["nix"];
+      operatingSystem = "nixos";
+    };
+    breakpointTolerance = {
+      global = "moderate";
+      skipBreakpointsForKnownPatterns = false;
+      alwaysBreakOn = ["destructive-operations" "secrets" "external-publication"];
+    };
+    communicationStyle = {
+      tone = "technical";
+      language = "en";
+      useEmojis = false;
+      explanationDepth = "brief";
+      preferredResponseFormat = "markdown";
+    };
+    experience = {};
+    installedPlugins = ["babysitter-pi"];
+    installedSkills = ["babysit" "call" "plan" "resume" "doctor" "yolo"];
+    installedAgents = [];
+    createdAt = defaultTimestamp;
+    updatedAt = defaultTimestamp;
+    version = 1;
+  };
+
+  effectiveProfile = lib.recursiveUpdate cfg.profile cfg.profileOverrides;
+  profileJsonTarget = "${cfg.profileDirectory}/user-profile.json";
+  profileMarkdownTarget = "${cfg.profileDirectory}/user-profile.md";
+  profilePreferences = effectiveProfile.preferences or {};
+  profileBreakpointTolerance = effectiveProfile.breakpointTolerance or {};
+
+  listMarkdown = values:
+    lib.concatMapStringsSep "\n" (value: "- ${toString value}") values;
+
+  specialtyDomains = map (specialty: specialty.domain or "unspecified") (effectiveProfile.specialties or []);
+
+  profileMarkdown = ''
+    # Babysitter User Profile
+
+    This file is generated by Home Manager from `coding.agents.babysitter`.
+
+    - Name: ${effectiveProfile.name or "unspecified"}
+    - Breakpoint tolerance: ${profileBreakpointTolerance.global or "unspecified"}
+    - Autonomy level: ${profilePreferences.autonomyLevel or "unspecified"}
+    - Risk tolerance: ${profilePreferences.riskTolerance or "unspecified"}
+
+    ## Specialties
+
+    ${listMarkdown specialtyDomains}
+
+    ## Installed Babysitter Pi Skills
+
+    ${listMarkdown (effectiveProfile.installedSkills or [])}
+  '';
+in {
+  options.coding.agents.babysitter = {
+    enable = lib.mkEnableOption "Babysitter user profile for Pi/agent workflows";
+
+    profileDirectory = lib.mkOption {
+      type = lib.types.str;
+      default = ".a5c";
+      description = ''
+        Home-relative directory where Babysitter reads the user profile.
+        Babysitter Pi documents the user profile at ~/.a5c/user-profile.json.
+      '';
+    };
+
+    profile = lib.mkOption {
+      type = lib.types.attrsOf lib.types.anything;
+      default = defaultUserProfile;
+      description = "Complete non-secret Babysitter user profile JSON.";
+    };
+
+    profileOverrides = lib.mkOption {
+      type = lib.types.attrsOf lib.types.anything;
+      default = {};
+      description = ''
+        Recursive overrides merged into the default Babysitter user profile.
+        Keep this non-secret; the result is written into the Nix store.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.profileDirectory != "" && !lib.hasPrefix "/" cfg.profileDirectory;
+        message = "coding.agents.babysitter.profileDirectory must be a non-empty home-relative path.";
+      }
+      {
+        assertion = effectiveProfile ? name && builtins.isString effectiveProfile.name;
+        message = "coding.agents.babysitter profile must include a string name.";
+      }
+      {
+        assertion = effectiveProfile ? specialties && builtins.isList effectiveProfile.specialties;
+        message = "coding.agents.babysitter profile must include a specialties list.";
+      }
+      {
+        assertion = effectiveProfile ? breakpointTolerance && effectiveProfile.breakpointTolerance ? global;
+        message = "coding.agents.babysitter profile must include breakpointTolerance.global.";
+      }
+    ];
+
+    home.file = {
+      "${profileJsonTarget}".text = builtins.toJSON effectiveProfile + "\n";
+      "${profileMarkdownTarget}".text = profileMarkdown;
+    };
+  };
+}

profiles/sets/coding/agents/opencode.nix

@@ -1,13 +1,4 @@
-{
-  inputs,
-  lib,
-  ...
-}: {
-  coding.agents.opencode = {
-    enable = true;
-    agentsInput = inputs.agents;
-  };
-
+{lib, ...}: {
   coding.opencode = {
     enable = true;
 

profiles/sets/coding/agents/pi.nix

@@ -1,39 +1,11 @@
-{inputs, ...}: {
+{...}: {
   coding.agents.pi = {
     enable = true;
-    agentsInput = inputs.agents;
-
-    modelOverrides = {
-      chiron = "minimax/MiniMax-M2.7";
-      chiron-forge = "minimax/MiniMax-M2.7";
-    };
-
-    # Coding rules for Pi agent
-    # Rules sourced from AGENTS repo
-    codingRules = {
-      # Language-specific rules
-      languages = [
-        "nix" # Nix language conventions
-      ];
-
-      # Standard concerns from AGENTS repo
-      concerns = [
-        "coding-style" # General coding principles
-        "naming" # Naming conventions (camelCase, snake_case, etc.)
-        "documentation" # Documentation standards
-        "testing" # Testing guidelines (Arrange-Act-Assert)
-        "git-workflow" # Conventional commits, branch naming
-        "git-identity" # Git identity configuration for agents
-        "project-structure" # Project layout conventions
-      ];
-
-      # No framework-specific rules for NixOS config
-      frameworks = [];
-    };
 
     settings = {
       packages = [
         "npm:@dreadedzombie/pi-init"
+        "git:github.com/a5c-ai/babysitter-pi"
         "npm:@plannotator/pi-extension"
         "npm:@thesethrose/pi-zai-provider"
         "npm:pi-agent-browser-native"
@@ -49,8 +21,8 @@
         "git:github.com/hk-vk/pi-connect"
       ];
 
-      defaultProvider = "minimax";
-      defaultModel = "MiniMax-M2.7";
+      defaultProvider = "openai-codex";
+      defaultModel = "gpt-5.5";
       defaultThinkingLevel = "high";
     };
 
@@ -59,7 +31,7 @@
     # NOTE: Local project .pi/extensions/guardrails.json can override same rule IDs.
     #       For immutable global policies, consider a wrapper or upstream patch.
     guardrails = {
-      enable = true;
+      enable = false;
       config = {
         enabled = true;
         applyBuiltinDefaults = true;

profiles/sets/coding/core/packages.nix

@@ -9,5 +9,6 @@
     jq
     ripgrep
     tree
+    worktrunk
   ];
 }

users/m3tam3re/identities/private.nix

@@ -44,107 +44,107 @@
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false;
-    matchBlocks = {
+    settings = {
       "github.com" = {
-        hostname = "github.com";
-        user = "m3tam3re";
-        port = 22;
-        identityFile = "~/.ssh/github";
+        HostName = "github.com";
+        User = "m3tam3re";
+        Port = 22;
+        IdentityFile = "~/.ssh/github";
       };
       "code.m3ta.dev" = {
-        hostname = "code.m3ta.dev";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/gitea";
+        HostName = "code.m3ta.dev";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/gitea";
       };
       "lkk-nix-1" = {
-        hostname = "89.58.10.189";
-        user = "lkk-admin";
-        identityFile = "~/.ssh/lkk-admin";
+        HostName = "89.58.10.189";
+        User = "lkk-admin";
+        IdentityFile = "~/.ssh/lkk-admin";
       };
       "m3-r1" = {
-        hostname = "202.61.226.110";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "202.61.226.110";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-deck" = {
-        hostname = "192.168.178.193";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.178.193";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-kratos-vm" = {
-        hostname = "192.168.122.43";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.122.43";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-helios" = {
-        hostname = "192.168.178.210";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.178.210";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-ares" = {
-        hostname = "192.168.1.30";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.1.30";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-atlas" = {
-        hostname = "152.53.85.162";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "152.53.85.162";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-hermes" = {
-        hostname = "204.168.229.93";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "204.168.229.93";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "hermes" = {
-        hostname = "46.224.0.92";
-        user = "admin";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "46.224.0.92";
+        User = "admin";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-zelda" = {
-        hostname = "95.217.189.186";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "95.217.189.186";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-skynet" = {
-        hostname = "m3-skynet";
-        user = "admin";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "m3-skynet";
+        User = "admin";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-prox-1" = {
-        hostname = "192.168.1.110";
-        user = "root";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.1.110";
+        User = "root";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "shp-old" = {
-        hostname = "95.217.3.250";
-        port = 2222;
-        user = "m3tam3re";
-        identityFile = "~/.ssh/self-host-playbook";
+        HostName = "95.217.3.250";
+        Port = 2222;
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/self-host-playbook";
       };
       "shp-1" = {
-        hostname = "95.217.189.186";
-        port = 2222;
-        user = "m3tam3re";
-        identityFile = "~/.ssh/self-host-playbook";
+        HostName = "95.217.189.186";
+        Port = 2222;
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/self-host-playbook";
       };
       "AZ-CLD-1" = {
-        hostname = "152.53.186.119";
-        user = "sascha.koenig";
-        port = 2022;
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "152.53.186.119";
+        User = "sascha.koenig";
+        Port = 2022;
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
       "AZ-PRM-1" = {
-        hostname = "192.168.152.76";
-        user = "sascha.koenig";
-        port = 2022;
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "192.168.152.76";
+        User = "sascha.koenig";
+        Port = 2022;
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
       "git.az-gruppe.com" = {
-        hostname = "git.az-gruppe.com";
-        port = 2022;
-        user = "sascha.koenig";
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "git.az-gruppe.com";
+        Port = 2022;
+        User = "sascha.koenig";
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
     };
   };