@heyitsiveen/dotfiles 1.0.0 → 1.0.1

package/dist/index.mjs

@@ -186,12 +186,26 @@ async function deleteManifest() {
 	const manifestPath = getManifestPath();
 	if (await pathExists$2(manifestPath)) await remove(manifestPath);
 }
+const TERMINAL_DEFAULTS = {
+	WezTerm: {
+		file: "wezterm.lua",
+		content: "local wezterm = require 'wezterm'\nreturn {}\n"
+	},
+	Ghostty: {
+		file: "config",
+		content: "# defaults\n"
+	}
+};
 async function uninstallGroups(groups) {
 	const errors = [];
-	for (const group of groups) for (const file of group.files) try {
-		if (await pathExists$2(file)) await remove(file);
-	} catch (err) {
-		errors.push(`${file}: ${err instanceof Error ? err.message : String(err)}`);
+	for (const group of groups) {
+		const termDefault = TERMINAL_DEFAULTS[group.name];
+		for (const file of group.files) try {
+			if (await pathExists$2(file)) if (termDefault && file.endsWith(termDefault.file)) await writeFile(file, termDefault.content, "utf-8");
+			else await remove(file);
+		} catch (err) {
+			errors.push(`${file}: ${err instanceof Error ? err.message : String(err)}`);
+		}
 	}
 	return errors;
 }
@@ -731,6 +745,7 @@ function showPrerequisites(platform) {
 		log.message(`    ${pc.cyan(item.link)}`);
 	}
 }
+/** Detect tools and show status. Returns missing tools (no install). */
 async function showToolStatus(groups, platform) {
 	const allTools = [];
 	const groupNames = new Set(groups.map((g) => g.name));
@@ -752,7 +767,7 @@ async function showToolStatus(groups, platform) {
 		installCmd: g.installCmd,
 		required: g.required
 	});
-	if (allTools.length === 0) return;
+	if (allTools.length === 0) return [];
 	const forGroupNames = new Set([...subTools.values()].flat().map((t) => t.name));
 	const requiredTools = [];
 	const optionalTools = [];
@@ -791,45 +806,26 @@ async function showToolStatus(groups, platform) {
 		const subs = subTools.get(t.name);
 		if (subs) for (const st of subs) showSubTool(st);
 	}
