From 2dd9e27ce129d159eadefab3176429d528d0ba07 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 13 Jan 2026 12:12:16 +0100 Subject: [PATCH] fix some things? --- Colors.qml | 38 +++++++++++++++++------------------ modules/bar/Bar.qml | 13 +++--------- modules/bar/Battery.qml | 1 + modules/bar/SystemTray.qml | 4 +--- modules/bar/Volume.qml | 2 +- modules/settings/Settings.qml | 2 +- modules/settings/config.json | 6 +++--- modules/wallpaper/Overlay.qml | 6 +++--- 8 files changed, 32 insertions(+), 40 deletions(-) diff --git a/Colors.qml b/Colors.qml index 0e0a638..68b2e97 100644 --- a/Colors.qml +++ b/Colors.qml @@ -5,25 +5,25 @@ import Quickshell Singleton { id: customColors // Core Backgrounds - readonly property color background: "#1A1B26" - readonly property color foreground: "#C0CAF5" - readonly property color cursor: "#C0CAF5" + readonly property color background: "#24273A" + readonly property color foreground: "#CAD3F5" + readonly property color cursor: "#CAD3F5" // The 16 Colors of the Apocalypse - readonly property color color0: "#414868" - readonly property color color1: "#F7768E" - readonly property color color2: "#9ECE6A" - readonly property color color3: "#E0AF68" - readonly property color color4: "#7AA2F7" - readonly property color color5: "#BB9AF7" - readonly property color color6: "#7DCFFF" - readonly property color color7: "#A9B1D6" - readonly property color color8: "#414868" - readonly property color color9: "#F7768E" - readonly property color color10: "#9ECE6A" - readonly property color color11: "#E0AF68" - readonly property color color12: "#7AA2F7" - readonly property color color13: "#BB9AF7" - readonly property color color14: "#7DCFFF" - readonly property color color15: "#C0CAF5" + readonly property color color0: "#494D64" + readonly property color color1: "#ED8796" + readonly property color color2: "#A6DA95" + readonly property color color3: "#EED49F" + readonly property color color4: "#8AADF4" + readonly property color color5: "#F5BDE6" + readonly property color color6: "#8BD5CA" + readonly property color color7: "#B8C0E0" + readonly property color color8: "#5B6078" + readonly property color color9: "#ED8796" + readonly property color color10: "#A6DA95" + readonly property color color11: "#EED49F" + readonly property color color12: "#8AADF4" + readonly property color color13: "#F5BDE6" + readonly property color color14: "#8BD5CA" + readonly property color color15: "#A5ADCB" } diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index aabe30c..785cbd0 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -36,16 +36,9 @@ PanelWindow { spacing: 40 anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - Loader { - sourceComponent: Battery {} - } - Loader { - sourceComponent: Volume {} - } - - Loader { - sourceComponent: PowerProfiles {} - } + Battery {} + Volume {} + PowerProfiles {} SystemTray { Layout.rightMargin: 30 } diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index 8ba3360..0d2cd9f 100644 --- a/modules/bar/Battery.qml +++ b/modules/bar/Battery.qml @@ -15,6 +15,7 @@ Item { property bool isCharging: UPower.displayDevice.state === UPowerDeviceState.Charging ColumnLayout { id: masterLayout + anchors.centerIn: parent implicitWidth: botText.width spacing: 0 Row { diff --git a/modules/bar/SystemTray.qml b/modules/bar/SystemTray.qml index 3b679dc..6bb221c 100644 --- a/modules/bar/SystemTray.qml +++ b/modules/bar/SystemTray.qml @@ -5,11 +5,9 @@ Item { id: root clip: true - // This was already correct in your last file, but keep it this way! implicitWidth: layout.implicitWidth < 0 ? 0 : layout.implicitWidth - implicitHeight: 30 + implicitHeight: 34 - // Hide if empty so we don't have a 50px gap for nothing visible: layout.children.length > 0 Row { diff --git a/modules/bar/Volume.qml b/modules/bar/Volume.qml index cde88cc..6759691 100644 --- a/modules/bar/Volume.qml +++ b/modules/bar/Volume.qml @@ -55,7 +55,7 @@ Item { id: styleLayout anchors.centerIn: parent spacing: 0 - implicitWidth: botText.width + implicitWidth: topText.width Row { spacing: 5 diff --git a/modules/settings/Settings.qml b/modules/settings/Settings.qml index 8faef55..5791b51 100644 --- a/modules/settings/Settings.qml +++ b/modules/settings/Settings.qml @@ -29,7 +29,7 @@ Singleton { id: jsonAdapter property string currentWall: "" property string wallDir: "/home/lucy/.walls/" - property string font: "Google Sans" + property string font: "Google Sans Code" property real fontSize: 14 } } diff --git a/modules/settings/config.json b/modules/settings/config.json index afc34f3..61fac11 100644 --- a/modules/settings/config.json +++ b/modules/settings/config.json @@ -1,6 +1,6 @@ { - "currentWall": "file:///home/lucy/.walls/ayanami.png", - "font": "SFMono Nerd Font Propo", - "fontSize": 13, + "currentWall": "file:///home/lucy/.walls/lain_room.png", + "font": "Google Sans Code", + "fontSize": 14, "wallDir": "/home/lucy/.walls/" } diff --git a/modules/wallpaper/Overlay.qml b/modules/wallpaper/Overlay.qml index 85cd27d..82d12bb 100644 --- a/modules/wallpaper/Overlay.qml +++ b/modules/wallpaper/Overlay.qml @@ -8,9 +8,9 @@ import "." WlrLayershell { id: overlayRoot required property var modelData - property var padding: 0 + property var padding: 5 property var rounding: 25 - property var hyprgaps: 20 + property var hyprgaps: 5 onPaddingChanged: { hyprGaps.exec(hyprGaps.command); console.log(hyprGaps.command); @@ -28,7 +28,7 @@ WlrLayershell { } Process { id: hyprRounding - property var rounding: overlayRoot.rounding + property var rounding: overlayRoot.rounding - 4 running: true command: ["hyprctl", "keyword", "decoration:rounding", rounding] onStarted: console.log("set rounding to ", overlayRoot.rounding)