matugen: add terminals always dark option

2025-12-06 05:25:41 -05:00 · 2025-11-13 17:19:37 -05:00
parent 13ab54e83a
commit 8ea97530d4
5 changed files with 60 additions and 44 deletions
--- a/quickshell/Common/SettingsData.qml
+++ b/quickshell/Common/SettingsData.qml
@@ -232,6 +232,7 @@ Singleton {
    property bool gtkThemingEnabled: false
    property bool qtThemingEnabled: false
    property bool syncModeWithPortal: true
+    property bool terminalsAlwaysDark: false

    property bool showDock: false
    property bool dockAutoHide: false
--- a/quickshell/Common/Theme.qml
+++ b/quickshell/Common/Theme.qml
@@ -779,8 +779,9 @@ Singleton {
        Quickshell.execDetached(["sh", "-c", `mkdir -p '${stateDir}' && cat > '${desiredPath}' << 'EOF'\n${json}\nEOF`])
        workerRunning = true
        const syncModeWithPortal = (typeof SettingsData !== "undefined" && SettingsData.syncModeWithPortal) ? "true" : "false"
+        const terminalsAlwaysDark = (typeof SettingsData !== "undefined" && SettingsData.terminalsAlwaysDark) ? "true" : "false"
        console.log("Theme: Starting matugen worker")
-        systemThemeGenerator.command = [shellDir + "/scripts/matugen-worker.sh", stateDir, shellDir, configDir, syncModeWithPortal, "--run"]
+        systemThemeGenerator.command = [shellDir + "/scripts/matugen-worker.sh", stateDir, shellDir, configDir, syncModeWithPortal, terminalsAlwaysDark, "--run"]
        systemThemeGenerator.running = true
    }

--- a/quickshell/Common/settings/SettingsSpec.js
+++ b/quickshell/Common/settings/SettingsSpec.js
@@ -149,6 +149,7 @@ var SPEC = {
    gtkThemingEnabled: { def: false, onChange: "regenSystemThemes" },
    qtThemingEnabled: { def: false, onChange: "regenSystemThemes" },
    syncModeWithPortal: { def: true },
+    terminalsAlwaysDark: { def: false, onChange: "regenSystemThemes" },

    showDock: { def: false },
    dockAutoHide: { def: false },
--- a/quickshell/Modules/Settings/ThemeColorsTab.qml
+++ b/quickshell/Modules/Settings/ThemeColorsTab.qml
@@ -1175,61 +1175,62 @@ Item {

            StyledRect {
                width: parent.width
-                height: portalSyncSection.implicitHeight + Theme.spacingL * 2
+                height: applicationsSection.implicitHeight + Theme.spacingL * 2
                radius: Theme.cornerRadius
                color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
                                      Theme.outline.b, 0.2)
                border.width: 0

-                Row {
-                    id: portalSyncSection
+                Column {
+                    id: applicationsSection

                    anchors.fill: parent
                    anchors.margins: Theme.spacingL
                    spacing: Theme.spacingM

-                    DankIcon {
-                        name: "sync"
-                        size: Theme.iconSize
-                        color: Theme.primary
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM

-                    Column {
-                        width: parent.width - Theme.iconSize - Theme.spacingM - syncToggle.width - Theme.spacingM
-                        spacing: Theme.spacingXS
-                        anchors.verticalCenter: parent.verticalCenter
-
-                        StyledText {
-                            text: I18n.tr("Sync Mode with Portal")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
+                        DankIcon {
+                            name: "terminal"
+                            size: Theme.iconSize
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
                        }

                        StyledText {
-                            text: I18n.tr("Sync dark mode with settings portals for system-wide theme hints")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                            wrapMode: Text.WordWrap
-                            width: parent.width
+                            text: I18n.tr("Applications")
+                            font.pixelSize: Theme.fontSizeLarge
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
                        }
                    }

                    DankToggle {
-                        id: syncToggle
-
-                        width: 48
-                        height: 32
+                        width: parent.width
+                        text: I18n.tr("Sync Mode with Portal")
+                        description: I18n.tr("Sync dark mode with settings portals for system-wide theme hints")
                        checked: SettingsData.syncModeWithPortal
-                        anchors.verticalCenter: parent.verticalCenter
-                        onToggled: checked => SettingsData.set("syncModeWithPortal", checked)
+                        onToggled: checked => {
+                            return SettingsData.set("syncModeWithPortal", checked)
+                        }
+                    }
+
+                    DankToggle {
+                        width: parent.width
+                        text: I18n.tr("Terminals - Always use Dark Theme")
+                        description: I18n.tr("Force terminal applications to always use dark color schemes")
+                        checked: SettingsData.terminalsAlwaysDark
+                        onToggled: checked => {
+                            return SettingsData.set("terminalsAlwaysDark", checked)
+                        }
                    }
                }
            }

-            // System Configuration Warning
            Rectangle {
                width: parent.width
                height: warningText.implicitHeight + Theme.spacingM * 2
@@ -1449,6 +1450,7 @@ Item {
                    }
                }
            }
+
        }
    }

@@ -1463,7 +1465,6 @@ Item {
        }

        onFileSelected: function(filePath) {
-            // Save the custom theme file path and switch to custom theme
            if (filePath.endsWith(".json")) {
                SettingsData.set("customThemeFile", filePath)
                Theme.switchTheme("custom")
--- a/quickshell/scripts/matugen-worker.sh
+++ b/quickshell/scripts/matugen-worker.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -euo pipefail

-if [ $# -lt 4 ]; then
-    echo "Usage: $0 STATE_DIR SHELL_DIR CONFIG_DIR SYNC_MODE_WITH_PORTAL --run" >&2
+if [ $# -lt 5 ]; then
+    echo "Usage: $0 STATE_DIR SHELL_DIR CONFIG_DIR SYNC_MODE_WITH_PORTAL TERMINALS_ALWAYS_DARK --run" >&2
    exit 1
 fi

@@ -10,6 +10,7 @@ STATE_DIR="$1"
 SHELL_DIR="$2"
 CONFIG_DIR="$3"
 SYNC_MODE_WITH_PORTAL="$4"
+TERMINALS_ALWAYS_DARK="$5"

 if [ ! -d "$STATE_DIR" ]; then
    echo "Error: STATE_DIR '$STATE_DIR' does not exist" >&2
@@ -26,10 +27,10 @@ if [ ! -d "$CONFIG_DIR" ]; then
    exit 1
 fi

-shift 4
+shift 5

 if [[ "${1:-}" != "--run" ]]; then
-  echo "usage: $0 STATE_DIR SHELL_DIR CONFIG_DIR SYNC_MODE_WITH_PORTAL --run" >&2
+  echo "usage: $0 STATE_DIR SHELL_DIR CONFIG_DIR SYNC_MODE_WITH_PORTAL TERMINALS_ALWAYS_DARK --run" >&2
  exit 1
 fi

@@ -202,6 +203,11 @@ EOF
  echo "[config]" > "$TMP_CONTENT_CFG"
  echo "" >> "$TMP_CONTENT_CFG"

+  TERMINAL_MODE="$mode"
+  if [[ "$TERMINALS_ALWAYS_DARK" == "true" ]]; then
+    TERMINAL_MODE="dark"
+  fi
+
  if command -v ghostty >/dev/null 2>&1; then
    sed "s|'SHELL_DIR/|'$SHELL_DIR/|g" "$SHELL_DIR/matugen/configs/ghostty.toml" >> "$TMP_CONTENT_CFG"
    echo "" >> "$TMP_CONTENT_CFG"
@@ -243,12 +249,13 @@ EOF
  fi

  if [[ -s "$TMP_CONTENT_CFG" ]] && grep -q '\[templates\.' "$TMP_CONTENT_CFG"; then
+    MAT_TERMINAL_MODE=(-m "$TERMINAL_MODE")
    case "$kind" in
      image)
-        matugen -c "$TMP_CONTENT_CFG" image "$value" "${MAT_MODE[@]}" "${MAT_TYPE[@]}" >/dev/null
+        matugen -c "$TMP_CONTENT_CFG" image "$value" "${MAT_TERMINAL_MODE[@]}" "${MAT_TYPE[@]}" >/dev/null
        ;;
      hex)
-        matugen -c "$TMP_CONTENT_CFG" color hex "$value" "${MAT_MODE[@]}" "${MAT_TYPE[@]}" >/dev/null
+        matugen -c "$TMP_CONTENT_CFG" color hex "$value" "${MAT_TERMINAL_MODE[@]}" "${MAT_TYPE[@]}" >/dev/null
        ;;
    esac
  fi
@@ -292,8 +299,13 @@ EOF
    return 2
  fi

+  TERMINAL_LIGHT_FLAG=""
+  if [[ "$TERMINALS_ALWAYS_DARK" != "true" ]] && [[ "$mode" == "light" ]]; then
+    TERMINAL_LIGHT_FLAG="--light"
+  fi
+
  if command -v ghostty >/dev/null 2>&1 && [[ -f "$CONFIG_DIR/ghostty/config-dankcolors" ]]; then
-    OUT=$(dms dank16 "$PRIMARY" $([[ "$mode" == "light" ]] && echo --light) ${SURFACE:+--background "$SURFACE"} --ghostty 2>/dev/null || true)
+    OUT=$(dms dank16 "$PRIMARY" $TERMINAL_LIGHT_FLAG ${SURFACE:+--background "$SURFACE"} --ghostty 2>/dev/null || true)
    if [[ -n "${OUT:-}" ]]; then
      printf "\n%s\n" "$OUT" >> "$CONFIG_DIR/ghostty/config-dankcolors"
      if [[ -f "$CONFIG_DIR/ghostty/config" ]] && grep -q "^[^#]*config-dankcolors" "$CONFIG_DIR/ghostty/config" 2>/dev/null; then
@@ -303,7 +315,7 @@ EOF
  fi

  if command -v kitty >/dev/null 2>&1 && [[ -f "$CONFIG_DIR/kitty/dank-theme.conf" ]]; then
-    OUT=$(dms dank16 "$PRIMARY" $([[ "$mode" == "light" ]] && echo --light) ${SURFACE:+--background "$SURFACE"} --kitty 2>/dev/null || true)
+    OUT=$(dms dank16 "$PRIMARY" $TERMINAL_LIGHT_FLAG ${SURFACE:+--background "$SURFACE"} --kitty 2>/dev/null || true)
    if [[ -n "${OUT:-}" ]]; then
      printf "\n%s\n" "$OUT" >> "$CONFIG_DIR/kitty/dank-theme.conf"
      if [[ -f "$CONFIG_DIR/kitty/kitty.conf" ]] && grep -q "^[^#]*dank-theme.conf" "$CONFIG_DIR/kitty/kitty.conf" 2>/dev/null; then
@@ -320,7 +332,7 @@ EOF
      echo "[colors]" > "$FOOT_CONFIG"
    fi

-    OUT=$(dms dank16 "$PRIMARY" $([[ "$mode" == "light" ]] && echo --light) ${SURFACE:+--background "$SURFACE"} --foot 2>/dev/null || true)
+    OUT=$(dms dank16 "$PRIMARY" $TERMINAL_LIGHT_FLAG ${SURFACE:+--background "$SURFACE"} --foot 2>/dev/null || true)
    if [[ -n "${OUT:-}" ]]; then
      printf "\n%s\n" "$OUT" >> "$FOOT_CONFIG"
    fi
@@ -334,7 +346,7 @@ EOF
      touch "$WEZTERM_CONFIG"
    fi

-    OUT=$(dms dank16 "$PRIMARY" $([[ "$mode" == "light" ]] && echo --light) ${SURFACE:+--background "$SURFACE"} --wezterm 2>/dev/null || true)
+    OUT=$(dms dank16 "$PRIMARY" $TERMINAL_LIGHT_FLAG ${SURFACE:+--background "$SURFACE"} --wezterm 2>/dev/null || true)
    if [[ -n "${OUT:-}" ]]; then
      printf "\n%s\n" "$OUT" >>"$WEZTERM_CONFIG"
    fi
@@ -348,7 +360,7 @@ EOF
      touch "$ALACRITTY_CONFIG"
    fi

-    OUT=$(dms dank16 "$PRIMARY" $([[ "$mode" == "light" ]] && echo --light) ${SURFACE:+--background "$SURFACE"} --alacritty 2>/dev/null || true)
+    OUT=$(dms dank16 "$PRIMARY" $TERMINAL_LIGHT_FLAG ${SURFACE:+--background "$SURFACE"} --alacritty 2>/dev/null || true)
    if [[ -n "${OUT:-}" ]]; then
      printf "\n%s\n" "$OUT" >> "$ALACRITTY_CONFIG"
    fi