formalconf 2.0.12 → 2.0.14

package/dist/formalconf.js

@@ -467,8 +467,8 @@ function StatusIndicator({
 // package.json
 var package_default = {
   name: "formalconf",
-  version: "2.0.12",
-  description: "Dotfiles management TUI for macOS - config management, package sync, and theme switching",
+  version: "2.0.14",
+  description: "Dotfiles management TUI for macOS and Linux - config management, package sync, and theme switching",
   type: "module",
   main: "./dist/formalconf.js",
   bin: {
@@ -4828,8 +4828,7 @@ function darken(hex, percent) {
 }
 function createColloidPalette(palette, mode) {
   const isDark = mode === "dark";
-  const grey = isDark ? interpolateGreyscale(palette.background, palette.foreground) : interpolateGreyscale(palette.foreground, palette.background);
-  const orderedGrey = isDark ? grey : [...grey].reverse();
+  const orderedGrey = isDark ? interpolateGreyscale(palette.foreground, palette.background) : interpolateGreyscale(palette.background, palette.foreground);
   const accentBase = palette.accent || palette.color4;
   return {
     grey: orderedGrey,
@@ -4867,6 +4866,8 @@ function createColloidPalette(palette, mode) {
 }
 function generateColloidScss(palette, mode) {
   const colloid = createColloidPalette(palette, mode);
+  const orange = interpolateColor(palette.color1, palette.color3, 0.5);
+  const pink = interpolateColor(palette.color1, palette.color5, 0.4);
   const greyNames = [
     "050",
     "100",
@@ -4891,41 +4892,62 @@ function generateColloidScss(palette, mode) {
   let scss = `// FormalConf Generated Color Palette
 // Auto-generated - do not edit manually
 
-// Greyscale (interpolated from theme background/foreground)
+// Red
+$red-light: ${colloid.red.light};
+$red-dark: ${colloid.red.dark};
+
+// Pink
+$pink-light: ${lighten(pink, 10)};
+$pink-dark: ${darken(pink, 10)};
+
+// Purple
+$purple-light: ${colloid.purple.light};
+$purple-dark: ${colloid.purple.dark};
+
+// Blue
+$blue-light: ${colloid.blue.light};
+$blue-dark: ${colloid.blue.dark};
+
+// Teal
+$teal-light: ${colloid.teal.light};
+$teal-dark: ${colloid.teal.dark};
+
+// Green
+$green-light: ${colloid.green.light};
+$green-dark: ${colloid.green.dark};
+
+// Yellow
+$yellow-light: ${colloid.yellow.light};
+$yellow-dark: ${colloid.yellow.dark};
+
+// Orange
+$orange-light: ${lighten(orange, 10)};
+$orange-dark: ${darken(orange, 10)};
+
+// Grey
 `;
   for (let i = 0;i < greyNames.length; i++) {
     scss += `$grey-${greyNames[i]}: ${colloid.grey[i]};
 `;
   }
   scss += `
-// Base colors
-$black: ${colloid.black};
+// White
 $white: ${colloid.white};
 
-// Semantic colors - dark variants
-$red-dark: ${colloid.red.dark};
-$green-dark: ${colloid.green.dark};
-$yellow-dark: ${colloid.yellow.dark};
-$blue-dark: ${colloid.blue.dark};
-$purple-dark: ${colloid.purple.dark};
-$teal-dark: ${colloid.teal.dark};
+// Black
+$black: ${colloid.black};
 
-// Semantic colors - light variants
-$red-light: ${colloid.red.light};
-$green-light: ${colloid.green.light};
-$yellow-light: ${colloid.yellow.light};
-$blue-light: ${colloid.blue.light};
-$purple-light: ${colloid.purple.light};
-$teal-light: ${colloid.teal.light};
+// Button (window controls)
+$button-close: ${palette.color1};
+$button-max: ${palette.color2};
+$button-min: ${palette.color3};
 
-// Accent colors (primary buttons, links, highlights)
-$default-dark: ${colloid.accent.dark};
-$default-light: ${colloid.accent.light};
+// Link
 $links: ${palette.accent || palette.color4};
 
-// Backgrounds
-$background: ${palette.background};
-$foreground: ${palette.foreground};
+// Theme (accent color)
+$default-light: ${colloid.accent.light};
+$default-dark: ${colloid.accent.dark};
 `;
   return scss;
 }
@@ -4987,6 +5009,7 @@ async function cloneColloidRepo() {
   return result.success;
 }
 async function updateColloidRepo() {
+  await exec(["git", "checkout", "--", "src/sass/_color-palette-default.scss"], COLLOID_DIR);
   const result = await exec(["git", "pull", "--rebase"], COLLOID_DIR);
   return result.success;
 }
@@ -4998,21 +5021,9 @@ async function ensureColloidRepo() {
 }
 async function writeCustomPalette(palette, mode) {
   const scss = generateColloidScss(palette, mode);
-  const palettePath = join6(COLLOID_DIR, "src", "sass", "_color-palette-formalconf.scss");
+  const palettePath = join6(COLLOID_DIR, "src", "sass", "_color-palette-default.scss");
   await writeFile(palettePath, scss);
 }
-async function patchTweaksFile(themeName) {
-  const tweaksContent = `// FormalConf theme: ${themeName}
-// Auto-patched to use custom color palette
-
-@import 'color-palette-formalconf';
-
-$tweaks: true;
-$colorscheme: true;
-`;
-  const tweaksPath = join6(COLLOID_DIR, "src", "sass", "_tweaks-temp.scss");
-  await writeFile(tweaksPath, tweaksContent);
-}
 async function runColloidInstall(options) {
   const args = [
     "./install.sh",
@@ -5024,14 +5035,15 @@ async function runColloidInstall(options) {
   if (options.installLibadwaita !== false) {
     args.push("-l");
   }
-  const tweaks = options.tweaks && options.tweaks.length > 0 ? options.tweaks : ["normal"];
-  args.push("--tweaks", ...tweaks);
+  if (options.mode === "dark") {
+    args.push("--tweaks", "black");
+  }
   const result = await exec(args, COLLOID_DIR);
   return result.exitCode;
 }
 function getGtkThemeName(themeName, mode) {
   const modeCapitalized = mode === "dark" ? "Dark" : "Light";
-  return `Colloid-formalconf-${themeName}-${modeCapitalized}`;
+  return `formalconf-${themeName}-${modeCapitalized}`;
 }
 async function applyGtkTheme(theme, mode) {
   if (getOS() !== "linux") {
@@ -5070,7 +5082,6 @@ ${instructions}`
     };
   }
   await writeCustomPalette(palette, mode);
-  await patchTweaksFile(themeName);
   const gtkConfig = theme.gtk || {};
   const options = {
     themeName,
@@ -5088,6 +5099,23 @@ ${instructions}`
     };
   }
   const installedThemeName = getGtkThemeName(themeName, mode);
+  const hasGsettings = await commandExists("gsettings");
+  if (hasGsettings) {
+    await exec([
+      "gsettings",
+      "set",
+      "org.gnome.desktop.interface",
+      "gtk-theme",
+      installedThemeName
+    ]);
+    await exec([
+      "gsettings",
+      "set",
+      "org.gnome.desktop.interface",
+      "color-scheme",
+      `prefer-${mode}`
+    ]);
+  }
   return {
     success: true,
     themeName: installedThemeName

package/package.json

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