diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b37d5ef --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Colors.qml \ No newline at end of file diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 654b927..f4ec309 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -2,6 +2,7 @@ import QtQuick import Quickshell import Quickshell.Hyprland import "./widgets" +import "../../colors" // TODO: interact with PyWal @@ -29,7 +30,7 @@ PanelWindow { Rectangle { // Bar id: bar anchors.fill: parent - color: "#800a0a0a" + color: Qt.alpha(Colors.background, 0.5) radius: 0 Row { // bar widgets left diff --git a/modules/bar/widgets/Clock.qml b/modules/bar/widgets/Clock.qml index 5c43afb..88ac518 100644 --- a/modules/bar/widgets/Clock.qml +++ b/modules/bar/widgets/Clock.qml @@ -1,13 +1,14 @@ import QtQuick import Quickshell import Quickshell.Hyprland +import "../../../colors" Rectangle { //workspace width: timeDisplay.width + 16 height: timeDisplay.height + 16 radius: 4 - color: "#333333" - border.color: "#555555" + color: Colors.tertiaryContainer + border.color: Colors.tertiaryContainer_fg border.width: 2 Text { @@ -16,7 +17,7 @@ Rectangle { //workspace property string currentTime: "" text: currentTime - color: "#ffffff" + color: Colors.tertiary font.pixelSize: 18 font.family: "Inter, sans-serif" diff --git a/modules/bar/widgets/MenuButton.qml b/modules/bar/widgets/MenuButton.qml index 457bc5e..4ad0533 100644 --- a/modules/bar/widgets/MenuButton.qml +++ b/modules/bar/widgets/MenuButton.qml @@ -1,6 +1,7 @@ import QtQuick import Quickshell import Quickshell.Hyprland +import "../../../colors" MouseArea { id: archButton @@ -11,7 +12,7 @@ MouseArea { Rectangle { anchors.fill: parent - color: archButton.containsMouse ? "#2a2a2a" : "transparent" + color: archButton.containsMouse ? Colors.tertiary : Qt.alpha(Colors.primaryContainer, 0.25) radius: 6 Text { @@ -19,7 +20,7 @@ MouseArea { text: "󰣇" font.pixelSize: 26 font.family: "Nerd Font" - color: "#ffffff" + color: archButton.containsMouse ? Colors.tertiary_fg : Colors.primary } } } \ No newline at end of file diff --git a/modules/bar/widgets/Network.qml b/modules/bar/widgets/Network.qml index 8069b1e..d5d3be8 100644 --- a/modules/bar/widgets/Network.qml +++ b/modules/bar/widgets/Network.qml @@ -2,6 +2,7 @@ import QtQuick import Quickshell import Quickshell.Hyprland import Quickshell.Io +import "../../../colors" MouseArea { id: networkButton @@ -21,7 +22,7 @@ MouseArea { Rectangle { anchors.fill: parent - color: networkButton.containsMouse ? "#2a2a2a" : "transparent" + color: networkButton.containsMouse ? Colors.tertiary : Qt.alpha(Colors.tertiaryContainer, 0.25) radius: 6 width: output.width + 16 @@ -30,7 +31,7 @@ MouseArea { anchors.centerIn: parent font.pixelSize: 26 font.family: "Nerd Font" - color: output.text === "󰤭 /󱐤" ? "#FF0000" : "#00ff00" + color: networkButton.containsMouse ? Colors.tertiary_fg : output.text === "󰤭 /󱐤" ? Colors.error : Colors.primary } Process { diff --git a/modules/bar/widgets/PowerButton.qml b/modules/bar/widgets/PowerButton.qml index 0bfc8cc..ef8242e 100644 --- a/modules/bar/widgets/PowerButton.qml +++ b/modules/bar/widgets/PowerButton.qml @@ -2,17 +2,18 @@ import QtQuick import Quickshell import Quickshell.Hyprland import Quickshell.Io +import "../../../colors" MouseArea { id: powerButton - width: 30 + width: powerText.width + 16 height: bar.height hoverEnabled: true cursorShape: Qt.PointingHandCursor Rectangle { anchors.fill: parent - color: powerButton.containsMouse ? "#2a2a2a" : "transparent" + color: powerButton.containsMouse ? Colors.secondaryContainer_fg : Qt.alpha(Colors.secondary, 0.5) radius: 6 Item { @@ -37,11 +38,12 @@ MouseArea { } Text { + id: powerText anchors.centerIn: parent text: "" font.pixelSize: 26 font.family: "Nerd Font" - color: "#ffffff" + color:powerButton.containsMouse ? Colors.secondaryContainer : Colors.secondary_fg } } } \ No newline at end of file diff --git a/modules/bar/widgets/Workspaces.qml b/modules/bar/widgets/Workspaces.qml index de5b468..66917c1 100644 --- a/modules/bar/widgets/Workspaces.qml +++ b/modules/bar/widgets/Workspaces.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import Quickshell.Hyprland - +import "../../../colors" Row { // Workspace Row id: workspacesRow @@ -17,8 +17,12 @@ Row { // Workspace Row width: workspaceNum.width + 26 height: workspaceNum.height + 8 radius: 4 - color: modelData.active ? "#4a93ff": "#333333" - border.color: "#555555" + color: workspaceButton.containsMouse ? Colors.tertiaryContainer + : modelData.active ? Colors.primaryContainer + : Colors.secondaryContainer + border.color: workspaceButton.containsMouse ? Colors.tertiaryContainer_fg + : modelData.active ? Colors.primaryContainer_fg + : Colors.secondaryContainer_fg border.width: 2 MouseArea { @@ -30,10 +34,7 @@ Row { // Workspace Row Rectangle { anchors.fill: parent - color: workspaceButton.containsMouse ? - modelData.active ? "#7fbaff" - : "#808080" - : "transparent" + color: "transparent" radius: 6 } } @@ -42,7 +43,9 @@ Row { // Workspace Row id: workspaceNum text: modelData.id anchors.centerIn: parent - color: modelData.active ? "#ffffff" : "#cccccc" + color: workspaceButton.containsMouse ? Colors.tertiary + : modelData.active ? Colors.primary + : Colors.secondary font.pixelSize: 18 font.family: "Inter, sans-serif" } @@ -53,7 +56,7 @@ Row { // Workspace Row Text { visible: Hyprland.workspaces.length === 0 text: "No Workspaces" - color: "#ffffff" + color: Colors.error font.pixelSize: 18 } } diff --git a/modules/wp/WallpaperPicker.qml b/modules/wp/WallpaperPicker.qml index c9d500d..dfd7d53 100644 --- a/modules/wp/WallpaperPicker.qml +++ b/modules/wp/WallpaperPicker.qml @@ -4,6 +4,7 @@ import QtQuick.Controls import Quickshell.Hyprland import Quickshell.Io import Qt.labs.folderlistmodel +import "../../colors" PanelWindow { id: picker @@ -15,10 +16,10 @@ PanelWindow { Rectangle { anchors.fill: parent radius: 10 - color: "#80000000" + color: Qt.alpha(Colors.surfaceContainerLowest, 0.5) border.width: 2 - border.color: "#555555" + border.color: Colors.outlineVariant //Wallpaper space @@ -31,7 +32,7 @@ PanelWindow { width: parent.width - 35 height: parent.height - 100 - color: "#80202020" + color: Qt.alpha(Colors.surfaceContainer, 0.5) radius: 10 clip: true @@ -75,6 +76,9 @@ PanelWindow { width: grid.cellWidth -10 height: grid.cellHeight * 0.7 + sourceSize.width: grid.cellWidth -10 + sourceSize.height: grid.cellHeight * 0.7 + asynchronous: true cache: true } @@ -83,7 +87,7 @@ PanelWindow { id: textHighlight width: parent.width - 10 height: 24 - color: mouseArea.containsMouse ? "#804a90e2" : "transparent" + color: mouseArea.containsMouse ? Qt.alpha(Colors.surfaceContainerHover, 0.5) : "transparent" anchors.horizontalCenter: parent.horizontalCenter Text { @@ -94,7 +98,7 @@ PanelWindow { font.pixelSize: 15 font.family: "Fira Sans" - color: "white" + color: Colors.surface_fg } } } @@ -134,11 +138,10 @@ PanelWindow { anchors.fill: parent radius: 10 color: "transparent" - border.color: "#777777" + border.color: Colors.outline border.width: 1 z: 999 } - } } } \ No newline at end of file diff --git a/modules/wp/set-wallpaper.sh b/modules/wp/set-wallpaper.sh index 318ac1c..f5380b2 100755 --- a/modules/wp/set-wallpaper.sh +++ b/modules/wp/set-wallpaper.sh @@ -45,6 +45,8 @@ elif [ -x "/usr/bin/hyprpaper" ]; then hyprctl hyprpaper wallpaper ", $image" fi +matugen image $image --mode dark + ### Blured Wallpaper for wlogout blur="50x30" static_wallpaper_dir="$HOME/Pictures/Wallpapers/Static"