formalconf 2.0.20 → 2.0.22

package/dist/formalconf.js

@@ -1,12 +1,16 @@
 #!/usr/bin/env node
 var __defProp = Object.defineProperty;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -457,7 +461,7 @@ async function isFirstRun() {
   const themesExist = await dirHasContents(THEMES_DIR);
   return !configsExist && !themesExist;
 }
-var HOME_DIR, CONFIG_DIR, THEME_TARGET_DIR, BACKGROUNDS_TARGET_DIR, scriptPath, ROOT_DIR, CONFIGS_DIR, THEMES_DIR, HOOKS_DIR, PKG_CONFIG_PATH, PKG_LOCK_PATH, THEME_CONFIG_PATH, TEMPLATES_DIR, TEMPLATES_MANIFEST_PATH, GENERATED_DIR, BUNDLED_TEMPLATES_DIR, BUNDLED_MANIFEST_PATH, GTK_DIR, COLLOID_DIR, QT_DIR, KVANTUM_CONFIG_DIR, KVANTUM_THEME_DIR;
+var HOME_DIR, CONFIG_DIR, THEME_TARGET_DIR, BACKGROUNDS_TARGET_DIR, scriptPath, ROOT_DIR, CONFIGS_DIR, THEMES_DIR, HOOKS_DIR, PKG_CONFIG_PATH, PKG_LOCK_PATH, THEME_CONFIG_PATH, TEMPLATES_DIR, TEMPLATES_MANIFEST_PATH, GENERATED_DIR, BUNDLED_TEMPLATES_DIR, BUNDLED_MANIFEST_PATH, GTK_DIR, COLLOID_DIR, GTK_OVERRIDES_DIR, QT_DIR, KVANTUM_CONFIG_DIR, KVANTUM_THEME_DIR;
 var init_paths = __esm(() => {
   init_runtime();
   init_platform();
@@ -480,6 +484,7 @@ var init_paths = __esm(() => {
   BUNDLED_MANIFEST_PATH = join(BUNDLED_TEMPLATES_DIR, "templates.json");
   GTK_DIR = join(CONFIG_DIR, "gtk");
   COLLOID_DIR = join(GTK_DIR, "colloid-gtk-theme");
+  GTK_OVERRIDES_DIR = join(GTK_DIR, "overrides");
   QT_DIR = join(CONFIG_DIR, "qt");
   KVANTUM_CONFIG_DIR = join(HOME_DIR, ".config", "Kvantum");
   KVANTUM_THEME_DIR = join(KVANTUM_CONFIG_DIR, "FormalConf");
@@ -3026,6 +3031,8 @@ $default-dark: ${colloid.accent.dark};
 // src/lib/gtk/colloid.ts
 import { existsSync as existsSync7 } from "fs";
 import { join as join6 } from "path";
+import { symlink, unlink, lstat } from "fs/promises";
+import { homedir as homedir2 } from "os";
 async function checkGtkDependencies() {
   const [git, sassc] = await Promise.all([
     commandExists("git"),
@@ -3117,6 +3124,46 @@ function getGtkThemeName(themeName, mode) {
   const modeCapitalized = mode === "dark" ? "Dark" : "Light";
   return `formalconf-${themeName}-${modeCapitalized}`;
 }
+async function applyGtkOverride(overrideName, mode) {
+  const overrideDir = join6(GTK_OVERRIDES_DIR, overrideName);
+  if (!existsSync7(overrideDir)) {
+    return {
+      success: false,
+      themeName: "",
+      error: `GTK override "${overrideName}" not found in ${GTK_OVERRIDES_DIR}`
+    };
+  }
+  const installTarget = join6(homedir2(), ".local", "share", "themes", overrideName);
+  await ensureDir2(join6(homedir2(), ".local", "share", "themes"));
+  try {
+    const stat = await lstat(installTarget);
+    if (stat.isSymbolicLink() || stat.isDirectory()) {
+      await unlink(installTarget);
+    }
+  } catch {}
+  await symlink(overrideDir, installTarget, "dir");
+  const hasGsettings = await commandExists("gsettings");
+  if (hasGsettings) {
+    await exec([
+      "gsettings",
+      "set",
+      "org.gnome.desktop.interface",
+      "gtk-theme",
+      overrideName
+    ]);
+    await exec([
+      "gsettings",
+      "set",
+      "org.gnome.desktop.interface",
+      "color-scheme",
+      `prefer-${mode}`
+    ]);
+  }
+  return {
+    success: true,
+    themeName: overrideName
+  };
+}
 async function applyGtkTheme(theme, mode) {
   if (getOS() !== "linux") {
     return {
@@ -3126,6 +3173,10 @@ async function applyGtkTheme(theme, mode) {
       skipReason: "GTK theming only available on Linux"
     };
   }
+  const overrideName = theme.gtk?.override?.[mode];
+  if (overrideName) {
+    return applyGtkOverride(overrideName, mode);
+  }
   const palette = mode === "dark" ? theme.dark : theme.light;
   if (!palette) {
     return {
@@ -3622,6 +3673,7 @@ function hexToColorVariable(hex) {
     strip: normalized.slice(1),
     rgb: `rgb(${r},${g},${b})`,
     rgba: `rgba(${r},${g},${b},1)`,
+    decimal: `${r},${g},${b}`,
     r,
     g,
     b,
@@ -3946,6 +3998,8 @@ function applyModifier(color, modifier) {
       return color.rgb;
     case "rgba":
       return color.rgba;
+    case "decimal":
+      return color.decimal;
     case "r":
       return String(color.r);
     case "g":
@@ -3979,6 +4033,7 @@ var init_modifiers = __esm(() => {
     "strip",
     "rgb",
     "rgba",
+    "decimal",
     "r",
     "g",
     "b",
@@ -4240,9 +4295,14 @@ async function getOutputFilename(templateName) {
   return templateName.replace(/\.template$/, "");
 }
 async function getTemplateTargets(templateName) {
-  const manifest = await loadBundledManifest();
-  const meta = manifest.templates[templateName];
-  return meta?.targets ?? [];
+  const installed = await loadTemplatesManifest();
+  const installedMeta = installed.templates[templateName];
+  if (installedMeta?.targets) {
+    return installedMeta.targets;
+  }
+  const bundled = await loadBundledManifest();
+  const bundledMeta = bundled.templates[templateName];
+  return bundledMeta?.targets ?? [];
 }
 async function listInstalledTemplates() {
   if (!existsSync11(TEMPLATES_DIR)) {
@@ -5560,8 +5620,162 @@ var init_template_manager = __esm(() => {
   }
 });
 
+// src/cli/gtk-manager.ts
+var exports_gtk_manager = {};
+__export(exports_gtk_manager, {
+  main: () => main6
+});
+import { parseArgs as parseArgs6 } from "util";
+import { existsSync as existsSync15, statSync as statSync2 } from "fs";
+import { join as join14, resolve, basename as basename5 } from "path";
+import { readdir as readdir2, rename, rm } from "fs/promises";
+import { tmpdir } from "os";
+function printHelp2() {
+  console.log(`
+${colors7.cyan}GTK Theme Manager - Manage pre-built GTK theme overrides${colors7.reset}
+
+Usage:
+  formalconf gtk <command> [options]
+
+Commands:
+  ${colors7.blue}import${colors7.reset} <path.tar.gz>  Import a GTK theme from a tar.gz archive
+  ${colors7.blue}list${colors7.reset}                  List installed GTK override themes
+  ${colors7.blue}remove${colors7.reset} <name>          Remove an installed GTK override theme
+
+Options:
+  -h, --help       Show this help message
+
+Examples:
+  formalconf gtk import ~/Downloads/Kanagawa_Dark.tar.gz
+  formalconf gtk list
+  formalconf gtk remove "Kanagawa Dark"
+`);
+}
+async function main6() {
+  const { positionals, values } = parseArgs6({
+    args: process.argv.slice(2),
+    options: {
+      help: { type: "boolean", short: "h" }
+    },
+    allowPositionals: true,
+    strict: false
+  });
+  const [subCommand, ...args] = positionals;
+  if (values.help || !subCommand) {
+    printHelp2();
+    process.exit(0);
+  }
+  switch (subCommand) {
+    case "import":
+      if (!args[0]) {
+        console.error(`${colors7.red}Error: Path to tar.gz file required${colors7.reset}`);
+        process.exit(1);
+      }
+      await handleImport(args[0]);
+      break;
+    case "list":
+      await handleList2();
+      break;
+    case "remove":
+      if (!args[0]) {
+        console.error(`${colors7.red}Error: Theme name required${colors7.reset}`);
+        process.exit(1);
+      }
+      await handleRemove(args[0]);
+      break;
+    default:
+      console.error(`${colors7.red}Unknown command: ${subCommand}${colors7.reset}`);
+      printHelp2();
+      process.exit(1);
+  }
+}
+async function handleImport(archivePath) {
+  const resolved = resolve(archivePath);
+  if (!existsSync15(resolved)) {
+    console.error(`${colors7.red}Error: File not found: ${resolved}${colors7.reset}`);
+    process.exit(1);
+  }
+  if (!resolved.endsWith(".tar.gz") && !resolved.endsWith(".tgz")) {
+    console.error(`${colors7.red}Error: File must be a .tar.gz or .tgz archive${colors7.reset}`);
+    process.exit(1);
+  }
+  const tempDir = join14(tmpdir(), `formalconf-gtk-import-${Date.now()}`);
+  await ensureDir2(tempDir);
+  console.log(`${colors7.cyan}Extracting ${basename5(resolved)}...${colors7.reset}`);
+  const extractResult = await exec(["tar", "xzf", resolved, "-C", tempDir]);
+  if (!extractResult.success) {
+    console.error(`${colors7.red}Error: Failed to extract archive${colors7.reset}`);
+    await rm(tempDir, { recursive: true, force: true });
+    process.exit(1);
+  }
+  const entries = await readdir2(tempDir);
+  const dirs = entries.filter((entry) => statSync2(join14(tempDir, entry)).isDirectory());
+  if (dirs.length === 0) {
+    console.error(`${colors7.red}Error: Archive contains no directories${colors7.reset}`);
+    await rm(tempDir, { recursive: true, force: true });
+    process.exit(1);
+  }
+  await ensureDir2(GTK_OVERRIDES_DIR);
+  for (const dir of dirs) {
+    const sourcePath = join14(tempDir, dir);
+    const destPath = join14(GTK_OVERRIDES_DIR, dir);
+    if (existsSync15(destPath)) {
+      await rm(destPath, { recursive: true, force: true });
+    }
+    await rename(sourcePath, destPath);
+    console.log(`${colors7.green}Imported: ${dir}${colors7.reset}`);
+    console.log(`${colors7.dim}  Use in theme JSON: "gtk": { "override": { "dark": "${dir}" } }${colors7.reset}`);
+  }
+  await rm(tempDir, { recursive: true, force: true });
+}
+async function handleList2() {
+  if (!existsSync15(GTK_OVERRIDES_DIR)) {
+    console.log(`${colors7.dim}No GTK overrides installed${colors7.reset}`);
+    return;
+  }
+  const entries = await readdir2(GTK_OVERRIDES_DIR);
+  const dirs = entries.filter((entry) => statSync2(join14(GTK_OVERRIDES_DIR, entry)).isDirectory());
+  if (dirs.length === 0) {
+    console.log(`${colors7.dim}No GTK overrides installed${colors7.reset}`);
+    return;
+  }
+  console.log(`
+${colors7.cyan}Installed GTK overrides:${colors7.reset}`);
+  for (const dir of dirs) {
+    console.log(`  ${colors7.blue}•${colors7.reset} ${dir}`);
+  }
+  console.log();
+}
+async function handleRemove(name) {
+  const targetPath = join14(GTK_OVERRIDES_DIR, name);
+  if (!existsSync15(targetPath)) {
+    console.error(`${colors7.red}Error: Override "${name}" not found${colors7.reset}`);
+    process.exit(1);
+  }
+  await rm(targetPath, { recursive: true, force: true });
+  console.log(`${colors7.green}Removed: ${name}${colors7.reset}`);
+}
+var colors7, isMainModule6;
+var init_gtk_manager = __esm(() => {
+  init_paths();
+  init_runtime();
+  colors7 = {
+    red: "\x1B[0;31m",
+    green: "\x1B[0;32m",
+    blue: "\x1B[0;34m",
+    yellow: "\x1B[1;33m",
+    cyan: "\x1B[0;36m",
+    dim: "\x1B[2m",
+    reset: "\x1B[0m"
+  };
+  isMainModule6 = process.argv[1]?.includes("gtk-manager");
+  if (isMainModule6) {
+    main6().catch(console.error);
+  }
+});
+
 // src/cli/formalconf.tsx
-import { parseArgs as parseArgs6 } from "node:util";
+import { parseArgs as parseArgs7 } from "node:util";
 import { useState as useState11, useEffect as useEffect7 } from "react";
 import { render, useApp as useApp2, useInput as useInput11 } from "ink";
 import { Spinner as Spinner2 } from "@inkjs/ui";
@@ -5704,7 +5918,7 @@ function StatusIndicator({
 // package.json
 var package_default = {
   name: "formalconf",
-  version: "2.0.20",
+  version: "2.0.22",
   description: "Dotfiles management TUI for macOS and Linux - config management, package sync, and theme switching",
   type: "module",
   main: "./dist/formalconf.js",
@@ -7928,7 +8142,7 @@ function ThemeMenu({ onBack }) {
 init_paths();
 init_runtime();
 import { jsxDEV as jsxDEV20 } from "react/jsx-dev-runtime";
-function printHelp2() {
+function printHelp3() {
   console.log(`
 FormalConf - Dotfiles Management TUI
 
@@ -7938,6 +8152,7 @@ Usage:
   formalconf config <cmd>       Config management (stow, unstow, status, list)
   formalconf pkg-sync [flags]   Sync packages from pkg-config.json
   formalconf template <cmd>     Template management (update, list, check)
+  formalconf gtk <cmd>          GTK override management (import, list, remove)
 
 Options:
   -h, --help                    Show this help message
@@ -8023,8 +8238,8 @@ function App() {
     ]
   }, undefined, true, undefined, this);
 }
-async function main6() {
-  const { positionals, values } = parseArgs6({
+async function main7() {
+  const { positionals, values } = parseArgs7({
     args: process.argv.slice(2),
     options: {
       help: { type: "boolean", short: "h" }
@@ -8034,7 +8249,7 @@ async function main6() {
   });
   const [subcommand] = positionals;
   if (values.help && !subcommand) {
-    printHelp2();
+    printHelp3();
     process.exit(0);
   }
   if (subcommand) {
@@ -8042,34 +8257,40 @@ async function main6() {
       theme: "set-theme",
       config: "config-manager",
       "pkg-sync": "pkg-sync",
-      template: "template-manager"
+      template: "template-manager",
+      gtk: "gtk-manager"
     };
     const scriptName = scriptMap[subcommand];
     if (!scriptName) {
       console.error(`Unknown subcommand: ${subcommand}`);
-      printHelp2();
+      printHelp3();
       process.exit(1);
     }
     process.argv = [process.argv[0], scriptName, ...process.argv.slice(3)];
     switch (subcommand) {
       case "theme": {
-        const { main: main7 } = await Promise.resolve().then(() => (init_set_theme(), exports_set_theme));
-        await main7();
+        const { main: main8 } = await Promise.resolve().then(() => (init_set_theme(), exports_set_theme));
+        await main8();
         break;
       }
       case "config": {
-        const { main: main7 } = await Promise.resolve().then(() => (init_config_manager(), exports_config_manager));
-        await main7();
+        const { main: main8 } = await Promise.resolve().then(() => (init_config_manager(), exports_config_manager));
+        await main8();
         break;
       }
       case "pkg-sync": {
-        const { main: main7 } = await Promise.resolve().then(() => (init_pkg_sync(), exports_pkg_sync));
-        await main7();
+        const { main: main8 } = await Promise.resolve().then(() => (init_pkg_sync(), exports_pkg_sync));
+        await main8();
         break;
       }
       case "template": {
-        const { main: main7 } = await Promise.resolve().then(() => (init_template_manager(), exports_template_manager));
-        await main7();
+        const { main: main8 } = await Promise.resolve().then(() => (init_template_manager(), exports_template_manager));
+        await main8();
+        break;
+      }
+      case "gtk": {
+        const { main: main8 } = await Promise.resolve().then(() => (init_gtk_manager(), exports_gtk_manager));
+        await main8();
         break;
       }
     }
@@ -8077,4 +8298,4 @@ async function main6() {
   }
   render(/* @__PURE__ */ jsxDEV20(App, {}, undefined, false, undefined, this));
 }
-main6();
+main7();

package/package.json

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