From de24d4425ebbeaea89fc2067e7bbb664f2845b42 Mon Sep 17 00:00:00 2001
From: alexion <contact@alexion.dev>
Date: Wed, 2 Sep 2026 20:20:38 -0400
Subject: [PATCH] refactor(shell): move agent tools into shell modules

---
 configs/nixos/hosts/neogaia/default.nix                       | 4 ++--
 configs/nixos/modules/{agents/tools => shell}/gitea-axi.nix   | 4 ++--
 .../nixos/modules/{agents/pi/pi.nix => shell/pi/default.nix}  | 4 ++--
 .../modules/{agents => shell}/pi/patches/pi-flex-spacer.patch | 0
 .../pi/patches/pi-tool-lookup-validation.patch                | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename configs/nixos/modules/{agents/tools => shell}/gitea-axi.nix (81%)
 rename configs/nixos/modules/{agents/pi/pi.nix => shell/pi/default.nix} (95%)
 rename configs/nixos/modules/{agents => shell}/pi/patches/pi-flex-spacer.patch (100%)
 rename configs/nixos/modules/{agents => shell}/pi/patches/pi-tool-lookup-validation.patch (100%)

diff --git a/configs/nixos/hosts/neogaia/default.nix b/configs/nixos/hosts/neogaia/default.nix
index 3ec1246..0e8e8a9 100644
--- a/configs/nixos/hosts/neogaia/default.nix
+++ b/configs/nixos/hosts/neogaia/default.nix
@@ -42,8 +42,8 @@
 
   modules.monorepo.enable = true;
   modules.shell.herdr.enable = true;
-  modules.agents.tools.gitea-axi.enable = true;
-  modules.agents.pi.enable = true;
+  modules.shell.gitea-axi.enable = true;
+  modules.shell.pi.enable = true;
 
   modules.desktop.enable = true;
   modules.desktop.apps.obsidian.enable = true;
diff --git a/configs/nixos/modules/agents/tools/gitea-axi.nix b/configs/nixos/modules/shell/gitea-axi.nix
similarity index 81%
rename from configs/nixos/modules/agents/tools/gitea-axi.nix
rename to configs/nixos/modules/shell/gitea-axi.nix
index a0ffeca..b35d4e6 100644
--- a/configs/nixos/modules/agents/tools/gitea-axi.nix
+++ b/configs/nixos/modules/shell/gitea-axi.nix
@@ -6,11 +6,11 @@
 }:
 # gitea-axi for the primary user, installed through its own home-manager module.
 let
-  cfg = config.modules.agents.tools.gitea-axi;
+  cfg = config.modules.shell.gitea-axi;
   user = config.user.name;
 in
 {
-  options.modules.agents.tools.gitea-axi.enable =
+  options.modules.shell.gitea-axi.enable =
     lib.mkEnableOption "gitea-axi, an agent-ergonomic CLI for Gitea issues and pull requests";
 
   config = lib.mkIf cfg.enable {
diff --git a/configs/nixos/modules/agents/pi/pi.nix b/configs/nixos/modules/shell/pi/default.nix
similarity index 95%
rename from configs/nixos/modules/agents/pi/pi.nix
rename to configs/nixos/modules/shell/pi/default.nix
index c4313d2..b205fca 100644
--- a/configs/nixos/modules/agents/pi/pi.nix
+++ b/configs/nixos/modules/shell/pi/default.nix
@@ -8,7 +8,7 @@
 # home-manager, which ships the package and manages global settings.
 # The login credential is left unmanaged, so it survives rebuilds.
 let
-  cfg = config.modules.agents.pi;
+  cfg = config.modules.shell.pi;
   user = config.user.name;
   piDir = "${config.users.users.${user}.home}/.pi/agent";
   patchedPi = pkgs.pi-coding-agent.overrideAttrs (old: {
@@ -19,7 +19,7 @@ let
   });
 in
 {
-  options.modules.agents.pi = {
+  options.modules.shell.pi = {
     enable = lib.mkEnableOption ''
       Pi, a terminal coding agent, configured via home-manager'';
   };
diff --git a/configs/nixos/modules/agents/pi/patches/pi-flex-spacer.patch b/configs/nixos/modules/shell/pi/patches/pi-flex-spacer.patch
similarity index 100%
rename from configs/nixos/modules/agents/pi/patches/pi-flex-spacer.patch
rename to configs/nixos/modules/shell/pi/patches/pi-flex-spacer.patch
diff --git a/configs/nixos/modules/agents/pi/patches/pi-tool-lookup-validation.patch b/configs/nixos/modules/shell/pi/patches/pi-tool-lookup-validation.patch
similarity index 100%
rename from configs/nixos/modules/agents/pi/patches/pi-tool-lookup-validation.patch
rename to configs/nixos/modules/shell/pi/patches/pi-tool-lookup-validation.patch