Commit 9efecb8fe870

Vincent Demeester <vincent@sbr.pm>
2026-05-27 11:09:27
dots: replace custom emacs-skills with skills CLI, add stale cleanup
- Move xenodium/emacs-skills to declarative SKILL_PACKAGES - Remove custom clone/update/symlink logic for emacs-skills - Add cleanup step in agent-skills-link to remove stale ~/.config/claude/skills dir-symlink from old layout Other machines (okinawa, aomi) will auto-cleanup on next make all.
main
1 parent fa3d603
Changed files (1)
dots
Makefile
dots/Makefile
@@ -67,29 +67,7 @@ pi-agent-auth : pi-agent
 	fi
 	@ln -snf ~/.local/share/ai-sync/pi-sessions ~/.pi/agent/sessions
 
-##@ Emacs Skills (xenodium/emacs-skills)
 
-EMACS_SKILLS_REPO := https://github.com/xenodium/emacs-skills.git
-EMACS_SKILLS_DIR := $(HOME)/.local/share/emacs-skills
-EMACS_SKILLS := d2 describe dired emacsclient file-links gnuplot highlight mermaid open plantuml select
-
-all += emacs-skills
-emacs-skills : agent-skills-link
-	@if [ ! -d "$(EMACS_SKILLS_DIR)/.git" ]; then \
-		echo "📦 Cloning emacs-skills..."; \
-		git clone --quiet $(EMACS_SKILLS_REPO) $(EMACS_SKILLS_DIR); \
-	else \
-		echo "🔄 Updating emacs-skills..."; \
-		git -C $(EMACS_SKILLS_DIR) pull --quiet --ff-only 2>/dev/null || \
-			echo "  ⚠️  Could not fast-forward, skipping update"; \
-	fi
-	@for skill in $(EMACS_SKILLS); do \
-		if [ -d "$(EMACS_SKILLS_DIR)/skills/$$skill" ]; then \
-			ln -snf "$(EMACS_SKILLS_DIR)/skills/$$skill" ~/.config/claude/skills/$$skill; \
-			echo "  → $$skill"; \
-		fi; \
-	done
-	@echo "✅ Emacs skills installed!"
 
 ##@ AI Shared Config
 
@@ -101,6 +79,11 @@ agent-skills : ~/.config/agent-skills
 AGENT_SKILL_DIRS := ~/.config/claude/skills ~/.agents/skills ~/.pi/agent/skills
 
 agent-skills-link:
+	@# Clean up stale dir-symlink from old layout
+	@if [ -L ~/.config/claude/skills ]; then \
+		echo "  ⚠️  Removing stale ~/.config/claude/skills dir-symlink"; \
+		rm ~/.config/claude/skills; \
+	fi
 	@for dir in $(AGENT_SKILL_DIRS); do \
 		mkdir -p $$dir; \
 	done
@@ -128,7 +111,7 @@ agent-skills-link:
 # Declarative skill packages — installed via `skills` CLI if not present.
 # Format: sentinel-skill=package (sentinel is any skill name from the package)
 # Installed to ~/.agents/skills/ and auto-linked to Claude, Pi, etc.
-SKILL_PACKAGES := brainstorming=obra/superpowers make-interfaces-feel-better=jakubkrehel/make-interfaces-feel-better
+SKILL_PACKAGES := brainstorming=obra/superpowers make-interfaces-feel-better=jakubkrehel/make-interfaces-feel-better emacsclient=xenodium/emacs-skills
 
 skills-install: agent-skills-link
 	@for entry in $(SKILL_PACKAGES); do \