fix: apply the namespace edits dropped from the task 0031 merge
The task 0031 commit moved the module files but a mis-staged `git add` left the option-path rewrites out, so main declared the old namespaces (`modules.claude-code`, `modules.gitea-axi`, `modules.pi`, `modules.desktop.hyprlock`/`hypridle`) while CONTEXT.md and ADR 0004 already documented the new ones. Rewrite the paths in the moved and in-place modules, the neogaia host, and the two live CLAUDE.md gotchas so the code matches the recorded convention.
This commit is contained in:
@@ -8,11 +8,11 @@
|
||||
# the package and manages ~/.claude. Login credentials are left unmanaged so they
|
||||
# survive rebuilds.
|
||||
let
|
||||
cfg = config.modules.claude-code;
|
||||
cfg = config.modules.agents.claude-code;
|
||||
user = config.user.name;
|
||||
in
|
||||
{
|
||||
options.modules.claude-code.enable = lib.mkEnableOption ''
|
||||
options.modules.agents.claude-code.enable = lib.mkEnableOption ''
|
||||
Claude Code, Anthropic's CLI, configured via home-manager.
|
||||
|
||||
Enabling this also widens sudo's credential cache, keying it per user rather
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
# home-manager, which ships the package and manages ~/.pi/agent.
|
||||
# The login credential is left unmanaged, so it survives rebuilds.
|
||||
let
|
||||
cfg = config.modules.pi;
|
||||
cfg = config.modules.agents.pi;
|
||||
user = config.user.name;
|
||||
in
|
||||
{
|
||||
options.modules.pi.enable = lib.mkEnableOption ''
|
||||
options.modules.agents.pi.enable = lib.mkEnableOption ''
|
||||
Pi, a terminal coding agent, configured via home-manager'';
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
# That module also declares the Claude Code context when that harness is
|
||||
# enabled on the host; enabling this alone installs the CLI and nothing else.
|
||||
let
|
||||
cfg = config.modules.gitea-axi;
|
||||
cfg = config.modules.agents.tools.gitea-axi;
|
||||
user = config.user.name;
|
||||
in
|
||||
{
|
||||
options.modules.gitea-axi.enable =
|
||||
options.modules.agents.tools.gitea-axi.enable =
|
||||
lib.mkEnableOption "gitea-axi, an agent-ergonomic CLI for Gitea issues and pull requests";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
@@ -11,8 +11,8 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
modules.desktop.clipboard.enable = lib.mkDefault true;
|
||||
modules.desktop.hyprland.enable = lib.mkDefault true;
|
||||
modules.desktop.hyprlock.enable = lib.mkDefault true;
|
||||
modules.desktop.hypridle.enable = lib.mkDefault true;
|
||||
modules.desktop.hyprland.hyprlock.enable = lib.mkDefault true;
|
||||
modules.desktop.hyprland.hypridle.enable = lib.mkDefault true;
|
||||
modules.desktop.login.enable = lib.mkDefault true;
|
||||
modules.desktop.mako.enable = lib.mkDefault true;
|
||||
modules.desktop.portals.enable = lib.mkDefault true;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# Idle management: hypridle locks on idle, powers the displays off, and locks
|
||||
# before every suspend, so an unattended session always lands at hyprlock.
|
||||
let
|
||||
cfg = config.modules.desktop.hypridle;
|
||||
cfg = config.modules.desktop.hyprland.hypridle;
|
||||
user = config.user.name;
|
||||
|
||||
hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
|
||||
@@ -18,7 +18,7 @@ let
|
||||
lockCmd = "${pkgs.procps}/bin/pidof hyprlock || ${hyprlock}";
|
||||
in
|
||||
{
|
||||
options.modules.desktop.hypridle = {
|
||||
options.modules.desktop.hyprland.hypridle = {
|
||||
enable = lib.mkEnableOption "hypridle idle management";
|
||||
|
||||
lockTimeout = lib.mkOption {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
# The lock screen: hyprlock, a session-lock client whose surface the compositor owns, so it survives a crash of the locker rather than exposing the session.
|
||||
let
|
||||
cfg = config.modules.desktop.hyprlock;
|
||||
cfg = config.modules.desktop.hyprland.hyprlock;
|
||||
user = config.user.name;
|
||||
|
||||
# The hyprlock this module installs, so the keybind and the idle daemon lock
|
||||
@@ -14,7 +14,7 @@ let
|
||||
hyprlock = "${config.home-manager.users.${user}.programs.hyprlock.package}/bin/hyprlock";
|
||||
in
|
||||
{
|
||||
options.modules.desktop.hyprlock.enable = lib.mkEnableOption "the hyprlock lock screen";
|
||||
options.modules.desktop.hyprland.hyprlock.enable = lib.mkEnableOption "the hyprlock lock screen";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home-manager.users.${user} = {
|
||||
|
||||
Reference in New Issue
Block a user