Add per-skill destinations for private Claude skills

Author: rounakdatta

configs/claude-skills/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = config.programs.claude-skills;
@@ -26,21 +26,74 @@ in
     # Private skills via git (activation script)
     home.activation.syncPrivateSkills = lib.mkIf cfg.enablePrivate (
       lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-        SKILLS_DIR="$HOME/.claude/skills"
-        CACHE_DIR="$HOME/.cache/claude-private-skills"
-
-        if [ ! -d "$CACHE_DIR" ]; then
-          git clone -b ${cfg.privateRepo.ref} ${cfg.privateRepo.url} "$CACHE_DIR"
-        else
-          git -C "$CACHE_DIR" pull --ff-only origin ${cfg.privateRepo.ref} || true
-        fi
-
-        # Symlink each private skill into ~/.claude/skills/
-        for skill in "$CACHE_DIR"/*/; do
-          [ -d "$skill" ] || continue
-          skill_name=$(basename "$skill")
-          ln -sfn "$skill" "$SKILLS_DIR/$skill_name"
-        done
+                SKILLS_DIR="$HOME/.claude/skills"
+                CACHE_DIR="$HOME/.cache/claude-private-skills"
+                MANAGED_LINKS_FILE="$HOME/.cache/claude-private-skills-managed-links"
+                JQ_BIN="${pkgs.jq}/bin/jq"
+
+                mkdir -p "$SKILLS_DIR"
+                mkdir -p "$(dirname "$MANAGED_LINKS_FILE")"
+
+                if [ ! -d "$CACHE_DIR" ]; then
+                  git clone -b ${cfg.privateRepo.ref} ${cfg.privateRepo.url} "$CACHE_DIR"
+                else
+                  git -C "$CACHE_DIR" pull --ff-only origin ${cfg.privateRepo.ref} || true
+                fi
+
+                # Clean only links that this activation previously managed.
+                if [ -f "$MANAGED_LINKS_FILE" ]; then
+                  while IFS= read -r old_link; do
+                    [ -L "$old_link" ] && rm -f "$old_link"
+                  done < "$MANAGED_LINKS_FILE"
+                fi
+                : > "$MANAGED_LINKS_FILE"
+
+                # Discover skills recursively. A skill is any directory containing SKILL.md.
+                while IFS= read -r skill_md; do
+                  skill_dir="$(dirname "$skill_md")"
+                  manifest="$skill_dir/skill.json"
+                  skill_name="$(basename "$skill_dir")"
+
+                  enabled="true"
+                  destinations="$SKILLS_DIR"
+
+                  # Optional per-skill metadata:
+                  # {
+                  #   "enabled": true,
+                  #   "destinations": ["~/.claude/skills", "~/work/byoc/.claude/skills"]
+                  # }
+                  if [ -f "$manifest" ]; then
+                    enabled="$("$JQ_BIN" -r '.enabled // true' "$manifest" 2>/dev/null || echo true)"
+                    if [ "$enabled" != "true" ]; then
+                      continue
+                    fi
+
+                    destinations="$("$JQ_BIN" -r '(.destinations // ["~/.claude/skills"])[]' "$manifest" 2>/dev/null || echo "~/.claude/skills")"
+                  fi
+
+                  while IFS= read -r destination; do
+                    [ -n "$destination" ] || continue
+
+                    # Expand "~" to $HOME for destination paths.
+                    case "$destination" in
+                      "~")
+                        destination="$HOME"
+                        ;;
+                      "~/"*)
+                        destination="$HOME/$(printf '%s' "$destination" | sed 's#^~/##')"
+                        ;;
+                    esac
+
+                    mkdir -p "$destination"
+                    target="$destination/$skill_name"
+                    ln -sfn "$skill_dir" "$target"
+                    echo "$target" >> "$MANAGED_LINKS_FILE"
+                  done <<EOF
+        $destinations
+        EOF
+                done <<EOF
+        $(find "$CACHE_DIR" -type f -name SKILL.md)
+        EOF
       ''
     );
   };

configs/claude/default.nix

@@ -48,7 +48,7 @@ let
         ];
         env = {
           # I think this is ok to be pubic, it's local to my browser anyway
-          PLAYWRIGHT_MCP_EXTENSION_TOKEN = "wASkRXZOFCIn7QoeT2KiO7e8hj7dEV7I-K7vfl4gLjU";
+          PLAYWRIGHT_MCP_EXTENSION_TOKEN = "7-yFGyEzSGhYDUCvdQXnZ0fzgEr0g2HuTyMhuWKgiLI";
         };
       };
       bash-history = {
@@ -58,21 +58,6 @@ let
           "mcp"
         ];
       };
-      say = {
-        command = "bash";
-        args = [
-          "-c"
-          "GOOGLE_AI_API_KEY=$(pass show api-keys/google-gemini) MCP_TTS_SUPPRESS_SPEAKING_OUTPUT=true exec $HOME/go/bin/mcp-tts"
-        ];
-      };
-      zomato = {
-        command = "npx";
-        args = [
-          "-y"
-          "mcp-remote"
-          "https://mcp-server.zomato.com/mcp"
-        ];
-      };
     };
   };
 in