-	if (missing.length > 0) {
-		const selectedNames = await multiselect({
-			message: "Install missing tools?",
-			options: missing.map((t) => ({
-				value: t.name,
-				label: `${t.name} — ${t.description}`,
-				hint: t.installCmd
-			})),
-			initialValues: missing.map((t) => t.name),
-			required: false
-		});
-		handleCancel(selectedNames);
-		const toInstall = missing.filter((t) => selectedNames.includes(t.name));
-		if (toInstall.length > 0) {
-			const brewFirst = toInstall.filter((t) => t.name === "Homebrew");
-			const rest = toInstall.filter((t) => t.name !== "Homebrew");
-			const ordered = [...brewFirst, ...rest];
-			const total = ordered.length;
-			let installed = 0;
-			for (const t of ordered) {
-				log.message(`  ${pc.dim("○")} Installing ${t.name}...`);
-				try {
-					execSync(t.installCmd, {
-						stdio: "pipe",
-						encoding: "utf-8",
-						timeout: 3e5
-					});
-					installed++;
-					log.message(`  ${pc.green("◆")} ${t.name} installed`);
-				} catch (err) {
-					log.message(`  ${pc.yellow("⚠")} ${t.name} failed`);
-					log.message(`    ${pc.dim(t.installCmd)} — ${pc.dim(err instanceof Error ? err.message : String(err))}`);
-				}
-			}
-			log.message("");
-			if (installed === total) log.message(`  ${pc.green("◆")} ${installed} tool${installed > 1 ? "s" : ""} installed successfully`);
-			else log.message(`  ${pc.yellow("⚠")} ${installed}/${total} tools installed (${total - installed} failed)`);
-		}
-	} else log.success("All tools installed!");
+	if (missing.length === 0) log.success("All tools installed!");
+	return missing;
+}
+/** Show multiselect picker for missing tools. Returns tools to install (no execution). */
+async function pickMissingTools(missing) {
+	const selectedNames = await multiselect({
+		message: "Install missing tools?",
+		options: missing.map((t) => ({
+			value: t.name,
+			label: t.name,
+			hint: t.installCmd
+		})),
+		initialValues: missing.map((t) => t.name),
+		required: false
+	});
+	handleCancel(selectedNames);
+	const toInstall = missing.filter((t) => selectedNames.includes(t.name));
+	const brewFirst = toInstall.filter((t) => t.name === "Homebrew");
+	const rest = toInstall.filter((t) => t.name !== "Homebrew");
+	return [...brewFirst, ...rest];
 }
 const groupCategories = {
 	"Shell & Terminal": [
@@ -884,9 +880,17 @@ function showReloadCommands(groups) {
 			break;
 	}
 	if (reloads.length > 0) {
-		log.message(pc.bold("\n  Reload your configs:"));
-		for (const r of reloads) log.message(`    ${r.name.padEnd(12)} →  ${pc.cyan(r.cmd)}`);
+		log.info("Reload your configs:");
+		for (const r of reloads) log.message(`      ${r.name.padEnd(12)} →  ${pc.cyan(r.cmd)}`);
 	}
+	const restartMsg = "Restart your terminal for all changes to take effect.";
+	const w = 57;
+	log.message([
+		"",
+		`    ${pc.dim("╭" + "─".repeat(w) + "╮")}`,
+		`    ${pc.dim("│")}  ${pc.bold(restartMsg)}  ${pc.dim("│")}`,
+		`    ${pc.dim("╰" + "─".repeat(w) + "╯")}`
+	].join("\n"));
 }
 async function resolvePlatform(flagPlatform) {
 	if (flagPlatform === "macos" || flagPlatform === "windows") return flagPlatform;
@@ -912,13 +916,29 @@ async function resolvePlatform(flagPlatform) {
 	handleCancel(chosen);
 	return chosen;
 }
-async function firstRunFlow(flagPlatform, dryRun = false) {
+async function showUpdateNotification(updatePromise) {
+	if (!updatePromise) return;
+	const latest = await updatePromise;
+	if (!latest) return;
+	const msg = `Update available: ${VERSION} → ${latest}`;
+	const cmd = "Run: bunx @heyitsiveen/dotfiles@latest";
+	const w = Math.max(msg.length, 38) + 4;
+	log.message([
+		`  ${pc.dim("╭" + "─".repeat(w) + "╮")}`,
+		`  ${pc.dim("│")}  ${pc.yellow(msg.padEnd(w - 2))}${pc.dim("│")}`,
+		`  ${pc.dim("│")}  ${pc.cyan(cmd.padEnd(w - 2))}${pc.dim("│")}`,
+		`  ${pc.dim("╰" + "─".repeat(w) + "╯")}`
+	].join("\n"));
+}
+async function firstRunFlow(flagPlatform, dryRun = false, updatePromise) {
 	showBanner();
 	intro(pc.bold("heyitsiveen"));
+	await showUpdateNotification(updatePromise);
 	const platform = await resolvePlatform(flagPlatform);
 	showPrerequisites(platform);
 	const allGroups = getDotfileGroups(platform);
-	await showToolStatus(allGroups, platform);
+	const missingTools = await showToolStatus(allGroups, platform);
+	const toolsToInstall = missingTools.length > 0 ? await pickMissingTools(missingTools) : [];
 	showOverview(allGroups);
 	const depTools = getDependencyTools(platform);
 	const selectedNames = await multiselect({
@@ -929,10 +949,11 @@ async function firstRunFlow(flagPlatform, dryRun = false) {
 			const warnings = [];
 			if (toolMissing) warnings.push("not installed");
 			if (missingDeps.length > 0) warnings.push(`${missingDeps.join(", ")} missing`);
-			const suffix = warnings.length > 0 ? pc.yellow(` ⚠ (${warnings.join(", ")})`) : "";
+			const hint = warnings.length > 0 ? `⚠ ${warnings.join(", ")}` : g.description;
 			return {
 				value: g.name,
-				label: `${g.name} — ${g.description}${suffix}`
+				label: g.name,
+				hint
 			};
 		}),
 		initialValues: allGroups.map((g) => g.name),
@@ -975,8 +996,27 @@ async function firstRunFlow(flagPlatform, dryRun = false) {
 		shouldBackup = doBackup;
 	}
 	if (dryRun) log.info(pc.yellow("Dry run — showing planned operations:"));
-	const s = spinner();
-	s.start("Installing dotfiles...");
+	if (toolsToInstall.length > 0) {
+		log.info("Installing tools...");
+		let toolsInstalled = 0;
+		for (const t of toolsToInstall) {
+			log.message(`    ${pc.dim("○")} ${t.name}...`);
+			try {
+				execSync(t.installCmd, {
+					stdio: "pipe",
+					encoding: "utf-8",
+					timeout: 3e5
+				});
+				toolsInstalled++;
+				log.message(`    ${pc.green("◆")} ${t.name} installed`);
+			} catch (err) {
+				log.message(`    ${pc.yellow("⚠")} ${t.name} failed`);
+				log.message(`      ${pc.dim(t.installCmd)} — ${pc.dim(err instanceof Error ? err.message : String(err))}`);
+			}
+		}
+		log.message(`  ${pc.green("◆")} ${toolsInstalled}/${toolsToInstall.length} tools installed`);
+	}
+	log.info("Installing dotfiles...");
 	const result = await install({
 		platform,
 		selectedGroups,
@@ -984,8 +1024,21 @@ async function firstRunFlow(flagPlatform, dryRun = false) {
 		backup: shouldBackup,
 		dryRun
 	});
+	for (const ig of result.installedGroups) log.message(`    ${pc.green("◆")} ${ig.name} → ${pc.dim(ig.target)}`);
+	log.message(`  ${pc.green("◆")} ${result.installedGroups.length}/${selectedGroups.length} configs installed`);
 	const themeGroups = selectedGroups.filter((g) => g.themeSupport);
-	if (themeGroups.length > 0) await switchTheme(theme, result.installedGroups.filter((ig) => themeGroups.some((sg) => sg.name === ig.name)), platform, dryRun);
+	if (themeGroups.length > 0) {
+		log.info("Applying theme...");
+		const themeResults = await switchTheme(theme, result.installedGroups.filter((ig) => themeGroups.some((sg) => sg.name === ig.name)), platform, dryRun);
+		for (const r of themeResults) log.message(`    ${pc.green("◆")} ${r}`);
+		log.message(`  ${pc.green("◆")} Theme: ${theme} activated`);
+	}
+	if (result.backedUp.length > 0) {
+		const unique = [...new Set(result.backedUp)];
+		log.info("Backed up existing configs:");
+		for (const name of unique) log.message(`    ${pc.green("◆")} ${name}`);
+		log.message(`  ${pc.green("◆")} ${unique.length} configs → ${pc.dim("~/.config/heyitsiveen/dotfiles/backup/")}`);
+	}
 	if (!dryRun) await createManifest(result, {
 		platform,
 		selectedGroups,
@@ -993,27 +1046,14 @@ async function firstRunFlow(flagPlatform, dryRun = false) {
 		backup: shouldBackup,
 		dryRun
 	});
-	s.stop("Installation complete!");
-	if (result.backedUp.length > 0) {
-		const unique = [...new Set(result.backedUp)];
-		log.message(`  ${pc.green("◆")} Backed up ${unique.length} existing configs → ${pc.dim("~/.config/heyitsiveen/dotfiles/backup/")}`);
-	}
-	for (const [category, names] of Object.entries(groupCategories)) {
-		const installed = result.installedGroups.filter((ig) => names.includes(ig.name));
-		if (installed.length === 0) continue;
-		log.message(`  ${pc.bold(category)}`);
-		for (const ig of installed) log.message(`    ${pc.green("◆")} ${ig.name} → ${pc.dim(ig.target)}`);
-	}
-	log.message(`  ${pc.green("◆")} Theme: ${theme} activated`);
 	if (result.errors.length > 0) for (const err of result.errors) log.message(`    ${pc.yellow("⚠")} ${err.file}: ${pc.dim(err.error)}`);
 	showReloadCommands(selectedGroups);
-	log.message("");
-	log.info(pc.bold("Restart your terminal for all changes to take effect."));
 	outro("Done! Your dotfiles are installed.");
 }
-async function reRunFlow(manifest, flagPlatform, dryRun = false) {
+async function reRunFlow(manifest, flagPlatform, dryRun = false, updatePromise) {
 	showBanner();
 	intro(pc.bold("heyitsiveen"));
+	await showUpdateNotification(updatePromise);
 	showPrerequisites(manifest.platform);
 	log.info(`Existing installation detected (v${manifest.version}, installed ${manifest.installedAt.split("T")[0]})`);
 	const mode = await select({
@@ -1127,7 +1167,8 @@ async function uninstallFlow(manifest, dryRun = false) {
 			message: "Which configs to remove?",
 			options: manifest.groups.map((g) => ({
 				value: g.name,
-				label: `${g.name} — ${g.target}`
+				label: g.name,
+				hint: g.target
 			})),
 			initialValues: manifest.groups.map((g) => g.name),
 			required: true
@@ -1418,22 +1459,8 @@ runMain(defineCommand({
 				await themeFlow(manifest, dryRun, args.theme);
 				return;
 			}
-			if (manifest) await reRunFlow(manifest, args.platform, dryRun);
-			else await firstRunFlow(args.platform, dryRun);
-			const latest = await updatePromise;
-			if (latest) {
-				const msg = `Update available: ${VERSION} → ${latest}`;
-				const cmd = "Run: bunx @heyitsiveen/dotfiles@latest";
-				const w = Math.max(msg.length, 38) + 4;
-				console.log([
-					"",
-					`  ${pc.dim("╭" + "─".repeat(w) + "╮")}`,
-					`  ${pc.dim("│")}  ${pc.yellow(msg.padEnd(w - 2))}${pc.dim("│")}`,
-					`  ${pc.dim("│")}  ${pc.cyan(cmd.padEnd(w - 2))}${pc.dim("│")}`,
-					`  ${pc.dim("╰" + "─".repeat(w) + "╯")}`,
-					""
-				].join("\n"));
-			}
+			if (manifest) await reRunFlow(manifest, args.platform, dryRun, updatePromise);
+			else await firstRunFlow(args.platform, dryRun, updatePromise);
 		} catch (err) {
 			if (err.code === "ERR_USE_AFTER_CLOSE") process.exit(0);
 			log.error(pc.red(err instanceof Error ? err.message : "An unexpected error occurred."));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heyitsiveen/dotfiles",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Interactive CLI to set up dotfiles for macOS and Windows 11",
   "type": "module",
   "bin": {