formalconf 2.0.7 → 2.0.8

package/dist/formalconf.js

@@ -317,6 +317,7 @@ var CONFIGS_DIR = join(CONFIG_DIR, "configs");
 var THEMES_DIR = join(CONFIG_DIR, "themes");
 var PKG_CONFIG_PATH = join(CONFIG_DIR, "pkg-config.json");
 var PKG_LOCK_PATH = join(CONFIG_DIR, "pkg-lock.json");
+var THEME_CONFIG_PATH = join(CONFIG_DIR, "theme-config.json");
 async function ensureDir2(path) {
   await ensureDir(path);
 }
@@ -446,7 +447,7 @@ function StatusIndicator({
 // package.json
 var package_default = {
   name: "formalconf",
-  version: "2.0.7",
+  version: "2.0.8",
   description: "Dotfiles management TUI for macOS - config management, package sync, and theme switching",
   type: "module",
   main: "./dist/formalconf.js",
@@ -4502,16 +4503,18 @@ function PackageMenu({ onBack }) {
 // src/components/menus/ThemeMenu.tsx
 import { useState as useState10, useEffect as useEffect6, useMemo as useMemo4 } from "react";
 import { Box as Box16, Text as Text15 } from "ink";
-import { existsSync as existsSync7, readdirSync as readdirSync5 } from "fs";
+import { existsSync as existsSync8, readdirSync as readdirSync5 } from "fs";
 import { join as join6 } from "path";
 
 // src/components/ThemeCard.tsx
 import { Box as Box15, Text as Text14 } from "ink";
 import { jsxDEV as jsxDEV18 } from "react/jsx-dev-runtime";
-function ThemeCard({ theme, isSelected, width }) {
+function ThemeCard({ theme, isSelected, width, isDeviceTheme }) {
   const borderColor = isSelected ? colors.accent : colors.border;
   const nameColor = isSelected ? colors.primary : colors.text;
   const indicators = [];
+  if (isDeviceTheme)
+    indicators.push("device");
   if (theme.hasBackgrounds)
     indicators.push("bg");
   if (theme.isLightMode)
@@ -4553,6 +4556,7 @@ function useThemeGrid({
   layoutOverhead = 20,
   minCardWidth = 28,
   onSelect,
+  onSelectAndSave,
   onBack,
   enabled = true
 }) {
@@ -4602,8 +4606,12 @@ function useThemeGrid({
         setSelectedIndex(prevIndex);
       }
     }
-    if (key.return && onSelect) {
-      onSelect(selectedIndex);
+    if (key.return) {
+      if (key.shift && onSelectAndSave) {
+        onSelectAndSave(selectedIndex);
+      } else if (onSelect) {
+        onSelect(selectedIndex);
+      }
     }
   });
   const visibleStartIndex = scrollOffset * cardsPerRow;
@@ -4700,8 +4708,86 @@ async function parseTheme(themePath, themeName) {
 
 // src/cli/set-theme.ts
 import { parseArgs as parseArgs4 } from "util";
-import { readdirSync as readdirSync4, existsSync as existsSync6, rmSync, symlinkSync, unlinkSync } from "fs";
+import { readdirSync as readdirSync4, existsSync as existsSync7, rmSync, symlinkSync, unlinkSync } from "fs";
 import { join as join5 } from "path";
+
+// src/lib/theme-config.ts
+import { hostname } from "os";
+import { existsSync as existsSync6, readFileSync, writeFileSync } from "fs";
+var DEFAULT_CONFIG = {
+  version: 1,
+  defaultTheme: null,
+  devices: {}
+};
+function getDeviceHostname() {
+  return hostname();
+}
+function loadThemeConfig() {
+  if (!existsSync6(THEME_CONFIG_PATH)) {
+    return { ...DEFAULT_CONFIG, devices: {} };
+  }
+  try {
+    const content = readFileSync(THEME_CONFIG_PATH, "utf-8");
+    const parsed = JSON.parse(content);
+    return {
+      version: parsed.version ?? 1,
+      defaultTheme: parsed.defaultTheme ?? null,
+      devices: parsed.devices ?? {}
+    };
+  } catch {
+    return { ...DEFAULT_CONFIG, devices: {} };
+  }
+}
+async function saveThemeConfig(config) {
+  await ensureConfigDir();
+  writeFileSync(THEME_CONFIG_PATH, JSON.stringify(config, null, 2) + `
+`);
+}
+function getDeviceTheme() {
+  const config = loadThemeConfig();
+  const device = getDeviceHostname();
+  const mapping = config.devices[device];
+  if (mapping) {
+    return mapping.theme;
+  }
+  return config.defaultTheme;
+}
+async function setDeviceTheme(themeName) {
+  const config = loadThemeConfig();
+  const device = getDeviceHostname();
+  config.devices[device] = {
+    theme: themeName,
+    setAt: new Date().toISOString()
+  };
+  await saveThemeConfig(config);
+}
+async function setDefaultTheme(themeName) {
+  const config = loadThemeConfig();
+  config.defaultTheme = themeName;
+  await saveThemeConfig(config);
+}
+async function clearDeviceTheme() {
+  const config = loadThemeConfig();
+  const device = getDeviceHostname();
+  delete config.devices[device];
+  await saveThemeConfig(config);
+}
+function listDeviceMappings() {
+  const config = loadThemeConfig();
+  const currentDevice = getDeviceHostname();
+  return Object.entries(config.devices).map(([device, mapping]) => ({
+    device,
+    theme: mapping.theme,
+    setAt: mapping.setAt,
+    isCurrent: device === currentDevice
+  }));
+}
+function getDefaultTheme() {
+  const config = loadThemeConfig();
+  return config.defaultTheme;
+}
+
+// src/cli/set-theme.ts
 var colors5 = {
   red: "\x1B[0;31m",
   green: "\x1B[0;32m",
@@ -4713,7 +4799,7 @@ var colors5 = {
 };
 async function listThemes() {
   await ensureConfigDir();
-  if (!existsSync6(THEMES_DIR)) {
+  if (!existsSync7(THEMES_DIR)) {
     return [];
   }
   const entries = readdirSync4(THEMES_DIR, { withFileTypes: true });
@@ -4728,7 +4814,7 @@ async function listThemes() {
   return themes;
 }
 function clearDirectory(dir) {
-  if (existsSync6(dir)) {
+  if (existsSync7(dir)) {
     const entries = readdirSync4(dir, { withFileTypes: true });
     for (const entry of entries) {
       const fullPath = join5(dir, entry.name);
@@ -4741,21 +4827,21 @@ function clearDirectory(dir) {
   }
 }
 function createSymlink(source, target) {
-  if (existsSync6(target)) {
+  if (existsSync7(target)) {
     unlinkSync(target);
   }
   symlinkSync(source, target);
 }
-async function applyTheme(themeName) {
+async function applyTheme(themeName, saveMapping = false) {
   const themeDir = join5(THEMES_DIR, themeName);
-  if (!existsSync6(themeDir)) {
+  if (!existsSync7(themeDir)) {
     return { output: `Theme '${themeName}' not found`, success: false };
   }
   await ensureConfigDir();
   await ensureDir2(THEME_TARGET_DIR);
   const theme = await parseTheme(themeDir, themeName);
   clearDirectory(THEME_TARGET_DIR);
-  if (existsSync6(BACKGROUNDS_TARGET_DIR)) {
+  if (existsSync7(BACKGROUNDS_TARGET_DIR)) {
     rmSync(BACKGROUNDS_TARGET_DIR, { recursive: true, force: true });
   }
   const entries = readdirSync4(themeDir, { withFileTypes: true });
@@ -4770,7 +4856,13 @@ async function applyTheme(themeName) {
     const backgroundsSource = join5(themeDir, "backgrounds");
     createSymlink(backgroundsSource, BACKGROUNDS_TARGET_DIR);
   }
+  if (saveMapping) {
+    await setDeviceTheme(themeName);
+  }
   let output = `Theme '${theme.name}' applied successfully`;
+  if (saveMapping) {
+    output += ` (saved as device preference for '${getDeviceHostname()}')`;
+  }
   if (theme.metadata?.author) {
     output += `
 Author: ${theme.metadata.author}`;
@@ -4787,7 +4879,7 @@ Note: This is a light mode theme`;
 }
 async function showThemeInfo(themeName) {
   const themeDir = join5(THEMES_DIR, themeName);
-  if (!existsSync6(themeDir)) {
+  if (!existsSync7(themeDir)) {
     console.error(`${colors5.red}Error: Theme '${themeName}' not found${colors5.reset}`);
     process.exit(1);
   }
@@ -4820,48 +4912,134 @@ ${colors5.green}Has wallpapers${colors5.reset}`);
     console.log(`${colors5.yellow}Light mode theme${colors5.reset}`);
   }
 }
-async function runSetTheme(themeName) {
-  return applyTheme(themeName);
+async function runSetTheme(themeName, saveMapping = false) {
+  return applyTheme(themeName, saveMapping);
+}
+function showDeviceMappings() {
+  const mappings = listDeviceMappings();
+  const defaultTheme = getDefaultTheme();
+  const currentDevice = getDeviceHostname();
+  console.log(`${colors5.cyan}Device Theme Mappings${colors5.reset}`);
+  console.log(`Current device: ${colors5.blue}${currentDevice}${colors5.reset}
+`);
+  if (defaultTheme) {
+    console.log(`Default theme: ${colors5.green}${defaultTheme}${colors5.reset}
+`);
+  }
+  if (mappings.length === 0) {
+    console.log(`${colors5.dim}No device-specific themes configured.${colors5.reset}`);
+    return;
+  }
+  console.log("Configured devices:");
+  for (const mapping of mappings) {
+    const marker = mapping.isCurrent ? ` ${colors5.green}(current)${colors5.reset}` : "";
+    const date = new Date(mapping.setAt).toLocaleDateString();
+    console.log(`  ${colors5.blue}•${colors5.reset} ${mapping.device}${marker}: ${mapping.theme} ${colors5.dim}(set ${date})${colors5.reset}`);
+  }
+}
+async function showThemeList() {
+  const themes = await listThemes();
+  const deviceTheme = getDeviceTheme();
+  if (themes.length === 0) {
+    console.log(`${colors5.yellow}No themes available.${colors5.reset}`);
+    console.log(`This system is compatible with omarchy themes.`);
+    console.log(`
+Add themes to: ${colors5.cyan}~/.config/formalconf/themes/${colors5.reset}`);
+    return;
+  }
+  console.log(`${colors5.cyan}Usage: formalconf theme <theme-name>${colors5.reset}`);
+  console.log(`       formalconf theme <theme-name> --save  ${colors5.dim}(save as device preference)${colors5.reset}`);
+  console.log(`       formalconf theme --apply              ${colors5.dim}(apply device's theme)${colors5.reset}`);
+  console.log(`       formalconf theme --list-devices       ${colors5.dim}(show device mappings)${colors5.reset}`);
+  console.log(`       formalconf theme --default <name>     ${colors5.dim}(set default theme)${colors5.reset}`);
+  console.log(`       formalconf theme --clear-default      ${colors5.dim}(remove default theme)${colors5.reset}`);
+  console.log(`       formalconf theme --clear              ${colors5.dim}(remove device mapping)${colors5.reset}`);
+  console.log(`       formalconf theme --info <theme-name>  ${colors5.dim}(show theme details)${colors5.reset}
+`);
+  console.log("Available themes:");
+  for (const theme of themes) {
+    const extras = [];
+    if (theme.hasBackgrounds)
+      extras.push("wallpapers");
+    if (theme.isLightMode)
+      extras.push("light");
+    if (theme.name === deviceTheme)
+      extras.push("device");
+    const suffix = extras.length ? ` ${colors5.dim}(${extras.join(", ")})${colors5.reset}` : "";
+    console.log(`  ${colors5.blue}•${colors5.reset} ${theme.name}${suffix}`);
+  }
 }
 async function main4() {
   const { positionals, values } = parseArgs4({
     args: process.argv.slice(2),
     options: {
-      info: { type: "boolean", short: "i" }
+      info: { type: "boolean", short: "i" },
+      save: { type: "boolean", short: "s" },
+      apply: { type: "boolean", short: "a" },
+      "list-devices": { type: "boolean", short: "l" },
+      default: { type: "string", short: "d" },
+      "clear-default": { type: "boolean" },
+      clear: { type: "boolean", short: "c" }
     },
     allowPositionals: true
   });
   const [themeName] = positionals;
-  if (!themeName) {
-    const themes = await listThemes();
-    if (themes.length === 0) {
-      console.log(`${colors5.yellow}No themes available.${colors5.reset}`);
-      console.log(`This system is compatible with omarchy themes.`);
-      console.log(`
-Add themes to: ${colors5.cyan}~/.config/formalconf/themes/${colors5.reset}`);
-      process.exit(0);
+  if (values["list-devices"]) {
+    showDeviceMappings();
+    return;
+  }
+  if (values.clear) {
+    const deviceTheme = getDeviceTheme();
+    if (!deviceTheme) {
+      console.log(`${colors5.yellow}No theme configured for this device.${colors5.reset}`);
+      return;
     }
-    console.log(`${colors5.cyan}Usage: formalconf theme <theme-name>${colors5.reset}`);
-    console.log(`       formalconf theme --info <theme-name>
-`);
-    console.log("Available themes:");
-    for (const theme of themes) {
-      const extras = [];
-      if (theme.hasBackgrounds)
-        extras.push("wallpapers");
-      if (theme.isLightMode)
-        extras.push("light");
-      const suffix = extras.length ? ` ${colors5.dim}(${extras.join(", ")})${colors5.reset}` : "";
-      console.log(`  ${colors5.blue}•${colors5.reset} ${theme.name}${suffix}`);
+    await clearDeviceTheme();
+    console.log(`${colors5.green}Removed theme mapping for '${getDeviceHostname()}'.${colors5.reset}`);
+    return;
+  }
+  if (values["clear-default"]) {
+    await setDefaultTheme(null);
+    console.log(`${colors5.green}Default theme cleared.${colors5.reset}`);
+    return;
+  }
+  if (values.default !== undefined) {
+    const themeDir = join5(THEMES_DIR, values.default);
+    if (!existsSync7(themeDir)) {
+      console.error(`${colors5.red}Error: Theme '${values.default}' not found${colors5.reset}`);
+      process.exit(1);
     }
-    process.exit(0);
+    await setDefaultTheme(values.default);
+    console.log(`${colors5.green}Default theme set to '${values.default}'.${colors5.reset}`);
+    return;
+  }
+  if (values.apply) {
+    const deviceTheme = getDeviceTheme();
+    if (!deviceTheme) {
+      console.log(`${colors5.yellow}No theme configured for device '${getDeviceHostname()}'.${colors5.reset}`);
+      console.log(`Use 'formalconf theme <name> --save' to set a device preference.`);
+      return;
+    }
+    const result2 = await applyTheme(deviceTheme);
+    console.log(result2.success ? `${colors5.green}${result2.output}${colors5.reset}` : `${colors5.red}${result2.output}${colors5.reset}`);
+    return;
+  }
+  if (!themeName) {
+    const deviceTheme = getDeviceTheme();
+    if (deviceTheme) {
+      const result2 = await applyTheme(deviceTheme);
+      console.log(result2.success ? `${colors5.green}${result2.output}${colors5.reset}` : `${colors5.red}${result2.output}${colors5.reset}`);
+    } else {
+      await showThemeList();
+    }
+    return;
   }
   if (values.info) {
     await showThemeInfo(themeName);
-  } else {
-    const result = await applyTheme(themeName);
-    console.log(result.success ? `${colors5.green}${result.output}${colors5.reset}` : `${colors5.red}${result.output}${colors5.reset}`);
+    return;
   }
+  const result = await applyTheme(themeName, values.save ?? false);
+  console.log(result.success ? `${colors5.green}${result.output}${colors5.reset}` : `${colors5.red}${result.output}${colors5.reset}`);
 }
 var isMainModule4 = process.argv[1]?.includes("set-theme");
 if (isMainModule4) {
@@ -4873,16 +5051,19 @@ import { jsxDEV as jsxDEV19 } from "react/jsx-dev-runtime";
 function ThemeMenu({ onBack }) {
   const [themes, setThemes] = useState10([]);
   const [loading, setLoading] = useState10(true);
+  const [deviceTheme, setDeviceThemeName] = useState10(null);
   const { state, output, success, isRunning, isResult, execute, reset } = useMenuAction();
+  const hostname2 = getDeviceHostname();
   const grid = useThemeGrid({
     itemCount: themes.length,
-    onSelect: (index) => applyTheme2(themes[index]),
+    onSelect: (index) => applyTheme2(themes[index], false),
+    onSelectAndSave: (index) => applyTheme2(themes[index], true),
     onBack,
     enabled: state === "menu" && !loading && themes.length > 0
   });
   useEffect6(() => {
     async function loadThemes() {
-      if (!existsSync7(THEMES_DIR)) {
+      if (!existsSync8(THEMES_DIR)) {
         setThemes([]);
         setLoading(false);
         return;
@@ -4897,13 +5078,17 @@ function ThemeMenu({ onBack }) {
         }
       }
       setThemes(loadedThemes);
+      setDeviceThemeName(getDeviceTheme());
       setLoading(false);
     }
     loadThemes();
   }, []);
-  const applyTheme2 = async (theme) => {
+  const applyTheme2 = async (theme, saveAsDeviceDefault) => {
     const themeName = theme.path.split("/").pop();
-    await execute(() => runSetTheme(themeName));
+    await execute(() => runSetTheme(themeName, saveAsDeviceDefault));
+    if (saveAsDeviceDefault) {
+      setDeviceThemeName(themeName);
+    }
   };
   const visibleThemes = useMemo4(() => {
     return themes.slice(grid.visibleStartIndex, grid.visibleEndIndex);
@@ -4973,7 +5158,8 @@ function ThemeMenu({ onBack }) {
         children: visibleThemes.map((theme, index) => /* @__PURE__ */ jsxDEV19(ThemeCard, {
           theme,
           isSelected: grid.visibleStartIndex + index === grid.selectedIndex,
-          width: grid.cardWidth
+          width: grid.cardWidth,
+          isDeviceTheme: theme.name === deviceTheme
         }, theme.path, false, undefined, this))
       }, undefined, false, undefined, this),
       grid.showScrollDown && /* @__PURE__ */ jsxDEV19(Text15, {
@@ -4988,11 +5174,21 @@ function ThemeMenu({ onBack }) {
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsxDEV19(Box16, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsxDEV19(Text15, {
-          dimColor: true,
-          children: "←→↑↓/hjkl navigate • Enter select • Esc back"
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this)
+        flexDirection: "column",
+        children: [
+          /* @__PURE__ */ jsxDEV19(Text15, {
+            dimColor: true,
+            children: "←→↑↓/hjkl navigate • Enter apply • Shift+Enter save as device default • Esc back"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV19(Text15, {
+            dimColor: true,
+            children: [
+              "Device: ",
+              hostname2
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formalconf",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Dotfiles management TUI for macOS - config management, package sync, and theme switching",
   "type": "module",
   "main": "./dist/formalconf.js",