feat: migrate Hyprland config to Lua (Hyprland 0.55+)

- Rewrite hyprland.nix to use configType = "lua" - Use Hyprland 0.55 Lua API: hl.config(), hl.bind(), hl.curve(), hl.animation(), hl.window_rule(), hl.workspace_rule(), hl.dsp.* - Consolidate window rules where possible - Update flake.lock: home-manager -> 74f170c6 (2026-05-18) - hypridle and hyprlock keep their own config format
2026-05-18 17:27:14 +02:00
28 changed files with 608 additions and 2725 deletions
@@ -177,7 +177,6 @@ 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
@@ -246,8 +245,6 @@ source = "${config."m3ta-home".paths.srcRoot}/assets/wallpapers";
 | `home-manager` | Home-Manager modules                                            |
 | `nix-colors`   | Dracula theme palette (used everywhere)                         |
 | `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                                             |

@@ -21,52 +21,14 @@
        "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": 1783016143,
-        "narHash": "sha256-3qejDAo4g2XfzTyWCaX8RVKH17JXnw/fujsbXQA+Mzc=",
-        "ref": "refs/heads/master",
-        "rev": "83284d752d2ac325d4bf3ab7b38acad1c2fffe3a",
-        "revCount": 98,
-        "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": 1780133320,
-        "narHash": "sha256-8AiN9tV9PBb5xblJiPlhumBbKj61qLjzqXXFtkj3vvY=",
+        "lastModified": 1777399938,
+        "narHash": "sha256-xXPqUQezDdDtF8MbpZnwD1HkybOYwF92evx8rJ6OXCU=",
        "ref": "refs/heads/master",
-        "rev": "920c00313ae242bd93275c30131b9ab1e52ee2fb",
-        "revCount": 88,
+        "rev": "9a91f1ee0cf011a7eaf1f16a9e17610b0457e055",
+        "revCount": 85,
        "type": "git",
        "url": "https://code.m3ta.dev/m3tam3re/AGENTS"
      },
@@ -135,86 +97,7 @@
        "type": "github"
      }
    },
-    "dms": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1783529634,
-        "narHash": "sha256-zdHsPGPE5MVi/y+uIt548XScTfZjQzdF21dME7ISEJM=",
-        "owner": "AvengeMedia",
-        "repo": "DankMaterialShell",
-        "rev": "bdfd565b72cbb416441a9ab828efcac4fd516c70",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "ref": "stable",
-        "repo": "DankMaterialShell",
-        "type": "github"
-      }
-    },
-    "dms-plugin-registry": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1783591397,
-        "narHash": "sha256-e4DDmVAas6IPwwY+gfSDKh3PMzW/FXLCbjyWXOnnnbM=",
-        "owner": "AvengeMedia",
-        "repo": "dms-plugin-registry",
-        "rev": "8b61e8fca730986e673737529fa56802dc9326bb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "dms-plugin-registry",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "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",
@@ -235,31 +118,6 @@
        "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",
-        "uv2nix": "uv2nix"
-      },
-      "locked": {
-        "lastModified": 1783592259,
-        "narHash": "sha256-4b01+K9g1iBpLUaeiioQufWVowPW7uYk4QCe0L0nHiI=",
-        "owner": "NousResearch",
-        "repo": "hermes-agent",
-        "rev": "73b611ad19720d70308dad6b0fb64648aaadc216",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NousResearch",
-        "repo": "hermes-agent",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -288,11 +146,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1783550008,
-        "narHash": "sha256-qbbZUk9IG9dLNwCPwdPBs6I5clxwugRpP+1YU+GPK20=",
+        "lastModified": 1779113444,
+        "narHash": "sha256-/L61sT1PIKmGWIQpIh0uJGH/ANvcsf6y4alxtb9kelg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f4d01c1d87c7c2ec909549165d5a8338f1bd3315",
+        "rev": "74f170c62d57f90e656841f1f699e6bdf40f0a24",
        "type": "github"
      },
      "original": {
@@ -303,7 +161,7 @@
    },
    "m3ta-nixpkgs": {
      "inputs": {
-        "agents": "agents_2",
+        "agents": "agents",
        "basecamp": "basecamp",
        "nixpkgs": [
          "nixpkgs"
@@ -312,11 +170,11 @@
        "openspec": "openspec"
      },
      "locked": {
-        "lastModified": 1783269665,
-        "narHash": "sha256-bA4PooGV1x3vtmhs6NEprZbWErwaEJdgxoKfAWaH0do=",
+        "lastModified": 1778508052,
+        "narHash": "sha256-kxzZvJv757TGfHReR21aX6N/jkGMWzGSy9GQEclYD4Y=",
        "ref": "refs/heads/master",
-        "rev": "f279ae9c89d59f3e0deb0fd6307800f4cb993815",
-        "revCount": 356,
+        "rev": "8113723a48c4afa016881ccd5bc4be3fad2c7d5f",
+        "revCount": 294,
        "type": "git",
        "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
      },
@@ -377,11 +235,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1782540244,
-        "narHash": "sha256-3skOZJEfAUG7LSB/Ok2AQUiqeagYLSq+8wKjtS1hOyc=",
+        "lastModified": 1778507606,
+        "narHash": "sha256-6Yc2dIhijc8G+dbMNocyclxF19dUrjaT+EeXGrXmXlg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a65184fc373636356fcaf460dc09655a919c66ea",
+        "rev": "39a7b8d815fcc8b689d56fc4a3fa8de4ef93d169",
        "type": "github"
      },
      "original": {
@@ -393,43 +251,27 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1772479524,
-        "narHash": "sha256-u7nCaNiMjqvKpE+uZz9hE7pgXXTmm5yvdtFaqzSzUQI=",
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4215e62dc2cd3bc705b0a423b9719ff6be378a43",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1783224372,
-        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1783224372,
-        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
        "type": "github"
      },
      "original": {
@@ -439,38 +281,17 @@
        "type": "github"
      }
    },
-    "npm-lockfile-fix": {
-      "inputs": {
-        "nixpkgs": [
-          "hermes-agent",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "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"
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1783593872,
-        "narHash": "sha256-KvFRxsi81gBoK7JOTHD2LoR1y2sWobHkrHGPhM3v/NY=",
+        "lastModified": 1778506944,
+        "narHash": "sha256-lU0Bleh0reE+WU7j8Uiqsu6ekPav50L8sXsgOvEQS+0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "73078fa6f0d34686ad26808f90cc74e81039ba9f",
+        "rev": "0166493cfe4e0e9927435c1cfbf5505cfb0d10d1",
        "type": "github"
      },
      "original": {
@@ -487,11 +308,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1782291243,
-        "narHash": "sha256-0pVn5pDqlKpqSgzf4eG9TFCjkjzOtnmGTpbILso7GwI=",
+        "lastModified": 1778120451,
+        "narHash": "sha256-MUSPD16+hoFBfQWYahtNLN2BIFEAlFFo2KNofrc947g=",
        "owner": "Fission-AI",
        "repo": "OpenSpec",
-        "rev": "737518b36fe4b6fdb09c83eeaf8d873a428c92e6",
+        "rev": "053d8a59d587f3c027a06ad80503a6b43d4f2a92",
        "type": "github"
      },
      "original": {
@@ -500,68 +321,13 @@
        "type": "github"
      }
    },
-    "pyproject-build-systems": {
-      "inputs": {
-        "nixpkgs": [
-          "hermes-agent",
-          "nixpkgs"
-        ],
-        "pyproject-nix": [
-          "hermes-agent",
-          "pyproject-nix"
-        ],
-        "uv2nix": [
-          "hermes-agent",
-          "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",
-          "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"
-      }
-    },
    "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_3",
+        "nixpkgs": "nixpkgs_2",
        "nur": "nur"
      }
    },
@@ -579,31 +345,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "uv2nix": {
-      "inputs": {
-        "nixpkgs": [
-          "hermes-agent",
-          "nixpkgs"
-        ],
-        "pyproject-nix": [
-          "hermes-agent",
-          "pyproject-nix"
-        ]
-      },
-      "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",
@@ -16,52 +16,26 @@
      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/v2026.7.1";
-      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, ...} @ inputs: {
+  outputs = {
+    self,
+    nixpkgs,
+    ...
+  } @ inputs: let
+    lib = nixpkgs.lib;
+  in {
    # 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;
@@ -1,16 +1,5 @@
 # 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 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"]);
-  }
+# Re-exports mkHome and future library functions.
+{inputs, selfPath}: import ./mkHome.nix {inherit inputs selfPath;}
@@ -19,10 +19,7 @@
 #   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 = {
@@ -83,13 +80,6 @@ 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
@@ -99,8 +89,6 @@ in {
      ++ contextImport
      ++ setImports;

-    _module.args.m3taHomeInputs = inputs;
-
    # Set the flake source root for asset path resolution
    "m3ta-home".paths.srcRoot = selfPath;

@@ -8,15 +8,11 @@
 {
  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

@@ -34,8 +30,6 @@
      ./../users/m3tam3re/identities/work.nix
    ];

-    _module.args.m3taHomeInputs = inputs;
-
    # Set the source root for asset path resolution
    "m3ta-home".paths.srcRoot = selfPath;
  };
@@ -2,19 +2,16 @@
 {
  config,
  lib,
-  options,
  ...
 }:
 with lib; let
  cfg = config.base.cliTools.fzf;
-  changeDirWidgetCommand = "fd --type d --exclude .git --follow --hidden";
 in {
  # Enabled by default — base modules are always-on.
  options.base.cliTools.fzf.enable = (mkEnableOption "enable fuzzy finder") // {default = true;};

  config = mkIf cfg.enable {
-    programs.fzf =
-      {
+    programs.fzf = {
      enable = true;
      enableFishIntegration = true;
      colors = {
@@ -38,11 +35,7 @@ in {
        "--bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort'"
      ];
      defaultCommand = "fd --type f --exclude .git --follow --hidden";
-      }
-      // (
-        if options.programs.fzf ? changeDirWidget
-        then {changeDirWidget.command = changeDirWidgetCommand;}
-        else {inherit changeDirWidgetCommand;}
-      );
+      changeDirWidgetCommand = "fd --type d --exclude .git --follow --hidden";
+    };
  };
 }
@@ -1,6 +1,7 @@
 # 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)
@@ -8,19 +9,21 @@
 #   - Base packages
 #
 # NOTE: Overlays are NOT set here. The consuming flake (nixos-config) handles
-# 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.
+# overlays at the NixOS level via nixpkgs.overlays. This module only imports
+# HM modules 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
@@ -41,7 +44,7 @@
  };

  # ── Color scheme ──
-  colorScheme = m3taHomeInputs.nix-colors.colorSchemes.dracula;
+  colorScheme = inputs.nix-colors.colorSchemes.dracula;

  # ── Base packages ──
  home.packages = with pkgs; [
@@ -6,8 +6,6 @@
 }:
 with lib; let
  cfg = config.base.shell.nushell;
-  # User-specific secrets file from agenix, resolved at build time.
-  secretsFile = "/run/agenix/${config.home.username}-secrets";
 in {
  # Enabled by default — base modules are always-on.
  options.base.shell.nushell.enable = (mkEnableOption "enable nushell") // {default = true;};
@@ -43,17 +41,6 @@ in {
              | transpose -r -d
              | load-env
          }
-
-          # Load user-specific 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.
-          # Path is resolved at Nix build time via config.home.username.
-          const user_secrets_file = if ("${secretsFile}" | path exists) {
-            "${secretsFile}"
-          } else {
-            null
-          }
-          source $user_secrets_file
      '';

      configFile.text = ''
@@ -1,7 +1,7 @@
 # Desktop environment aggregator — only loaded when context=desktop.
 # Includes window manager, applications, theming, and desktop session config.
 {
-  m3taHomeInputs,
+  config,
  pkgs,
  ...
 }: {
@@ -38,8 +38,7 @@
    };
  };

-  home = {
-    sessionVariables = {
+  home.sessionVariables = {
    WEBKIT_DISABLE_COMPOSITING_MODE = "1";
    NIXOS_OZONE_WL = "1";
    TERMINAL = "ghostty";
@@ -49,47 +48,13 @@
    XDG_SESSION_DESKTOP = "Hyprland";
  };

-    sessionPath = [
+  home.sessionPath = [
    "\${XDG_BIN_HOME}"
    "\${HOME}/.cargo/bin"
    "$HOME/.npm-global/bin"
    "$HOME/.cache/.bun/bin"
  ];

-    pointerCursor = {
-      enable = true;
-      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;

  programs.ghostty = {
@@ -99,30 +64,59 @@
    settings = {
      font-family = "Fira Code";
      copy-on-select = "clipboard";
-      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}"
-      # ];
+      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
+  ];
 }
@@ -1,4 +1,4 @@
-# GTK and Qt theming — system-wide dark Adwaita/libadwaita-compatible theme.
+# GTK and Qt theming — Dracula theme with matching icons and cursor.
 {
  pkgs,
  config,
@@ -6,19 +6,18 @@
 }: {
  qt = {
    enable = true;
-    platformTheme.name = "gtk3";
+    platformTheme.name = "gtk";
  };

  gtk = {
    enable = true;
-    colorScheme = "dark";
    theme = {
-      name = "adw-gtk3-dark";
-      package = pkgs.adw-gtk3;
+      name = "Dracula";
+      package = pkgs.dracula-theme;
    };
    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
+      name = "Dracula";
+      package = pkgs.dracula-icon-theme;
    };
    gtk4.theme = config.gtk.theme;
  };
@@ -4,6 +4,5 @@
    ./hyprland.nix
    ./wayland.nix
    ./rofi.nix
-    ./dms.nix
  ];
 }
@@ -1,29 +0,0 @@
-# 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;
-      };
-    };
-  };
-}
@@ -1,4 +1,6 @@
-# Hyprland window manager with keybindings, window rules, idle/lock, and hyprpaper.
+# 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/
 {
  config,
  lib,
@@ -6,41 +8,25 @@
 }:
 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 = "hyprlang";
-      settings = {
-        xwayland = {
-          force_zero_scaling = true;
-        };
-        source = [
-          "~/.config/hypr/dms/colors.conf"
-          "~/.config/hypr/dms/layout.conf"
-          "~/.config/hypr/dms/outputs.conf"
-        ];
-        exec-once = [
-          "vibetyper"
-        ];
+      configType = "lua";

-        env = [
-          "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"
-        ];
+      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 = "us";
+            kb_layout = "de,us";
            kb_variant = "";
            kb_model = "";
            kb_rules = "";
@@ -52,6 +38,10 @@ in {
            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";
          };

@@ -60,8 +50,7 @@ in {
              enabled = true;
              range = 60;
              render_power = 3;
-            # color = "rgba(${config.colorScheme.palette.base00}66)";
-            offset = "1 2";
+              color = "rgba(${p.base00}66)";
              scale = 0.97;
            };
            rounding = 8;
@@ -74,278 +63,257 @@ in {
            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"
-          ];
-        };
+          animations = {enabled = true;};

          dwindle = {
-          # pseudotile = true; # TODO
+            pseudotile = true;
            preserve_split = true;
          };

-        master = {
-          new_status = "master";
+          master = {new_status = "master";};
        };

+        # ── 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"]; }
+        ];
+
+        # ── Per-device config (rendered as: hl.device({...})) ──
        device = [
-          # Alle normalen Keyboards explizit auf de setzen:
-          {
-            name = "video-bus";
-            kb_layout = "de,us";
-            kb_options = "ctrl:nocaps";
-          }
-          {
-            name = "razer-razer-pro-click-v2-vertical-edition-keyboard";
-            kb_layout = "de,us";
-            kb_options = "ctrl:nocaps";
-          }
-          {
-            name = "razer-razer-pro-click-v2-vertical-edition-1";
-            kb_layout = "de,us";
-            kb_options = "ctrl:nocaps";
-          }
-          {
-            name = "vibe-typer-virtual-keyboard";
-            kb_layout = "de";
-            kb_options = "ctrl:nocaps";
-          }
-          {
-            name = "keychron-keychron-k7";
-            kb_layout = "us";
-            kb_options = "ctrl:nocaps";
-          }
-          # Moonlander Sub-Devices bleiben us (erben global)
-          {
-            name = "zsa-technology-labs-moonlander-mark-i-consumer-control";
-            kb_layout = "us";
-            kb_options = "ctrl:nocaps";
-          }
-          {
-            name = "zsa-technology-labs-moonlander-mark-i-keyboard";
-            kb_layout = "us";
-            kb_options = "ctrl:nocaps";
-          }
-          {
-            name = "zsa-technology-labs-moonlander-mark-i-system-control";
-            kb_layout = "us";
-            kb_options = "ctrl:nocaps";
-          }
+          {name = "epic-mouse-v1"; sensitivity = -0.5;}
+          {name = "zsa-technology-labs-moonlander-mark-i"; kb_layout = "us";}
+          {name = "keychron-keychron-k7"; kb_layout = "us";}
        ];
+      };

-        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"
-          "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_shadow on"
-          "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_anim on"
-          "match:class ^vibe-typer$, match:title ^Recording Indicator$, border_size 0"
-          "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_focus on"
-          "border_color rgb(ffffff), match:xwayland 1"
-        ];
+      # ── 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} } })

-        "$mainMod" = "SUPER";
-        "$terminal" = "ghostty";
+        -- 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" })

-        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: 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"))

-        bindr = [
-        ];
+        -- 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"))

-        bindm = [
-          "$mainMod, mouse:272, movewindow"
-          "$mainMod, mouse:273, resizewindow"
+        -- 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";
+          }
        ];
      };
    };

-    # 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";
-    #       }
-    #     ];
-    #   };
-    # };
+    services.hyprpaper.enable = true;

-    # services.hyprpaper.enable = true;
+    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})";

-    # 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})";
+        general = {
+          hide_cursor = true;
+        };

-    #     general = {
-    #       hide_cursor = true;
-    #     };
+        background = {
+          monitor = "";
+          path = "${config.home.homeDirectory}/.config/hypr/wallpapers/wallhaven-lmmo8r.jpg";
+          blur_passes = 0;
+          color = "rgb(${p.base00})";
+        };

-    #     background = {
-    #       monitor = "";
-    #       path = "${config.home.homeDirectory}/.config/hypr/wallpapers/wallhaven-lmmo8r.jpg";
-    #       blur_passes = 0;
-    #       color = "rgb(${config.colorScheme.palette.base00})";
-    #     };
+        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";
+          }
+        ];

-    #     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";
-    #       }
-    #     ];
-    #   };
-    # };
+        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";
+          }
+        ];
+      };
+    };
  };
 }
@@ -1,36 +0,0 @@
-{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;
-      };
-    };
-  };
-}
@@ -1,8 +1,10 @@
 # AI agent system — OpenCode, Pi, and MCP server configuration.
 # Relies on coding.agents options provided by home/common/default.nix
-# (m3taHomeInputs.m3ta-nixpkgs.homeManagerModules.default).
+# (inputs.m3ta-nixpkgs.homeManagerModules.default).
 {
-  m3taHomeInputs,
+  config,
+  inputs,
+  lib,
  pkgs,
  videoDrivers ? [],
  ...
@@ -17,14 +19,24 @@
  };

  imports = [
-    # OpenCode, Pi, and Babysitter agent configurations
-    ./agents-lib.nix
-    ./babysitter.nix
+    # OpenCode and Pi agent configurations
    ./opencode.nix
    ./pi.nix
  ];

-  coding.agents.babysitter.enable = true;
+  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;}
+    ];
+  };

  programs.mcp = {
    enable = true;
@@ -54,21 +66,13 @@
          ''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
-    aionui
-    m3taHomeInputs.agent-lib.packages.${pkgs.stdenv.hostPlatform.system}.agent-lib-cli
    beads
-    crunch
-    herdr
    pi-coding-agent
    (qmd.override {
      vulkanSupport = videoDrivers == ["amdgpu"];
@@ -77,7 +81,5 @@
    # opencode-desktop
    openshell
    openspec
-    openwork
-    talk
  ];
 }
@@ -1,142 +0,0 @@
-# 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;
-    };
-  };
-}
@@ -1,28 +1,37 @@
-{lib, ...}: {
+{
+  inputs,
+  lib,
+  ...
+}: {
+  coding.agents.opencode = {
+    enable = true;
+    agentsInput = inputs.agents;
+  };
+
  coding.opencode = {
    enable = true;

    ohMyOpencodeSettings = {
      agents = {
-        sisyphus.model = "zai-coding-plan/glm-5.2";
-        oracle.model = "litellm/claude-sonnet-5";
-        librarian.model = "litellm/claude-sonnet-5";
+        sisyphus.model = "litellm/claude-opus-4-6";
+        oracle.model = "litellm/claude-sonnet-4-6";
+        librarian.model = "litellm/claude-sonnet-4-6";
        explore.model = "litellm/claude-haiku-4-5";
        multimodal-looker.model = "litellm/gpt-5.3-codex";
-        prometheus.model = "litellm/claude-opus-4-8";
-        metis.model = "litellm/claude-opus-4-8";
-        momus.model = "zai-coding-plan/glm-5.2";
-        atlas.model = "zai-coding-plan/glm-5.2";
+        prometheus.model = "litellm/claude-opus-4-6";
+        metis.model = "litellm/claude-opus-4-6";
+        momus.model = "litellm/claude-opus-4-6";
+        atlas.model = "litellm/claude-sonnet-4-6";
      };
      categories = {
-        visual-engineering.model = "zai-coding-plan/glm-5.2";
-        ultrabrain.model = "litellm/claude-opus-4-8";
-        deep.model = "litellm/claude-sonnet-5";
-        artistry.model = "zai-coding-plan/glm-5.2";
+        visual-engineering.model = "zai-coding-plan/glm-5.1";
+        ultrabrain.model = "litellm/claude-opus-4-6";
+        deep.model = "litellm/claude-sonnet-4-6";
+        artistry.model = "zai-coding-plan/glm-5.1";
        quick.model = "litellm/claude-haiku-4-5";
-        unspecified-low.model = "litellm/claude-sonnet-5";
-        unspecified-high.model = "litellm/claude-opus-4-8";
-        writing.model = "zai-coding-plan/glm-5.2";
+        unspecified-low.model = "litellm/claude-sonnet-4-6";
+        unspecified-high.model = "litellm/claude-opus-4-6";
+        writing.model = "zai-coding-plan/glm-5.1";
      };
    };
  };
@@ -227,11 +236,12 @@
              output = 64000;
            };
          };
-          "claude-opus-4-8" = {
-            name = "Claude Opus 4.8";
+          "claude-opus-4-6" = {
+            name = "Claude Opus 4.6";
            options = {
              thinking = {
-                type = "adaptive";
+                type = "enabled";
+                budget_tokens = 16000;
              };
            };
            limit = {
@@ -1,12 +1,41 @@
-{...}: {
+{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"
        "npm:pi-beads-extension"
        "npm:pi-lens"
@@ -17,10 +46,11 @@
        "npm:pi-subagents"
        "npm:pi-tool-display"
        "npm:pi-web-access"
+        "git:github.com/hk-vk/pi-connect"
      ];

-      defaultProvider = "openai-codex";
-      defaultModel = "gpt-5.5";
+      defaultProvider = "minimax";
+      defaultModel = "MiniMax-M2.7";
      defaultThinkingLevel = "high";
    };

@@ -29,7 +59,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 = false;
+      enable = true;
      config = {
        enabled = true;
        applyBuiltinDefaults = true;
@@ -9,6 +9,5 @@
    jq
    ripgrep
    tree
-    worktrunk
  ];
 }
@@ -17,6 +17,9 @@ in {
      bun
    ];

+    home.file.".npmrc".text = ''
+      prefix=${npmGlobalPrefix}
+    '';
    home.sessionVariables.NPM_CONFIG_PREFIX = npmGlobalPrefix;
  };
 }
@@ -15,7 +15,7 @@ in {
      amf
      ffmpeg_6-full
      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-bad
+      gst_all_1.gst-vaapi
      pamixer
      pavucontrol
      qpwgraph
@@ -44,107 +44,107 @@
  programs.ssh = {
    enable = true;
    enableDefaultConfig = false;
-    settings = {
+    matchBlocks = {
      "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";
      };
    };
  };
@@ -44,29 +44,29 @@
  programs.ssh = {
    enable = true;
    enableDefaultConfig = false;
-    settings = {
+    matchBlocks = {
      "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";
      };
      "code.m3ta.dev" = {
-        HostName = "code.m3ta.dev";
-        User = "m3tam3re";
-        IdentityFile = "~/.ssh/sascha.koenig";
+        hostname = "code.m3ta.dev";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/sascha.koenig";
      };
    };
  };
@@ -11,9 +11,7 @@
  pkgs,
  lib,
  ...
-}: let
-  npmGlobalPrefix = "${config.home.homeDirectory}/.npm-global";
-in {
+}: {
  # ── Clipboard ──
  services.cliphist = {
    enable = true;
@@ -27,10 +25,4 @@ in {
  # These are overridden by the identity module, but provide safe defaults.
  home.username = lib.mkDefault "m3tam3re";
  home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
-
-  home.file.".npmrc".text = ''
-    prefix=${npmGlobalPrefix}
-    @m3ta:registry=https://code.m3ta.dev/api/packages/m3tam3re/npm/
-    //code.m3ta.dev/api/packages/m3tam3re/npm/:_authToken=''${GITEA_TOKEN}
-  '';
 }