From 76be8535e68abd87abc9567ad54185c7c9c7052b Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Thu, 17 Jul 2025 22:05:04 -0400 Subject: [PATCH 1/8] theme --- shell/config/Theme.qml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 shell/config/Theme.qml diff --git a/shell/config/Theme.qml b/shell/config/Theme.qml new file mode 100644 index 0000000..5bf1bf5 --- /dev/null +++ b/shell/config/Theme.qml @@ -0,0 +1,29 @@ +pragma Singleton + +import QtQml +import QtQuick +import Quickshell + +Singleton { + id: root + + property string fontFamily: "JetBrainsMono Nerd Font" + property Palette palette: Palette {} + + component Palette: QtObject { + id: palette + + property color primary: "#1fb854" + property color secondary: "#1eb88e" + property color accent: "#1fb8ab" + property color neutral: "#19362d" + property color base100: "#1b1717" + property color base200: "#161212" + property color base300: "#110d0d" + property color basecontent: "#cac9c9" + property color info: "#00b5ff" + property color success: "#00a96e" + property color warning: "#ffbe00" + property color error: "#ff5861" + } +} From faa8a9df59183beefb72e5b3a52f710c90347620 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Thu, 17 Jul 2025 22:05:48 -0400 Subject: [PATCH 2/8] styled elements --- shell/styled/StyledLabel.qml | 8 ++++++++ shell/styled/StyledText.qml | 6 ++++++ shell/{widgets => styled}/StyledWindow.qml | 0 3 files changed, 14 insertions(+) create mode 100644 shell/styled/StyledLabel.qml create mode 100644 shell/styled/StyledText.qml rename shell/{widgets => styled}/StyledWindow.qml (100%) diff --git a/shell/styled/StyledLabel.qml b/shell/styled/StyledLabel.qml new file mode 100644 index 0000000..9e785ac --- /dev/null +++ b/shell/styled/StyledLabel.qml @@ -0,0 +1,8 @@ +import QtQuick +import "root:config" + +Rectangle { + color: Theme.palette.base100 + + radius: 5 +} diff --git a/shell/styled/StyledText.qml b/shell/styled/StyledText.qml new file mode 100644 index 0000000..838d6ef --- /dev/null +++ b/shell/styled/StyledText.qml @@ -0,0 +1,6 @@ +import QtQuick +import "root:config" + +Text { + color: Theme.palette.basecontent +} diff --git a/shell/widgets/StyledWindow.qml b/shell/styled/StyledWindow.qml similarity index 100% rename from shell/widgets/StyledWindow.qml rename to shell/styled/StyledWindow.qml From 7c4cf83d55db8bac38eba162302beef5cb645fcf Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Thu, 17 Jul 2025 22:06:07 -0400 Subject: [PATCH 3/8] config for Paths --- shell/config/Paths.qml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 shell/config/Paths.qml diff --git a/shell/config/Paths.qml b/shell/config/Paths.qml new file mode 100644 index 0000000..3e93bf5 --- /dev/null +++ b/shell/config/Paths.qml @@ -0,0 +1,13 @@ +import Quickshell + +Singleton { + id: root + + readonly property url home: StandardPaths.standardLocations(StandardPaths.)[0] + readonly property url wallpapers: `${StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]}/Wallpapers` + + readonly property url data: `${StandardPaths.standardLocations(StandardPaths.GenericDataLocation)[0]}/lux` + readonly property url state: `${StandardPaths.standardLocations(StandardPaths.GenericStateLocation)[0]}/lux` + readonly property url cache: `${StandardPaths.standardLocations(StandardPaths.GenericCacheLocation)[0]}/lux` + readonly property url config: `${StandardPaths.standardLocations(StandardPaths.GenericConfigLocation)[0]}/quickshell` +} From c33b9e2a4ca2a03dbcf6f32b8c03dc9b642c6069 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Thu, 17 Jul 2025 22:06:14 -0400 Subject: [PATCH 4/8] use root import --- shell/modules/background/Background.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/modules/background/Background.qml b/shell/modules/background/Background.qml index 343ff38..bc4bc35 100644 --- a/shell/modules/background/Background.qml +++ b/shell/modules/background/Background.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import Quickshell.Wayland -import "../../widgets" +import "root:styled" Variants { model: Quickshell.screens From 5e7035efdc09a9fb2f0f4497ae31104163da19b4 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Thu, 17 Jul 2025 22:06:25 -0400 Subject: [PATCH 5/8] use styled --- shell/modules/bar/components/Clock.qml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/shell/modules/bar/components/Clock.qml b/shell/modules/bar/components/Clock.qml index d5df94b..fbb65fa 100644 --- a/shell/modules/bar/components/Clock.qml +++ b/shell/modules/bar/components/Clock.qml @@ -1,6 +1,7 @@ import Quickshell import Quickshell.Io import QtQuick +import "root:styled" Item { id: clock @@ -8,19 +9,14 @@ Item { implicitWidth: 200 implicitHeight: 30 - Rectangle { + StyledLabel { anchors.fill: parent - color: "#333" - opacity: 0.5 - radius: 5 } - Text { + StyledText { id: text anchors.centerIn: parent - color: "white" - Process { // give the process object an id so we can talk // about it from the timer From 2a7de7e56a16d9a8b485295a2751731e04101392 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Thu, 17 Jul 2025 22:06:42 -0400 Subject: [PATCH 6/8] update using theme --- shell/modules/bar/Bar.qml | 7 ++-- shell/modules/bar/components/Workspace.qml | 38 +++++++++++++++++++++ shell/modules/bar/components/Workspaces.qml | 37 +------------------- 3 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 shell/modules/bar/components/Workspace.qml diff --git a/shell/modules/bar/Bar.qml b/shell/modules/bar/Bar.qml index cbc1717..e3de268 100644 --- a/shell/modules/bar/Bar.qml +++ b/shell/modules/bar/Bar.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import "components" -import "../../config" +import "../../config/" Scope { PanelWindow { @@ -13,13 +13,14 @@ Scope { right: true } - implicitHeight: 30 + implicitHeight: 40 color: 'transparent' Rectangle { + id: background anchors.fill: parent - color: Colours.palette.base100 + color: Theme.palette.base300 } Row { diff --git a/shell/modules/bar/components/Workspace.qml b/shell/modules/bar/components/Workspace.qml new file mode 100644 index 0000000..3319258 --- /dev/null +++ b/shell/modules/bar/components/Workspace.qml @@ -0,0 +1,38 @@ +import QtQuick +import QtQuick.Controls +import Quickshell.Hyprland +import "../../../config" + +Item { + id: workspace + + required property HyprlandWorkspace modelData + + visible: modelData.id > 0 + + width: 30 + height: 30 + + Button { + id: button + anchors.centerIn: parent + + padding: 6 + leftPadding: 7 + rightPadding: 7 + + background: Rectangle { + id: rectangle + anchors.fill: parent + color: "#161212" + radius: 8 + } + + rotation: workspace.modelData.active ? 0 : 180 + + icon.source: "/home/baobeld/dotfiles/quickshell/shell/assets/triangle.svg" + icon.color: workspace.modelData.active ? Theme.palette.primary : Theme.palette.basecontent + + onClicked: workspace.modelData.activate() + } +} diff --git a/shell/modules/bar/components/Workspaces.qml b/shell/modules/bar/components/Workspaces.qml index 4a69735..ceef72b 100644 --- a/shell/modules/bar/components/Workspaces.qml +++ b/shell/modules/bar/components/Workspaces.qml @@ -1,8 +1,6 @@ import QtQuick import QtQuick.Controls -import QtQuick.VectorImage import Quickshell.Hyprland -import "../../../config" Row { id: root @@ -13,39 +11,6 @@ Row { model: Hyprland.workspaces - Item { - id: workspace - - required property HyprlandWorkspace modelData - - visible: modelData.id > 0 - - width: 25 - height: 25 - - Rectangle { - id: rectangle - - anchors.verticalCenter: parent.verticalCenter - anchors.fill: parent - color: "#161212" - radius: 8 - } - - Button { - id: button - anchors.centerIn: parent - anchors.fill: parent - - rotation: workspace.modelData.active ? 0 : 180 - - icon.source: "/home/baobeld/dotfiles/quickshell/shell/assets/triangle.svg" - icon.color: "#1fb854" - - // palette.button: QtColor. - - onClicked: workspace.modelData.activate() - } - } + Workspace {} } } From 5feccc745218300070a7f7ff42bc4969da9cb607 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Thu, 17 Jul 2025 22:22:19 -0400 Subject: [PATCH 7/8] move everything to root --- shell/ReloadPopup.qml => ReloadPopup.qml | 0 {shell/assets => assets}/triangle-alert.svg | 0 {shell/assets => assets}/triangle-dashed.svg | 0 {shell/assets => assets}/triangle.svg | 0 {shell/config => config}/Paths.qml | 0 {shell/config => config}/Theme.qml | 0 {shell/modules => modules}/background/Background.qml | 0 {shell/modules => modules}/bar/Bar.qml | 0 {shell/modules => modules}/bar/components/Clock.qml | 0 {shell/modules => modules}/bar/components/Workspace.qml | 2 +- {shell/modules => modules}/bar/components/Workspaces.qml | 0 shell/shell.qml => shell.qml | 0 {shell/styled => styled}/StyledLabel.qml | 0 {shell/styled => styled}/StyledText.qml | 0 {shell/styled => styled}/StyledWindow.qml | 0 15 files changed, 1 insertion(+), 1 deletion(-) rename shell/ReloadPopup.qml => ReloadPopup.qml (100%) rename {shell/assets => assets}/triangle-alert.svg (100%) rename {shell/assets => assets}/triangle-dashed.svg (100%) rename {shell/assets => assets}/triangle.svg (100%) rename {shell/config => config}/Paths.qml (100%) rename {shell/config => config}/Theme.qml (100%) rename {shell/modules => modules}/background/Background.qml (100%) rename {shell/modules => modules}/bar/Bar.qml (100%) rename {shell/modules => modules}/bar/components/Clock.qml (100%) rename {shell/modules => modules}/bar/components/Workspace.qml (89%) rename {shell/modules => modules}/bar/components/Workspaces.qml (100%) rename shell/shell.qml => shell.qml (100%) rename {shell/styled => styled}/StyledLabel.qml (100%) rename {shell/styled => styled}/StyledText.qml (100%) rename {shell/styled => styled}/StyledWindow.qml (100%) diff --git a/shell/ReloadPopup.qml b/ReloadPopup.qml similarity index 100% rename from shell/ReloadPopup.qml rename to ReloadPopup.qml diff --git a/shell/assets/triangle-alert.svg b/assets/triangle-alert.svg similarity index 100% rename from shell/assets/triangle-alert.svg rename to assets/triangle-alert.svg diff --git a/shell/assets/triangle-dashed.svg b/assets/triangle-dashed.svg similarity index 100% rename from shell/assets/triangle-dashed.svg rename to assets/triangle-dashed.svg diff --git a/shell/assets/triangle.svg b/assets/triangle.svg similarity index 100% rename from shell/assets/triangle.svg rename to assets/triangle.svg diff --git a/shell/config/Paths.qml b/config/Paths.qml similarity index 100% rename from shell/config/Paths.qml rename to config/Paths.qml diff --git a/shell/config/Theme.qml b/config/Theme.qml similarity index 100% rename from shell/config/Theme.qml rename to config/Theme.qml diff --git a/shell/modules/background/Background.qml b/modules/background/Background.qml similarity index 100% rename from shell/modules/background/Background.qml rename to modules/background/Background.qml diff --git a/shell/modules/bar/Bar.qml b/modules/bar/Bar.qml similarity index 100% rename from shell/modules/bar/Bar.qml rename to modules/bar/Bar.qml diff --git a/shell/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml similarity index 100% rename from shell/modules/bar/components/Clock.qml rename to modules/bar/components/Clock.qml diff --git a/shell/modules/bar/components/Workspace.qml b/modules/bar/components/Workspace.qml similarity index 89% rename from shell/modules/bar/components/Workspace.qml rename to modules/bar/components/Workspace.qml index 3319258..e48780d 100644 --- a/shell/modules/bar/components/Workspace.qml +++ b/modules/bar/components/Workspace.qml @@ -30,7 +30,7 @@ Item { rotation: workspace.modelData.active ? 0 : 180 - icon.source: "/home/baobeld/dotfiles/quickshell/shell/assets/triangle.svg" + icon.source: "/home/baobeld/dotfiles/quickshell/assets/triangle.svg" icon.color: workspace.modelData.active ? Theme.palette.primary : Theme.palette.basecontent onClicked: workspace.modelData.activate() diff --git a/shell/modules/bar/components/Workspaces.qml b/modules/bar/components/Workspaces.qml similarity index 100% rename from shell/modules/bar/components/Workspaces.qml rename to modules/bar/components/Workspaces.qml diff --git a/shell/shell.qml b/shell.qml similarity index 100% rename from shell/shell.qml rename to shell.qml diff --git a/shell/styled/StyledLabel.qml b/styled/StyledLabel.qml similarity index 100% rename from shell/styled/StyledLabel.qml rename to styled/StyledLabel.qml diff --git a/shell/styled/StyledText.qml b/styled/StyledText.qml similarity index 100% rename from shell/styled/StyledText.qml rename to styled/StyledText.qml diff --git a/shell/styled/StyledWindow.qml b/styled/StyledWindow.qml similarity index 100% rename from shell/styled/StyledWindow.qml rename to styled/StyledWindow.qml From f62b9255ecd1e6831ba1f3fa724effd3e5a530e2 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Thu, 17 Jul 2025 22:22:25 -0400 Subject: [PATCH 8/8] ignore qmlls --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dfbea23 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.qmlls.ini