From c527cde02f754e92ee5060c9c0a0b5922cc3c23f Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:23:26 -0500
Subject: [PATCH] toplevel

---
 .../claude-code => claude-code}/commands/hack.md   |  0
 .../claude-code => claude-code}/commands/pr.md     |  0
 .../mcp/chrome-devtools.nix                        |  0
 .../claude-code => claude-code}/mcp/nixos-mcp.nix  |  0
 .../home/claude-code => claude-code}/memory.md     |  0
 .../home/claude-code => claude-code}/settings.nix  |  0
 .../skills/article-extractor/SKILL.md              |  0
 .../skills/article-extractor/default.nix           |  0
 .../skills/haskell/SKILL.md                        |  0
 .../skills/nix/SKILL.md                            |  0
 .../subagents/pre-commit.md                        |  0
 modules/home/claude-code/default.nix               | 14 ++++++++------
 12 files changed, 8 insertions(+), 6 deletions(-)
 rename {modules/home/claude-code => claude-code}/commands/hack.md (100%)
 rename {modules/home/claude-code => claude-code}/commands/pr.md (100%)
 rename {modules/home/claude-code => claude-code}/mcp/chrome-devtools.nix (100%)
 rename {modules/home/claude-code => claude-code}/mcp/nixos-mcp.nix (100%)
 rename {modules/home/claude-code => claude-code}/memory.md (100%)
 rename {modules/home/claude-code => claude-code}/settings.nix (100%)
 rename {modules/home/claude-code => claude-code}/skills/article-extractor/SKILL.md (100%)
 rename {modules/home/claude-code => claude-code}/skills/article-extractor/default.nix (100%)
 rename {modules/home/claude-code => claude-code}/skills/haskell/SKILL.md (100%)
 rename {modules/home/claude-code => claude-code}/skills/nix/SKILL.md (100%)
 rename {modules/home/claude-code => claude-code}/subagents/pre-commit.md (100%)

diff --git a/modules/home/claude-code/commands/hack.md b/claude-code/commands/hack.md
similarity index 100%
rename from modules/home/claude-code/commands/hack.md
rename to claude-code/commands/hack.md
diff --git a/modules/home/claude-code/commands/pr.md b/claude-code/commands/pr.md
similarity index 100%
rename from modules/home/claude-code/commands/pr.md
rename to claude-code/commands/pr.md
diff --git a/modules/home/claude-code/mcp/chrome-devtools.nix b/claude-code/mcp/chrome-devtools.nix
similarity index 100%
rename from modules/home/claude-code/mcp/chrome-devtools.nix
rename to claude-code/mcp/chrome-devtools.nix
diff --git a/modules/home/claude-code/mcp/nixos-mcp.nix b/claude-code/mcp/nixos-mcp.nix
similarity index 100%
rename from modules/home/claude-code/mcp/nixos-mcp.nix
rename to claude-code/mcp/nixos-mcp.nix
diff --git a/modules/home/claude-code/memory.md b/claude-code/memory.md
similarity index 100%
rename from modules/home/claude-code/memory.md
rename to claude-code/memory.md
diff --git a/modules/home/claude-code/settings.nix b/claude-code/settings.nix
similarity index 100%
rename from modules/home/claude-code/settings.nix
rename to claude-code/settings.nix
diff --git a/modules/home/claude-code/skills/article-extractor/SKILL.md b/claude-code/skills/article-extractor/SKILL.md
similarity index 100%
rename from modules/home/claude-code/skills/article-extractor/SKILL.md
rename to claude-code/skills/article-extractor/SKILL.md
diff --git a/modules/home/claude-code/skills/article-extractor/default.nix b/claude-code/skills/article-extractor/default.nix
similarity index 100%
rename from modules/home/claude-code/skills/article-extractor/default.nix
rename to claude-code/skills/article-extractor/default.nix
diff --git a/modules/home/claude-code/skills/haskell/SKILL.md b/claude-code/skills/haskell/SKILL.md
similarity index 100%
rename from modules/home/claude-code/skills/haskell/SKILL.md
rename to claude-code/skills/haskell/SKILL.md
diff --git a/modules/home/claude-code/skills/nix/SKILL.md b/claude-code/skills/nix/SKILL.md
similarity index 100%
rename from modules/home/claude-code/skills/nix/SKILL.md
rename to claude-code/skills/nix/SKILL.md
diff --git a/modules/home/claude-code/subagents/pre-commit.md b/claude-code/subagents/pre-commit.md
similarity index 100%
rename from modules/home/claude-code/subagents/pre-commit.md
rename to claude-code/subagents/pre-commit.md
diff --git a/modules/home/claude-code/default.nix b/modules/home/claude-code/default.nix
index ec29acc..7154478 100644
--- a/modules/home/claude-code/default.nix
+++ b/modules/home/claude-code/default.nix
@@ -1,6 +1,8 @@
 { flake, pkgs, lib, ... }:
 let
-  subagentsDir = ./subagents;
+  claudeCodeDir = flake.inputs.self + /claude-code;
+
+  subagentsDir = claudeCodeDir + "/subagents";
   agents = lib.mapAttrs'
     (fileName: _:
       lib.nameValuePair
@@ -9,7 +11,7 @@ let
     )
     (builtins.readDir subagentsDir);
 
-  commandsDir = ./commands;
+  commandsDir = claudeCodeDir + "/commands";
   commands = lib.mapAttrs'
     (fileName: _:
       lib.nameValuePair
@@ -18,7 +20,7 @@ let
     )
     (builtins.readDir commandsDir);
 
-  skillsDir = ./skills;
+  skillsDir = claudeCodeDir + "/skills";
   skillDirs = lib.filterAttrs (_: type: type == "directory") (builtins.readDir skillsDir);
 
   # Process skill: if it has default.nix, build and substitute; otherwise use as-is
@@ -39,7 +41,7 @@ let
     else
       skillPath;
 
-  mcpDir = ./mcp;
+  mcpDir = claudeCodeDir + "/mcp";
   mcpServers = lib.mapAttrs'
     (fileName: _:
       lib.nameValuePair
@@ -74,10 +76,10 @@ in
       else pkgs.claude-code;
 
     # Basic settings for Claude Code
-    settings = import ./settings.nix;
+    settings = import (claudeCodeDir + "/settings.nix");
 
     # System prompt / memory
-    memory.text = builtins.readFile ./memory.md;
+    memory.text = builtins.readFile (claudeCodeDir + "/memory.md");
 
     # Automatically discovered commands from commands/ directory
     commands = commands;