diff --git a/bar/modules/Clock.qml b/bar/modules/Clock.qml index cff9713..08393c8 100644 --- a/bar/modules/Clock.qml +++ b/bar/modules/Clock.qml @@ -265,7 +265,7 @@ ModuleChip { Rectangle { anchors.centerIn: parent; width: 22; height: 22; radius: 11 - color: isToday ? root.t.accent : "transparent" + color: isToday ? root.t.calTodayBg : "transparent" border.color: isToday ? root.t.borderToday : "transparent" border.width: isToday ? 2 : 0 visible: inMonth diff --git a/bar/modules/Stats.qml b/bar/modules/Stats.qml index a9d5300..c97fc3c 100644 --- a/bar/modules/Stats.qml +++ b/bar/modules/Stats.qml @@ -42,19 +42,27 @@ ModuleChip { Process { id: statsProc command: ["sh", "-c", - "top -bn1 | awk '/^%Cpu/ {print 100-$8}'; " + - "free | awk '/Mem:/ {print ($2-$7)/$2 * 100}'; " + - "df / --output=pcent | tail -1 | awk '{print $1}'; " + + "(head -n 1 /proc/stat; sleep 1; head -n 1 /proc/stat) | awk " + + "'{u=$2+$3;s=$4;i=$5+$6;x=$7+$8;t=u+s+i+x;if(NR==1){p=t;q=i;next}" + + "{dt=t-p;di=i-q;print (dt>0?100*(dt-di)/dt:0)}}'; " + + "awk '/MemTotal/{t=$2}/MemAvailable/{a=$2}END" + + "{print (t>0?(t-a)/t*100:0)}' /proc/meminfo; " + + "df / | awk 'NR==2{sub(/%/,\"\",$5); print $5}'; " + "ct=-1; for d in /sys/class/hwmon/hwmon*; do " + "n=$(cat $d/name 2>/dev/null); " + - "if echo \"$n\" | grep -qiE 'coretemp|k10temp|cpu_thermal'; then " + + "if echo \"$n\" | grep -qiE " + + "'coretemp|k10temp|cpu_thermal|zenpower|acpitz|x86_pkg_temp|thinkpad|nct6775'; then " + "ct=$(( $(cat $d/temp1_input 2>/dev/null) / 1000 )); break; " + "fi; done; echo $ct; " + "gt=-1; for d in /sys/class/hwmon/hwmon*; do " + "n=$(cat $d/name 2>/dev/null); " + - "if echo \"$n\" | grep -qiE 'amdgpu|radeon'; then " + + "if echo \"$n\" | grep -qiE 'amdgpu|radeon|nouveau'; then " + "gt=$(( $(cat $d/temp1_input 2>/dev/null) / 1000 )); break; " + - "fi; done; echo $gt"] + "fi; done; " + + "[ \"$gt\" = \"-1\" ] && " + + "gt=$(nvidia-smi --query-gpu=temperature.gpu " + + "--format=csv,noheader 2>/dev/null | head -n 1); " + + "echo $gt"] property string rawOutput: "" stdout: SplitParser { onRead: data => { statsProc.rawOutput += data + "\n" } diff --git a/config/config.qml b/config/config.qml index 8725000..57c2ee4 100644 --- a/config/config.qml +++ b/config/config.qml @@ -6,7 +6,7 @@ import "themes" QtObject { id: root - readonly property var theme: Goldencity + readonly property var theme: Tranquil // ──────────────────────────────────────────────────────────────────────── // Widgets diff --git a/config/themes/aero.qml b/config/themes/aero.qml index 2d89355..601e929 100644 --- a/config/themes/aero.qml +++ b/config/themes/aero.qml @@ -20,13 +20,11 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#f0f9f9" // Crisp glass white readonly property color textDim: "#99b2d8d8" // Muted aqua gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#cbdc3d" // Vibrant lime aurora readonly property color border: "transparent" readonly property color borderPopup: "#6681c7c7" // Soft sky blue border - readonly property color borderToday: accent // ── ArchLogo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -157,6 +155,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#cbdc3d" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/aurora.qml b/config/themes/aurora.qml index e3c1bbe..cd4681a 100644 --- a/config/themes/aurora.qml +++ b/config/themes/aurora.qml @@ -20,13 +20,11 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffe0f7ff" // Starlight white readonly property color textDim: "#997a94ad" // Muted nebula blue - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ff00d9ff" // Electric comet cyan readonly property color border: "transparent" readonly property color borderPopup: "#881e3a5f" // Deep Atlantic blue - readonly property color borderToday: accent // ── ArchLogo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -157,6 +155,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ff82e6ff" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/autumn.qml b/config/themes/autumn.qml index 6c41b36..be4a9e8 100644 --- a/config/themes/autumn.qml +++ b/config/themes/autumn.qml @@ -20,14 +20,12 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#fff1dfbf" // Bright cloud highlight white readonly property color textDim: "#99a88b62" // Hazy horizon gray - readonly property color todayText: "#fff8e7c9" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffffa51f" // Warm hazy horizon gold readonly property color border: "transparent" readonly property color frameBorder: "transparent" readonly property color borderPopup: "transparent" - readonly property color borderToday: accent // ── Logo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -158,6 +156,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#fff8e7c9" readonly property color clockPopupHeader: "#ffffa51f" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/beach.qml b/config/themes/beach.qml index a05a38b..5cbb3ca 100644 --- a/config/themes/beach.qml +++ b/config/themes/beach.qml @@ -20,13 +20,11 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffeef2f5" // Soft cloud white readonly property color textDim: "#99a5b9c4" // Muted horizon gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffebc6a0" // Warm sunset reflection readonly property color border: "transparent" readonly property color borderPopup: "#884a5d6e" // Slate blue border - readonly property color borderToday: accent // ── ArchLogo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -157,6 +155,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ffebc6a0" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/boat.qml b/config/themes/boat.qml index 48d8ee9..a93e21e 100644 --- a/config/themes/boat.qml +++ b/config/themes/boat.qml @@ -20,14 +20,12 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#fffaf4f0" // Warm sunset cream highlight readonly property color textDim: "#998f7e7c" // Hazy dusk mauve gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffe0533c" // Vibrant horizon crimson-orange readonly property color border: "transparent" readonly property color frameBorder: "transparent" readonly property color borderPopup: "transparent" - readonly property color borderToday: accent // ── Logo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -158,6 +156,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ffe0533c" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/colorful.qml b/config/themes/colorful.qml index b4ab470..8fb5f19 100644 --- a/config/themes/colorful.qml +++ b/config/themes/colorful.qml @@ -20,13 +20,11 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffeff1f5" // Snow white readonly property color textDim: "#998da0c4" // Muted sky blue - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#fff0a1ba" // Sunset pink accent readonly property color border: "transparent" readonly property color borderPopup: "#fff0a1ba" // Muted slate blue - readonly property color borderToday: accent // ── ArchLogo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -157,6 +155,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#fff0a1ba" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/cosmic.qml b/config/themes/cosmic.qml index a5e72ac..7d8cb41 100644 --- a/config/themes/cosmic.qml +++ b/config/themes/cosmic.qml @@ -20,13 +20,11 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffe0f2ff" // Brighter starlight white readonly property color textDim: "#997a89ad" // Muted sky blue - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffbdf0ff" // Comet core (bright cyan-white) readonly property color border: "transparent" readonly property color borderPopup: "#883d4a6d" // Softened nebula blue - readonly property color borderToday: accent // ── ArchLogo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -157,6 +155,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ffcfb3ff" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/everforest.qml b/config/themes/everforest.qml index d57fe63..a08d135 100644 --- a/config/themes/everforest.qml +++ b/config/themes/everforest.qml @@ -20,14 +20,12 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffe8f0ea" // Cool near-white (droplet highlight) readonly property color textDim: "#997a9080" // Muted sage-gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ff4a8c5c" // Muted forest green readonly property color border: "transparent" readonly property color frameBorder: "transparent" readonly property color borderPopup: "transparent" - readonly property color borderToday: accent // ── Logo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -160,6 +158,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ff4a8c5c" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/goldencity.qml b/config/themes/goldencity.qml index 8635408..131bad5 100644 --- a/config/themes/goldencity.qml +++ b/config/themes/goldencity.qml @@ -20,14 +20,13 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffe8eef2" // Bright cloud highlight white readonly property color textDim: "#997a8996" // Hazy horizon gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffc19375" // Warm hazy horizon gold readonly property color border: "transparent" readonly property color frameBorder: "transparent" readonly property color borderPopup: "transparent" - readonly property color borderToday: accent + // ── Logo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -158,6 +157,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ffc19375" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/hummingbird.qml b/config/themes/hummingbird.qml index b1dc6ac..fd64dc8 100644 --- a/config/themes/hummingbird.qml +++ b/config/themes/hummingbird.qml @@ -20,14 +20,12 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#fff1f8e9" // Creamy mint highlight readonly property color textDim: "#99a5ad94" // Sage horizon gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffff5722" // Fiery vermilion (throat) readonly property color border: "transparent" readonly property color frameBorder: "transparent" readonly property color borderPopup: "transparent" - readonly property color borderToday: accent // ── Logo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -158,6 +156,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ffff5722" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/lowlight.qml b/config/themes/lowlight.qml index beb3edd..8dc83f5 100644 --- a/config/themes/lowlight.qml +++ b/config/themes/lowlight.qml @@ -20,14 +20,12 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffe8eef8" // Star-white readonly property color textDim: "#996878a0" // Muted midnight blue-gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffb068d8" // Mauve horizon glow readonly property color border: "transparent" readonly property color frameBorder: "transparent" readonly property color borderPopup: "transparent" - readonly property color borderToday: accent // ── Logo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -160,6 +158,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ffb068d8" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/metropolitan.qml b/config/themes/metropolitan.qml index 799df25..b966ebe 100644 --- a/config/themes/metropolitan.qml +++ b/config/themes/metropolitan.qml @@ -21,13 +21,11 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffe0e6ed" // Bright office window white readonly property color textDim: "#9971798a" // Steel gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffffb86c" // Warm street lamp amber readonly property color border: "transparent" readonly property color borderPopup: "#882e3440" // Dark girder blue - readonly property color borderToday: accent // ── ArchLogo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -158,6 +156,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ffffb86c" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/neonica.qml b/config/themes/neonica.qml index ad39b29..6b24ccd 100644 --- a/config/themes/neonica.qml +++ b/config/themes/neonica.qml @@ -20,13 +20,11 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffe0def4" readonly property color textDim: "#99908caa" - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffff2e97" // Your magenta accent readonly property color border: "transparent" readonly property color borderPopup: "#883b224c" - readonly property color borderToday: accent // ── ArchLogo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -157,6 +155,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ff9ccfd8" // Blue header readonly property color clockPopupText: textMain readonly property color clockPopupDim: "#ff6e6a86" diff --git a/config/themes/pinkie.qml b/config/themes/pinkie.qml index 066ed85..a848846 100644 --- a/config/themes/pinkie.qml +++ b/config/themes/pinkie.qml @@ -20,14 +20,12 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffe8eef2" // Bright highlight white readonly property color textDim: "#997e8098" // Muted lavender-gray - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ff4ec0b8" // Teal eye color readonly property color border: "transparent" readonly property color frameBorder: "transparent" readonly property color borderPopup: "transparent" - readonly property color borderToday: accent // ── Logo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -160,6 +158,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ff4ec0b8" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/qmldir b/config/themes/qmldir index e83f7d1..df46679 100644 --- a/config/themes/qmldir +++ b/config/themes/qmldir @@ -16,4 +16,6 @@ singleton Boat 1.0 boat.qml singleton Autumn 1.0 autumn.qml singleton Pinkie 1.0 pinkie.qml singleton Lowlight 1.0 lowlight.qml +singleton Tranquil 1.0 tranquil.qml + diff --git a/config/themes/supreme.qml b/config/themes/supreme.qml index 9beaa00..dbf981b 100644 --- a/config/themes/supreme.qml +++ b/config/themes/supreme.qml @@ -20,13 +20,11 @@ QtObject { // ── Text ────────────────────────────────────────────────────────────────── readonly property color textMain: "#ffffeff5" // Soft sugar white readonly property color textDim: "#aaefb4c1" // Muted petal pink - readonly property color todayText: "#ffffffff" // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ffff7eb9" // Neon bubblegum pink readonly property color border: "transparent" readonly property color borderPopup: "#66ff7eb9" // Glowing pink edge - readonly property color borderToday: accent // ── ArchLogo Module ──────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -157,6 +155,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" readonly property color clockPopupHeader: "#ffff7eb9" readonly property color clockPopupText: textMain readonly property color clockPopupDim: textDim diff --git a/config/themes/tranquil.qml b/config/themes/tranquil.qml new file mode 100644 index 0000000..80efa4a --- /dev/null +++ b/config/themes/tranquil.qml @@ -0,0 +1,371 @@ +pragma Singleton +import QtQuick +import Quickshell + +QtObject { + id: theme + + // ── Wallpaper ────────────────────────────────────────────────────────────── + readonly property string wallpaper: Quickshell.env("HOME") + "/.config/quickshell/wallpapers/tranquil.jpg" + + // ── Base Backgrounds ─────────────────────────────────────────────────────── + readonly property color bg: "#cc0d0b18" // Deepest dusk violet shadow + readonly property color bgPanel: "transparent" + readonly property color bgPopup: "#cc0d0b18" // Near-black twilight silhouette + readonly property color bgFrame: bg + + // ── Separators ──────────────────────────────────────────────────────────── + readonly property color separator: "#334a3d6e" // Muted purple-gray + + // ── Text ────────────────────────────────────────────────────────────────── + readonly property color textMain: "#ffe8e4f8" // Soft moonlit lavender white + readonly property color textDim: "#998a7aaa" // Hazy dusk violet-gray + + // ── Accent & Borders ────────────────────────────────────────────────────── + readonly property color accent: "#ffb09de8" // Soft lavender bloom + readonly property color border: "transparent" + readonly property color frameBorder: "transparent" + readonly property color borderPopup: "transparent" + + + // ── Logo Module ──────────────────────────────────────────────────────── + readonly property color logoBg: bgPanel + readonly property color logoBgHover: "#22ffffff" + readonly property color logoBorder: border + readonly property color logoBorderActive: accent + readonly property color logoIcon: textMain + readonly property color logoIconActive: accent + + + // ── Mpris Module ────────────────────────────────────────────────────────── + readonly property color mprisAccent: accent + readonly property color mprisTextMain: textMain + readonly property color mprisTextDim: textDim + readonly property color mprisTrackColor: statsTrackColor + readonly property color mprisButtonText: bgPopup + readonly property color mprisAlbumBg: Qt.alpha(accent, 0.08) + readonly property color mprisAlbumBorder: Qt.alpha(accent, 0.15) + readonly property color mprisBtnBg: Qt.alpha(accent, 0.10) + readonly property color mprisBtnBgHover: Qt.alpha(accent, 0.22) + readonly property color mprisBtnBorder: Qt.alpha(accent, 0.20) + readonly property color mprisBtnBorderHover: Qt.alpha(accent, 0.45) + readonly property color mprisBtnIcon: accent + readonly property color mprisBtnIconHover: Qt.lighter(accent, 1.3) + + // ── Stats Module (Variation: Twilight Pulse) ────────────────────────────── + readonly property color statsBg: bgPanel + readonly property color statsBorder: border + readonly property color statsCpuColor: "#ffb09de8" // Lavender bloom + readonly property color statsMemColor: "#ff89a4fa" // Soft periwinkle blue + readonly property color statsDiskColor: "#ff94d5e2" // Cool sky teal + readonly property color statsTrackColor: "#15ffffff" + readonly property color statsCpuTempColor: "#fff38ba8" // Warm rose + readonly property color statsGpuColor: "#ffcba6f7" // Soft violet + + + // ── SysInfo Module ──────────────────────────────────────────────────────── + readonly property color sysInfoAccent: accent + readonly property color sysInfoTextMain: textMain + readonly property color sysInfoTextDim: textDim + readonly property color sysInfoCpuColor: statsCpuColor + readonly property color sysInfoMemColor: statsMemColor + readonly property color sysInfoDiskColor: statsDiskColor + readonly property color sysInfoCpuTempColor: "#fff38ba8" + readonly property color sysInfoGpuColor: statsGpuColor + readonly property color sysInfoTrackColor: statsTrackColor + + // ── Volume Module (Variation: Moonlit Mist) ─────────────────────────────── + readonly property color volBg: bgPanel + readonly property color volBgHover: "#224a3d6e" + readonly property color volBorder: border + readonly property color volBorderHover: "#ff89a4fa" + readonly property color volPopupBg: bgPopup + readonly property color volPopupBorder: borderPopup + readonly property color volIcon: "#ff89a4fa" + readonly property color volIconMuted: "#ff5a5278" + readonly property color volTrack: "#22ffffff" + readonly property color volHandle: accent + readonly property color volHandleBorder: "#33ffffff" + readonly property color volMuteBg: "#33f38ba8" + readonly property color volPickerHover: "#15b09de8" + + // ── Volume Limit Buttons ──────────────────────────────────────────────── + readonly property color volLimitBtn: "transparent" + readonly property color volLimitBtnHover: "#22b09de8" + readonly property color volLimitBtnPress: accent + readonly property color volOutputLimitBtnPress: accent + readonly property color volInputLimitBtnPress: statusInfo + readonly property color volOutputLimitBtnHover: Qt.alpha(accent, 0.08) + readonly property color volInputLimitBtnHover: Qt.alpha(statusInfo, 0.08) + + // ── Clock Module ─────────────────────────────────────────────────────────── + readonly property color clockBg: bgPanel + readonly property color clockBgHover: "#11ffffff" + readonly property color clockBorder: border + readonly property color clockBorderHover: accent + readonly property color clockTime: textMain + readonly property color clockSeconds: "#ffb09de8" // Lavender glow + readonly property color clockIcon: accent + + // ── Battery Module ──────────────────────────────────────────────────────── + readonly property color batteryFull: accent + readonly property color batteryCharging: accent + readonly property color batteryCritical: statusErr + readonly property color batteryLow: statusWarn + readonly property color batteryIcon: clockIcon + readonly property color batBg: bgPanel + readonly property color batBgHover: "#11ffffff" + readonly property color batBorder: border + readonly property color batBorderHover: accent + readonly property color batText: textMain + readonly property color batPopupBg: bgPopup + readonly property color batPopupBorder: borderPopup + readonly property color batPopupSeparator: separator + readonly property color batPopupHeader: "#ffb09de8" + readonly property color batPopupText: textMain + readonly property color batPopupDim: textDim + readonly property color batProgressTrack: separator + readonly property color batProfileActiveText: bg + + // ── Network Module ──────────────────────────────────────────────────────── + readonly property color netBg: bgPanel + readonly property color netBgHover: "#11ffffff" + readonly property color netBorder: border + readonly property color netBorderHover: accent + readonly property color netText: textMain + readonly property color netPopupBg: bgPopup + readonly property color netPopupBorder: borderPopup + readonly property color netPopupSeparator: separator + readonly property color netPopupHeader: "#ffb09de8" + readonly property color netPopupText: textMain + readonly property color netPopupDim: textDim + readonly property color netFieldBg: "#22ffffff" + readonly property color netCancelBgHover: "#22ffffff" + readonly property color netConnectText: "#ff0d0b18" + readonly property color netApActiveBg: Qt.alpha(accent, 0.15) + readonly property color netApHoverBg: calArrowBgHover + readonly property color netDisconnectBg: Qt.alpha(statusErr, 0.18) + readonly property color netDisconnectBorder: Qt.alpha(statusErr, 0.45) + readonly property color netWiredOkBg: Qt.alpha(statusOk, 0.12) + readonly property color netWiredErrBg: Qt.alpha(statusErr, 0.12) + readonly property color netWiredOkBorder: Qt.alpha(statusOk, 0.4) + readonly property color netWiredErrBorder: Qt.alpha(statusErr, 0.4) + readonly property color netWifiIconOk: "#ffb4c9a1" // soft sage green + readonly property color netWifiIconErr: "#fff38ba8" // soft rose pink + readonly property color netEthIconOk: "#ffb4c9a1" + readonly property color netEthIconErr: "#fff38ba8" + + // ── Calendar Popup ───────────────────────────────────────────────────────── + readonly property color calCardBg: bgPopup + readonly property color calCardBorder: borderPopup + readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffffffff" + readonly property color clockPopupHeader: "#ffb09de8" + readonly property color clockPopupText: textMain + readonly property color clockPopupDim: textDim + readonly property color clockPopupDate: textMain + readonly property color clockPopupUtc: textDim + readonly property color calArrowIcon: textDim + readonly property color calArrowIconHover: "#ffb09de8" // Hovered arrow — lavender bloom + readonly property color calArrowBg: "transparent" + readonly property color calArrowBgHover: "#22b09de8" // Hovered button — soft lavender tint + readonly property color calArrowBgPress: "#ffb09de8" // Pressed button — full lavender + + + // ── Weather Module ────────────────────────────────────────────────────── + readonly property color weatherAccent: accent + readonly property color weatherTextMain: textMain + readonly property color weatherTextDim: textDim + readonly property color weatherTempColor: "#fff38ba8" + readonly property color weatherFeelsColor: "#ffcba6f7" + readonly property color weatherHumidColor: "#ff89a4fa" + readonly property color weatherWindColor: "#ff94d5e2" + + // ── Workspace Module ─────────────────────────────────────────────────────── + readonly property color wsPanelBg: bgPanel + readonly property color wsPanelBorder: "transparent" + readonly property color wsActiveBg: accent + readonly property color wsInactiveBg: "#15ffffff" + readonly property color wsHoverBg: "#334a3d6e" + readonly property color wsActiveText: "#ff0d0b18" + readonly property color wsInactiveText: textMain + readonly property color wsHoverText: "#ffffffff" + readonly property color wsMagicActiveBg: "#ff9b6df5" + readonly property color wsMagicActiveText: wsActiveText + + // ── Tray Module ──────────────────────────────────────────────────────────── + readonly property color trayBg: bgPanel + readonly property color trayBgHover: "#11ffffff" + readonly property color trayBorder: border + readonly property color trayBorderHover: "#22ffffff" + readonly property color trayIcon: textMain + + // ── Tray Context Menu ────────────────────────────────────────────────────── + readonly property color trayMenuBg: bgPopup + readonly property color trayMenuBorder: borderPopup + readonly property color trayMenuText: textMain + readonly property color trayMenuDim: textDim + readonly property color trayMenuHover: "#22b09de8" // soft lavender tint + readonly property color trayMenuCheck: accent + readonly property color trayMenuSeparator: separator + + // ── Launcher (Variation: Twilight Veil) ─────────────────────────────────── + readonly property color launcherBg: bgPopup + readonly property color launcherBorder: borderPopup + readonly property color launcherInput: "#44080a0d" + readonly property color launcherInputBorderFocus: accent + readonly property color launcherPill: "#444a3d6e" + readonly property color launcherText: textMain + readonly property color launcherDim: textDim + readonly property color launcherAccent: accent + readonly property color launcherHover: "#22b09de8" + readonly property color launcherSelected: "#44b09de8" + readonly property color launcherModeActiveText: "#ffffffff" + readonly property color launcherModeActiveBg: accent + + // ── Status Colors ────────────────────────────────────────────────────────── + readonly property color statusOk: "#ffb4c9a1" // Sage green + readonly property color statusWarn: "#ffe8c57a" // Muted amber + readonly property color statusErr: "#fff38ba8" // Soft rose + readonly property color statusInfo: "#ff89a4fa" // Periwinkle blue + + // ── Notifications Module ─────────────────────────────────────────────────── + readonly property color notifBg: bgPanel + readonly property color notifBgHover: "#11ffffff" + readonly property color notifBorder: border + readonly property color notifBorderActive: accent + readonly property color notifIcon: textMain + readonly property color notifIconActive: accent + readonly property color notifBadgeBg: statusErr + readonly property color notifBadgeText: "#ffffffff" + readonly property color notifSeparator: separator + readonly property color notifDnd: separator + + // ── Toast cards (Variation: Moonrise Glow) ──────────────────────────────── + readonly property color notifToastBg: bgPopup + readonly property color notifToastBgHover: "#22ffffff" + readonly property color notifToastBorder: borderPopup + readonly property color notifToastText: textMain + readonly property color notifToastDim: textDim + readonly property color notifToastAppName: accent + + // ── Urgency colours ──────────────────────────────────────────────────────── + readonly property color notifUrgencyCritical: statusErr + readonly property color notifUrgencyNormal: accent + readonly property color notifUrgencyLow: textDim + + // ── Progress bar ─────────────────────────────────────────────────────────── + readonly property color notifProgressBg: "#22ffffff" + readonly property color notifProgressFill: accent + + // ── History popup ────────────────────────────────────────────────────────── + readonly property color notifHistoryBg: bgPopup + readonly property color notifHistoryBorder: borderPopup + readonly property color notifHistoryHover: "#11b09de8" + readonly property color notifHistoryEmpty: textDim + + // ── BgDate Module ────────────────────────────────────────────────────────── + readonly property color bgDateText: "#ffffffff" // Pure white + readonly property color bgDateShadow: "#88000000" // Soft shadow + readonly property color bgDateSecondsText: bgDateText + + // ── Crypto Module ────────────────────────────────────────────────────────── + readonly property color cryptoBg: bgPanel + readonly property color cryptoBgHover: "#15ffffff" + readonly property color cryptoBorder: border + readonly property color cryptoBorderHover: accent + + readonly property color cryptoIcon: accent + readonly property color cryptoLabel: textDim + readonly property color cryptoValue: textMain + + readonly property color cryptoUp: "#ffb4c9a1" // soft sage green + readonly property color cryptoDown: "#fff38ba8" // soft rose + + // Popup card + readonly property color cryptoPopupBg: bgPopup + readonly property color cryptoPopupBorder: borderPopup + readonly property color cryptoPopupHeader: "#ffb09de8" // lavender bloom + readonly property color cryptoPopupText: textMain + readonly property color cryptoPopupDim: textDim + + // Tinted surfaces + readonly property color cryptoUpBg: Qt.rgba(cryptoUp.r, cryptoUp.g, cryptoUp.b, 0.13) + readonly property color cryptoDownBg: Qt.rgba(cryptoDown.r, cryptoDown.g, cryptoDown.b, 0.13) + readonly property color cryptoChipRemoveBg: Qt.rgba(cryptoDown.r, cryptoDown.g, cryptoDown.b, 0.27) + readonly property color cryptoApplyIdleBg: Qt.rgba(accent.r, accent.g, accent.b, 0.20) + + readonly property color cryptoFieldBg: "#15ffffff" + readonly property color cryptoFieldBgFocus: "#22ffffff" + readonly property color cryptoRangeTrack: "#1affffff" + readonly property color cryptoTextOnAccent: "#ff0d0b18" + readonly property color cryptoPlaceholder: Qt.rgba(textDim.r, textDim.g, textDim.b, 0.33) + + // ── Polkit Dialog ────────────────────────────────────────────────────────── + // Overlay + readonly property color polkitOverlayBg: "#bb000000" + + // Card chrome + readonly property color polkitCardBg: bgPopup + readonly property color polkitCardBorder: border + + // Lock icon + readonly property color polkitIconBg: "#1eb09de8" // translucent lavender fill + readonly property color polkitIconBorder: "#44b09de8" // stronger lavender ring + readonly property color polkitIconColor: accent + + // Text hierarchy + readonly property color polkitTitle: textMain + readonly property color polkitMessage: "#cce8e4f8" + + // Action-ID pill + readonly property color polkitPillBg: "#1a4a3d6e" // muted violet tint + readonly property color polkitPillText: "#668a7aaa" + + // Divider + readonly property color polkitDivider: "#334a3d6e" + + // Supplementary message — error state + readonly property color polkitSuppErrBg: "#1af38ba8" + readonly property color polkitSuppErrBorder: "#44f38ba8" + readonly property color polkitSuppErrText: statusErr + + // Supplementary message — info / ok state + readonly property color polkitSuppOkBg: "#1ab4c9a1" + readonly property color polkitSuppOkBorder: "#44b4c9a1" + readonly property color polkitSuppOkText: statusOk + + // Fields + readonly property color polkitFieldBg: "#44080a0d" + readonly property color polkitFieldBorder: "#22ffffff" + readonly property color polkitFieldBorderFocus: accent + + // Identity selector + readonly property color polkitUserLabel: "#998a7aaa" + readonly property color polkitUserValue: accent + + // Input prompt + readonly property color polkitInputPrompt: "#888a7aaa" + + // TextInput + readonly property color polkitInputText: textMain + readonly property color polkitInputSelection: "#55b09de8" // lavender selection highlight + readonly property color polkitInputSelectedText: bg + + // Eye toggle + readonly property color polkitEyeIcon: "#668a7aaa" + readonly property color polkitEyeIconHover: accent + + // Authenticate button + readonly property color polkitAuthBg: "#ddb09de8" // slightly-muted lavender fill + readonly property color polkitAuthBgHover: accent + readonly property color polkitAuthText: bg + + // Cancel button + readonly property color polkitCancelBg: "#0dffffff" + readonly property color polkitCancelBgHover: "#22ffffff" + readonly property color polkitCancelBorder: "#22ffffff" + readonly property color polkitCancelText: "#cce8e4f8" +} diff --git a/config/themes/tropicalnight.qml b/config/themes/tropicalnight.qml index 0496b72..c5ed47f 100644 --- a/config/themes/tropicalnight.qml +++ b/config/themes/tropicalnight.qml @@ -21,14 +21,12 @@ QtObject { // reduced whiteness — cooler/dimmer grays for primary text readonly property color textMain: "#ffbfc6c9" // less-white moonlit gray readonly property color textDim: "#ff92979b" // dimmer gray - readonly property color todayText: "#ffccd1d4" // subdued off-white // ── Accent & Borders ────────────────────────────────────────────────────── readonly property color accent: "#ff89b4fa" // Summer sky blue (Main Accent) readonly property color border: "transparent" readonly property color frameBorder: "transparent" readonly property color borderPopup: "transparent" - readonly property color borderToday: accent // ── Logo Module ─────────────────────────────────────────────────────── readonly property color logoBg: bgPanel @@ -159,6 +157,9 @@ QtObject { readonly property color calCardBg: bgPopup readonly property color calCardBorder: borderPopup readonly property color calSeparator: separator + readonly property color calTodayBg: accent + readonly property color borderToday: accent + readonly property color todayText: "#ffccd1d4" // subdued off-white readonly property color clockPopupHeader: accent readonly property color clockPopupText: textMain readonly property color clockPopupDim: "#ff92979b" diff --git a/wallpapers/tranquil.jpg b/wallpapers/tranquil.jpg new file mode 100644 index 0000000..80793d6 Binary files /dev/null and b/wallpapers/tranquil.jpg differ diff --git a/widgets/sidebar/Sidebar.qml b/widgets/sidebar/Sidebar.qml index a0a7d13..699d5e7 100644 --- a/widgets/sidebar/Sidebar.qml +++ b/widgets/sidebar/Sidebar.qml @@ -47,6 +47,8 @@ PanelWindow { } function open() { + var fm = Hyprland.focusedMonitor + if (!fm || fm.name !== screen.name) return visible = true _open = true enterAnim.stop() @@ -61,7 +63,13 @@ PanelWindow { exitAnim.start() } - function toggle() { _open ? close() : open() } + function toggle() { + if (!_open) { + var fm = Hyprland.focusedMonitor + if (!fm || fm.name !== screen.name) return + } + _open ? close() : open() + } Timer { id: hideTimer diff --git a/widgets/sidebar/sysinfo/SysInfo.qml b/widgets/sidebar/sysinfo/SysInfo.qml index 509d500..d6b3b86 100644 --- a/widgets/sidebar/sysinfo/SysInfo.qml +++ b/widgets/sidebar/sysinfo/SysInfo.qml @@ -57,7 +57,8 @@ ColumnLayout { command: ["sh", "-c", "t=-1; for d in /sys/class/hwmon/hwmon*; do " + "n=$(cat $d/name 2>/dev/null); " + - "if echo \"$n\" | grep -qiE 'coretemp|k10temp'; then " + + "if echo \"$n\" | grep -qiE " + + "'coretemp|k10temp|cpu_thermal|zenpower|acpitz|x86_pkg_temp|thinkpad|nct6775'; then " + "t=$(( $(cat $d/temp1_input 2>/dev/null) / 1000 )); break; " + "fi; done; echo $t"] stdout: SplitParser { onRead: d => { cpuTempProc._buf = d } } @@ -74,9 +75,13 @@ ColumnLayout { command: ["sh", "-c", "t=-1; for d in /sys/class/hwmon/hwmon*; do " + "n=$(cat $d/name 2>/dev/null); " + - "if echo \"$n\" | grep -qiE 'amdgpu|radeon'; then " + + "if echo \"$n\" | grep -qiE 'amdgpu|radeon|nouveau'; then " + "t=$(( $(cat $d/temp1_input 2>/dev/null) / 1000 )); break; " + - "fi; done; echo $t"] + "fi; done; " + + "[ \"$t\" = \"-1\" ] && " + + "t=$(nvidia-smi --query-gpu=temperature.gpu " + + "--format=csv,noheader 2>/dev/null | head -n 1); " + + "echo $t"] stdout: SplitParser { onRead: d => { gpuTempProc._buf = d } } onRunningChanged: { if (running || !_buf) return @@ -110,7 +115,9 @@ ColumnLayout { Process { id: memProc property string _buf: "" - command: ["sh", "-c", "free -b | awk '/^Mem:/{print $2,$3,$7}'"] + command: ["sh", "-c", + "awk '/MemTotal/{t=$2}/MemAvailable/{a=$2}END" + + "{print t*1024, (t-a)*1024, a*1024}' /proc/meminfo"] stdout: SplitParser { onRead: d => { memProc._buf = d } } onRunningChanged: { if (running || !_buf) return @@ -126,7 +133,9 @@ ColumnLayout { Process { id: swapProc property string _buf: "" - command: ["sh", "-c", "free -b | awk '/^Swap:/{print $2,$3}'"] + command: ["sh", "-c", + "awk '/SwapTotal/{t=$2}/SwapFree/{f=$2}END" + + "{print t*1024, (t-f)*1024}' /proc/meminfo"] stdout: SplitParser { onRead: d => { swapProc._buf = d } } onRunningChanged: { if (running || !_buf) return