From 547cd6f63768dab623265ba479566c5cc490aaa9 Mon Sep 17 00:00:00 2001 From: cnst Date: Mon, 30 Jun 2025 17:22:09 +0200 Subject: [PATCH] remove qs for real --- modules/default.nix | 2 - .../quickshell/components/bar/Battery.qml | 48 -- .../quickshell/components/bar/Clock.qml | 16 - .../quickshell/components/bar/Mpris.qml | 14 - .../quickshell/components/bar/Resources.qml | 54 -- .../quickshell/components/bar/Text.qml | 5 - .../quickshell/components/bar/Tray.qml | 14 - .../components/bar/workspaces/Workspace.qml | 26 - .../components/bar/workspaces/Workspaces.qml | 55 -- modules/home/services/quickshell/default.nix | 16 - modules/home/services/quickshell/shell.qml | 6 - .../home/services/quickshell/shell/LICENSE | 674 ----------------- .../home/services/quickshell/shell/README.md | 226 ------ .../quickshell/shell/assets/beat_detector.cpp | 568 --------------- .../quickshell/shell/assets/bongocat.gif | Bin 8495 -> 0 bytes .../quickshell/shell/assets/kurukuru.gif | Bin 99006 -> 0 bytes .../quickshell/shell/config/Appearance.qml | 84 --- .../quickshell/shell/config/BarConfig.qml | 22 - .../quickshell/shell/config/BorderConfig.qml | 6 - .../quickshell/shell/config/Config.qml | 42 -- .../shell/config/DashboardConfig.qml | 23 - .../shell/config/LauncherConfig.qml | 15 - .../quickshell/shell/config/LockConfig.qml | 27 - .../quickshell/shell/config/NotifsConfig.qml | 15 - .../quickshell/shell/config/OsdConfig.qml | 10 - .../quickshell/shell/config/SessionConfig.qml | 9 - .../quickshell/shell/config/UserPaths.qml | 8 - .../quickshell/shell/config/WInfoConfig.qml | 8 - .../quickshell/shell/modules/Shortcuts.qml | 65 -- .../shell/modules/areapicker/AreaPicker.qml | 82 --- .../shell/modules/areapicker/Picker.qml | 278 ------- .../shell/modules/background/Background.qml | 26 - .../shell/modules/background/Wallpaper.qml | 143 ---- .../quickshell/shell/modules/bar/Bar.qml | 174 ----- .../modules/bar/components/ActiveWindow.qml | 140 ---- .../shell/modules/bar/components/Clock.qml | 33 - .../shell/modules/bar/components/OsIcon.qml | 11 - .../shell/modules/bar/components/Power.qml | 27 - .../modules/bar/components/StatusIcons.qml | 117 --- .../shell/modules/bar/components/Tray.qml | 72 -- .../shell/modules/bar/components/TrayItem.qml | 48 -- .../components/workspaces/ActiveIndicator.qml | 111 --- .../bar/components/workspaces/OccupiedBg.qml | 99 --- .../bar/components/workspaces/Workspace.qml | 106 --- .../bar/components/workspaces/Workspaces.qml | 75 -- .../modules/bar/popouts/ActiveWindow.qml | 102 --- .../shell/modules/bar/popouts/Background.qml | 84 --- .../shell/modules/bar/popouts/Battery.qml | 235 ------ .../shell/modules/bar/popouts/Bluetooth.qml | 18 - .../shell/modules/bar/popouts/Content.qml | 151 ---- .../shell/modules/bar/popouts/Network.qml | 22 - .../shell/modules/bar/popouts/TrayMenu.qml | 237 ------ .../shell/modules/bar/popouts/Wrapper.qml | 181 ----- .../shell/modules/dashboard/Background.qml | 69 -- .../shell/modules/dashboard/Content.qml | 139 ---- .../shell/modules/dashboard/Dash.qml | 86 --- .../shell/modules/dashboard/Media.qml | 599 --------------- .../shell/modules/dashboard/Performance.qml | 246 ------- .../shell/modules/dashboard/Tabs.qml | 251 ------- .../shell/modules/dashboard/Wrapper.qml | 68 -- .../shell/modules/dashboard/dash/Calendar.qml | 72 -- .../shell/modules/dashboard/dash/DateTime.qml | 71 -- .../shell/modules/dashboard/dash/Media.qml | 259 ------- .../modules/dashboard/dash/Resources.qml | 88 --- .../shell/modules/dashboard/dash/User.qml | 202 ------ .../shell/modules/dashboard/dash/Weather.qml | 57 -- .../shell/modules/drawers/Backgrounds.qml | 66 -- .../shell/modules/drawers/Border.qml | 47 -- .../shell/modules/drawers/Drawers.qml | 147 ---- .../shell/modules/drawers/Exclusions.qml | 37 - .../shell/modules/drawers/Interactions.qml | 160 ----- .../shell/modules/drawers/Panels.qml | 95 --- .../shell/modules/launcher/ActionItem.qml | 69 -- .../shell/modules/launcher/Actions.qml | 164 ----- .../shell/modules/launcher/AppItem.qml | 72 -- .../shell/modules/launcher/AppList.qml | 216 ------ .../shell/modules/launcher/Background.qml | 63 -- .../shell/modules/launcher/CalcItem.qml | 162 ----- .../shell/modules/launcher/Content.qml | 174 ----- .../shell/modules/launcher/ContentList.qml | 182 ----- .../shell/modules/launcher/M3Variants.qml | 91 --- .../shell/modules/launcher/SchemeItem.qml | 93 --- .../shell/modules/launcher/Schemes.qml | 67 -- .../shell/modules/launcher/VariantItem.qml | 69 -- .../shell/modules/launcher/WallpaperItem.qml | 109 --- .../shell/modules/launcher/WallpaperList.qml | 79 -- .../shell/modules/launcher/Wrapper.qml | 55 -- .../shell/modules/lock/Backgrounds.qml | 480 ------------- .../quickshell/shell/modules/lock/Buttons.qml | 115 --- .../quickshell/shell/modules/lock/Clock.qml | 53 -- .../quickshell/shell/modules/lock/Input.qml | 260 ------- .../quickshell/shell/modules/lock/Lock.qml | 57 -- .../shell/modules/lock/LockSurface.qml | 191 ----- .../shell/modules/lock/MediaPlaying.qml | 307 -------- .../shell/modules/lock/Notification.qml | 217 ------ .../quickshell/shell/modules/lock/Status.qml | 249 ------- .../shell/modules/lock/WeatherInfo.qml | 61 -- .../modules/notifications/Background.qml | 66 -- .../shell/modules/notifications/Content.qml | 162 ----- .../modules/notifications/Notification.qml | 479 ------------ .../shell/modules/notifications/Wrapper.qml | 14 - .../shell/modules/osd/Background.qml | 63 -- .../quickshell/shell/modules/osd/Content.qml | 43 -- .../shell/modules/osd/Interactions.qml | 48 -- .../quickshell/shell/modules/osd/Wrapper.qml | 57 -- .../shell/modules/session/Background.qml | 63 -- .../shell/modules/session/Content.qml | 120 ---- .../shell/modules/session/Wrapper.qml | 56 -- .../shell/modules/windowinfo/Buttons.qml | 185 ----- .../shell/modules/windowinfo/Details.qml | 164 ----- .../shell/modules/windowinfo/Preview.qml | 97 --- .../shell/modules/windowinfo/WindowInfo.qml | 64 -- .../home/services/quickshell/shell/run.fish | 9 - .../quickshell/shell/services/Apps.qml | 30 - .../quickshell/shell/services/Audio.qml | 25 - .../shell/services/BeatDetector.qml | 22 - .../quickshell/shell/services/Bluetooth.qml | 104 --- .../quickshell/shell/services/Brightness.qml | 113 --- .../quickshell/shell/services/Cava.qml | 23 - .../quickshell/shell/services/Colours.qml | 144 ---- .../quickshell/shell/services/Hyprland.qml | 37 - .../quickshell/shell/services/Network.qml | 81 --- .../quickshell/shell/services/Notifs.qml | 108 --- .../quickshell/shell/services/Players.qml | 97 --- .../quickshell/shell/services/Requests.qml | 36 - .../quickshell/shell/services/SystemUsage.qml | 220 ------ .../quickshell/shell/services/Time.qml | 20 - .../shell/services/Visibilities.qml | 12 - .../quickshell/shell/services/Wallpapers.qml | 140 ---- .../quickshell/shell/services/Weather.qml | 38 - .../home/services/quickshell/shell/shell.qml | 17 - .../services/quickshell/shell/utils/Icons.qml | 257 ------- .../services/quickshell/shell/utils/Paths.qml | 38 - .../shell/utils/scripts/fuzzysort.js | 679 ------------------ .../quickshell/shell/widgets/CachingImage.qml | 43 -- .../quickshell/shell/widgets/Colouriser.qml | 15 - .../shell/widgets/CustomShortcut.qml | 5 - .../quickshell/shell/widgets/MaterialIcon.qml | 16 - .../services/quickshell/shell/widgets/Ref.qml | 9 - .../quickshell/shell/widgets/StateLayer.qml | 102 --- .../shell/widgets/StyledClippingRect.qml | 17 - .../quickshell/shell/widgets/StyledRect.qml | 16 - .../shell/widgets/StyledScrollBar.qml | 34 - .../quickshell/shell/widgets/StyledText.qml | 52 -- .../shell/widgets/StyledTextField.qml | 68 -- .../quickshell/shell/widgets/StyledWindow.qml | 11 - .../shell/widgets/VerticalSlider.qml | 136 ---- .../home/services/quickshell/utils/Colors.qml | 9 - .../quickshell/utils/HyprlandUtils.qml | 67 -- .../services/quickshell/utils/Resources.qml | 67 -- .../home/services/quickshell/utils/Time.qml | 29 - .../home/services/quickshell/windows/Bar.qml | 79 -- modules/home/services/swaync/default.nix | 117 --- users/cnst/modules/home.nix | 3 - users/cnstlab/modules/home.nix | 3 - 155 files changed, 15873 deletions(-) delete mode 100644 modules/home/services/quickshell/components/bar/Battery.qml delete mode 100644 modules/home/services/quickshell/components/bar/Clock.qml delete mode 100644 modules/home/services/quickshell/components/bar/Mpris.qml delete mode 100644 modules/home/services/quickshell/components/bar/Resources.qml delete mode 100644 modules/home/services/quickshell/components/bar/Text.qml delete mode 100644 modules/home/services/quickshell/components/bar/Tray.qml delete mode 100644 modules/home/services/quickshell/components/bar/workspaces/Workspace.qml delete mode 100644 modules/home/services/quickshell/components/bar/workspaces/Workspaces.qml delete mode 100644 modules/home/services/quickshell/default.nix delete mode 100644 modules/home/services/quickshell/shell.qml delete mode 100644 modules/home/services/quickshell/shell/LICENSE delete mode 100644 modules/home/services/quickshell/shell/README.md delete mode 100755 modules/home/services/quickshell/shell/assets/beat_detector.cpp delete mode 100644 modules/home/services/quickshell/shell/assets/bongocat.gif delete mode 100644 modules/home/services/quickshell/shell/assets/kurukuru.gif delete mode 100644 modules/home/services/quickshell/shell/config/Appearance.qml delete mode 100644 modules/home/services/quickshell/shell/config/BarConfig.qml delete mode 100644 modules/home/services/quickshell/shell/config/BorderConfig.qml delete mode 100644 modules/home/services/quickshell/shell/config/Config.qml delete mode 100644 modules/home/services/quickshell/shell/config/DashboardConfig.qml delete mode 100644 modules/home/services/quickshell/shell/config/LauncherConfig.qml delete mode 100644 modules/home/services/quickshell/shell/config/LockConfig.qml delete mode 100644 modules/home/services/quickshell/shell/config/NotifsConfig.qml delete mode 100644 modules/home/services/quickshell/shell/config/OsdConfig.qml delete mode 100644 modules/home/services/quickshell/shell/config/SessionConfig.qml delete mode 100644 modules/home/services/quickshell/shell/config/UserPaths.qml delete mode 100644 modules/home/services/quickshell/shell/config/WInfoConfig.qml delete mode 100644 modules/home/services/quickshell/shell/modules/Shortcuts.qml delete mode 100644 modules/home/services/quickshell/shell/modules/areapicker/AreaPicker.qml delete mode 100644 modules/home/services/quickshell/shell/modules/areapicker/Picker.qml delete mode 100644 modules/home/services/quickshell/shell/modules/background/Background.qml delete mode 100644 modules/home/services/quickshell/shell/modules/background/Wallpaper.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/Bar.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/ActiveWindow.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/Clock.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/OsIcon.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/Power.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/StatusIcons.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/Tray.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/TrayItem.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/workspaces/ActiveIndicator.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/workspaces/OccupiedBg.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/workspaces/Workspace.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/components/workspaces/Workspaces.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/popouts/ActiveWindow.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/popouts/Background.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/popouts/Battery.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/popouts/Bluetooth.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/popouts/Content.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/popouts/Network.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/popouts/TrayMenu.qml delete mode 100644 modules/home/services/quickshell/shell/modules/bar/popouts/Wrapper.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/Background.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/Content.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/Dash.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/Media.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/Performance.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/Tabs.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/Wrapper.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/dash/Calendar.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/dash/DateTime.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/dash/Media.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/dash/Resources.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/dash/User.qml delete mode 100644 modules/home/services/quickshell/shell/modules/dashboard/dash/Weather.qml delete mode 100644 modules/home/services/quickshell/shell/modules/drawers/Backgrounds.qml delete mode 100644 modules/home/services/quickshell/shell/modules/drawers/Border.qml delete mode 100644 modules/home/services/quickshell/shell/modules/drawers/Drawers.qml delete mode 100644 modules/home/services/quickshell/shell/modules/drawers/Exclusions.qml delete mode 100644 modules/home/services/quickshell/shell/modules/drawers/Interactions.qml delete mode 100644 modules/home/services/quickshell/shell/modules/drawers/Panels.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/ActionItem.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/Actions.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/AppItem.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/AppList.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/Background.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/CalcItem.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/Content.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/ContentList.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/M3Variants.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/SchemeItem.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/Schemes.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/VariantItem.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/WallpaperItem.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/WallpaperList.qml delete mode 100644 modules/home/services/quickshell/shell/modules/launcher/Wrapper.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/Backgrounds.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/Buttons.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/Clock.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/Input.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/Lock.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/LockSurface.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/MediaPlaying.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/Notification.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/Status.qml delete mode 100644 modules/home/services/quickshell/shell/modules/lock/WeatherInfo.qml delete mode 100644 modules/home/services/quickshell/shell/modules/notifications/Background.qml delete mode 100644 modules/home/services/quickshell/shell/modules/notifications/Content.qml delete mode 100644 modules/home/services/quickshell/shell/modules/notifications/Notification.qml delete mode 100644 modules/home/services/quickshell/shell/modules/notifications/Wrapper.qml delete mode 100644 modules/home/services/quickshell/shell/modules/osd/Background.qml delete mode 100644 modules/home/services/quickshell/shell/modules/osd/Content.qml delete mode 100644 modules/home/services/quickshell/shell/modules/osd/Interactions.qml delete mode 100644 modules/home/services/quickshell/shell/modules/osd/Wrapper.qml delete mode 100644 modules/home/services/quickshell/shell/modules/session/Background.qml delete mode 100644 modules/home/services/quickshell/shell/modules/session/Content.qml delete mode 100644 modules/home/services/quickshell/shell/modules/session/Wrapper.qml delete mode 100644 modules/home/services/quickshell/shell/modules/windowinfo/Buttons.qml delete mode 100644 modules/home/services/quickshell/shell/modules/windowinfo/Details.qml delete mode 100644 modules/home/services/quickshell/shell/modules/windowinfo/Preview.qml delete mode 100644 modules/home/services/quickshell/shell/modules/windowinfo/WindowInfo.qml delete mode 100755 modules/home/services/quickshell/shell/run.fish delete mode 100644 modules/home/services/quickshell/shell/services/Apps.qml delete mode 100644 modules/home/services/quickshell/shell/services/Audio.qml delete mode 100644 modules/home/services/quickshell/shell/services/BeatDetector.qml delete mode 100644 modules/home/services/quickshell/shell/services/Bluetooth.qml delete mode 100644 modules/home/services/quickshell/shell/services/Brightness.qml delete mode 100644 modules/home/services/quickshell/shell/services/Cava.qml delete mode 100644 modules/home/services/quickshell/shell/services/Colours.qml delete mode 100644 modules/home/services/quickshell/shell/services/Hyprland.qml delete mode 100644 modules/home/services/quickshell/shell/services/Network.qml delete mode 100644 modules/home/services/quickshell/shell/services/Notifs.qml delete mode 100644 modules/home/services/quickshell/shell/services/Players.qml delete mode 100644 modules/home/services/quickshell/shell/services/Requests.qml delete mode 100644 modules/home/services/quickshell/shell/services/SystemUsage.qml delete mode 100644 modules/home/services/quickshell/shell/services/Time.qml delete mode 100644 modules/home/services/quickshell/shell/services/Visibilities.qml delete mode 100644 modules/home/services/quickshell/shell/services/Wallpapers.qml delete mode 100644 modules/home/services/quickshell/shell/services/Weather.qml delete mode 100644 modules/home/services/quickshell/shell/shell.qml delete mode 100644 modules/home/services/quickshell/shell/utils/Icons.qml delete mode 100644 modules/home/services/quickshell/shell/utils/Paths.qml delete mode 100644 modules/home/services/quickshell/shell/utils/scripts/fuzzysort.js delete mode 100644 modules/home/services/quickshell/shell/widgets/CachingImage.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/Colouriser.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/CustomShortcut.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/MaterialIcon.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/Ref.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/StateLayer.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/StyledClippingRect.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/StyledRect.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/StyledScrollBar.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/StyledText.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/StyledTextField.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/StyledWindow.qml delete mode 100644 modules/home/services/quickshell/shell/widgets/VerticalSlider.qml delete mode 100644 modules/home/services/quickshell/utils/Colors.qml delete mode 100644 modules/home/services/quickshell/utils/HyprlandUtils.qml delete mode 100644 modules/home/services/quickshell/utils/Resources.qml delete mode 100644 modules/home/services/quickshell/utils/Time.qml delete mode 100644 modules/home/services/quickshell/windows/Bar.qml delete mode 100644 modules/home/services/swaync/default.nix diff --git a/modules/default.nix b/modules/default.nix index f974ebc1..ad73e2ec 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -47,9 +47,7 @@ ./home/services/mako ./home/services/nix-index ./home/services/protonmail-bridge - ./home/services/swaync ./home/services/syncthing - # ./home/services/quickshell ./home/services/udiskie ./home/services/xdg ]; diff --git a/modules/home/services/quickshell/components/bar/Battery.qml b/modules/home/services/quickshell/components/bar/Battery.qml deleted file mode 100644 index bc5e32f5..00000000 --- a/modules/home/services/quickshell/components/bar/Battery.qml +++ /dev/null @@ -1,48 +0,0 @@ -import Quickshell -import Quickshell.Services.UPower -import QtQuick -import QtQuick.Layouts -import org.kde.kirigami - -Rectangle { - id: bat - - Layout.preferredWidth: batIcon.width - Layout.fillHeight: true - color: 'transparent' - - readonly property var battery: UPower.displayDevice - readonly property int percentage: Math.round(battery.percentage * 100) - property var size: height * 0.4 - - visible: battery.isLaptopBattery - - Icon { - id: batIcon - anchors.centerIn: parent - - implicitHeight: bat.size - implicitWidth: bat.size - - // This recolors the entire svg, instead of only classless components. - // Hopefully in the future classes can be selected for recoloring. - isMask: true - color: 'white' - - source: { - const nearestTen = Math.round(bat.percentage / 10) * 10; - const number = nearestTen.toString().padStart(2, "0"); - let charging; - - if (bat.battery.state == UPowerDeviceState.Charging) { - charging = "-charging"; - } else if (bat.battery.state.toString() == UPowerDeviceState.FullyCharged) { - charging = "-charged"; - } else { - charging = ""; - } - - return Quickshell.iconPath(`battery-level-${number}${charging}-symbolic`); - } - } -} diff --git a/modules/home/services/quickshell/components/bar/Clock.qml b/modules/home/services/quickshell/components/bar/Clock.qml deleted file mode 100644 index 8256b8a3..00000000 --- a/modules/home/services/quickshell/components/bar/Clock.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick -import QtQuick.Layouts -import "../../utils" - -Rectangle { - Layout.fillHeight: true - color: "transparent" - implicitWidth: clockText.width - - Text { - id: clockText - text: Time.time - color: Colors.fg - anchors.centerIn: parent - } -} diff --git a/modules/home/services/quickshell/components/bar/Mpris.qml b/modules/home/services/quickshell/components/bar/Mpris.qml deleted file mode 100644 index d4d15296..00000000 --- a/modules/home/services/quickshell/components/bar/Mpris.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QtQuick.Layouts - -Rectangle { - Layout.fillHeight: true - color: "salmon" - implicitWidth: mprisText.width - - Text { - id: mprisText - text: "Mpris" - anchors.centerIn: parent - } -} diff --git a/modules/home/services/quickshell/components/bar/Resources.qml b/modules/home/services/quickshell/components/bar/Resources.qml deleted file mode 100644 index d1b2bbba..00000000 --- a/modules/home/services/quickshell/components/bar/Resources.qml +++ /dev/null @@ -1,54 +0,0 @@ -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls -import "../../utils" - -Rectangle { - id: resources - - Layout.fillHeight: true - color: "transparent" - implicitWidth: rowLayout.width - - property int valueSize: 8 - property int textSize: 6 - - property string valueColor: "white" - property string textColor: "lightgray" - - RowLayout { - id: rowLayout - anchors.centerIn: parent - - ColumnLayout { - id: cpuColumn - Label { - color: textColor - font.pointSize: textSize - text: "CPU" - Layout.alignment: Qt.AlignCenter - } - Label { - color: valueColor - font.pointSize: valueSize - text: Resources.cpu_percent + "%" - Layout.alignment: Qt.AlignCenter - } - } - - ColumnLayout { - Label { - color: textColor - font.pointSize: textSize - text: "MEM" - Layout.alignment: Qt.AlignCenter - } - Label { - color: valueColor - font.pointSize: valueSize - text: Resources.mem_percent + "%" - Layout.alignment: Qt.AlignCenter - } - } - } -} diff --git a/modules/home/services/quickshell/components/bar/Text.qml b/modules/home/services/quickshell/components/bar/Text.qml deleted file mode 100644 index 90e0758e..00000000 --- a/modules/home/services/quickshell/components/bar/Text.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick - -Text { - renderType: Text.NativeRendering -} diff --git a/modules/home/services/quickshell/components/bar/Tray.qml b/modules/home/services/quickshell/components/bar/Tray.qml deleted file mode 100644 index 475c83bf..00000000 --- a/modules/home/services/quickshell/components/bar/Tray.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick -import QtQuick.Layouts - -Rectangle { - Layout.fillHeight: true - color: "lightblue" - implicitWidth: trayText.width - - Text { - id: trayText - text: "Tray" - anchors.centerIn: parent - } -} diff --git a/modules/home/services/quickshell/components/bar/workspaces/Workspace.qml b/modules/home/services/quickshell/components/bar/workspaces/Workspace.qml deleted file mode 100644 index f41e8380..00000000 --- a/modules/home/services/quickshell/components/bar/workspaces/Workspace.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick -import QtQuick.Layouts - -Rectangle { - id: ws - - property bool hovered: false - - Layout.preferredWidth: parent.height * 0.4 - Layout.preferredHeight: parent.height * 0.4 - Layout.alignment: Qt.AlignHCenter - radius: height / 2 - - MouseArea { - anchors.fill: parent - hoverEnabled: true - - onEntered: () => { - ws.hovered = true; - } - onExited: () => { - ws.hovered = false; - } - onClicked: () => console.log(`workspace ?`) - } -} diff --git a/modules/home/services/quickshell/components/bar/workspaces/Workspaces.qml b/modules/home/services/quickshell/components/bar/workspaces/Workspaces.qml deleted file mode 100644 index b47f5702..00000000 --- a/modules/home/services/quickshell/components/bar/workspaces/Workspaces.qml +++ /dev/null @@ -1,55 +0,0 @@ -pragma ComponentBehavior: Bound - -import QtQuick -import QtQuick.Layouts -import "../../../utils" -import Quickshell.Hyprland - -Rectangle { - id: workspaces - - color: 'transparent' - - width: workspacesRow.implicitWidth - Layout.fillHeight: true - - RowLayout { - id: workspacesRow - - height: parent.height - implicitWidth: (parent.height * 0.5 + spacing) * 2 - spacing - anchors.centerIn: parent - - spacing: height / 7 - - Repeater { - id: repeater - - model: HyprlandUtils.maxWorkspace - - Workspace { - id: ws - required property int index - property HyprlandWorkspace currWorkspace: Hyprland.workspaces.values.find(e => e.id == index + 1) || null - property bool nonexistent: currWorkspace === null - property bool focused: index + 1 === Hyprland.focusedMonitor.activeWorkspace.id - - Layout.preferredWidth: { - if (focused) { - return parent.height * 0.8; - } else { - return parent.height * 0.4; - } - } - - color: { - if (nonexistent) { - return Colors.bgBlur; - } else { - return Colors.monitorColors[Hyprland.monitors.values.indexOf(Hyprland.workspaces.values.find(e => e.id === index + 1).monitor)]; - } - } - } - } - } -} diff --git a/modules/home/services/quickshell/default.nix b/modules/home/services/quickshell/default.nix deleted file mode 100644 index 2ba6dcf3..00000000 --- a/modules/home/services/quickshell/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - pkgs, - inputs, - lib, - ... -}: let - quickshell = inputs.quickshell.packages.${pkgs.system}.default; -in { - home.packages = [quickshell]; - - home.sessionVariables.QML2_IMPORT_PATH = lib.concatStringsSep ":" [ - "${quickshell}/lib/qt-6/qml" - "${pkgs.kdePackages.qtdeclarative}/lib/qt-6/qml" - "${pkgs.kdePackages.kirigami.unwrapped}/lib/qt-6/qml" - ]; -} diff --git a/modules/home/services/quickshell/shell.qml b/modules/home/services/quickshell/shell.qml deleted file mode 100644 index 932a8cb6..00000000 --- a/modules/home/services/quickshell/shell.qml +++ /dev/null @@ -1,6 +0,0 @@ -import "./windows" -import Quickshell // for ShellRoot and PanelWindow - -ShellRoot { - Bar {} -} diff --git a/modules/home/services/quickshell/shell/LICENSE b/modules/home/services/quickshell/shell/LICENSE deleted file mode 100644 index f288702d..00000000 --- a/modules/home/services/quickshell/shell/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/modules/home/services/quickshell/shell/README.md b/modules/home/services/quickshell/shell/README.md deleted file mode 100644 index 467c1d3e..00000000 --- a/modules/home/services/quickshell/shell/README.md +++ /dev/null @@ -1,226 +0,0 @@ -

caelestia-shell

- -
- -![GitHub last commit](https://img.shields.io/github/last-commit/caelestia-dots/shell?style=for-the-badge&labelColor=101418&color=9ccbfb) -![GitHub Repo stars](https://img.shields.io/github/stars/caelestia-dots/shell?style=for-the-badge&labelColor=101418&color=b9c8da) -![GitHub repo size](https://img.shields.io/github/repo-size/caelestia-dots/shell?style=for-the-badge&labelColor=101418&color=d3bfe6) -[![Ko-Fi donate](https://img.shields.io/badge/donate-kofi?style=for-the-badge&logo=ko-fi&logoColor=ffffff&label=ko-fi&labelColor=101418&color=f16061&link=https%3A%2F%2Fko-fi.com%2Fsoramane)](https://ko-fi.com/soramane) - -
- -https://github.com/user-attachments/assets/0840f496-575c-4ca6-83a8-87bb01a85c5f - -## Components - -- Widgets: [`Quickshell`](https://quickshell.outfoxxed.me) -- Window manager: [`Hyprland`](https://hyprland.org) -- Dots: [`caelestia`](https://github.com/caelestia-dots) - -## Installation - -> [!NOTE] -> This repo is for the desktop shell of the caelestia dots. If you want installation instructions -> for the entire dots, head to [the main repo](https://github.com/caelestia-dots/caelestia) instead. - -### Package manager - -> [!NOTE] -> If you want to make your own changes/tweaks to the shell do NOT edit the files installed by the AUR -> package. Instead, follow the instructions in the [manual installation section](#manual-installation). - -The shell is available from the AUR as `caelestia-shell-git`. You can install it with an AUR helper -like [`yay`](https://github.com/Jguer/yay) or manually downloading the PKGBUILD and running `makepkg -si`. - -### Manual installation - -Dependencies: - -- [`caelestia-cli`](https://github.com/caelestia-dots/cli) -- [`quickshell-git`](https://quickshell.outfoxxed.me) - this has to be the git version, not the latest tagged version -- [`ddcutil`](https://github.com/rockowitz/ddcutil) -- [`brightnessctl`](https://github.com/Hummer12007/brightnessctl) -- [`app2unit`](https://github.com/Vladimir-csp/app2unit) -- [`cava`](https://github.com/karlstav/cava) -- [`networkmanager`](https://networkmanager.dev) -- [`lm-sensors`](https://github.com/lm-sensors/lm-sensors) -- [`fish`](https://github.com/fish-shell/fish-shell) -- [`aubio`](https://github.com/aubio/aubio) -- [`libpipewire`](https://pipewire.org) -- `glibc` -- `qt6-declarative` -- `gcc-libs` -- [`material-symbols`](https://fonts.google.com/icons) -- [`jetbrains-mono-nerd`](https://www.nerdfonts.com/font-downloads) -- [`grim`](https://gitlab.freedesktop.org/emersion/grim) -- [`swappy`](https://github.com/jtheoof/swappy) -- [`libqalculate`](https://github.com/Qalculate/libqalculate) - -To install the shell manually, install all dependencies and clone this repo to `$XDG_CONFIG_HOME/quickshell/caelestia`. -Then compile the beat detector and install it to `/usr/lib/caelestia/beat_detector`. - -```sh -cd $XDG_CONFIG_HOME/quickshell -git clone https://github.com/caelestia-dots/shell.git caelestia -g++ -std=c++17 -Wall -Wextra -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/aubio -o beat_detector caelestia/assets/beat_detector.cpp -lpipewire-0.3 -laubio -sudo mv beat_detector /usr/lib/caelestia/beat_detector -``` - -## Usage - -The shell can be started via the `caelestia shell -d` command or `qs -c caelestia`. -If the entire caelestia dots are installed, the shell will be autostarted on login -via an `exec-once` in the hyprland config. - -### Shortcuts/IPC - -All keybinds are accessible via Hyprland [global shortcuts](https://wiki.hyprland.org/Configuring/Binds/#dbus-global-shortcuts). -If using the entire caelestia dots, the keybinds are already configured for you. -Otherwise, [this file](https://github.com/caelestia-dots/caelestia/blob/main/hypr/hyprland/keybinds.conf#L1-L39) -contains an example on how to use global shortcuts. - -All IPC commands can be accessed via `caelestia shell ...`. For example - -```sh -caelestia shell mpris getActive trackTitle -``` - -The list of IPC commands can be shown via `caelestia shell -s`: - -``` -$ caelestia shell -s -target drawers - function toggle(drawer: string): void - function list(): string -target notifs - function clear(): void -target lock - function lock(): void - function unlock(): void - function isLocked(): bool -target mpris - function playPause(): void - function getActive(prop: string): string - function next(): void - function stop(): void - function play(): void - function list(): string - function pause(): void - function previous(): void -target picker - function openFreeze(): void - function open(): void -target wallpaper - function set(path: string): void - function get(): string - function list(): string -``` - -### PFP/Wallpapers - -The profile picture for the dashboard is read from the file `~/.face`, so to set -it you can copy your image to there or set it via the dashboard. - -The wallpapers for the wallpaper switcher are read from `~/Pictures/Wallpapers` -by default. To change it, change the wallpapers path in `~/.config/caelestia/shell.json`. - -To set the wallpaper, you can use the command `caelestia wallpaper`. Use `caelestia wallpaper -h` for more info about -the command. - -## Updating - -If installed via the AUR package, simply update your system (e.g. using `yay`). - -If installed manually, you can update by running `git pull` in `$XDG_CONFIG_HOME/quickshell/caelestia`. - -```sh -cd $XDG_CONFIG_HOME/quickshell/caelestia -git pull -``` - -## Configuring - -All configuration options are in `~/.config/caelestia/shell.json`. - -
Example configuration - -```json -{ - "bar": { - "workspaces": { - "activeIndicator": true, - "activeLabel": "󰮯 ", - "activeTrail": false, - "label": " ", - "occupiedBg": false, - "occupiedLabel": "󰮯 ", - "rounded": true, - "showWindows": true, - "shown": 5 - } - }, - "border": { - "rounding": 25, - "thickness": 10 - }, - "dashboard": { - "mediaUpdateInterval": 500, - "visualiserBars": 45, - "weatherLocation": "10,10" - }, - "launcher": { - "actionPrefix": ">", - "enableDangerousActions": false, - "maxShown": 8, - "maxWallpapers": 9 - }, - "lock": { - "maxNotifs": 5 - }, - "notifs": { - "actionOnClick": false, - "clearThreshold": 0.3, - "defaultExpireTimeout": 5000, - "expandThreshold": 20, - "expire": false - }, - "osd": { - "hideDelay": 2000 - }, - "paths": { - "mediaGif": "root:/assets/bongocat.gif", - "sessionGif": "root:/assets/kurukuru.gif", - "wallpaperDir": "~/Pictures/Wallpapers" - }, - "session": { - "dragThreshold": 30 - } -} -``` - -
- -## Credits - -Thanks to the Hyprland discord community (especially the homies in #rice-discussion) for all the help and suggestions -for improving these dots! - -A special thanks to [@outfoxxed](https://github.com/outfoxxed) for making Quickshell and the effort put into fixing issues -and implementing various feature requests. - -Another special thanks to [@end_4](https://github.com/end-4) for his [config](https://github.com/end-4/dots-hyprland) -which helped me a lot with learning how to use Quickshell. - -Finally another thank you to all the configs I took inspiration from (only one for now): - -- [Axenide/Ax-Shell](https://github.com/Axenide/Ax-Shell) - -## Stonks 📈 - - - - - - Star History Chart - - diff --git a/modules/home/services/quickshell/shell/assets/beat_detector.cpp b/modules/home/services/quickshell/shell/assets/beat_detector.cpp deleted file mode 100755 index 4eb9b484..00000000 --- a/modules/home/services/quickshell/shell/assets/beat_detector.cpp +++ /dev/null @@ -1,568 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class EnhancedBeatDetector { -private: - static constexpr uint32_t SAMPLE_RATE = 44100; - static constexpr uint32_t CHANNELS = 1; - - // PipeWire objects - pw_main_loop* main_loop_; - pw_context* context_; - pw_core* core_; - pw_stream* stream_; - - // Aubio objects - std::unique_ptr tempo_; - std::unique_ptr input_buffer_; - std::unique_ptr output_buffer_; - - // Additional aubio objects for enhanced features - std::unique_ptr onset_; - std::unique_ptr pitch_; - std::unique_ptr pitch_buffer_; - - const uint32_t buf_size_; - const uint32_t fft_size_; - - static std::atomic should_quit_; - static EnhancedBeatDetector* instance_; - - // Enhanced features - std::ofstream log_file_; - bool enable_logging_; - bool enable_performance_stats_; - bool enable_pitch_detection_; - bool enable_visual_feedback_; - - // Performance tracking - std::chrono::high_resolution_clock::time_point last_process_time_; - std::vector process_times_; - uint64_t total_beats_; - uint64_t total_onsets_; - std::chrono::steady_clock::time_point start_time_; - - // Beat analysis - std::vector recent_bpms_; - static constexpr size_t BPM_HISTORY_SIZE = 10; - float last_bpm_; - std::chrono::steady_clock::time_point last_beat_time_; - - // Useless Visual feedback - std::string generate_beat_visual(float bpm, bool is_beat) { - if (!enable_visual_feedback_) return ""; - - std::stringstream ss; - if (is_beat) { - // Useless Animated beat indicator based on BPM intensity - int intensity = static_cast(std::min(bpm / 20.0f, 10.0f)); - ss << "\r "; - for (int i = 0; i < intensity; ++i) ss << "█"; - for (int i = intensity; i < 10; ++i) ss << "░"; - ss << " BPM: " << std::fixed << std::setprecision(1) << bpm; - ss << " | Avg: " << get_average_bpm(); - } - return ss.str(); - } - -public: - explicit EnhancedBeatDetector(uint32_t buf_size = 512, - bool enable_logging = true, - bool enable_performance_stats = true, - bool enable_pitch_detection = false, - bool enable_visual_feedback = true) - : main_loop_(nullptr) - , context_(nullptr) - , core_(nullptr) - , stream_(nullptr) - , tempo_(nullptr, &del_aubio_tempo) - , input_buffer_(nullptr, &del_fvec) - , output_buffer_(nullptr, &del_fvec) - , onset_(nullptr, &del_aubio_onset) - , pitch_(nullptr, &del_aubio_pitch) - , pitch_buffer_(nullptr, &del_fvec) - , buf_size_(buf_size) - , fft_size_(buf_size * 2) - , enable_logging_(enable_logging) - , enable_performance_stats_(enable_performance_stats) - , enable_pitch_detection_(enable_pitch_detection) - , enable_visual_feedback_(enable_visual_feedback) - , total_beats_(0) - , total_onsets_(0) - , last_bpm_(0.0f) - { - instance_ = this; - recent_bpms_.reserve(BPM_HISTORY_SIZE); - if (enable_performance_stats_) { - process_times_.reserve(1000); // Reserve space for performance data - } - initialize(); - } - - ~EnhancedBeatDetector() { - print_final_stats(); - cleanup(); - instance_ = nullptr; - } - - // Delete copy constructor and assignment operator - EnhancedBeatDetector(const EnhancedBeatDetector&) = delete; - EnhancedBeatDetector& operator=(const EnhancedBeatDetector&) = delete; - - bool initialize() { - start_time_ = std::chrono::steady_clock::now(); - - // Useless Initialize logging (actually useful) - if (enable_logging_) { - auto now = std::chrono::system_clock::now(); - auto time_t = std::chrono::system_clock::to_time_t(now); - std::stringstream filename; - filename << "beat_log_" << std::put_time(std::localtime(&time_t), "%Y%m%d_%H%M%S") << ".txt"; - log_file_.open(filename.str()); - if (log_file_.is_open()) { - log_file_ << "# Beat Detection Log - " << std::put_time(std::localtime(&time_t), "%Y-%m-%d %H:%M:%S") << "\n"; - log_file_ << "# Timestamp,BPM,Onset,Pitch(Hz),ProcessTime(ms)\n"; - std::cout << " Logging to: " << filename.str() << std::endl; - } - } - - // Initialize PipeWire - pw_init(nullptr, nullptr); - - main_loop_ = pw_main_loop_new(nullptr); - if (!main_loop_) { - std::cerr << " Failed to create main loop" << std::endl; - return false; - } - - context_ = pw_context_new(pw_main_loop_get_loop(main_loop_), nullptr, 0); - if (!context_) { - std::cerr << " Failed to create context" << std::endl; - return false; - } - - core_ = pw_context_connect(context_, nullptr, 0); - if (!core_) { - std::cerr << " Failed to connect to PipeWire" << std::endl; - return false; - } - - // Initialize Aubio objects - tempo_.reset(new_aubio_tempo("default", fft_size_, buf_size_, SAMPLE_RATE)); - if (!tempo_) { - std::cerr << " Failed to create aubio tempo detector" << std::endl; - return false; - } - - input_buffer_.reset(new_fvec(buf_size_)); - output_buffer_.reset(new_fvec(1)); - - if (!input_buffer_ || !output_buffer_) { - std::cerr << " Failed to create aubio buffers" << std::endl; - return false; - } - - // Initialize onset detection - onset_.reset(new_aubio_onset("default", fft_size_, buf_size_, SAMPLE_RATE)); - if (!onset_) { - std::cerr << " Failed to create aubio onset detector" << std::endl; - return false; - } - - // Initialize pitch detection if enabled - if (enable_pitch_detection_) { - pitch_.reset(new_aubio_pitch("default", fft_size_, buf_size_, SAMPLE_RATE)); - pitch_buffer_.reset(new_fvec(1)); - if (!pitch_ || !pitch_buffer_) { - std::cerr << " Failed to create aubio pitch detector" << std::endl; - return false; - } - aubio_pitch_set_unit(pitch_.get(), "Hz"); - } - - return setup_stream(); - } - - void run() { - if (!main_loop_) return; - - print_startup_info(); - pw_main_loop_run(main_loop_); - } - - void stop() { - should_quit_ = true; - if (main_loop_) { - pw_main_loop_quit(main_loop_); - } - } - - static void signal_handler(int sig) { - if (instance_) { - std::cout << "\n Received signal " << sig << ", stopping gracefullllly..." << std::endl; - instance_->stop(); - } - } - -private: - void print_startup_info() { - std::cout << "\n󰝚 Beat Detector Started!" << std::endl; - std::cout << " Buffer size: " << buf_size_ << " samples" << std::endl; - std::cout << " Sample rate: " << SAMPLE_RATE << " Hz" << std::endl; - std::cout << " Features enabled:" << std::endl; - std::cout << "  Logging: " << (enable_logging_ ? " " : "") << std::endl; - std::cout << "  Performance stats: " << (enable_performance_stats_ ? " " : "") << std::endl; - std::cout << " 󰗅 Pitch detection: " << (enable_pitch_detection_ ? " " : "") << std::endl; - std::cout << "\n Listening for beats... Press Ctrl+C to stop.\n" << std::endl; - } - - void print_final_stats() { - if (!enable_performance_stats_) return; - - auto end_time = std::chrono::steady_clock::now(); - auto duration = std::chrono::duration_cast(end_time - start_time_); - - std::cout << "\n Final Statistics:" << std::endl; - std::cout << " 󱎫 Total runtime: " << duration.count() << " seconds" << std::endl; - std::cout << "  Total beats detected: " << total_beats_ << std::endl; - std::cout << "  Total onsets detected: " << total_onsets_ << std::endl; - - if (!process_times_.empty()) { - double avg_time = 0; - for (double t : process_times_) avg_time += t; - avg_time /= process_times_.size(); - - auto max_time = *std::max_element(process_times_.begin(), process_times_.end()); - auto min_time = *std::min_element(process_times_.begin(), process_times_.end()); - - std::cout << " ⚡ Average processing time: " << std::fixed << std::setprecision(3) - << avg_time << " ms" << std::endl; - std::cout << " 📈 Max processing time: " << max_time << " ms" << std::endl; - std::cout << " 📉 Min processing time: " << min_time << " ms" << std::endl; - } - - if (!recent_bpms_.empty()) { - std::cout << " 󰝚 Final average BPM: " << get_average_bpm() << std::endl; - } - } - - float get_average_bpm() const { - if (recent_bpms_.empty()) return 0.0f; - float sum = 0; - for (float bpm : recent_bpms_) sum += bpm; - return sum / recent_bpms_.size(); - } - - bool setup_stream() { - // Stream events - static const pw_stream_events stream_events = { - .version = PW_VERSION_STREAM_EVENTS, - .destroy = nullptr, - .state_changed = on_state_changed, - .control_info = nullptr, - .io_changed = nullptr, - .param_changed = nullptr, - .add_buffer = nullptr, - .remove_buffer = nullptr, - .process = on_process, - .drained = nullptr, - .command = nullptr, - .trigger_done = nullptr, - }; - - stream_ = pw_stream_new_simple( - pw_main_loop_get_loop(main_loop_), - "enhanced-beat-detector", - pw_properties_new( - PW_KEY_MEDIA_TYPE, "Audio", - PW_KEY_MEDIA_CATEGORY, "Capture", - PW_KEY_MEDIA_ROLE, "Music", - nullptr - ), - &stream_events, - this - ); - - if (!stream_) { - std::cerr << " Failed to create stream" << std::endl; - return false; - } - - // Audio format parameters - uint8_t buffer[1024]; - spa_pod_builder pod_builder = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - - struct spa_audio_info_raw audio_info = {}; - audio_info.format = SPA_AUDIO_FORMAT_F32_LE; - audio_info.channels = CHANNELS; - audio_info.rate = SAMPLE_RATE; - audio_info.flags = 0; - - const spa_pod* params[1]; - params[0] = spa_format_audio_raw_build(&pod_builder, SPA_PARAM_EnumFormat, &audio_info); - - if (pw_stream_connect(stream_, - PW_DIRECTION_INPUT, - PW_ID_ANY, - static_cast( - PW_STREAM_FLAG_AUTOCONNECT | - PW_STREAM_FLAG_MAP_BUFFERS | - PW_STREAM_FLAG_RT_PROCESS), - params, 1) < 0) { - std::cerr << " Failed to connect stream" << std::endl; - return false; - } - - return true; - } - - static void on_state_changed(void* userdata, enum pw_stream_state /* old_state */, - enum pw_stream_state state, const char* error) { - auto* detector = static_cast(userdata); - - const char* state_emoji = "󰑓 "; - switch (state) { - case PW_STREAM_STATE_CONNECTING: state_emoji = "󰄙 "; break; - case PW_STREAM_STATE_PAUSED: state_emoji = ""; break; - case PW_STREAM_STATE_STREAMING: state_emoji = "󰝚 "; break; - case PW_STREAM_STATE_ERROR: state_emoji = ""; break; - case PW_STREAM_STATE_UNCONNECTED: state_emoji = " "; break; - } - - std::cout << state_emoji << " Stream state: " << pw_stream_state_as_string(state) << std::endl; - - if (state == PW_STREAM_STATE_ERROR) { - std::cerr << " Stream error: " << (error ? error : "unknown") << std::endl; - detector->stop(); - } - } - - static void on_process(void* userdata) { - auto* detector = static_cast(userdata); - detector->process_audio(); - } - - void process_audio() { - if (should_quit_) return; - - auto process_start = std::chrono::high_resolution_clock::now(); - - pw_buffer* buffer = pw_stream_dequeue_buffer(stream_); - if (!buffer) return; - - spa_buffer* spa_buf = buffer->buffer; - if (!spa_buf->datas[0].data) { - pw_stream_queue_buffer(stream_, buffer); - return; - } - - const float* audio_data = static_cast(spa_buf->datas[0].data); - const uint32_t n_samples = spa_buf->datas[0].chunk->size / sizeof(float); - - // Process in chunks - for (uint32_t offset = 0; offset + buf_size_ <= n_samples; offset += buf_size_) { - std::memcpy(input_buffer_->data, audio_data + offset, buf_size_ * sizeof(float)); - - // Beat detection - aubio_tempo_do(tempo_.get(), input_buffer_.get(), output_buffer_.get()); - bool is_beat = output_buffer_->data[0] != 0.0f; - - // Onset detection - aubio_onset_do(onset_.get(), input_buffer_.get(), output_buffer_.get()); - bool is_onset = output_buffer_->data[0] != 0.0f; - - float pitch_hz = 0.0f; - if (enable_pitch_detection_) { - aubio_pitch_do(pitch_.get(), input_buffer_.get(), pitch_buffer_.get()); - pitch_hz = pitch_buffer_->data[0]; - } - - if (is_beat) { - total_beats_++; - last_bpm_ = aubio_tempo_get_bpm(tempo_.get()); - last_beat_time_ = std::chrono::steady_clock::now(); - - // Update BPM history - recent_bpms_.push_back(last_bpm_); - if (recent_bpms_.size() > BPM_HISTORY_SIZE) { - recent_bpms_.erase(recent_bpms_.begin()); - } - - // Visual feedback - if (enable_visual_feedback_) { - std::cout << generate_beat_visual(last_bpm_, true) << std::flush; - } else { - std::cout << " BPM: " << std::fixed << std::setprecision(1) << last_bpm_ << std::endl; - } - } - - if (is_onset) { - total_onsets_++; - } - - // Logging - if (enable_logging_ && log_file_.is_open() && (is_beat || is_onset)) { - auto now = std::chrono::system_clock::now(); - auto time_t = std::chrono::system_clock::to_time_t(now); - auto ms = std::chrono::duration_cast( - now.time_since_epoch()) % 1000; - - log_file_ << std::put_time(std::localtime(&time_t), "%H:%M:%S") - << "." << std::setfill('0') << std::setw(3) << ms.count() << "," - << (is_beat ? last_bpm_ : 0) << "," - << (is_onset ? 1 : 0) << "," - << pitch_hz << ","; - } - } - - pw_stream_queue_buffer(stream_, buffer); - - // Performance tracking - if (enable_performance_stats_) { - auto process_end = std::chrono::high_resolution_clock::now(); - auto process_time = std::chrono::duration(process_end - process_start).count(); - - if (log_file_.is_open() && (total_beats_ > 0 || total_onsets_ > 0)) { - log_file_ << std::fixed << std::setprecision(3) << process_time << "\n"; - } - - if (process_times_.size() < 1000) { - process_times_.push_back(process_time); - } - } - } - - void cleanup() { - if (log_file_.is_open()) { - log_file_.close(); - } - - if (stream_) { - pw_stream_destroy(stream_); - stream_ = nullptr; - } - - if (core_) { - pw_core_disconnect(core_); - core_ = nullptr; - } - - if (context_) { - pw_context_destroy(context_); - context_ = nullptr; - } - - if (main_loop_) { - pw_main_loop_destroy(main_loop_); - main_loop_ = nullptr; - } - - tempo_.reset(); - input_buffer_.reset(); - output_buffer_.reset(); - onset_.reset(); - pitch_.reset(); - pitch_buffer_.reset(); - - pw_deinit(); - - std::cout << "\n Cleanup complete - All resources freed!" << std::endl; - } -}; - -// Static member definitions -std::atomic EnhancedBeatDetector::should_quit_{false}; -EnhancedBeatDetector* EnhancedBeatDetector::instance_{nullptr}; - -void print_usage() { - std::cout << " Beat Detector Usage:" << std::endl; - std::cout << " ./beat_detector [buffer_size] [options]" << std::endl; - std::cout << "\nOptions:" << std::endl; - std::cout << " --no-log Disable logging to file" << std::endl; - std::cout << " --no-stats Disable performance statistics" << std::endl; - std::cout << " --pitch Enable pitch detection" << std::endl; - std::cout << " --no-visual Disable visual feedback" << std::endl; - std::cout << " --help Show this help" << std::endl; - std::cout << "\nExamples:" << std::endl; - std::cout << " ./beat_detector # Default settings" << std::endl; - std::cout << " ./beat_detector 256 --pitch # Smaller buffer with pitch detection" << std::endl; - std::cout << " ./beat_detector 1024 --no-visual # Larger buffer, no visual feedback" << std::endl; -} - -int main(int argc, char* argv[]) { - // Parse command line arguments - uint32_t buffer_size = 512; - bool enable_logging = true; - bool enable_performance_stats = true; - bool enable_pitch_detection = false; - bool enable_visual_feedback = true; - - for (int i = 1; i < argc; ++i) { - std::string arg = argv[i]; - - if (arg == "--help" || arg == "-h") { - print_usage(); - return 0; - } else if (arg == "--no-log") { - enable_logging = false; - } else if (arg == "--no-stats") { - enable_performance_stats = false; - } else if (arg == "--pitch") { - enable_pitch_detection = true; - } else if (arg == "--no-visual") { - enable_visual_feedback = false; - } else if (arg[0] != '-') { - // Assume it's a buffer size - try { - buffer_size = std::stoul(arg); - if (buffer_size < 64 || buffer_size > 8192) { - std::cerr << " Buffer size must be between 64 and 8192" << std::endl; - return 1; - } - } catch (...) { - std::cerr << " Invalid buffer size: " << arg << std::endl; - return 1; - } - } else { - std::cerr << " Unknown option: " << arg << std::endl; - print_usage(); - return 1; - } - } - - // Set up signal handling - std::signal(SIGINT, EnhancedBeatDetector::signal_handler); - std::signal(SIGTERM, EnhancedBeatDetector::signal_handler); - - try { - EnhancedBeatDetector detector(buffer_size, enable_logging, enable_performance_stats, - enable_pitch_detection, enable_visual_feedback); - detector.run(); - } catch (const std::exception& e) { - std::cerr << " Error: " << e.what() << std::endl; - return 1; - } - - return 0; -} - -/* - * Compilation command: - * g++ -std=c++17 -O3 -Wall -Wextra -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/aubio \ - * -o beat_detector beat_detector.cpp -lpipewire-0.3 -laubio -pthread - */ diff --git a/modules/home/services/quickshell/shell/assets/bongocat.gif b/modules/home/services/quickshell/shell/assets/bongocat.gif deleted file mode 100644 index 4a50ff1ab3429aba23f82a103200871ad19038ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8495 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 Mtpz;H0s;)y06+J`m;e9( diff --git a/modules/home/services/quickshell/shell/assets/kurukuru.gif b/modules/home/services/quickshell/shell/assets/kurukuru.gif deleted file mode 100644 index 38d203d9adb89fe337df810aa9483d70229fa57d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99006 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

mgb;x7&hf05ooEc&n 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 gYt>Cq1Xur^P{8lf emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1] - readonly property list emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1] - readonly property list emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1] - readonly property list standard: [0.2, 0, 0, 1, 1, 1] - readonly property list standardAccel: [0.3, 0, 1, 1, 1, 1] - readonly property list standardDecel: [0, 0, 0, 1, 1, 1] - readonly property list expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1] - readonly property list expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1] - readonly property list expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1] - } - - component AnimDurations: QtObject { - readonly property int small: 200 - readonly property int normal: 400 - readonly property int large: 600 - readonly property int extraLarge: 1000 - readonly property int expressiveFastSpatial: 350 - readonly property int expressiveDefaultSpatial: 500 - readonly property int expressiveEffects: 200 - } - - component Anim: QtObject { - readonly property AnimCurves curves: AnimCurves {} - readonly property AnimDurations durations: AnimDurations {} - } -} diff --git a/modules/home/services/quickshell/shell/config/BarConfig.qml b/modules/home/services/quickshell/shell/config/BarConfig.qml deleted file mode 100644 index 31577c45..00000000 --- a/modules/home/services/quickshell/shell/config/BarConfig.qml +++ /dev/null @@ -1,22 +0,0 @@ -import Quickshell.Io - -JsonObject { - property JsonObject sizes: JsonObject { - property int innerHeight: 30 - property int windowPreviewSize: 400 - property int trayMenuWidth: 300 - property int batteryWidth: 250 - } - - property JsonObject workspaces: JsonObject { - property int shown: 5 - property bool rounded: true - property bool activeIndicator: true - property bool occupiedBg: false - property bool showWindows: true - property bool activeTrail: false - property string label: " " - property string occupiedLabel: "󰮯 " - property string activeLabel: "󰮯 " - } -} diff --git a/modules/home/services/quickshell/shell/config/BorderConfig.qml b/modules/home/services/quickshell/shell/config/BorderConfig.qml deleted file mode 100644 index b15811fd..00000000 --- a/modules/home/services/quickshell/shell/config/BorderConfig.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Quickshell.Io - -JsonObject { - property int thickness: Appearance.padding.normal - property int rounding: Appearance.rounding.large -} diff --git a/modules/home/services/quickshell/shell/config/Config.qml b/modules/home/services/quickshell/shell/config/Config.qml deleted file mode 100644 index e655400c..00000000 --- a/modules/home/services/quickshell/shell/config/Config.qml +++ /dev/null @@ -1,42 +0,0 @@ -pragma Singleton - -import "root:/utils" -import Quickshell -import Quickshell.Io - -Singleton { - id: root - - property alias bar: adapter.bar - property alias border: adapter.border - property alias dashboard: adapter.dashboard - property alias launcher: adapter.launcher - property alias notifs: adapter.notifs - property alias osd: adapter.osd - property alias session: adapter.session - property alias winfo: adapter.winfo - property alias lock: adapter.lock - property alias paths: adapter.paths - - FileView { - path: `${Paths.config}/shell.json` - watchChanges: true - onFileChanged: reload() - onAdapterUpdated: writeAdapter() - - JsonAdapter { - id: adapter - - property JsonObject bar: BarConfig {} - property JsonObject border: BorderConfig {} - property JsonObject dashboard: DashboardConfig {} - property JsonObject launcher: LauncherConfig {} - property JsonObject notifs: NotifsConfig {} - property JsonObject osd: OsdConfig {} - property JsonObject session: SessionConfig {} - property JsonObject winfo: WInfoConfig {} - property JsonObject lock: LockConfig {} - property JsonObject paths: UserPaths {} - } - } -} diff --git a/modules/home/services/quickshell/shell/config/DashboardConfig.qml b/modules/home/services/quickshell/shell/config/DashboardConfig.qml deleted file mode 100644 index 02f838e8..00000000 --- a/modules/home/services/quickshell/shell/config/DashboardConfig.qml +++ /dev/null @@ -1,23 +0,0 @@ -import Quickshell.Io - -JsonObject { - property int mediaUpdateInterval: 500 - property int visualiserBars: 45 - property string weatherLocation: "" // A lat,long pair, e.g. "37.8267,-122.4233" - - property JsonObject sizes: JsonObject { - readonly property int tabIndicatorHeight: 3 - readonly property int tabIndicatorSpacing: 5 - readonly property int infoWidth: 200 - readonly property int infoIconSize: 25 - readonly property int dateTimeWidth: 110 - readonly property int mediaWidth: 200 - readonly property int mediaProgressSweep: 180 - readonly property int mediaProgressThickness: 8 - readonly property int resourceProgessThickness: 10 - readonly property int weatherWidth: 250 - readonly property int mediaCoverArtSize: 150 - readonly property int mediaVisualiserSize: 80 - readonly property int resourceSize: 200 - } -} diff --git a/modules/home/services/quickshell/shell/config/LauncherConfig.qml b/modules/home/services/quickshell/shell/config/LauncherConfig.qml deleted file mode 100644 index ea3c364f..00000000 --- a/modules/home/services/quickshell/shell/config/LauncherConfig.qml +++ /dev/null @@ -1,15 +0,0 @@ -import Quickshell.Io - -JsonObject { - property int maxShown: 8 - property int maxWallpapers: 9 // Warning: even numbers look bad - property string actionPrefix: ">" - property bool enableDangerousActions: false // Allow actions that can cause losing data, like shutdown, reboot and logout - - property JsonObject sizes: JsonObject { - property int itemWidth: 600 - property int itemHeight: 57 - property int wallpaperWidth: 280 - property int wallpaperHeight: 200 - } -} diff --git a/modules/home/services/quickshell/shell/config/LockConfig.qml b/modules/home/services/quickshell/shell/config/LockConfig.qml deleted file mode 100644 index 5745dee0..00000000 --- a/modules/home/services/quickshell/shell/config/LockConfig.qml +++ /dev/null @@ -1,27 +0,0 @@ -import Quickshell.Io - -JsonObject { - property int maxNotifs: 5 - - property JsonObject sizes: JsonObject { - property int border: 100 - property int clockWidth: 800 - property int clockHeight: 200 - property int inputWidth: 600 - property int inputHeight: 200 - property int faceSize: 100 - property int weatherWidth: 400 - property int weatherHeight: 100 - property int mediaWidth: 600 - property int mediaWidthSmall: 450 - property int mediaHeight: 170 - property int mediaHeightSmall: 150 - property int mediaCoverSize: 150 - property int mediaCoverSizeSmall: 120 - property int mediaCoverBorder: 3 - property int largeScreenWidth: 2560 - property int smallScreenWidth: 1080 - property int buttonsWidth: 500 - property int buttonsWidthSmall: 300 - } -} diff --git a/modules/home/services/quickshell/shell/config/NotifsConfig.qml b/modules/home/services/quickshell/shell/config/NotifsConfig.qml deleted file mode 100644 index 920233fd..00000000 --- a/modules/home/services/quickshell/shell/config/NotifsConfig.qml +++ /dev/null @@ -1,15 +0,0 @@ -import Quickshell.Io - -JsonObject { - property bool expire: true - property int defaultExpireTimeout: 5000 - property real clearThreshold: 0.3 - property int expandThreshold: 20 - property bool actionOnClick: false - - property JsonObject sizes: JsonObject { - property int width: 400 - property int image: 41 - property int badge: 20 - } -} diff --git a/modules/home/services/quickshell/shell/config/OsdConfig.qml b/modules/home/services/quickshell/shell/config/OsdConfig.qml deleted file mode 100644 index 7275e225..00000000 --- a/modules/home/services/quickshell/shell/config/OsdConfig.qml +++ /dev/null @@ -1,10 +0,0 @@ -import Quickshell.Io - -JsonObject { - property int hideDelay: 2000 - - property JsonObject sizes: JsonObject { - property int sliderWidth: 30 - property int sliderHeight: 150 - } -} diff --git a/modules/home/services/quickshell/shell/config/SessionConfig.qml b/modules/home/services/quickshell/shell/config/SessionConfig.qml deleted file mode 100644 index 09154693..00000000 --- a/modules/home/services/quickshell/shell/config/SessionConfig.qml +++ /dev/null @@ -1,9 +0,0 @@ -import Quickshell.Io - -JsonObject { - property int dragThreshold: 30 - - property JsonObject sizes: JsonObject { - property int button: 80 - } -} diff --git a/modules/home/services/quickshell/shell/config/UserPaths.qml b/modules/home/services/quickshell/shell/config/UserPaths.qml deleted file mode 100644 index ee24a73b..00000000 --- a/modules/home/services/quickshell/shell/config/UserPaths.qml +++ /dev/null @@ -1,8 +0,0 @@ -import "root:/utils" -import Quickshell.Io - -JsonObject { - property string wallpaperDir: Paths.strip(`${Paths.pictures}/Wallpapers`) - property string sessionGif: "root:/assets/kurukuru.gif" - property string mediaGif: "root:/assets/bongocat.gif" -} diff --git a/modules/home/services/quickshell/shell/config/WInfoConfig.qml b/modules/home/services/quickshell/shell/config/WInfoConfig.qml deleted file mode 100644 index cd48a6b1..00000000 --- a/modules/home/services/quickshell/shell/config/WInfoConfig.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Quickshell.Io - -JsonObject { - property JsonObject sizes: JsonObject { - property real heightMult: 0.7 - property real detailsWidth: 500 - } -} diff --git a/modules/home/services/quickshell/shell/modules/Shortcuts.qml b/modules/home/services/quickshell/shell/modules/Shortcuts.qml deleted file mode 100644 index 3d665ff4..00000000 --- a/modules/home/services/quickshell/shell/modules/Shortcuts.qml +++ /dev/null @@ -1,65 +0,0 @@ -import "root:/widgets" -import "root:/services" -import Quickshell -import Quickshell.Io - -Scope { - id: root - - property bool launcherInterrupted - - CustomShortcut { - name: "showall" - description: "Toggle launcher, dashboard and osd" - onPressed: { - const v = Visibilities.getForActive(); - v.launcher = v.dashboard = v.osd = !(v.launcher || v.dashboard || v.osd); - } - } - - CustomShortcut { - name: "session" - description: "Toggle session menu" - onPressed: { - const visibilities = Visibilities.getForActive(); - visibilities.session = !visibilities.session; - } - } - - CustomShortcut { - name: "launcher" - description: "Toggle launcher" - onPressed: root.launcherInterrupted = false - onReleased: { - if (!root.launcherInterrupted) { - const visibilities = Visibilities.getForActive(); - visibilities.launcher = !visibilities.launcher; - } - root.launcherInterrupted = false; - } - } - - CustomShortcut { - name: "launcherInterrupt" - description: "Interrupt launcher keybind" - onPressed: root.launcherInterrupted = true - } - - IpcHandler { - target: "drawers" - - function toggle(drawer: string): void { - if (list().split("\n").includes(drawer)) { - const visibilities = Visibilities.getForActive(); - visibilities[drawer] = !visibilities[drawer]; - } else { - console.warn(`[IPC] Drawer "${drawer}" does not exist`); - } - } - - function list(): string { - const visibilities = Visibilities.getForActive(); - return Object.keys(visibilities).filter(k => typeof visibilities[k] === "boolean").join("\n"); - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/areapicker/AreaPicker.qml b/modules/home/services/quickshell/shell/modules/areapicker/AreaPicker.qml deleted file mode 100644 index 100634a9..00000000 --- a/modules/home/services/quickshell/shell/modules/areapicker/AreaPicker.qml +++ /dev/null @@ -1,82 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import Quickshell -import Quickshell.Wayland -import Quickshell.Io - -Scope { - LazyLoader { - id: root - - property bool freeze - property bool closing - - Variants { - model: Quickshell.screens - - StyledWindow { - id: win - - required property ShellScreen modelData - - screen: modelData - name: "area-picker" - WlrLayershell.exclusionMode: ExclusionMode.Ignore - WlrLayershell.layer: WlrLayer.Overlay - WlrLayershell.keyboardFocus: root.closing ? WlrKeyboardFocus.None : WlrKeyboardFocus.Exclusive - mask: root.closing ? empty : null - - anchors.top: true - anchors.bottom: true - anchors.left: true - anchors.right: true - - Region { - id: empty - } - - Picker { - loader: root - screen: win.modelData - } - } - } - } - - IpcHandler { - target: "picker" - - function open(): void { - root.freeze = false; - root.closing = false; - root.activeAsync = true; - } - - function openFreeze(): void { - root.freeze = true; - root.closing = false; - root.activeAsync = true; - } - } - - CustomShortcut { - name: "screenshot" - description: "Open screenshot tool" - onPressed: { - root.freeze = false; - root.closing = false; - root.activeAsync = true; - } - } - - CustomShortcut { - name: "screenshotFreeze" - description: "Open screenshot tool (freeze mode)" - onPressed: { - root.freeze = true; - root.closing = false; - root.activeAsync = true; - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/areapicker/Picker.qml b/modules/home/services/quickshell/shell/modules/areapicker/Picker.qml deleted file mode 100644 index 312c403c..00000000 --- a/modules/home/services/quickshell/shell/modules/areapicker/Picker.qml +++ /dev/null @@ -1,278 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Io -import Quickshell.Wayland -import QtQuick -import QtQuick.Effects - -MouseArea { - id: root - - required property LazyLoader loader - required property ShellScreen screen - - property int borderWidth - property int rounding - - property bool onClient - - property real realBorderWidth: onClient ? borderWidth : 2 - property real realRounding: onClient ? rounding : 0 - - property real ssx - property real ssy - - property real sx: 0 - property real sy: 0 - property real ex: screen.width - property real ey: screen.height - - property real rsx: Math.min(sx, ex) - property real rsy: Math.min(sy, ey) - property real sw: Math.abs(sx - ex) - property real sh: Math.abs(sy - ey) - - property list clients: Hyprland.toplevels.values.filter(c => c.workspace.id === Hyprland.activeWsId).sort((a, b) => { - // Pinned first, then floating, then any other - if (a.lastIpcObject.pinned === b.lastIpcObject.pinned) - return a.lastIpcObject.floating === b.lastIpcObject.floating ? 0 : a.lastIpcObject.floating ? -1 : 1; - if (a.lastIpcObject.pinned) - return -1; - return 1; - }) - - function checkClientRects(x: real, y: real): void { - for (const client of clients) { - const { - at: [cx, cy], - size: [cw, ch] - } = client.lastIpcObject; - if (cx <= x && cy <= y && cx + cw >= x && cy + ch >= y) { - onClient = true; - sx = cx; - sy = cy; - ex = cx + cw; - ey = cy + ch; - break; - } - } - } - - anchors.fill: parent - opacity: 0 - hoverEnabled: true - cursorShape: Qt.CrossCursor - - Component.onCompleted: { - // Break binding if frozen - if (loader.freeze) - clients = clients; - - opacity = 1; - sx = screen.width / 2 - 100; - sy = screen.height / 2 - 100; - ex = screen.width / 2 + 100; - ey = screen.height / 2 + 100; - } - - onPressed: event => { - ssx = event.x; - ssy = event.y; - } - - onReleased: { - if (closeAnim.running) - return; - - Quickshell.execDetached(["sh", "-c", `grim -l 0 -g '${screen.x + Math.ceil(rsx)},${screen.y + Math.ceil(rsy)} ${Math.floor(sw)}x${Math.floor(sh)}' - | swappy -f -`]); - closeAnim.start(); - } - - onPositionChanged: event => { - const x = event.x; - const y = event.y; - - if (pressed) { - onClient = false; - sx = ssx; - sy = ssy; - ex = x; - ey = y; - } else { - checkClientRects(x, y); - } - } - - focus: true - Keys.onEscapePressed: closeAnim.start() - - SequentialAnimation { - id: closeAnim - - PropertyAction { - target: root.loader - property: "closing" - value: true - } - ParallelAnimation { - Anim { - target: root - property: "opacity" - to: 0 - duration: Appearance.anim.durations.large - } - Anim { - target: root - properties: "rsx,rsy" - to: 0 - } - Anim { - target: root - property: "sw" - to: root.screen.width - } - Anim { - target: root - property: "sh" - to: root.screen.height - } - } - PropertyAction { - target: root.loader - property: "activeAsync" - value: false - } - } - - Connections { - target: Hyprland - - function onActiveWsIdChanged(): void { - root.checkClientRects(root.mouseX, root.mouseY); - } - } - - Process { - running: true - command: ["hyprctl", "-j", "getoption", "general:border_size"] - stdout: StdioCollector { - onStreamFinished: root.borderWidth = JSON.parse(text).int - } - } - - Process { - running: true - command: ["hyprctl", "-j", "getoption", "decoration:rounding"] - stdout: StdioCollector { - onStreamFinished: root.rounding = JSON.parse(text).int - } - } - - Loader { - anchors.fill: parent - - active: root.loader.freeze - asynchronous: true - - sourceComponent: ScreencopyView { - captureSource: root.screen - } - } - - StyledRect { - id: background - - anchors.fill: parent - color: Colours.palette.m3secondaryContainer - visible: false - } - - Item { - id: selectionWrapper - - anchors.fill: parent - layer.enabled: true - visible: false - - Rectangle { - id: selectionRect - - radius: root.realRounding - x: root.rsx - y: root.rsy - implicitWidth: root.sw - implicitHeight: root.sh - } - } - - MultiEffect { - anchors.fill: parent - source: background - maskSource: selectionWrapper - maskEnabled: true - maskInverted: true - maskSpreadAtMin: 1 - maskThresholdMin: 0.5 - opacity: 0.3 - } - - Rectangle { - color: "transparent" - radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0 - border.width: root.realBorderWidth - border.color: Colours.palette.m3primary - - x: selectionRect.x - root.realBorderWidth - y: selectionRect.y - root.realBorderWidth - implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2 - implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2 - - Behavior on border.color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - Behavior on opacity { - Anim { - duration: Appearance.anim.durations.large - } - } - - Behavior on rsx { - enabled: !root.pressed - - Anim {} - } - - Behavior on rsy { - enabled: !root.pressed - - Anim {} - } - - Behavior on sw { - enabled: !root.pressed - - Anim {} - } - - Behavior on sh { - enabled: !root.pressed - - Anim {} - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial - } -} diff --git a/modules/home/services/quickshell/shell/modules/background/Background.qml b/modules/home/services/quickshell/shell/modules/background/Background.qml deleted file mode 100644 index 11c91511..00000000 --- a/modules/home/services/quickshell/shell/modules/background/Background.qml +++ /dev/null @@ -1,26 +0,0 @@ -import "root:/widgets" -import Quickshell -import Quickshell.Wayland - -Variants { - model: Quickshell.screens - - StyledWindow { - id: win - - required property ShellScreen modelData - - screen: modelData - name: "background" - WlrLayershell.exclusionMode: ExclusionMode.Ignore - WlrLayershell.layer: WlrLayer.Background - color: "black" - - anchors.top: true - anchors.bottom: true - anchors.left: true - anchors.right: true - - Wallpaper {} - } -} diff --git a/modules/home/services/quickshell/shell/modules/background/Wallpaper.qml b/modules/home/services/quickshell/shell/modules/background/Wallpaper.qml deleted file mode 100644 index 72383031..00000000 --- a/modules/home/services/quickshell/shell/modules/background/Wallpaper.qml +++ /dev/null @@ -1,143 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Dialogs - -Item { - id: root - - property string source: Wallpapers.current - property Image current: one - - anchors.fill: parent - - onSourceChanged: { - if (!source) - current = null; - else if (current === one) - two.update(); - else - one.update(); - } - - Loader { - anchors.fill: parent - - active: !root.source - asynchronous: true - - sourceComponent: StyledRect { - color: Colours.palette.m3surfaceContainer - - Row { - anchors.centerIn: parent - spacing: Appearance.spacing.large - - MaterialIcon { - text: "sentiment_stressed" - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.extraLarge * 5 - } - - Column { - anchors.verticalCenter: parent.verticalCenter - spacing: Appearance.spacing.small - - StyledText { - text: qsTr("Wallpaper missing?") - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.extraLarge * 2 - font.bold: true - } - - StyledRect { - implicitWidth: selectWallText.implicitWidth + Appearance.padding.large * 2 - implicitHeight: selectWallText.implicitHeight + Appearance.padding.small * 2 - - radius: Appearance.rounding.full - color: Colours.palette.m3primary - - FileDialog { - id: dialog - - nameFilters: [`Image files (${Wallpapers.extensions.map(e => `*.${e}`).join(" ")})`] - - onAccepted: Wallpapers.setWallpaper(selectedFile.toString().replace("file://", "")) - } - - StateLayer { - radius: parent.radius - color: Colours.palette.m3onPrimary - - function onClicked(): void { - dialog.open(); - } - } - - StyledText { - id: selectWallText - - anchors.centerIn: parent - - text: qsTr("Set it now!") - color: Colours.palette.m3onPrimary - font.pointSize: Appearance.font.size.large - } - } - } - } - } - } - - Img { - id: one - } - - Img { - id: two - } - - component Img: CachingImage { - id: img - - function update(): void { - if (path === root.source) - root.current = this; - else - path = root.source; - } - - anchors.fill: parent - - opacity: 0 - scale: Wallpapers.showPreview ? 1 : 0.8 - - onStatusChanged: { - if (status === Image.Ready) - root.current = this; - } - - states: State { - name: "visible" - when: root.current === img - - PropertyChanges { - img.opacity: 1 - img.scale: 1 - } - } - - transitions: Transition { - NumberAnimation { - target: img - properties: "opacity,scale" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/Bar.qml b/modules/home/services/quickshell/shell/modules/bar/Bar.qml deleted file mode 100644 index 9f5509b2..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/Bar.qml +++ /dev/null @@ -1,174 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/modules/bar/popouts" as BarPopouts -import "components" -import "components/workspaces" -import Quickshell -import QtQuick - -Item { - id: root - - required property ShellScreen screen - required property BarPopouts.Wrapper popouts - - function checkPopout(y: real): void { - const spacing = Appearance.spacing.small; - const aw = activeWindow.child; - const awy = activeWindow.y + aw.y; - - const ty = tray.y; - const th = tray.implicitHeight; - const trayItems = tray.items; - - const n = statusIconsInner.network; - const ny = statusIcons.y + statusIconsInner.y + n.y - spacing / 2; - - const bls = statusIcons.y + statusIconsInner.y + statusIconsInner.bs - spacing / 2; - const ble = statusIcons.y + statusIconsInner.y + statusIconsInner.be + spacing / 2; - - const b = statusIconsInner.battery; - const by = statusIcons.y + statusIconsInner.y + b.y - spacing / 2; - - if (y >= awy && y <= awy + aw.implicitHeight) { - popouts.currentName = "activewindow"; - popouts.currentCenter = Qt.binding(() => activeWindow.y + aw.y + aw.implicitHeight / 2); - popouts.hasCurrent = true; - } else if (y > ty && y < ty + th) { - const index = Math.floor(((y - ty) / th) * trayItems.count); - const item = trayItems.itemAt(index); - - popouts.currentName = `traymenu${index}`; - popouts.currentCenter = Qt.binding(() => tray.y + item.y + item.implicitHeight / 2); - popouts.hasCurrent = true; - } else if (y >= ny && y <= ny + n.implicitHeight + spacing) { - popouts.currentName = "network"; - popouts.currentCenter = Qt.binding(() => statusIcons.y + statusIconsInner.y + n.y + n.implicitHeight / 2); - popouts.hasCurrent = true; - } else if (y >= bls && y <= ble) { - popouts.currentName = "bluetooth"; - popouts.currentCenter = Qt.binding(() => statusIcons.y + statusIconsInner.y + statusIconsInner.bs + (statusIconsInner.be - statusIconsInner.bs) / 2); - popouts.hasCurrent = true; - } else if (y >= by && y <= by + b.implicitHeight + spacing) { - popouts.currentName = "battery"; - popouts.currentCenter = Qt.binding(() => statusIcons.y + statusIconsInner.y + b.y + b.implicitHeight / 2); - popouts.hasCurrent = true; - } else { - popouts.hasCurrent = false; - } - } - - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - - implicitWidth: child.implicitWidth + Config.border.thickness * 2 - - Item { - id: child - - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - - implicitWidth: Math.max(osIcon.implicitWidth, workspaces.implicitWidth, activeWindow.implicitWidth, tray.implicitWidth, clock.implicitWidth, statusIcons.implicitWidth, power.implicitWidth) - - OsIcon { - id: osIcon - - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - anchors.topMargin: Appearance.padding.large - } - - StyledRect { - id: workspaces - - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: osIcon.bottom - anchors.topMargin: Appearance.spacing.normal - - radius: Appearance.rounding.full - color: Colours.palette.m3surfaceContainer - - implicitWidth: workspacesInner.implicitWidth + Appearance.padding.small * 2 - implicitHeight: workspacesInner.implicitHeight + Appearance.padding.small * 2 - - MouseArea { - anchors.fill: parent - anchors.leftMargin: -Config.border.thickness - anchors.rightMargin: -Config.border.thickness - - onWheel: event => { - const activeWs = Hyprland.activeToplevel?.workspace?.name; - if (activeWs?.startsWith("special:")) - Hyprland.dispatch(`togglespecialworkspace ${activeWs.slice(8)}`); - else if (event.angleDelta.y < 0 || Hyprland.activeWsId > 1) - Hyprland.dispatch(`workspace r${event.angleDelta.y > 0 ? "-" : "+"}1`); - } - } - - Workspaces { - id: workspacesInner - - anchors.centerIn: parent - } - } - - ActiveWindow { - id: activeWindow - - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: workspaces.bottom - anchors.bottom: tray.top - anchors.margins: Appearance.spacing.large - - monitor: Brightness.getMonitorForScreen(root.screen) - } - - Tray { - id: tray - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: clock.top - anchors.bottomMargin: Appearance.spacing.larger - } - - Clock { - id: clock - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: statusIcons.top - anchors.bottomMargin: Appearance.spacing.normal - } - - StyledRect { - id: statusIcons - - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: power.top - anchors.bottomMargin: Appearance.spacing.normal - - radius: Appearance.rounding.full - color: Colours.palette.m3surfaceContainer - - implicitHeight: statusIconsInner.implicitHeight + Appearance.padding.normal * 2 - - StatusIcons { - id: statusIconsInner - - anchors.centerIn: parent - } - } - - Power { - id: power - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - anchors.bottomMargin: Appearance.padding.large - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/ActiveWindow.qml b/modules/home/services/quickshell/shell/modules/bar/components/ActiveWindow.qml deleted file mode 100644 index fc0c3038..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/ActiveWindow.qml +++ /dev/null @@ -1,140 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/utils" -import "root:/config" -import QtQuick - -Item { - id: root - - required property Brightness.Monitor monitor - property color colour: Colours.palette.m3primary - readonly property Item child: child - - implicitWidth: child.implicitWidth - implicitHeight: child.implicitHeight - - MouseArea { - anchors.top: parent.top - anchors.bottom: child.top - anchors.left: parent.left - anchors.right: parent.right - - onWheel: event => { - if (event.angleDelta.y > 0) - Audio.setVolume(Audio.volume + 0.1); - else if (event.angleDelta.y < 0) - Audio.setVolume(Audio.volume - 0.1); - } - } - - MouseArea { - anchors.top: child.bottom - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: parent.right - - onWheel: event => { - const monitor = root.monitor; - if (event.angleDelta.y > 0) - monitor.setBrightness(monitor.brightness + 0.1); - else if (event.angleDelta.y < 0) - monitor.setBrightness(monitor.brightness - 0.1); - } - } - - Item { - id: child - - property Item current: text1 - - anchors.centerIn: parent - - clip: true - implicitWidth: Math.max(icon.implicitWidth, current.implicitHeight) - implicitHeight: icon.implicitHeight + current.implicitWidth + current.anchors.topMargin - - MaterialIcon { - id: icon - - animate: true - text: Icons.getAppCategoryIcon(Hyprland.activeToplevel?.lastIpcObject.class, "desktop_windows") - color: root.colour - - anchors.horizontalCenter: parent.horizontalCenter - } - - Title { - id: text1 - } - - Title { - id: text2 - } - - TextMetrics { - id: metrics - - text: Hyprland.activeToplevel?.title ?? qsTr("Desktop") - font.pointSize: Appearance.font.size.smaller - font.family: Appearance.font.family.mono - elide: Qt.ElideRight - elideWidth: root.height - icon.height - - onTextChanged: { - const next = child.current === text1 ? text2 : text1; - next.text = elidedText; - child.current = next; - } - onElideWidthChanged: child.current.text = elidedText - } - - Behavior on implicitWidth { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - } - - component Title: StyledText { - id: text - - anchors.horizontalCenter: icon.horizontalCenter - anchors.top: icon.bottom - anchors.topMargin: Appearance.spacing.small - - font.pointSize: metrics.font.pointSize - font.family: metrics.font.family - color: root.colour - opacity: child.current === this ? 1 : 0 - - transform: Rotation { - angle: 90 - origin.x: text.implicitHeight / 2 - origin.y: text.implicitHeight / 2 - } - - width: implicitHeight - height: implicitWidth - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/Clock.qml b/modules/home/services/quickshell/shell/modules/bar/components/Clock.qml deleted file mode 100644 index ea57e2bc..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/Clock.qml +++ /dev/null @@ -1,33 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -Column { - id: root - - property color colour: Colours.palette.m3tertiary - - spacing: Appearance.spacing.small - - MaterialIcon { - id: icon - - text: "calendar_month" - color: root.colour - - anchors.horizontalCenter: parent.horizontalCenter - } - - StyledText { - id: text - - anchors.horizontalCenter: parent.horizontalCenter - - horizontalAlignment: StyledText.AlignHCenter - text: Time.format("hh\nmm") - font.pointSize: Appearance.font.size.smaller - font.family: Appearance.font.family.mono - color: root.colour - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/OsIcon.qml b/modules/home/services/quickshell/shell/modules/bar/components/OsIcon.qml deleted file mode 100644 index e040cf09..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/OsIcon.qml +++ /dev/null @@ -1,11 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/utils" -import "root:/config" - -StyledText { - text: Icons.osIcon - font.pointSize: Appearance.font.size.smaller - font.family: Appearance.font.family.mono - color: Colours.palette.m3tertiary -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/Power.qml b/modules/home/services/quickshell/shell/modules/bar/components/Power.qml deleted file mode 100644 index a870cb35..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/Power.qml +++ /dev/null @@ -1,27 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell - -MaterialIcon { - text: "power_settings_new" - color: Colours.palette.m3error - font.bold: true - font.pointSize: Appearance.font.size.normal - - StateLayer { - anchors.fill: undefined - anchors.centerIn: parent - anchors.horizontalCenterOffset: 1 - - implicitWidth: parent.implicitHeight + Appearance.padding.small * 2 - implicitHeight: implicitWidth - - radius: Appearance.rounding.full - - function onClicked(): void { - const v = Visibilities.screens[QsWindow.window.screen]; - v.session = !v.session; - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/StatusIcons.qml b/modules/home/services/quickshell/shell/modules/bar/components/StatusIcons.qml deleted file mode 100644 index 540f0416..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/StatusIcons.qml +++ /dev/null @@ -1,117 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/utils" -import "root:/config" -import Quickshell -import Quickshell.Services.UPower -import QtQuick - -Item { - id: root - - property color colour: Colours.palette.m3secondary - - readonly property Item network: network - readonly property real bs: bluetooth.y - readonly property real be: repeater.count > 0 ? devices.y + devices.implicitHeight : bluetooth.y + bluetooth.implicitHeight - readonly property Item battery: battery - - clip: true - implicitWidth: Math.max(network.implicitWidth, bluetooth.implicitWidth, devices.implicitWidth, battery.implicitWidth) - implicitHeight: network.implicitHeight + bluetooth.implicitHeight + bluetooth.anchors.topMargin + (repeater.count > 0 ? devices.implicitHeight + devices.anchors.topMargin : 0) + battery.implicitHeight + battery.anchors.topMargin - - MaterialIcon { - id: network - - animate: true - text: Network.active ? Icons.getNetworkIcon(Network.active.strength ?? 0) : "wifi_off" - color: root.colour - - anchors.horizontalCenter: parent.horizontalCenter - } - - MaterialIcon { - id: bluetooth - - anchors.horizontalCenter: network.horizontalCenter - anchors.top: network.bottom - anchors.topMargin: Appearance.spacing.smaller / 2 - - animate: true - text: Bluetooth.powered ? "bluetooth" : "bluetooth_disabled" - color: root.colour - } - - Column { - id: devices - - anchors.horizontalCenter: bluetooth.horizontalCenter - anchors.top: bluetooth.bottom - anchors.topMargin: Appearance.spacing.smaller / 2 - - spacing: Appearance.spacing.smaller / 2 - - Repeater { - id: repeater - - model: ScriptModel { - values: Bluetooth.devices.filter(d => d.connected) - } - - MaterialIcon { - required property Bluetooth.Device modelData - - animate: true - text: Icons.getBluetoothIcon(modelData.icon) - color: root.colour - fill: 1 - } - } - } - - MaterialIcon { - id: battery - - anchors.horizontalCenter: devices.horizontalCenter - anchors.top: repeater.count > 0 ? devices.bottom : bluetooth.bottom - anchors.topMargin: Appearance.spacing.smaller / 2 - - animate: true - text: { - if (!UPower.displayDevice.isLaptopBattery) { - if (PowerProfiles.profile === PowerProfile.PowerSaver) - return "energy_savings_leaf"; - if (PowerProfiles.profile === PowerProfile.Performance) - return "rocket_launch"; - return "balance"; - } - - const perc = UPower.displayDevice.percentage; - const charging = !UPower.onBattery; - if (perc === 1) - return charging ? "battery_charging_full" : "battery_full"; - let level = Math.floor(perc * 7); - if (charging && (level === 4 || level === 1)) - level--; - return charging ? `battery_charging_${(level + 3) * 10}` : `battery_${level}_bar`; - } - color: !UPower.onBattery || UPower.displayDevice.percentage > 0.2 ? root.colour : Colours.palette.m3error - fill: 1 - } - - Behavior on implicitWidth { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/Tray.qml b/modules/home/services/quickshell/shell/modules/bar/components/Tray.qml deleted file mode 100644 index 15a6bc4f..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/Tray.qml +++ /dev/null @@ -1,72 +0,0 @@ -import "root:/config" -import Quickshell.Services.SystemTray -import QtQuick - -Item { - id: root - - readonly property Repeater items: items - - clip: true - visible: width > 0 && height > 0 // To avoid warnings about being visible with no size - - implicitWidth: layout.implicitWidth - implicitHeight: layout.implicitHeight - - Column { - id: layout - - spacing: Appearance.spacing.small - - add: Transition { - NumberAnimation { - properties: "scale" - from: 0 - to: 1 - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - } - - move: Transition { - NumberAnimation { - properties: "scale" - to: 1 - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - NumberAnimation { - properties: "x,y" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Repeater { - id: items - - model: SystemTray.items - - TrayItem {} - } - } - - Behavior on implicitWidth { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/TrayItem.qml b/modules/home/services/quickshell/shell/modules/bar/components/TrayItem.qml deleted file mode 100644 index b8e5d42f..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/TrayItem.qml +++ /dev/null @@ -1,48 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import Quickshell.Services.SystemTray -import QtQuick - -MouseArea { - id: root - - required property SystemTrayItem modelData - - acceptedButtons: Qt.LeftButton | Qt.RightButton - implicitWidth: Appearance.font.size.small * 2 - implicitHeight: Appearance.font.size.small * 2 - - onClicked: event => { - if (event.button === Qt.LeftButton) - modelData.activate(); - else if (modelData.hasMenu) - menu.open(); - } - - // TODO custom menu - QsMenuAnchor { - id: menu - - menu: root.modelData.menu - anchor.window: this.QsWindow.window - } - - IconImage { - id: icon - - source: { - let icon = root.modelData.icon; - if (icon.includes("?path=")) { - const [name, path] = icon.split("?path="); - icon = `file://${path}/${name.slice(name.lastIndexOf("/") + 1)}`; - } - return icon; - } - asynchronous: true - anchors.fill: parent - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/home/services/quickshell/shell/modules/bar/components/workspaces/ActiveIndicator.qml deleted file mode 100644 index 68073976..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/workspaces/ActiveIndicator.qml +++ /dev/null @@ -1,111 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Effects - -StyledRect { - id: root - - required property list workspaces - required property Item mask - required property real maskWidth - required property real maskHeight - required property int groupOffset - - readonly property int currentWsIdx: Hyprland.activeWsId - 1 - groupOffset - property real leading: getWsY(currentWsIdx) - property real trailing: getWsY(currentWsIdx) - property real currentSize: workspaces[currentWsIdx]?.size ?? 0 - property real offset: Math.min(leading, trailing) - property real size: { - const s = Math.abs(leading - trailing) + currentSize; - if (Config.bar.workspaces.activeTrail && lastWs > currentWsIdx) - return Math.min(getWsY(lastWs) + (workspaces[lastWs]?.size ?? 0) - offset, s); - return s; - } - - property int cWs - property int lastWs - - function getWsY(idx: int): real { - let y = 0; - for (let i = 0; i < idx; i++) - y += workspaces[i]?.size ?? 0; - return y; - } - - onCurrentWsIdxChanged: { - lastWs = cWs; - cWs = currentWsIdx; - } - - clip: true - x: 1 - y: offset + 1 - implicitWidth: Config.bar.sizes.innerHeight - 2 - implicitHeight: size - 2 - radius: Config.bar.workspaces.rounded ? Appearance.rounding.full : 0 - color: Colours.palette.m3primary - - StyledRect { - id: base - - visible: false - anchors.fill: parent - color: Colours.palette.m3onPrimary - } - - MultiEffect { - source: base - maskSource: root.mask - maskEnabled: true - maskSpreadAtMin: 1 - maskThresholdMin: 0.5 - - x: 0 - y: -parent.offset - implicitWidth: root.maskWidth - implicitHeight: root.maskHeight - - anchors.horizontalCenter: parent.horizontalCenter - } - - Behavior on leading { - enabled: Config.bar.workspaces.activeTrail - - Anim {} - } - - Behavior on trailing { - enabled: Config.bar.workspaces.activeTrail - - Anim { - duration: Appearance.anim.durations.normal * 2 - } - } - - Behavior on currentSize { - enabled: Config.bar.workspaces.activeTrail - - Anim {} - } - - Behavior on offset { - enabled: !Config.bar.workspaces.activeTrail - - Anim {} - } - - Behavior on size { - enabled: !Config.bar.workspaces.activeTrail - - Anim {} - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/workspaces/OccupiedBg.qml b/modules/home/services/quickshell/shell/modules/bar/components/workspaces/OccupiedBg.qml deleted file mode 100644 index c5ed7ccb..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/workspaces/OccupiedBg.qml +++ /dev/null @@ -1,99 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick - -Item { - id: root - - required property list workspaces - required property var occupied - required property int groupOffset - - property list pills: [] - - onOccupiedChanged: { - let count = 0; - const start = groupOffset; - const end = start + Config.bar.workspaces.shown; - for (const [ws, occ] of Object.entries(occupied)) { - if (ws > start && ws <= end && occ) { - if (!occupied[ws - 1]) { - if (pills[count]) - pills[count].start = ws; - else - pills.push(pillComp.createObject(root, { - start: ws - })); - count++; - } - if (!occupied[ws + 1]) - pills[count - 1].end = ws; - } - } - if (pills.length > count) - pills.splice(count, pills.length - count).forEach(p => p.destroy()); - } - - Repeater { - model: ScriptModel { - values: root.pills.filter(p => p) - } - - StyledRect { - id: rect - - required property var modelData - - readonly property Workspace start: root.workspaces[modelData.start - 1 - root.groupOffset] ?? null - readonly property Workspace end: root.workspaces[modelData.end - 1 - root.groupOffset] ?? null - - color: Colours.alpha(Colours.palette.m3surfaceContainerHigh, true) - radius: Config.bar.workspaces.rounded ? Appearance.rounding.full : 0 - - x: start?.x ?? 0 - y: start?.y ?? 0 - implicitWidth: Config.bar.sizes.innerHeight - implicitHeight: end?.y + end?.height - start?.y - - anchors.horizontalCenter: parent.horizontalCenter - - scale: 0 - Component.onCompleted: scale = 1 - - Behavior on scale { - Anim { - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - } - - Behavior on x { - Anim {} - } - - Behavior on y { - Anim {} - } - } - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - - component Pill: QtObject { - property int start - property int end - } - - Component { - id: pillComp - - Pill {} - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/workspaces/Workspace.qml b/modules/home/services/quickshell/shell/modules/bar/components/workspaces/Workspace.qml deleted file mode 100644 index 0e0fcc99..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/workspaces/Workspace.qml +++ /dev/null @@ -1,106 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/utils" -import "root:/config" -import Quickshell -import QtQuick -import QtQuick.Layouts - -Item { - id: root - - required property int index - required property var occupied - required property int groupOffset - - readonly property bool isWorkspace: true // Flag for finding workspace children - // Unanimated prop for others to use as reference - readonly property real size: childrenRect.height + (hasWindows ? Appearance.padding.smaller : 0) - - readonly property int ws: groupOffset + index + 1 - readonly property bool isOccupied: occupied[ws] ?? false - readonly property bool hasWindows: isOccupied && Config.bar.workspaces.showWindows - - Layout.preferredWidth: childrenRect.width - Layout.preferredHeight: size - - StyledText { - id: indicator - - readonly property string label: Config.bar.workspaces.label || root.ws - readonly property string occupiedLabel: Config.bar.workspaces.occupiedLabel || label - readonly property string activeLabel: Config.bar.workspaces.activeLabel || (root.isOccupied ? occupiedLabel : label) - - animate: true - text: Hyprland.activeWsId === root.ws ? activeLabel : root.isOccupied ? occupiedLabel : label - color: Config.bar.workspaces.occupiedBg || root.isOccupied || Hyprland.activeWsId === root.ws ? Colours.palette.m3onSurface : Colours.palette.m3outlineVariant - horizontalAlignment: StyledText.AlignHCenter - verticalAlignment: StyledText.AlignVCenter - - width: Config.bar.sizes.innerHeight - height: Config.bar.sizes.innerHeight - } - - Loader { - id: windows - - active: Config.bar.workspaces.showWindows - asynchronous: true - - anchors.horizontalCenter: indicator.horizontalCenter - anchors.top: indicator.bottom - anchors.topMargin: -Config.bar.sizes.innerHeight / 10 - - sourceComponent: Column { - spacing: 0 - - add: Transition { - Anim { - properties: "scale" - from: 0 - to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - } - - move: Transition { - Anim { - properties: "scale" - to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - Anim { - properties: "x,y" - } - } - - Repeater { - model: ScriptModel { - values: Hyprland.toplevels.values.filter(c => c.workspace?.id === root.ws) - } - - MaterialIcon { - required property var modelData - - grade: 0 - text: Icons.getAppCategoryIcon(modelData.lastIpcObject.class, "terminal") - color: Colours.palette.m3onSurfaceVariant - } - } - } - } - - Behavior on Layout.preferredWidth { - Anim {} - } - - Behavior on Layout.preferredHeight { - Anim {} - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/components/workspaces/Workspaces.qml b/modules/home/services/quickshell/shell/modules/bar/components/workspaces/Workspaces.qml deleted file mode 100644 index 92647625..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/components/workspaces/Workspaces.qml +++ /dev/null @@ -1,75 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Layouts - -Item { - id: root - - readonly property list workspaces: layout.children.filter(c => c.isWorkspace).sort((w1, w2) => w1.ws - w2.ws) - readonly property var occupied: Hyprland.workspaces.values.reduce((acc, curr) => { - acc[curr.id] = curr.lastIpcObject.windows > 0; - return acc; - }, {}) - readonly property int groupOffset: Math.floor((Hyprland.activeWsId - 1) / Config.bar.workspaces.shown) * Config.bar.workspaces.shown - - implicitWidth: layout.implicitWidth - implicitHeight: layout.implicitHeight - - ColumnLayout { - id: layout - - spacing: 0 - layer.enabled: true - layer.smooth: true - - Repeater { - model: Config.bar.workspaces.shown - - Workspace { - occupied: root.occupied - groupOffset: root.groupOffset - } - } - } - - Loader { - active: Config.bar.workspaces.occupiedBg - asynchronous: true - - z: -1 - anchors.fill: parent - - sourceComponent: OccupiedBg { - workspaces: root.workspaces - occupied: root.occupied - groupOffset: root.groupOffset - } - } - - Loader { - active: Config.bar.workspaces.activeIndicator - asynchronous: true - - sourceComponent: ActiveIndicator { - workspaces: root.workspaces - mask: layout - maskWidth: root.width - maskHeight: root.height - groupOffset: root.groupOffset - } - } - - MouseArea { - anchors.fill: parent - - onPressed: event => { - const ws = layout.childAt(event.x, event.y).index + root.groupOffset + 1; - if (Hyprland.activeWsId !== ws) - Hyprland.dispatch(`workspace ${ws}`); - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/popouts/ActiveWindow.qml b/modules/home/services/quickshell/shell/modules/bar/popouts/ActiveWindow.qml deleted file mode 100644 index 9575ddea..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/popouts/ActiveWindow.qml +++ /dev/null @@ -1,102 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/utils" -import "root:/config" -import Quickshell.Widgets -import Quickshell.Wayland -import QtQuick -import QtQuick.Layouts - -Item { - id: root - - required property Item wrapper - - implicitWidth: Hyprland.activeToplevel ? child.implicitWidth : -Appearance.padding.large * 2 - implicitHeight: child.implicitHeight - - Column { - id: child - - anchors.centerIn: parent - spacing: Appearance.spacing.normal - - RowLayout { - id: detailsRow - - anchors.left: parent.left - anchors.right: parent.right - spacing: Appearance.spacing.normal - - IconImage { - id: icon - - Layout.alignment: Qt.AlignVCenter - implicitSize: details.implicitHeight - source: Icons.getAppIcon(Hyprland.activeToplevel?.lastIpcObject.class ?? "", "image-missing") - } - - ColumnLayout { - id: details - - spacing: 0 - Layout.fillWidth: true - - StyledText { - Layout.fillWidth: true - text: Hyprland.activeToplevel?.title ?? "" - font.pointSize: Appearance.font.size.normal - elide: Text.ElideRight - } - - StyledText { - Layout.fillWidth: true - text: Hyprland.activeToplevel?.lastIpcObject.class ?? "" - color: Colours.palette.m3onSurfaceVariant - elide: Text.ElideRight - } - } - - Item { - implicitWidth: expandIcon.implicitHeight + Appearance.padding.small * 2 - implicitHeight: expandIcon.implicitHeight + Appearance.padding.small * 2 - - Layout.alignment: Qt.AlignVCenter - - StateLayer { - radius: Appearance.rounding.normal - - function onClicked(): void { - root.wrapper.detach("winfo"); - } - } - - MaterialIcon { - id: expandIcon - - anchors.centerIn: parent - anchors.horizontalCenterOffset: font.pointSize * 0.05 - - text: "chevron_right" - - font.pointSize: Appearance.font.size.large - } - } - } - - ClippingWrapperRectangle { - color: "transparent" - radius: Appearance.rounding.small - - ScreencopyView { - id: preview - - captureSource: Hyprland.activeToplevel?.wayland ?? null - live: visible - - constraintSize.width: Config.bar.sizes.windowPreviewSize - constraintSize.height: Config.bar.sizes.windowPreviewSize - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/popouts/Background.qml b/modules/home/services/quickshell/shell/modules/bar/popouts/Background.qml deleted file mode 100644 index 6aeb205e..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/popouts/Background.qml +++ /dev/null @@ -1,84 +0,0 @@ -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - required property Wrapper wrapper - required property bool invertBottomRounding - readonly property real rounding: Config.border.rounding - readonly property bool flatten: wrapper.width < rounding * 2 - readonly property real roundingX: flatten ? wrapper.width / 2 : rounding - property real ibr: invertBottomRounding ? -1 : 1 - - property real sideRounding: startX > 0 ? -1 : 1 - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - PathArc { - relativeX: root.roundingX - relativeY: root.rounding * root.sideRounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - direction: root.sideRounding < 0 ? PathArc.Clockwise : PathArc.Counterclockwise - } - PathLine { - relativeX: root.wrapper.width - root.roundingX * 2 - relativeY: 0 - } - PathArc { - relativeX: root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - } - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.rounding * 2 - } - PathArc { - relativeX: -root.roundingX * root.ibr - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - direction: root.ibr < 0 ? PathArc.Counterclockwise : PathArc.Clockwise - } - PathLine { - relativeX: -(root.wrapper.width - root.roundingX - root.roundingX * root.ibr) - relativeY: 0 - } - PathArc { - relativeX: -root.roundingX - relativeY: root.rounding * root.sideRounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - direction: root.sideRounding < 0 ? PathArc.Clockwise : PathArc.Counterclockwise - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on ibr { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on sideRounding { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/popouts/Battery.qml b/modules/home/services/quickshell/shell/modules/bar/popouts/Battery.qml deleted file mode 100644 index ebd0fc82..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/popouts/Battery.qml +++ /dev/null @@ -1,235 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell.Services.UPower -import QtQuick - -Column { - id: root - - spacing: Appearance.spacing.normal - width: Config.bar.sizes.batteryWidth - - StyledText { - text: UPower.displayDevice.isLaptopBattery ? qsTr("Remaining: %1%").arg(Math.round(UPower.displayDevice.percentage * 100)) : qsTr("No battery detected") - } - - StyledText { - function formatSeconds(s: int, fallback: string): string { - const day = Math.floor(s / 86400); - const hr = Math.floor(s / 3600) % 60; - const min = Math.floor(s / 60) % 60; - - let comps = []; - if (day > 0) - comps.push(`${day} days`); - if (hr > 0) - comps.push(`${hr} hours`); - if (min > 0) - comps.push(`${min} mins`); - - return comps.join(", ") || fallback; - } - - text: UPower.displayDevice.isLaptopBattery ? qsTr("Time %1: %2").arg(UPower.onBattery ? "remaining" : "until charged").arg(UPower.onBattery ? formatSeconds(UPower.displayDevice.timeToEmpty, "Calculating...") : formatSeconds(UPower.displayDevice.timeToFull, "Fully charged!")) : qsTr("Power profile: %1").arg(PowerProfile.toString(PowerProfiles.profile)) - } - - Loader { - anchors.horizontalCenter: parent.horizontalCenter - - active: PowerProfiles.degradationReason !== PerformanceDegradationReason.None - asynchronous: true - - height: active ? (item?.implicitHeight ?? 0) : 0 - - sourceComponent: StyledRect { - implicitWidth: child.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: child.implicitHeight + Appearance.padding.smaller * 2 - - color: Colours.palette.m3error - radius: Appearance.rounding.normal - - Column { - id: child - - anchors.centerIn: parent - - Row { - anchors.horizontalCenter: parent.horizontalCenter - spacing: Appearance.spacing.small - - MaterialIcon { - anchors.verticalCenter: parent.verticalCenter - anchors.verticalCenterOffset: -font.pointSize / 10 - - text: "warning" - color: Colours.palette.m3onError - } - - StyledText { - anchors.verticalCenter: parent.verticalCenter - text: qsTr("Performance Degraded") - color: Colours.palette.m3onError - font.family: Appearance.font.family.mono - font.weight: 500 - } - - MaterialIcon { - anchors.verticalCenter: parent.verticalCenter - anchors.verticalCenterOffset: -font.pointSize / 10 - - text: "warning" - color: Colours.palette.m3onError - } - } - - StyledText { - anchors.horizontalCenter: parent.horizontalCenter - - text: qsTr("Reason: %1").arg(PerformanceDegradationReason.toString(PowerProfiles.degradationReason)) - color: Colours.palette.m3onError - } - } - } - } - - StyledRect { - id: profiles - - property string current: { - const p = PowerProfiles.profile; - if (p === PowerProfile.PowerSaver) - return saver.icon; - if (p === PowerProfile.Performance) - return perf.icon; - return balance.icon; - } - - anchors.horizontalCenter: parent.horizontalCenter - - implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Appearance.padding.normal * 2 + Appearance.spacing.large * 2 - implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Appearance.padding.small * 2 - - color: Colours.palette.m3surfaceContainer - radius: Appearance.rounding.full - - StyledRect { - id: indicator - - color: Colours.palette.m3primary - radius: Appearance.rounding.full - state: profiles.current - - states: [ - State { - name: saver.icon - - Fill { - item: saver - } - }, - State { - name: balance.icon - - Fill { - item: balance - } - }, - State { - name: perf.icon - - Fill { - item: perf - } - } - ] - - transitions: Transition { - AnchorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - } - - Profile { - id: saver - - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: Appearance.padding.small - - profile: PowerProfile.PowerSaver - icon: "energy_savings_leaf" - } - - Profile { - id: balance - - anchors.centerIn: parent - - profile: PowerProfile.Balanced - icon: "balance" - } - - Profile { - id: perf - - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: Appearance.padding.small - - profile: PowerProfile.Performance - icon: "rocket_launch" - } - } - - component Fill: AnchorChanges { - required property Item item - - target: indicator - anchors.left: item.left - anchors.right: item.right - anchors.top: item.top - anchors.bottom: item.bottom - } - - component Profile: Item { - required property string icon - required property int profile - - implicitWidth: icon.implicitHeight + Appearance.padding.small * 2 - implicitHeight: icon.implicitHeight + Appearance.padding.small * 2 - - StateLayer { - radius: Appearance.rounding.full - color: profiles.current === parent.icon ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface - - function onClicked(): void { - PowerProfiles.profile = parent.profile; - } - } - - MaterialIcon { - id: icon - - anchors.centerIn: parent - - text: parent.icon - font.pointSize: Appearance.font.size.large - color: profiles.current === text ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface - fill: profiles.current === text ? 1 : 0 - - Behavior on fill { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/popouts/Bluetooth.qml b/modules/home/services/quickshell/shell/modules/bar/popouts/Bluetooth.qml deleted file mode 100644 index ad7d087c..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/popouts/Bluetooth.qml +++ /dev/null @@ -1,18 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -Column { - id: root - - spacing: Appearance.spacing.normal - - StyledText { - text: qsTr("Bluetooth %1").arg(Bluetooth.powered ? "enabled" : "disabled") - } - - StyledText { - text: Bluetooth.devices.some(d => d.connected) ? qsTr("Connected to: %1").arg(Bluetooth.devices.filter(d => d.connected).map(d => d.alias).join(", ")) : qsTr("No devices connected") - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/popouts/Content.qml b/modules/home/services/quickshell/shell/modules/bar/popouts/Content.qml deleted file mode 100644 index 2c10e5fc..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/popouts/Content.qml +++ /dev/null @@ -1,151 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Services.SystemTray -import QtQuick - -Item { - id: root - - required property Item wrapper - required property ShellScreen screen - required property string currentName - required property real currentCenter - required property bool hasCurrent - - anchors.centerIn: parent - - implicitWidth: (content.children.find(c => c.shouldBeActive)?.implicitWidth ?? 0) + Appearance.padding.large * 2 - implicitHeight: (content.children.find(c => c.shouldBeActive)?.implicitHeight ?? 0) + Appearance.padding.large * 2 - - Item { - id: content - - anchors.fill: parent - anchors.margins: Appearance.padding.large - - Popout { - name: "activewindow" - sourceComponent: ActiveWindow { - wrapper: root.wrapper - } - } - - Popout { - name: "network" - source: "Network.qml" - } - - Popout { - name: "bluetooth" - source: "Bluetooth.qml" - } - - Popout { - name: "battery" - source: "Battery.qml" - } - - Repeater { - model: ScriptModel { - values: [...SystemTray.items.values] - } - - Popout { - id: trayMenu - - required property SystemTrayItem modelData - required property int index - - name: `traymenu${index}` - sourceComponent: trayMenuComp - - Connections { - target: root - - function onHasCurrentChanged(): void { - if (root.hasCurrent && trayMenu.shouldBeActive) { - trayMenu.sourceComponent = null; - trayMenu.sourceComponent = trayMenuComp; - } - } - } - - Component { - id: trayMenuComp - - TrayMenu { - popouts: root - trayItem: trayMenu.modelData.menu - } - } - } - } - } - - component Popout: Loader { - id: popout - - required property string name - property bool shouldBeActive: root.currentName === name - - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - - opacity: 0 - scale: 0.8 - active: false - asynchronous: true - - states: State { - name: "active" - when: popout.shouldBeActive - - PropertyChanges { - popout.active: true - popout.opacity: 1 - popout.scale: 1 - } - } - - transitions: [ - Transition { - from: "active" - to: "" - - SequentialAnimation { - Anim { - properties: "opacity,scale" - duration: Appearance.anim.durations.small - } - PropertyAction { - target: popout - property: "active" - } - } - }, - Transition { - from: "" - to: "active" - - SequentialAnimation { - PropertyAction { - target: popout - property: "active" - } - Anim { - properties: "opacity,scale" - } - } - } - ] - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/popouts/Network.qml b/modules/home/services/quickshell/shell/modules/bar/popouts/Network.qml deleted file mode 100644 index 7a79ef15..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/popouts/Network.qml +++ /dev/null @@ -1,22 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -Column { - id: root - - spacing: Appearance.spacing.normal - - StyledText { - text: qsTr("Connected to: %1").arg(Network.active?.ssid ?? "None") - } - - StyledText { - text: qsTr("Strength: %1/100").arg(Network.active?.strength ?? 0) - } - - StyledText { - text: qsTr("Frequency: %1 MHz").arg(Network.active?.frequency ?? 0) - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/popouts/TrayMenu.qml b/modules/home/services/quickshell/shell/modules/bar/popouts/TrayMenu.qml deleted file mode 100644 index 433de7fd..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/popouts/TrayMenu.qml +++ /dev/null @@ -1,237 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import QtQuick -import QtQuick.Controls - -StackView { - id: root - - required property Item popouts - required property QsMenuHandle trayItem - - implicitWidth: currentItem.implicitWidth - implicitHeight: currentItem.implicitHeight - - initialItem: SubMenu { - handle: root.trayItem - } - - pushEnter: Anim {} - pushExit: Anim {} - popEnter: Anim {} - popExit: Anim {} - - component Anim: Transition { - NumberAnimation { - duration: 0 - } - } - - component SubMenu: Column { - id: menu - - required property QsMenuHandle handle - property bool isSubMenu - property bool shown - - padding: Appearance.padding.smaller - spacing: Appearance.spacing.small - - opacity: shown ? 1 : 0 - scale: shown ? 1 : 0.8 - - Component.onCompleted: shown = true - StackView.onActivating: shown = true - StackView.onDeactivating: shown = false - StackView.onRemoved: destroy() - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on scale { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - QsMenuOpener { - id: menuOpener - - menu: menu.handle - } - - Repeater { - model: menuOpener.children - - StyledRect { - id: item - - required property QsMenuEntry modelData - - implicitWidth: Config.bar.sizes.trayMenuWidth - implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight - - radius: Appearance.rounding.full - color: modelData.isSeparator ? Colours.palette.m3outlineVariant : "transparent" - - Loader { - id: children - - anchors.left: parent.left - anchors.right: parent.right - - active: !item.modelData.isSeparator - asynchronous: true - - sourceComponent: Item { - implicitHeight: label.implicitHeight - - StateLayer { - anchors.margins: -Appearance.padding.small / 2 - anchors.leftMargin: -Appearance.padding.smaller - anchors.rightMargin: -Appearance.padding.smaller - - radius: item.radius - disabled: !item.modelData.enabled - - function onClicked(): void { - const entry = item.modelData; - if (entry.hasChildren) - root.push(subMenuComp.createObject(null, { - handle: entry, - isSubMenu: true - })); - else { - item.modelData.triggered(); - root.popouts.hasCurrent = false; - } - } - } - - Loader { - id: icon - - anchors.left: parent.left - - active: item.modelData.icon !== "" - asynchronous: true - - sourceComponent: IconImage { - implicitSize: label.implicitHeight - - source: item.modelData.icon - } - } - - StyledText { - id: label - - anchors.left: icon.right - anchors.leftMargin: icon.active ? Appearance.spacing.smaller : 0 - - text: labelMetrics.elidedText - color: item.modelData.enabled ? Colours.palette.m3onSurface : Colours.palette.m3outline - } - - TextMetrics { - id: labelMetrics - - text: item.modelData.text - font.pointSize: label.font.pointSize - font.family: label.font.family - - elide: Text.ElideRight - elideWidth: Config.bar.sizes.trayMenuWidth - (icon.active ? icon.implicitWidth + label.anchors.leftMargin : 0) - (expand.active ? expand.implicitWidth + Appearance.spacing.normal : 0) - } - - Loader { - id: expand - - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - - active: item.modelData.hasChildren - asynchronous: true - - sourceComponent: MaterialIcon { - text: "chevron_right" - color: item.modelData.enabled ? Colours.palette.m3onSurface : Colours.palette.m3outline - } - } - } - } - } - } - - Loader { - active: menu.isSubMenu - asynchronous: true - - sourceComponent: Item { - implicitWidth: back.implicitWidth - implicitHeight: back.implicitHeight + Appearance.spacing.small / 2 - - Item { - anchors.bottom: parent.bottom - implicitWidth: back.implicitWidth - implicitHeight: back.implicitHeight - - StyledRect { - anchors.fill: parent - anchors.margins: -Appearance.padding.small / 2 - anchors.leftMargin: -Appearance.padding.smaller - anchors.rightMargin: -Appearance.padding.smaller * 2 - - radius: Appearance.rounding.full - color: Colours.palette.m3secondaryContainer - - StateLayer { - radius: parent.radius - color: Colours.palette.m3onSecondaryContainer - - function onClicked(): void { - root.pop(); - } - } - } - - Row { - id: back - - anchors.verticalCenter: parent.verticalCenter - - MaterialIcon { - anchors.verticalCenter: parent.verticalCenter - text: "chevron_left" - color: Colours.palette.m3onSecondaryContainer - } - - StyledText { - anchors.verticalCenter: parent.verticalCenter - text: qsTr("Back") - color: Colours.palette.m3onSecondaryContainer - } - } - } - } - } - } - - Component { - id: subMenuComp - - SubMenu {} - } -} diff --git a/modules/home/services/quickshell/shell/modules/bar/popouts/Wrapper.qml b/modules/home/services/quickshell/shell/modules/bar/popouts/Wrapper.qml deleted file mode 100644 index 6bab78c3..00000000 --- a/modules/home/services/quickshell/shell/modules/bar/popouts/Wrapper.qml +++ /dev/null @@ -1,181 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/services" -import "root:/config" -import "root:/modules/windowinfo" -import Quickshell -import Quickshell.Wayland -import Quickshell.Hyprland -import QtQuick - -Item { - id: root - - required property ShellScreen screen - - readonly property real nonAnimWidth: x > 0 || hasCurrent ? children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth : 0 - readonly property real nonAnimHeight: children.find(c => c.shouldBeActive)?.implicitHeight ?? content.implicitHeight - - property string currentName - property real currentCenter - property bool hasCurrent - - property string detachedMode - readonly property bool isDetached: detachedMode.length > 0 - - property int animLength: Appearance.anim.durations.normal - property list animCurve: Appearance.anim.curves.emphasized - - function detach(mode: string): void { - animLength = Appearance.anim.durations.large; - detachedMode = mode; - focus = true; - } - - function close(): void { - hasCurrent = false; - animCurve = Appearance.anim.curves.emphasizedAccel; - animLength = Appearance.anim.durations.normal; - detachedMode = ""; - animCurve = Appearance.anim.curves.emphasized; - } - - visible: width > 0 && height > 0 - clip: true - - implicitWidth: nonAnimWidth - implicitHeight: nonAnimHeight - - Keys.onEscapePressed: close() - - HyprlandFocusGrab { - active: root.isDetached - windows: [QsWindow.window] - onCleared: root.close() - } - - Binding { - when: root.isDetached - - target: QsWindow.window - property: "WlrLayershell.keyboardFocus" - value: WlrKeyboardFocus.OnDemand - } - - Comp { - id: content - - shouldBeActive: !root.detachedMode - asynchronous: true - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - - sourceComponent: Content { - wrapper: root - screen: root.screen - currentName: root.currentName - currentCenter: root.currentCenter - hasCurrent: root.hasCurrent - } - } - - Comp { - shouldBeActive: root.detachedMode === "winfo" - asynchronous: true - anchors.centerIn: parent - - sourceComponent: WindowInfo { - screen: root.screen - client: Hyprland.activeToplevel - } - } - - Behavior on x { - Anim { - duration: root.animLength - easing.bezierCurve: root.animCurve - } - } - - Behavior on y { - enabled: root.implicitWidth > 0 - - Anim { - duration: root.animLength - easing.bezierCurve: root.animCurve - } - } - - Behavior on implicitWidth { - Anim { - duration: root.animLength - easing.bezierCurve: root.animCurve - } - } - - Behavior on implicitHeight { - enabled: root.implicitWidth > 0 - - Anim { - duration: root.animLength - easing.bezierCurve: root.animCurve - } - } - - component Comp: Loader { - id: comp - - property bool shouldBeActive - - asynchronous: true - active: false - opacity: 0 - - states: State { - name: "active" - when: comp.shouldBeActive - - PropertyChanges { - comp.opacity: 1 - comp.active: true - } - } - - transitions: [ - Transition { - from: "" - to: "active" - - SequentialAnimation { - PropertyAction { - property: "active" - } - Anim { - property: "opacity" - easing.bezierCurve: Appearance.anim.curves.standard - } - } - }, - Transition { - from: "active" - to: "" - - SequentialAnimation { - Anim { - property: "opacity" - easing.bezierCurve: Appearance.anim.curves.standard - } - PropertyAction { - property: "active" - } - } - } - ] - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/Background.qml b/modules/home/services/quickshell/shell/modules/dashboard/Background.qml deleted file mode 100644 index 41aaddd9..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/Background.qml +++ /dev/null @@ -1,69 +0,0 @@ -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - required property Wrapper wrapper - readonly property real rounding: Config.border.rounding - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - PathArc { - relativeX: root.rounding - relativeY: root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - } - - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY * 2 - } - - PathArc { - relativeX: root.rounding - relativeY: root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - direction: PathArc.Counterclockwise - } - - PathLine { - relativeX: root.wrapper.width - root.rounding * 2 - relativeY: 0 - } - - PathArc { - relativeX: root.rounding - relativeY: -root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - direction: PathArc.Counterclockwise - } - - PathLine { - relativeX: 0 - relativeY: -(root.wrapper.height - root.roundingY * 2) - } - - PathArc { - relativeX: root.rounding - relativeY: -root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/Content.qml b/modules/home/services/quickshell/shell/modules/dashboard/Content.qml deleted file mode 100644 index 4f4e2421..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/Content.qml +++ /dev/null @@ -1,139 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import QtQuick -import QtQuick.Layouts - -Item { - id: root - - required property PersistentProperties visibilities - required property PersistentProperties state - readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2 - - implicitWidth: nonAnimWidth - implicitHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins * 2 - - Tabs { - id: tabs - - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - anchors.topMargin: Appearance.padding.normal - anchors.margins: Appearance.padding.large - - nonAnimWidth: root.nonAnimWidth - anchors.margins * 2 - state: root.state - } - - ClippingRectangle { - id: viewWrapper - - anchors.top: tabs.bottom - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: Appearance.padding.large - - radius: Appearance.rounding.normal - color: "transparent" - - Flickable { - id: view - - readonly property int currentIndex: root.state.currentTab - readonly property Item currentItem: row.children[currentIndex] - - anchors.fill: parent - - flickableDirection: Flickable.HorizontalFlick - - implicitWidth: currentItem.implicitWidth - implicitHeight: currentItem.implicitHeight - - contentX: currentItem.x - contentWidth: row.implicitWidth - contentHeight: row.implicitHeight - - onContentXChanged: { - if (!moving) - return; - - const x = contentX - currentItem.x; - if (x > currentItem.implicitWidth / 2) - root.state.currentTab = Math.min(root.state.currentTab + 1, tabs.count - 1); - else if (x < -currentItem.implicitWidth / 2) - root.state.currentTab = Math.max(root.state.currentTab - 1, 0); - } - - onDragEnded: { - const x = contentX - currentItem.x; - if (x > currentItem.implicitWidth / 10) - root.state.currentTab = Math.min(root.state.currentTab + 1, tabs.count - 1); - else if (x < -currentItem.implicitWidth / 10) - root.state.currentTab = Math.max(root.state.currentTab - 1, 0); - else - contentX = Qt.binding(() => currentItem.x); - } - - RowLayout { - id: row - - Pane { - sourceComponent: Dash { - visibilities: root.visibilities - } - } - - Pane { - sourceComponent: Media { - visibilities: root.visibilities - } - } - - Pane { - sourceComponent: Performance {} - } - } - - Behavior on contentX { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - } - - Behavior on implicitWidth { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - component Pane: Loader { - Layout.alignment: Qt.AlignTop - - Component.onCompleted: active = Qt.binding(() => { - const vx = Math.floor(view.visibleArea.xPosition * view.contentWidth); - const vex = Math.floor(vx + view.visibleArea.widthRatio * view.contentWidth); - return (vx >= x && vx <= x + implicitWidth) || (vex >= x && vex <= x + implicitWidth); - }) - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/Dash.qml b/modules/home/services/quickshell/shell/modules/dashboard/Dash.qml deleted file mode 100644 index 56312baf..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/Dash.qml +++ /dev/null @@ -1,86 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import "dash" -import QtQuick.Layouts - -GridLayout { - id: root - - required property var visibilities - - rowSpacing: Appearance.spacing.normal - columnSpacing: Appearance.spacing.normal - - Rect { - Layout.column: 2 - Layout.columnSpan: 3 - Layout.preferredWidth: user.implicitWidth - Layout.preferredHeight: user.implicitHeight - - User { - id: user - - visibilities: root.visibilities - } - } - - Rect { - Layout.row: 0 - Layout.columnSpan: 2 - Layout.preferredWidth: Config.dashboard.sizes.weatherWidth - Layout.fillHeight: true - - Weather {} - } - - Rect { - Layout.row: 1 - Layout.preferredWidth: dateTime.implicitWidth - Layout.fillHeight: true - - DateTime { - id: dateTime - } - } - - Rect { - Layout.row: 1 - Layout.column: 1 - Layout.columnSpan: 3 - Layout.fillWidth: true - Layout.preferredHeight: calendar.implicitHeight - - Calendar { - id: calendar - } - } - - Rect { - Layout.row: 1 - Layout.column: 4 - Layout.preferredWidth: resources.implicitWidth - Layout.fillHeight: true - - Resources { - id: resources - } - } - - Rect { - Layout.row: 0 - Layout.column: 5 - Layout.rowSpan: 2 - Layout.preferredWidth: media.implicitWidth - Layout.fillHeight: true - - Media { - id: media - } - } - - component Rect: StyledRect { - radius: Appearance.rounding.small - color: Colours.palette.m3surfaceContainer - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/Media.qml b/modules/home/services/quickshell/shell/modules/dashboard/Media.qml deleted file mode 100644 index fd36b53f..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/Media.qml +++ /dev/null @@ -1,599 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/utils" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import Quickshell.Services.Mpris -import QtQuick -import QtQuick.Controls -import QtQuick.Effects -import QtQuick.Layouts - -Item { - id: root - - required property PersistentProperties visibilities - - property real playerProgress: { - const active = Players.active; - return active?.length ? active.position / active.length : 0; - } - - function lengthStr(length: int): string { - if (length < 0) - return "-1:-1"; - return `${Math.floor(length / 60)}:${Math.floor(length % 60).toString().padStart(2, "0")}`; - } - - implicitWidth: cover.implicitWidth + Config.dashboard.sizes.mediaVisualiserSize * 2 + details.implicitWidth + details.anchors.leftMargin + bongocat.implicitWidth + bongocat.anchors.leftMargin * 2 + Appearance.padding.large * 2 - implicitHeight: Math.max(cover.implicitHeight + Config.dashboard.sizes.mediaVisualiserSize * 2, details.implicitHeight, bongocat.implicitHeight) + Appearance.padding.large * 2 - - Behavior on playerProgress { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Timer { - running: Players.active?.isPlaying ?? false - interval: Config.dashboard.mediaUpdateInterval - triggeredOnStart: true - repeat: true - onTriggered: Players.active?.positionChanged() - } - - Connections { - target: Cava - - function onValuesChanged(): void { - visualiser.requestPaint(); - } - } - - Canvas { - id: visualiser - - readonly property real centerX: width / 2 - readonly property real centerY: height / 2 - readonly property real innerX: cover.implicitWidth / 2 + Appearance.spacing.small - readonly property real innerY: cover.implicitHeight / 2 + Appearance.spacing.small - property color colour: Colours.palette.m3primary - - anchors.fill: cover - anchors.margins: -Config.dashboard.sizes.mediaVisualiserSize - - onColourChanged: requestPaint() - - onPaint: { - const ctx = getContext("2d"); - ctx.reset(); - - const values = Cava.values; - const len = values.length; - - ctx.strokeStyle = colour; - ctx.lineWidth = 360 / len - Appearance.spacing.small / 4; - ctx.lineCap = "round"; - - const size = Config.dashboard.sizes.mediaVisualiserSize; - const cx = centerX; - const cy = centerY; - const rx = innerX + ctx.lineWidth / 2; - const ry = innerY + ctx.lineWidth / 2; - - for (let i = 0; i < len; i++) { - const v = Math.max(1, Math.min(100, values[i])); - - const angle = i * 2 * Math.PI / len; - const magnitude = v / 100 * size; - const cos = Math.cos(angle); - const sin = Math.sin(angle); - - ctx.moveTo(cx + rx * cos, cy + ry * sin); - ctx.lineTo(cx + (rx + magnitude) * cos, cy + (ry + magnitude) * sin); - } - - ctx.stroke(); - } - - Behavior on colour { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Ref { - service: Cava - } - } - - StyledClippingRect { - id: cover - - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: Appearance.padding.large + Config.dashboard.sizes.mediaVisualiserSize - - implicitWidth: Config.dashboard.sizes.mediaCoverArtSize - implicitHeight: Config.dashboard.sizes.mediaCoverArtSize - - color: Colours.palette.m3surfaceContainerHigh - radius: Appearance.rounding.full - - MaterialIcon { - anchors.centerIn: parent - - grade: 200 - text: "art_track" - color: Colours.palette.m3onSurfaceVariant - font.pointSize: (parent.width * 0.4) || 1 - } - - Image { - id: image - - anchors.fill: parent - - source: Players.active?.trackArtUrl ?? "" - asynchronous: true - fillMode: Image.PreserveAspectCrop - sourceSize.width: width - sourceSize.height: height - } - } - - ColumnLayout { - id: details - - anchors.verticalCenter: parent.verticalCenter - anchors.left: visualiser.right - anchors.leftMargin: Appearance.spacing.normal - - spacing: Appearance.spacing.small - - ElideText { - id: title - - label: (Players.active?.trackTitle ?? qsTr("No media")) || qsTr("Unknown title") - color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.normal - } - - ElideText { - id: album - - label: (Players.active?.trackAlbum ?? qsTr("No media")) || qsTr("Unknown album") - color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small - } - - ElideText { - id: artist - - label: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist") - color: Colours.palette.m3secondary - } - - RowLayout { - id: controls - - Layout.alignment: Qt.AlignHCenter - Layout.topMargin: Appearance.spacing.small - Layout.bottomMargin: Appearance.spacing.smaller - - spacing: Appearance.spacing.small - - Control { - icon: "skip_previous" - canUse: Players.active?.canGoPrevious ?? false - - function onClicked(): void { - Players.active?.previous(); - } - } - - Control { - icon: Players.active?.isPlaying ? "pause" : "play_arrow" - canUse: Players.active?.canTogglePlaying ?? false - primary: true - - function onClicked(): void { - Players.active?.togglePlaying(); - } - } - - Control { - icon: "skip_next" - canUse: Players.active?.canGoNext ?? false - - function onClicked(): void { - Players.active?.next(); - } - } - } - - Slider { - id: slider - - implicitWidth: controls.implicitWidth * 1.5 - implicitHeight: Appearance.padding.normal * 3 - - value: root.playerProgress - onMoved: { - const active = Players.active; - if (active?.canSeek && active?.positionSupported) - active.position = value * active.length; - } - - background: Item { - StyledRect { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.topMargin: slider.implicitHeight / 3 - anchors.bottomMargin: slider.implicitHeight / 3 - - implicitWidth: slider.handle.x - slider.implicitHeight / 6 - - color: Colours.palette.m3primary - radius: Appearance.rounding.full - topRightRadius: slider.implicitHeight / 15 - bottomRightRadius: slider.implicitHeight / 15 - } - - StyledRect { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.topMargin: slider.implicitHeight / 3 - anchors.bottomMargin: slider.implicitHeight / 3 - - implicitWidth: parent.width - slider.handle.x - slider.handle.implicitWidth - slider.implicitHeight / 6 - - color: Colours.palette.m3surfaceContainer - radius: Appearance.rounding.full - topLeftRadius: slider.implicitHeight / 15 - bottomLeftRadius: slider.implicitHeight / 15 - } - } - - handle: StyledRect { - id: rect - - x: slider.visualPosition * slider.availableWidth - - implicitWidth: slider.implicitHeight / 4.5 - implicitHeight: slider.implicitHeight - - color: Colours.palette.m3primary - radius: Appearance.rounding.full - - MouseArea { - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onPressed: event => event.accepted = false - } - } - } - - Item { - Layout.fillWidth: true - implicitHeight: Math.max(position.implicitHeight, length.implicitHeight) - - StyledText { - id: position - - anchors.left: parent.left - - text: root.lengthStr(Players.active?.position ?? -1) - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - } - - StyledText { - id: length - - anchors.right: parent.right - - text: root.lengthStr(Players.active?.length ?? -1) - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - } - } - - RowLayout { - Layout.alignment: Qt.AlignHCenter - spacing: Appearance.spacing.small - - Control { - icon: "flip_to_front" - canUse: Players.active?.canRaise ?? false - fontSize: Appearance.font.size.larger - padding: Appearance.padding.small - fill: false - color: Colours.palette.m3surfaceContainer - - function onClicked(): void { - Players.active?.raise(); - root.visibilities.dashboard = false; - } - } - - MouseArea { - id: playerSelector - - property bool expanded - - Layout.alignment: Qt.AlignVCenter - - implicitWidth: slider.implicitWidth / 2 - implicitHeight: currentPlayer.implicitHeight + Appearance.padding.small * 2 - - cursorShape: Qt.PointingHandCursor - onClicked: expanded = !expanded - - RectangularShadow { - anchors.fill: playerSelectorBg - - opacity: playerSelector.expanded ? 1 : 0 - radius: playerSelectorBg.radius - color: Colours.palette.m3shadow - blur: 5 - spread: 0 - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - StyledRect { - id: playerSelectorBg - - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - - implicitHeight: playersWrapper.implicitHeight + Appearance.padding.small * 2 - - color: Colours.palette.m3secondaryContainer - radius: Appearance.rounding.normal - - Item { - id: playersWrapper - - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: Appearance.padding.small - - clip: true - implicitHeight: playerSelector.expanded && Players.list.length > 1 ? players.implicitHeight : currentPlayer.implicitHeight - - Column { - id: players - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - - spacing: Appearance.spacing.small - - Repeater { - model: Players.list.filter(p => p !== Players.active) - - Row { - id: player - - required property MprisPlayer modelData - - anchors.horizontalCenter: parent.horizontalCenter - spacing: Appearance.spacing.small - - IconImage { - id: playerIcon - - source: Icons.getAppIcon(player.modelData.identity, "image-missing") - implicitSize: Math.round(identity.implicitHeight * 0.9) - } - - StyledText { - id: identity - - text: identityMetrics.elidedText - color: Colours.palette.m3onSecondaryContainer - - TextMetrics { - id: identityMetrics - - text: player.modelData.identity - font.family: identity.font.family - font.pointSize: identity.font.pointSize - elide: Text.ElideRight - elideWidth: playerSelector.implicitWidth - playerIcon.implicitWidth - player.spacing - Appearance.padding.smaller * 2 - } - - MouseArea { - - anchors.fill: parent - - cursorShape: Qt.PointingHandCursor - onClicked: { - Players.manualActive = player.modelData; - playerSelector.expanded = false; - } - } - } - } - } - - Item { - anchors.left: parent.left - anchors.right: parent.right - implicitHeight: 1 - - StyledRect { - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: -Appearance.padding.normal - color: Colours.palette.m3secondary - implicitHeight: 1 - } - } - - Row { - id: currentPlayer - - anchors.horizontalCenter: parent.horizontalCenter - spacing: Appearance.spacing.small - - IconImage { - id: currentIcon - - source: Icons.getAppIcon(Players.active?.identity ?? "", "multimedia-player") - implicitSize: Math.round(currentIdentity.implicitHeight * 0.9) - } - - StyledText { - id: currentIdentity - - animate: true - text: currentIdentityMetrics.elidedText - color: Colours.palette.m3onSecondaryContainer - - TextMetrics { - id: currentIdentityMetrics - - text: Players.active?.identity ?? "No players" - font.family: currentIdentity.font.family - font.pointSize: currentIdentity.font.pointSize - elide: Text.ElideRight - elideWidth: playerSelector.implicitWidth - currentIcon.implicitWidth - currentPlayer.spacing - Appearance.padding.smaller * 2 - } - } - } - } - - Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - } - } - } - - Control { - icon: "delete" - canUse: Players.active?.canQuit ?? false - fontSize: Appearance.font.size.larger - padding: Appearance.padding.small - fill: false - color: Colours.palette.m3surfaceContainer - - function onClicked(): void { - Players.active?.quit(); - } - } - } - } - - Item { - id: bongocat - - anchors.verticalCenter: parent.verticalCenter - anchors.left: details.right - anchors.leftMargin: Appearance.spacing.normal - - implicitWidth: visualiser.width - implicitHeight: visualiser.height - - AnimatedImage { - anchors.centerIn: parent - - width: visualiser.width * 0.75 - height: visualiser.height * 0.75 - - playing: Players.active?.isPlaying ?? false - speed: BeatDetector.bpm / 300 - source: Paths.expandTilde(Config.paths.mediaGif) - asynchronous: true - fillMode: AnimatedImage.PreserveAspectFit - } - } - - component ElideText: StyledText { - id: elideText - - property alias label: metrics.text - - Layout.fillWidth: true - - animate: true - horizontalAlignment: Text.AlignHCenter - text: metrics.elidedText - - TextMetrics { - id: metrics - - font.family: elideText.font.family - font.pointSize: elideText.font.pointSize - elide: Text.ElideRight - elideWidth: elideText.width - } - } - - component Control: StyledRect { - id: control - - required property string icon - required property bool canUse - property int fontSize: Appearance.font.size.extraLarge - property int padding - property bool fill: true - property bool primary - function onClicked(): void { - } - - implicitWidth: Math.max(icon.implicitWidth, icon.implicitHeight) + padding * 2 - implicitHeight: implicitWidth - - radius: Appearance.rounding.full - color: primary && canUse ? Colours.palette.m3primary : "transparent" - - StateLayer { - disabled: !control.canUse - radius: parent.radius - color: control.primary ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface - - function onClicked(): void { - control.onClicked(); - } - } - - MaterialIcon { - id: icon - - anchors.centerIn: parent - anchors.horizontalCenterOffset: -font.pointSize * 0.02 - anchors.verticalCenterOffset: font.pointSize * 0.02 - - animate: true - fill: control.fill ? 1 : 0 - text: control.icon - color: control.canUse ? control.primary ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface : Colours.palette.m3outline - font.pointSize: control.fontSize - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/Performance.qml b/modules/home/services/quickshell/shell/modules/dashboard/Performance.qml deleted file mode 100644 index 5c6361d9..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/Performance.qml +++ /dev/null @@ -1,246 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Layouts - -RowLayout { - id: root - - readonly property int padding: Appearance.padding.large - - spacing: Appearance.spacing.large * 3 - - Ref { - service: SystemUsage - } - - Resource { - Layout.alignment: Qt.AlignVCenter - Layout.topMargin: root.padding - Layout.bottomMargin: root.padding - Layout.leftMargin: root.padding * 2 - - value1: Math.min(1, SystemUsage.gpuTemp / 90) - value2: SystemUsage.gpuPerc - - label1: `${Math.ceil(SystemUsage.gpuTemp)}°C` - label2: `${Math.round(SystemUsage.gpuPerc * 100)}%` - - sublabel1: qsTr("GPU temp") - sublabel2: qsTr("Usage") - } - - Resource { - Layout.alignment: Qt.AlignVCenter - Layout.topMargin: root.padding - Layout.bottomMargin: root.padding - - primary: true - - value1: Math.min(1, SystemUsage.cpuTemp / 90) - value2: SystemUsage.cpuPerc - - label1: `${Math.ceil(SystemUsage.cpuTemp)}°C` - label2: `${Math.round(SystemUsage.cpuPerc * 100)}%` - - sublabel1: qsTr("CPU temp") - sublabel2: qsTr("Usage") - } - - Resource { - Layout.alignment: Qt.AlignVCenter - Layout.topMargin: root.padding - Layout.bottomMargin: root.padding - Layout.rightMargin: root.padding * 3 - - value1: SystemUsage.memPerc - value2: SystemUsage.storagePerc - - label1: { - const fmt = SystemUsage.formatKib(SystemUsage.memUsed); - return `${+fmt.value.toFixed(1)}${fmt.unit}`; - } - label2: { - const fmt = SystemUsage.formatKib(SystemUsage.storageUsed); - return `${Math.floor(fmt.value)}${fmt.unit}`; - } - - sublabel1: qsTr("Memory") - sublabel2: qsTr("Storage") - } - - component Resource: Item { - id: res - - required property real value1 - required property real value2 - required property string sublabel1 - required property string sublabel2 - required property string label1 - required property string label2 - - property bool primary - readonly property real primaryMult: primary ? 1.2 : 1 - - readonly property real thickness: Config.dashboard.sizes.resourceProgessThickness * primaryMult - - property color fg1: Colours.palette.m3primary - property color fg2: Colours.palette.m3secondary - property color bg1: Colours.palette.m3primaryContainer - property color bg2: Colours.palette.m3secondaryContainer - - implicitWidth: Config.dashboard.sizes.resourceSize * primaryMult - implicitHeight: Config.dashboard.sizes.resourceSize * primaryMult - - onValue1Changed: canvas.requestPaint() - onValue2Changed: canvas.requestPaint() - onFg1Changed: canvas.requestPaint() - onFg2Changed: canvas.requestPaint() - onBg1Changed: canvas.requestPaint() - onBg2Changed: canvas.requestPaint() - - Column { - anchors.centerIn: parent - - StyledText { - anchors.horizontalCenter: parent.horizontalCenter - - text: res.label1 - font.pointSize: Appearance.font.size.extraLarge * res.primaryMult - } - - StyledText { - anchors.horizontalCenter: parent.horizontalCenter - - text: res.sublabel1 - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.smaller * res.primaryMult - } - } - - Column { - anchors.horizontalCenter: parent.right - anchors.top: parent.verticalCenter - anchors.horizontalCenterOffset: -res.thickness / 2 - anchors.topMargin: res.thickness / 2 + Appearance.spacing.small - - StyledText { - anchors.horizontalCenter: parent.horizontalCenter - - text: res.label2 - font.pointSize: Appearance.font.size.smaller * res.primaryMult - } - - StyledText { - anchors.horizontalCenter: parent.horizontalCenter - - text: res.sublabel2 - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small * res.primaryMult - } - } - - Canvas { - id: canvas - - readonly property real centerX: width / 2 - readonly property real centerY: height / 2 - - readonly property real arc1Start: degToRad(45) - readonly property real arc1End: degToRad(220) - readonly property real arc2Start: degToRad(230) - readonly property real arc2End: degToRad(360) - - function degToRad(deg: int): real { - return deg * Math.PI / 180; - } - - anchors.fill: parent - - onPaint: { - const ctx = getContext("2d"); - ctx.reset(); - - ctx.lineWidth = res.thickness; - ctx.lineCap = "round"; - - const radius = (Math.min(width, height) - ctx.lineWidth) / 2; - const cx = centerX; - const cy = centerY; - const a1s = arc1Start; - const a1e = arc1End; - const a2s = arc2Start; - const a2e = arc2End; - - ctx.beginPath(); - ctx.arc(cx, cy, radius, a1s, a1e, false); - ctx.strokeStyle = res.bg1; - ctx.stroke(); - - ctx.beginPath(); - ctx.arc(cx, cy, radius, a1s, (a1e - a1s) * res.value1 + a1s, false); - ctx.strokeStyle = res.fg1; - ctx.stroke(); - - ctx.beginPath(); - ctx.arc(cx, cy, radius, a2s, a2e, false); - ctx.strokeStyle = res.bg2; - ctx.stroke(); - - ctx.beginPath(); - ctx.arc(cx, cy, radius, a2s, (a2e - a2s) * res.value2 + a2s, false); - ctx.strokeStyle = res.fg2; - ctx.stroke(); - } - } - - Behavior on value1 { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on value2 { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on fg1 { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on fg2 { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on bg1 { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on bg2 { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/Tabs.qml b/modules/home/services/quickshell/shell/modules/dashboard/Tabs.qml deleted file mode 100644 index b7aca5f7..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/Tabs.qml +++ /dev/null @@ -1,251 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import QtQuick -import QtQuick.Controls - -Item { - id: root - - required property real nonAnimWidth - required property PersistentProperties state - readonly property alias count: bar.count - - implicitHeight: bar.implicitHeight + indicator.implicitHeight + indicator.anchors.topMargin + separator.implicitHeight - - TabBar { - id: bar - - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - - currentIndex: root.state.currentTab - background: null - - Tab { - iconName: "dashboard" - text: qsTr("Dashboard") - } - - Tab { - iconName: "queue_music" - text: qsTr("Media") - } - - Tab { - iconName: "speed" - text: qsTr("Performance") - } - - // Tab { - // iconName: "workspaces" - // text: qsTr("Workspaces") - // } - } - - Item { - id: indicator - - anchors.top: bar.bottom - anchors.topMargin: Config.dashboard.sizes.tabIndicatorSpacing - - implicitWidth: bar.currentItem.implicitWidth - implicitHeight: Config.dashboard.sizes.tabIndicatorHeight - - x: { - const tab = bar.currentItem; - const width = (root.nonAnimWidth - bar.spacing * (bar.count - 1)) / bar.count; - return width * tab.TabBar.index + (width - tab.implicitWidth) / 2; - } - - clip: true - - StyledRect { - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - implicitHeight: parent.implicitHeight * 2 - - color: Colours.palette.m3primary - radius: Appearance.rounding.full - } - - Behavior on x { - Anim {} - } - - Behavior on implicitWidth { - Anim {} - } - } - - StyledRect { - id: separator - - anchors.top: indicator.bottom - anchors.left: parent.left - anchors.right: parent.right - - implicitHeight: 1 - color: Colours.palette.m3outlineVariant - } - - component Tab: TabButton { - id: tab - - required property string iconName - readonly property bool current: TabBar.tabBar.currentItem === this - - background: null - - contentItem: MouseArea { - id: mouse - - implicitWidth: Math.max(icon.width, label.width) - implicitHeight: icon.height + label.height - - cursorShape: Qt.PointingHandCursor - - onPressed: event => { - root.state.currentTab = tab.TabBar.index; - - const stateY = stateWrapper.y; - rippleAnim.x = event.x; - rippleAnim.y = event.y - stateY; - - const dist = (ox, oy) => ox * ox + oy * oy; - const stateEndY = stateY + stateWrapper.height; - rippleAnim.radius = Math.sqrt(Math.max(dist(0, stateY), dist(0, stateEndY), dist(width, stateY), dist(width, stateEndY))); - - rippleAnim.restart(); - } - onWheel: event => { - if (event.angleDelta.y < 0) - root.state.currentTab = Math.min(root.state.currentTab + 1, bar.count - 1); - else if (event.angleDelta.y > 0) - root.state.currentTab = Math.max(root.state.currentTab - 1, 0); - } - - SequentialAnimation { - id: rippleAnim - - property real x - property real y - property real radius - - PropertyAction { - target: ripple - property: "x" - value: rippleAnim.x - } - PropertyAction { - target: ripple - property: "y" - value: rippleAnim.y - } - PropertyAction { - target: ripple - property: "opacity" - value: 0.1 - } - ParallelAnimation { - Anim { - target: ripple - properties: "implicitWidth,implicitHeight" - from: 0 - to: rippleAnim.radius * 2 - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - Anim { - target: ripple - property: "opacity" - to: 0 - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - } - } - - ClippingRectangle { - id: stateWrapper - - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - implicitHeight: parent.height + Config.dashboard.sizes.tabIndicatorSpacing * 2 - - color: "transparent" - radius: Appearance.rounding.small - - StyledRect { - id: stateLayer - - anchors.fill: parent - - color: tab.current ? Colours.palette.m3primary : Colours.palette.m3onSurface - opacity: mouse.pressed ? 0.1 : tab.hovered ? 0.08 : 0 - - Behavior on opacity { - Anim {} - } - } - - StyledRect { - id: ripple - - radius: Appearance.rounding.full - color: tab.current ? Colours.palette.m3primary : Colours.palette.m3onSurface - opacity: 0 - - transform: Translate { - x: -ripple.width / 2 - y: -ripple.height / 2 - } - } - } - - MaterialIcon { - id: icon - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: label.top - - text: tab.iconName - color: tab.current ? Colours.palette.m3primary : Colours.palette.m3onSurfaceVariant - fill: tab.current ? 1 : 0 - font.pointSize: Appearance.font.size.large - - Behavior on fill { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - StyledText { - id: label - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - - text: tab.text - color: tab.current ? Colours.palette.m3primary : Colours.palette.m3onSurfaceVariant - } - } - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/Wrapper.qml b/modules/home/services/quickshell/shell/modules/dashboard/Wrapper.qml deleted file mode 100644 index 26f6d5b9..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/Wrapper.qml +++ /dev/null @@ -1,68 +0,0 @@ -pragma ComponentBehavior: Bound - -import QtQuick -import Quickshell -import "root:/config" - -Item { - id: root - - required property PersistentProperties visibilities - readonly property PersistentProperties state: PersistentProperties { - property int currentTab - } - - visible: height > 0 - implicitHeight: 0 - implicitWidth: content.implicitWidth - - states: State { - name: "visible" - when: root.visibilities.dashboard - - PropertyChanges { - root.implicitHeight: content.implicitHeight - } - } - - transitions: [ - Transition { - from: "" - to: "visible" - - NumberAnimation { - target: root - property: "implicitHeight" - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial - } - }, - Transition { - from: "visible" - to: "" - - NumberAnimation { - target: root - property: "implicitHeight" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - ] - - Loader { - id: content - - Component.onCompleted: active = Qt.binding(() => root.visibilities.dashboard || root.visible) - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - - sourceComponent: Content { - visibilities: root.visibilities - state: root.state - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/dash/Calendar.qml b/modules/home/services/quickshell/shell/modules/dashboard/dash/Calendar.qml deleted file mode 100644 index 1860d9fa..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/dash/Calendar.qml +++ /dev/null @@ -1,72 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Controls - -Column { - id: root - - anchors.left: parent.left - anchors.right: parent.right - padding: Appearance.padding.large - spacing: Appearance.spacing.small - - DayOfWeekRow { - id: days - - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: parent.padding - - delegate: StyledText { - required property var model - - horizontalAlignment: Text.AlignHCenter - text: model.shortName - font.family: Appearance.font.family.sans - font.weight: 500 - } - } - - MonthGrid { - id: grid - - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: parent.padding - - spacing: 3 - - delegate: Item { - id: day - - required property var model - - implicitWidth: implicitHeight - implicitHeight: text.implicitHeight + Appearance.padding.small * 2 - - StyledRect { - anchors.centerIn: parent - - implicitWidth: parent.implicitHeight - implicitHeight: parent.implicitHeight - - radius: Appearance.rounding.full - color: model.today ? Colours.palette.m3primary : "transparent" - - StyledText { - id: text - - anchors.centerIn: parent - - horizontalAlignment: Text.AlignHCenter - text: Qt.formatDate(day.model.date, "d") - color: day.model.today ? Colours.palette.m3onPrimary : day.model.month === grid.month ? Colours.palette.m3onSurfaceVariant : Colours.palette.m3outline - } - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/dash/DateTime.qml b/modules/home/services/quickshell/shell/modules/dashboard/dash/DateTime.qml deleted file mode 100644 index 25df7a55..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/dash/DateTime.qml +++ /dev/null @@ -1,71 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -Item { - id: root - - anchors.top: parent.top - anchors.bottom: parent.bottom - implicitWidth: Config.dashboard.sizes.dateTimeWidth - - StyledText { - id: hours - - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.topMargin: (root.height - (hours.implicitHeight + sep.implicitHeight + sep.anchors.topMargin + mins.implicitHeight + mins.anchors.topMargin + date.implicitHeight + date.anchors.topMargin)) / 2 - - horizontalAlignment: Text.AlignHCenter - text: Time.format("HH") - color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - } - - StyledText { - id: sep - - anchors.left: parent.left - anchors.right: parent.right - anchors.top: hours.bottom - anchors.topMargin: -font.pointSize * 0.5 - - horizontalAlignment: Text.AlignHCenter - text: "•••" - color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.extraLarge * 0.9 - } - - StyledText { - id: mins - - anchors.left: parent.left - anchors.right: parent.right - anchors.top: sep.bottom - anchors.topMargin: -sep.font.pointSize * 0.45 - - horizontalAlignment: Text.AlignHCenter - text: Time.format("mm") - color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - } - - StyledText { - id: date - - anchors.left: parent.left - anchors.right: parent.right - anchors.top: mins.bottom - anchors.topMargin: Appearance.spacing.normal - - horizontalAlignment: Text.AlignHCenter - text: Time.format("ddd, d") - color: Colours.palette.m3tertiary - font.pointSize: Appearance.font.size.normal - font.weight: 500 - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/dash/Media.qml b/modules/home/services/quickshell/shell/modules/dashboard/dash/Media.qml deleted file mode 100644 index 1ff93a8d..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/dash/Media.qml +++ /dev/null @@ -1,259 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import QtQuick -import QtQuick.Shapes - -Item { - id: root - - property real playerProgress: { - const active = Players.active; - return active?.length ? active.position / active.length : 0; - } - - anchors.top: parent.top - anchors.bottom: parent.bottom - implicitWidth: Config.dashboard.sizes.mediaWidth - - Behavior on playerProgress { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Timer { - running: Players.active?.isPlaying ?? false - interval: Config.dashboard.mediaUpdateInterval - triggeredOnStart: true - repeat: true - onTriggered: Players.active?.positionChanged() - } - - Shape { - preferredRendererType: Shape.CurveRenderer - - ShapePath { - fillColor: "transparent" - strokeColor: Colours.palette.m3surfaceContainerHigh - strokeWidth: Config.dashboard.sizes.mediaProgressThickness - capStyle: ShapePath.RoundCap - - PathAngleArc { - centerX: cover.x + cover.width / 2 - centerY: cover.y + cover.height / 2 - radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Appearance.spacing.small - radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Appearance.spacing.small - startAngle: -90 - Config.dashboard.sizes.mediaProgressSweep / 2 - sweepAngle: Config.dashboard.sizes.mediaProgressSweep - } - - Behavior on strokeColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - ShapePath { - fillColor: "transparent" - strokeColor: Colours.palette.m3primary - strokeWidth: Config.dashboard.sizes.mediaProgressThickness - capStyle: ShapePath.RoundCap - - PathAngleArc { - centerX: cover.x + cover.width / 2 - centerY: cover.y + cover.height / 2 - radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Appearance.spacing.small - radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Appearance.spacing.small - startAngle: -90 - Config.dashboard.sizes.mediaProgressSweep / 2 - sweepAngle: Config.dashboard.sizes.mediaProgressSweep * root.playerProgress - } - - Behavior on strokeColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - } - - StyledClippingRect { - id: cover - - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Appearance.padding.large + Config.dashboard.sizes.mediaProgressThickness + Appearance.spacing.small - - implicitHeight: width - color: Colours.palette.m3surfaceContainerHigh - radius: Appearance.rounding.full - - MaterialIcon { - anchors.centerIn: parent - - grade: 200 - text: "art_track" - color: Colours.palette.m3onSurfaceVariant - font.pointSize: (parent.width * 0.4) || 1 - } - - Image { - id: image - - anchors.fill: parent - - source: Players.active?.trackArtUrl ?? "" - asynchronous: true - fillMode: Image.PreserveAspectCrop - sourceSize.width: width - sourceSize.height: height - } - } - - StyledText { - id: title - - anchors.top: cover.bottom - anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Appearance.spacing.normal - - animate: true - horizontalAlignment: Text.AlignHCenter - text: (Players.active?.trackTitle ?? qsTr("No media")) || qsTr("Unknown title") - color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.normal - - width: parent.implicitWidth - Appearance.padding.large * 2 - elide: Text.ElideRight - } - - StyledText { - id: album - - anchors.top: title.bottom - anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Appearance.spacing.small - - animate: true - horizontalAlignment: Text.AlignHCenter - text: (Players.active?.trackAlbum ?? qsTr("No media")) || qsTr("Unknown album") - color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.small - - width: parent.implicitWidth - Appearance.padding.large * 2 - elide: Text.ElideRight - } - - StyledText { - id: artist - - anchors.top: album.bottom - anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Appearance.spacing.small - - animate: true - horizontalAlignment: Text.AlignHCenter - text: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist") - color: Colours.palette.m3secondary - - width: parent.implicitWidth - Appearance.padding.large * 2 - elide: Text.ElideRight - } - - Row { - id: controls - - anchors.top: artist.bottom - anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Appearance.spacing.smaller - - spacing: Appearance.spacing.small - - Control { - icon: "skip_previous" - canUse: Players.active?.canGoPrevious ?? false - - function onClicked(): void { - Players.active?.previous(); - } - } - - Control { - icon: Players.active?.isPlaying ? "pause" : "play_arrow" - canUse: Players.active?.canTogglePlaying ?? false - - function onClicked(): void { - Players.active?.togglePlaying(); - } - } - - Control { - icon: "skip_next" - canUse: Players.active?.canGoNext ?? false - - function onClicked(): void { - Players.active?.next(); - } - } - } - - AnimatedImage { - id: bongocat - - anchors.top: controls.bottom - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: parent.right - anchors.topMargin: Appearance.spacing.small - anchors.bottomMargin: Appearance.padding.large - anchors.margins: Appearance.padding.large * 2 - - playing: Players.active?.isPlaying ?? false - speed: BeatDetector.bpm / 300 - source: Paths.expandTilde(Config.paths.mediaGif) - asynchronous: true - fillMode: AnimatedImage.PreserveAspectFit - } - - component Control: StyledRect { - id: control - - required property string icon - required property bool canUse - function onClicked(): void { - } - - implicitWidth: Math.max(icon.implicitHeight, icon.implicitHeight) + Appearance.padding.small - implicitHeight: implicitWidth - - StateLayer { - disabled: !control.canUse - radius: Appearance.rounding.full - - function onClicked(): void { - control.onClicked(); - } - } - - MaterialIcon { - id: icon - - anchors.centerIn: parent - anchors.verticalCenterOffset: font.pointSize * 0.05 - - animate: true - text: control.icon - color: control.canUse ? Colours.palette.m3onSurface : Colours.palette.m3outline - font.pointSize: Appearance.font.size.large - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/dash/Resources.qml b/modules/home/services/quickshell/shell/modules/dashboard/dash/Resources.qml deleted file mode 100644 index a27cce57..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/dash/Resources.qml +++ /dev/null @@ -1,88 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -Row { - id: root - - anchors.top: parent.top - anchors.bottom: parent.bottom - - padding: Appearance.padding.large - spacing: Appearance.spacing.normal - - Ref { - service: SystemUsage - } - - Resource { - icon: "memory" - value: SystemUsage.cpuPerc - colour: Colours.palette.m3primary - } - - Resource { - icon: "memory_alt" - value: SystemUsage.memPerc - colour: Colours.palette.m3secondary - } - - Resource { - icon: "hard_disk" - value: SystemUsage.storagePerc - colour: Colours.palette.m3tertiary - } - - component Resource: Item { - id: res - - required property string icon - required property real value - required property color colour - - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.margins: Appearance.padding.large - implicitWidth: icon.implicitWidth - - StyledRect { - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - anchors.bottom: icon.top - anchors.bottomMargin: Appearance.spacing.small - - implicitWidth: Config.dashboard.sizes.resourceProgessThickness - - color: Colours.palette.m3surfaceContainerHigh - radius: Appearance.rounding.full - - StyledRect { - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - implicitHeight: res.value * parent.height - - color: res.colour - radius: Appearance.rounding.full - } - } - - MaterialIcon { - id: icon - - anchors.bottom: parent.bottom - - text: res.icon - color: res.colour - } - - Behavior on value { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/dash/User.qml b/modules/home/services/quickshell/shell/modules/dashboard/dash/User.qml deleted file mode 100644 index ba4fa183..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/dash/User.qml +++ /dev/null @@ -1,202 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import Quickshell -import Quickshell.Io -import QtQuick -import QtQuick.Dialogs - -Row { - id: root - - required property PersistentProperties visibilities - - padding: Appearance.padding.large - spacing: Appearance.spacing.normal - - StyledClippingRect { - implicitWidth: info.implicitHeight - implicitHeight: info.implicitHeight - - radius: Appearance.rounding.large - color: Colours.palette.m3surfaceContainerHigh - - MaterialIcon { - anchors.centerIn: parent - - text: "person" - fill: 1 - grade: 200 - font.pointSize: Math.floor(info.implicitHeight / 2) || 1 - } - - CachingImage { - id: pfp - - anchors.fill: parent - path: `${Paths.home}/.face` - } - - MouseArea { - anchors.fill: parent - - cursorShape: Qt.PointingHandCursor - hoverEnabled: true - - onClicked: { - root.visibilities.launcher = false; - dialog.open(); - } - - StyledRect { - anchors.fill: parent - - color: Qt.alpha(Colours.palette.m3primary, 0.1) - opacity: parent.containsMouse ? 1 : 0 - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - StyledRect { - anchors.centerIn: parent - - implicitWidth: selectIcon.implicitHeight + Appearance.padding.small * 2 - implicitHeight: selectIcon.implicitHeight + Appearance.padding.small * 2 - - radius: Appearance.rounding.normal - color: Colours.palette.m3primary - scale: parent.containsMouse ? 1 : 0.5 - opacity: parent.containsMouse ? 1 : 0 - - MaterialIcon { - id: selectIcon - - anchors.centerIn: parent - anchors.horizontalCenterOffset: -font.pointSize * 0.02 - - text: "frame_person" - color: Colours.palette.m3onPrimary - font.pointSize: Appearance.font.size.extraLarge - } - - Behavior on scale { - NumberAnimation { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial - } - } - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial - } - } - } - } - - FileDialog { - id: dialog - - nameFilters: [`Image files (${Wallpapers.extensions.map(e => `*.${e}`).join(" ")})`] - - onAccepted: { - Paths.copy(selectedFile, `${Paths.home}/.face`); - pfp.pathChanged(); - Quickshell.execDetached(["notify-send", "-a", "caelestia-shell", "-u", "low", "Profile picture changed", `Profile picture changed to ${Paths.strip(selectedFile)}`]); - } - } - } - - Column { - id: info - - anchors.verticalCenter: parent.verticalCenter - spacing: Appearance.spacing.normal - - InfoLine { - icon: Icons.osIcon - text: Icons.osName - colour: Colours.palette.m3primary - materialIcon: false - } - - InfoLine { - icon: "select_window_2" - text: Quickshell.env("XDG_CURRENT_DESKTOP") || Quickshell.env("XDG_SESSION_DESKTOP") - colour: Colours.palette.m3secondary - } - - InfoLine { - icon: "timer" - text: uptimeProc.uptime - colour: Colours.palette.m3tertiary - - Timer { - running: true - repeat: true - interval: 15000 - onTriggered: uptimeProc.running = true - } - - Process { - id: uptimeProc - - property string uptime - - running: true - command: ["uptime", "-p"] - stdout: StdioCollector { - onStreamFinished: uptimeProc.uptime = text.trim() - } - } - } - } - - component InfoLine: Item { - id: line - - required property string icon - required property string text - required property color colour - property bool materialIcon: true - - implicitWidth: icon.implicitWidth + text.width + text.anchors.leftMargin - implicitHeight: Math.max(icon.implicitHeight, text.implicitHeight) - - MaterialIcon { - id: icon - - anchors.left: parent.left - anchors.leftMargin: (Config.dashboard.sizes.infoIconSize - implicitWidth) / 2 - - fill: 1 - text: line.icon - color: line.colour - font.pointSize: Appearance.font.size.normal - font.family: line.materialIcon ? Appearance.font.family.material : Appearance.font.family.sans - } - - StyledText { - id: text - - anchors.verticalCenter: icon.verticalCenter - anchors.left: icon.right - anchors.leftMargin: icon.anchors.leftMargin - text: `: ${line.text}` - font.pointSize: Appearance.font.size.normal - - width: Config.dashboard.sizes.infoWidth - elide: Text.ElideRight - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/dashboard/dash/Weather.qml b/modules/home/services/quickshell/shell/modules/dashboard/dash/Weather.qml deleted file mode 100644 index cc193856..00000000 --- a/modules/home/services/quickshell/shell/modules/dashboard/dash/Weather.qml +++ /dev/null @@ -1,57 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import QtQuick - -Item { - id: root - - anchors.centerIn: parent - - implicitWidth: icon.implicitWidth + info.implicitWidth + info.anchors.leftMargin - - Component.onCompleted: Weather.reload() - - MaterialIcon { - id: icon - - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - - animate: true - text: Weather.icon || "cloud_alert" - color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge * 2 - } - - Column { - id: info - - anchors.verticalCenter: parent.verticalCenter - anchors.left: icon.right - anchors.leftMargin: Appearance.spacing.large - - spacing: Appearance.spacing.small - - StyledText { - anchors.horizontalCenter: parent.horizontalCenter - - animate: true - text: `${Weather.temperature}°C` - color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - } - - StyledText { - anchors.horizontalCenter: parent.horizontalCenter - - animate: true - text: Weather.description || qsTr("No weather") - - elide: Text.ElideRight - width: Math.min(implicitWidth, root.parent.width - icon.implicitWidth - info.anchors.leftMargin - Appearance.padding.large * 2) - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/drawers/Backgrounds.qml b/modules/home/services/quickshell/shell/modules/drawers/Backgrounds.qml deleted file mode 100644 index b7e3d399..00000000 --- a/modules/home/services/quickshell/shell/modules/drawers/Backgrounds.qml +++ /dev/null @@ -1,66 +0,0 @@ -import "root:/services" -import "root:/config" -import "root:/modules/osd" as Osd -import "root:/modules/notifications" as Notifications -import "root:/modules/session" as Session -import "root:/modules/launcher" as Launcher -import "root:/modules/dashboard" as Dashboard -import "root:/modules/bar/popouts" as BarPopouts -import QtQuick -import QtQuick.Shapes - -Shape { - id: root - - required property Panels panels - required property Item bar - - anchors.fill: parent - anchors.margins: Config.border.thickness - anchors.leftMargin: bar.implicitWidth - preferredRendererType: Shape.CurveRenderer - opacity: Colours.transparency.enabled ? Colours.transparency.base : 1 - - Osd.Background { - wrapper: panels.osd - - startX: root.width - panels.session.width - startY: (root.height - wrapper.height) / 2 - rounding - } - - Notifications.Background { - wrapper: panels.notifications - - startX: root.width - startY: 0 - } - - Session.Background { - wrapper: panels.session - - startX: root.width - startY: (root.height - wrapper.height) / 2 - rounding - } - - Launcher.Background { - wrapper: panels.launcher - - startX: (root.width - wrapper.width) / 2 - rounding - startY: root.height - } - - Dashboard.Background { - wrapper: panels.dashboard - - startX: (root.width - wrapper.width) / 2 - rounding - startY: 0 - } - - BarPopouts.Background { - wrapper: panels.popouts - invertBottomRounding: wrapper.y + wrapper.height + 1 >= root.height - - startX: wrapper.x - startY: wrapper.y - rounding * sideRounding - } -} diff --git a/modules/home/services/quickshell/shell/modules/drawers/Border.qml b/modules/home/services/quickshell/shell/modules/drawers/Border.qml deleted file mode 100644 index 3dada1ff..00000000 --- a/modules/home/services/quickshell/shell/modules/drawers/Border.qml +++ /dev/null @@ -1,47 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick -import QtQuick.Effects - -Item { - id: root - - required property Item bar - - anchors.fill: parent - - StyledRect { - id: rect - - anchors.fill: parent - color: Colours.alpha(Colours.palette.m3surface, false) - visible: false - } - - Item { - id: mask - - anchors.fill: parent - layer.enabled: true - visible: false - - Rectangle { - anchors.fill: parent - anchors.margins: Config.border.thickness - anchors.leftMargin: root.bar.implicitWidth - radius: Config.border.rounding - } - } - - MultiEffect { - anchors.fill: parent - maskEnabled: true - maskInverted: true - maskSource: mask - source: rect - maskThresholdMin: 0.5 - maskSpreadAtMin: 1 - } -} diff --git a/modules/home/services/quickshell/shell/modules/drawers/Drawers.qml b/modules/home/services/quickshell/shell/modules/drawers/Drawers.qml deleted file mode 100644 index 5cab75b8..00000000 --- a/modules/home/services/quickshell/shell/modules/drawers/Drawers.qml +++ /dev/null @@ -1,147 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/modules/bar" -import Quickshell -import Quickshell.Wayland -import Quickshell.Hyprland -import QtQuick -import QtQuick.Effects - -Variants { - model: Quickshell.screens - - Scope { - id: scope - - required property ShellScreen modelData - - Exclusions { - screen: scope.modelData - bar: bar - } - - StyledWindow { - id: win - - screen: scope.modelData - name: "drawers" - WlrLayershell.exclusionMode: ExclusionMode.Ignore - WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.session ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None - - mask: Region { - x: bar.implicitWidth - y: Config.border.thickness - width: win.width - bar.implicitWidth - Config.border.thickness - height: win.height - Config.border.thickness * 2 - intersection: Intersection.Xor - - regions: regions.instances - } - - anchors.top: true - anchors.bottom: true - anchors.left: true - anchors.right: true - - Variants { - id: regions - - model: panels.children - - Region { - required property Item modelData - - x: modelData.x + bar.implicitWidth - y: modelData.y + Config.border.thickness - width: modelData.width - height: modelData.height - intersection: Intersection.Subtract - } - } - - HyprlandFocusGrab { - active: visibilities.launcher || visibilities.session - windows: [win] - onCleared: { - visibilities.launcher = false; - visibilities.session = false; - } - } - - StyledRect { - anchors.fill: parent - opacity: visibilities.session ? 0.5 : 0 - color: Colours.palette.m3scrim - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - Item { - id: background - - anchors.fill: parent - visible: false - - Border { - bar: bar - } - - Backgrounds { - panels: panels - bar: bar - } - } - - MultiEffect { - anchors.fill: source - source: background - shadowEnabled: true - blurMax: 15 - shadowColor: Qt.alpha(Colours.palette.m3shadow, 0.7) - } - - PersistentProperties { - id: visibilities - - property bool osd - property bool session - property bool launcher - property bool dashboard - - Component.onCompleted: Visibilities.screens[scope.modelData] = this - } - - Interactions { - screen: scope.modelData - popouts: panels.popouts - visibilities: visibilities - panels: panels - bar: bar - - Panels { - id: panels - - screen: scope.modelData - visibilities: visibilities - bar: bar - } - } - - Bar { - id: bar - - screen: scope.modelData - popouts: panels.popouts - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/drawers/Exclusions.qml b/modules/home/services/quickshell/shell/modules/drawers/Exclusions.qml deleted file mode 100644 index 5557cdba..00000000 --- a/modules/home/services/quickshell/shell/modules/drawers/Exclusions.qml +++ /dev/null @@ -1,37 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/config" -import Quickshell -import QtQuick - -Scope { - id: root - - required property ShellScreen screen - required property Item bar - - ExclusionZone { - anchors.left: true - exclusiveZone: root.bar.implicitWidth - } - - ExclusionZone { - anchors.top: true - } - - ExclusionZone { - anchors.right: true - } - - ExclusionZone { - anchors.bottom: true - } - - component ExclusionZone: StyledWindow { - screen: root.screen - name: "border-exclusion" - exclusiveZone: Config.border.thickness - mask: Region {} - } -} diff --git a/modules/home/services/quickshell/shell/modules/drawers/Interactions.qml b/modules/home/services/quickshell/shell/modules/drawers/Interactions.qml deleted file mode 100644 index 54cb24c7..00000000 --- a/modules/home/services/quickshell/shell/modules/drawers/Interactions.qml +++ /dev/null @@ -1,160 +0,0 @@ -import "root:/services" -import "root:/config" -import "root:/modules/bar/popouts" as BarPopouts -import "root:/modules/osd" as Osd -import Quickshell -import QtQuick - -MouseArea { - id: root - - required property ShellScreen screen - required property BarPopouts.Wrapper popouts - required property PersistentProperties visibilities - required property Panels panels - required property Item bar - - property bool osdHovered - property point dragStart - property bool dashboardShortcutActive - property bool osdShortcutActive - - function withinPanelHeight(panel: Item, x: real, y: real): bool { - const panelY = Config.border.thickness + panel.y; - return y >= panelY - Config.border.rounding && y <= panelY + panel.height + Config.border.rounding; - } - - function inRightPanel(panel: Item, x: real, y: real): bool { - return x > bar.implicitWidth + panel.x && withinPanelHeight(panel, x, y); - } - - function inTopPanel(panel: Item, x: real, y: real): bool { - const panelX = bar.implicitWidth + panel.x; - return y < Config.border.thickness + panel.y + panel.height && x >= panelX - Config.border.rounding && x <= panelX + panel.width + Config.border.rounding; - } - - anchors.fill: parent - hoverEnabled: true - - onPressed: event => dragStart = Qt.point(event.x, event.y) - onContainsMouseChanged: { - if (!containsMouse) { - // Only hide if not activated by shortcut - if (!osdShortcutActive) { - visibilities.osd = false; - osdHovered = false; - } - if (!dashboardShortcutActive) { - visibilities.dashboard = false; - } - popouts.hasCurrent = false; - } - } - - onPositionChanged: event => { - const x = event.x; - const y = event.y; - - // Show osd on hover - const showOsd = inRightPanel(panels.osd, x, y); - - // Always update visibility based on hover if not in shortcut mode - if (!osdShortcutActive) { - visibilities.osd = showOsd; - osdHovered = showOsd; - } else if (showOsd) { - // If hovering over OSD area while in shortcut mode, transition to hover control - osdShortcutActive = false; - osdHovered = true; - } - - // Show/hide session on drag - if (pressed && withinPanelHeight(panels.session, x, y)) { - const dragX = x - dragStart.x; - if (dragX < -Config.session.dragThreshold) - visibilities.session = true; - else if (dragX > Config.session.dragThreshold) - visibilities.session = false; - } - - // Show dashboard on hover - const showDashboard = inTopPanel(panels.dashboard, x, y); - - // Always update visibility based on hover if not in shortcut mode - if (!dashboardShortcutActive) { - visibilities.dashboard = showDashboard; - } else if (showDashboard) { - // If hovering over dashboard area while in shortcut mode, transition to hover control - dashboardShortcutActive = false; - } - - // Show popouts on hover - const popout = panels.popouts; - if (x < bar.implicitWidth + popout.width) { - if (x < bar.implicitWidth) - // Handle like part of bar - bar.checkPopout(y); - else - // Keep on hover - popouts.hasCurrent = withinPanelHeight(popout, x, y); - } else - popouts.hasCurrent = false; - } - - // Monitor individual visibility changes - Connections { - target: root.visibilities - - function onLauncherChanged() { - // If launcher is hidden, clear shortcut flags for dashboard and OSD - if (!root.visibilities.launcher) { - root.dashboardShortcutActive = false; - root.osdShortcutActive = false; - - // Also hide dashboard and OSD if they're not being hovered - const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY); - const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY); - - if (!inDashboardArea) { - root.visibilities.dashboard = false; - } - if (!inOsdArea) { - root.visibilities.osd = false; - root.osdHovered = false; - } - } - } - - function onDashboardChanged() { - if (root.visibilities.dashboard) { - // Dashboard became visible, immediately check if this should be shortcut mode - const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY); - if (!inDashboardArea) { - root.dashboardShortcutActive = true; - } - } else { - // Dashboard hidden, clear shortcut flag - root.dashboardShortcutActive = false; - } - } - - function onOsdChanged() { - if (root.visibilities.osd) { - // OSD became visible, immediately check if this should be shortcut mode - const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY); - if (!inOsdArea) { - root.osdShortcutActive = true; - } - } else { - // OSD hidden, clear shortcut flag - root.osdShortcutActive = false; - } - } - } - - Osd.Interactions { - screen: root.screen - visibilities: root.visibilities - hovered: root.osdHovered - } -} diff --git a/modules/home/services/quickshell/shell/modules/drawers/Panels.qml b/modules/home/services/quickshell/shell/modules/drawers/Panels.qml deleted file mode 100644 index 5b2229cb..00000000 --- a/modules/home/services/quickshell/shell/modules/drawers/Panels.qml +++ /dev/null @@ -1,95 +0,0 @@ -import "root:/services" -import "root:/config" -import "root:/modules/osd" as Osd -import "root:/modules/notifications" as Notifications -import "root:/modules/session" as Session -import "root:/modules/launcher" as Launcher -import "root:/modules/dashboard" as Dashboard -import "root:/modules/bar/popouts" as BarPopouts -import Quickshell -import QtQuick - -Item { - id: root - - required property ShellScreen screen - required property PersistentProperties visibilities - required property Item bar - - readonly property Osd.Wrapper osd: osd - readonly property Notifications.Wrapper notifications: notifications - readonly property Session.Wrapper session: session - readonly property Launcher.Wrapper launcher: launcher - readonly property Dashboard.Wrapper dashboard: dashboard - readonly property BarPopouts.Wrapper popouts: popouts - - anchors.fill: parent - anchors.margins: Config.border.thickness - anchors.leftMargin: bar.implicitWidth - - Component.onCompleted: Visibilities.panels[screen] = this - - Osd.Wrapper { - id: osd - - clip: root.visibilities.session - screen: root.screen - visibility: root.visibilities.osd - - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: session.width - } - - Notifications.Wrapper { - id: notifications - - anchors.top: parent.top - anchors.right: parent.right - } - - Session.Wrapper { - id: session - - visibilities: root.visibilities - - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - } - - Launcher.Wrapper { - id: launcher - - visibilities: root.visibilities - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - } - - Dashboard.Wrapper { - id: dashboard - - visibilities: root.visibilities - - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - } - - BarPopouts.Wrapper { - id: popouts - - screen: root.screen - - x: isDetached ? (root.width - nonAnimWidth) / 2 : 0 - y: { - if (isDetached) - return (root.height - nonAnimHeight) / 2; - - const off = currentCenter - Config.border.thickness - nonAnimHeight / 2; - const diff = root.height - Math.floor(off + nonAnimHeight); - if (diff < 0) - return off + diff; - return off; - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/ActionItem.qml b/modules/home/services/quickshell/shell/modules/launcher/ActionItem.qml deleted file mode 100644 index 01dcf1bf..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/ActionItem.qml +++ /dev/null @@ -1,69 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -Item { - id: root - - required property Actions.Action modelData - required property var list - - implicitHeight: Config.launcher.sizes.itemHeight - - anchors.left: parent?.left - anchors.right: parent?.right - - StateLayer { - radius: Appearance.rounding.full - - function onClicked(): void { - root.modelData?.onClicked(root.list); - } - } - - Item { - anchors.fill: parent - anchors.leftMargin: Appearance.padding.larger - anchors.rightMargin: Appearance.padding.larger - anchors.margins: Appearance.padding.smaller - - MaterialIcon { - id: icon - - text: root.modelData?.icon ?? "" - font.pointSize: Appearance.font.size.extraLarge - - anchors.verticalCenter: parent.verticalCenter - } - - Item { - anchors.left: icon.right - anchors.leftMargin: Appearance.spacing.normal - anchors.verticalCenter: icon.verticalCenter - - implicitWidth: parent.width - icon.width - implicitHeight: name.implicitHeight + desc.implicitHeight - - StyledText { - id: name - - text: root.modelData?.name ?? "" - font.pointSize: Appearance.font.size.normal - } - - StyledText { - id: desc - - text: root.modelData?.desc ?? "" - font.pointSize: Appearance.font.size.small - color: Colours.alpha(Colours.palette.m3outline, true) - - elide: Text.ElideRight - width: root.width - icon.width - Appearance.rounding.normal * 2 - - anchors.top: name.bottom - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/Actions.qml b/modules/home/services/quickshell/shell/modules/launcher/Actions.qml deleted file mode 100644 index bca89303..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/Actions.qml +++ /dev/null @@ -1,164 +0,0 @@ -pragma Singleton - -import "root:/utils/scripts/fuzzysort.js" as Fuzzy -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - property string qalcResult - - readonly property list list: [ - Action { - name: qsTr("Calculator") - desc: qsTr("Do simple math equations (powered by Qalc)") - icon: "calculate" - - function onClicked(list: AppList): void { - root.autocomplete(list, "calc"); - } - }, - Action { - name: qsTr("Scheme") - desc: qsTr("Change the current colour scheme") - icon: "palette" - - function onClicked(list: AppList): void { - root.autocomplete(list, "scheme"); - } - }, - Action { - name: qsTr("Wallpaper") - desc: qsTr("Change the current wallpaper") - icon: "image" - - function onClicked(list: AppList): void { - root.autocomplete(list, "wallpaper"); - } - }, - Action { - name: qsTr("Variant") - desc: qsTr("Change the current scheme variant") - icon: "colors" - - function onClicked(list: AppList): void { - root.autocomplete(list, "variant"); - } - }, - Action { - name: qsTr("Transparency") - desc: qsTr("Change shell transparency") - icon: "opacity" - disabled: true - - function onClicked(list: AppList): void { - root.autocomplete(list, "transparency"); - } - }, - Action { - name: qsTr("Light") - desc: qsTr("Change the scheme to light mode") - icon: "light_mode" - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Colours.setMode("light"); - } - }, - Action { - name: qsTr("Dark") - desc: qsTr("Change the scheme to dark mode") - icon: "dark_mode" - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Colours.setMode("dark"); - } - }, - Action { - name: qsTr("Shutdown") - desc: qsTr("Shutdown the system") - icon: "power_settings_new" - disabled: !Config.launcher.enableDangerousActions - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Quickshell.execDetached(["systemctl", "poweroff"]); - } - }, - Action { - name: qsTr("Reboot") - desc: qsTr("Reboot the system") - icon: "cached" - disabled: !Config.launcher.enableDangerousActions - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Quickshell.execDetached(["systemctl", "reboot"]); - } - }, - Action { - name: qsTr("Logout") - desc: qsTr("Log out of the current session") - icon: "exit_to_app" - disabled: !Config.launcher.enableDangerousActions - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Quickshell.execDetached(["loginctl", "terminate-user", ""]); - } - }, - Action { - name: qsTr("Lock") - desc: qsTr("Lock the current session") - icon: "lock" - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Quickshell.execDetached(["loginctl", "lock-session"]); - } - }, - Action { - name: qsTr("Sleep") - desc: qsTr("Suspend then hibernate") - icon: "bedtime" - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Quickshell.execDetached(["systemctl", "suspend-then-hibernate"]); - } - } - ] - - readonly property list preppedActions: list.filter(a => !a.disabled).map(a => ({ - name: Fuzzy.prepare(a.name), - desc: Fuzzy.prepare(a.desc), - action: a - })) - - function fuzzyQuery(search: string): var { - return Fuzzy.go(search.slice(Config.launcher.actionPrefix.length), preppedActions, { - all: true, - keys: ["name", "desc"], - scoreFn: r => r[0].score > 0 ? r[0].score * 0.9 + r[1].score * 0.1 : 0 - }).map(r => r.obj.action); - } - - function autocomplete(list: AppList, text: string): void { - list.search.text = `${Config.launcher.actionPrefix}${text} `; - } - - component Action: QtObject { - required property string name - required property string desc - required property string icon - property bool disabled - - function onClicked(list: AppList): void { - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/AppItem.qml b/modules/home/services/quickshell/shell/modules/launcher/AppItem.qml deleted file mode 100644 index e3f6720a..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/AppItem.qml +++ /dev/null @@ -1,72 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import QtQuick - -Item { - id: root - - required property DesktopEntry modelData - required property PersistentProperties visibilities - - implicitHeight: Config.launcher.sizes.itemHeight - - anchors.left: parent?.left - anchors.right: parent?.right - - StateLayer { - radius: Appearance.rounding.full - - function onClicked(): void { - Apps.launch(root.modelData); - root.visibilities.launcher = false; - } - } - - Item { - anchors.fill: parent - anchors.leftMargin: Appearance.padding.larger - anchors.rightMargin: Appearance.padding.larger - anchors.margins: Appearance.padding.smaller - - IconImage { - id: icon - - source: Quickshell.iconPath(root.modelData?.icon, "image-missing") - implicitSize: parent.height * 0.8 - - anchors.verticalCenter: parent.verticalCenter - } - - Item { - anchors.left: icon.right - anchors.leftMargin: Appearance.spacing.normal - anchors.verticalCenter: icon.verticalCenter - - implicitWidth: parent.width - icon.width - implicitHeight: name.implicitHeight + comment.implicitHeight - - StyledText { - id: name - - text: root.modelData?.name ?? "" - font.pointSize: Appearance.font.size.normal - } - - StyledText { - id: comment - - text: (root.modelData?.comment || root.modelData?.genericName || root.modelData?.name) ?? "" - font.pointSize: Appearance.font.size.small - color: Colours.alpha(Colours.palette.m3outline, true) - - elide: Text.ElideRight - width: root.width - icon.width - Appearance.rounding.normal * 2 - - anchors.top: name.bottom - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/AppList.qml b/modules/home/services/quickshell/shell/modules/launcher/AppList.qml deleted file mode 100644 index bbcb27fb..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/AppList.qml +++ /dev/null @@ -1,216 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick -import QtQuick.Controls - -ListView { - id: root - - required property TextField search - required property PersistentProperties visibilities - - property bool isAction: search.text.startsWith(Config.launcher.actionPrefix) - property bool isCalc: search.text.startsWith(`${Config.launcher.actionPrefix}calc `) - property bool isScheme: search.text.startsWith(`${Config.launcher.actionPrefix}scheme `) - property bool isVariant: search.text.startsWith(`${Config.launcher.actionPrefix}variant `) - - function getModelValues() { - let text = search.text; - if (isCalc) - return [0]; - if (isScheme) - return Schemes.fuzzyQuery(text); - if (isVariant) - return M3Variants.fuzzyQuery(text); - if (isAction) - return Actions.fuzzyQuery(text); - if (text.startsWith(Config.launcher.actionPrefix)) - text = search.text.slice(Config.launcher.actionPrefix.length); - return Apps.fuzzyQuery(text); - } - - model: ScriptModel { - values: root.getModelValues() - onValuesChanged: root.currentIndex = 0 - } - - spacing: Appearance.spacing.small - orientation: Qt.Vertical - implicitHeight: (Config.launcher.sizes.itemHeight + spacing) * Math.min(Config.launcher.maxShown, count) - spacing - - highlightMoveDuration: Appearance.anim.durations.normal - highlightResizeDuration: 0 - - highlight: StyledRect { - radius: Appearance.rounding.full - color: Colours.palette.m3onSurface - opacity: 0.08 - } - - delegate: { - if (isCalc) - return calcItem; - if (isScheme) - return schemeItem; - if (isVariant) - return variantItem; - if (isAction) - return actionItem; - return appItem; - } - - ScrollBar.vertical: StyledScrollBar {} - - add: Transition { - Anim { - properties: "opacity,scale" - from: 0 - to: 1 - } - } - - remove: Transition { - Anim { - properties: "opacity,scale" - from: 1 - to: 0 - } - } - - move: Transition { - Anim { - property: "y" - } - Anim { - properties: "opacity,scale" - to: 1 - } - } - - addDisplaced: Transition { - Anim { - property: "y" - duration: Appearance.anim.durations.small - } - Anim { - properties: "opacity,scale" - to: 1 - } - } - - displaced: Transition { - Anim { - property: "y" - } - Anim { - properties: "opacity,scale" - to: 1 - } - } - - Component { - id: appItem - - AppItem { - visibilities: root.visibilities - } - } - - Component { - id: actionItem - - ActionItem { - list: root - } - } - - Component { - id: calcItem - - CalcItem { - list: root - } - } - - Component { - id: schemeItem - - SchemeItem { - list: root - } - } - - Component { - id: variantItem - - VariantItem { - list: root - } - } - - Behavior on isAction { - ChangeAnim {} - } - - Behavior on isCalc { - ChangeAnim {} - } - - Behavior on isScheme { - ChangeAnim {} - } - - Behavior on isVariant { - ChangeAnim {} - } - - component ChangeAnim: SequentialAnimation { - ParallelAnimation { - Anim { - target: root - property: "opacity" - from: 1 - to: 0 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardAccel - } - Anim { - target: root - property: "scale" - from: 1 - to: 0.9 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardAccel - } - } - PropertyAction {} - ParallelAnimation { - Anim { - target: root - property: "opacity" - from: 0 - to: 1 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - Anim { - target: root - property: "scale" - from: 0.9 - to: 1 - duration: Appearance.anim.durations.small - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - } - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/Background.qml b/modules/home/services/quickshell/shell/modules/launcher/Background.qml deleted file mode 100644 index 56733f76..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/Background.qml +++ /dev/null @@ -1,63 +0,0 @@ -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - required property Wrapper wrapper - readonly property real rounding: Config.border.rounding - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - PathArc { - relativeX: root.rounding - relativeY: -root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: 0 - relativeY: -(root.wrapper.height - root.roundingY * 2) - } - PathArc { - relativeX: root.rounding - relativeY: -root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - } - PathLine { - relativeX: root.wrapper.width - root.rounding * 2 - relativeY: 0 - } - PathArc { - relativeX: root.rounding - relativeY: root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - } - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY * 2 - } - PathArc { - relativeX: root.rounding - relativeY: root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - direction: PathArc.Counterclockwise - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/CalcItem.qml b/modules/home/services/quickshell/shell/modules/launcher/CalcItem.qml deleted file mode 100644 index ad816fe5..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/CalcItem.qml +++ /dev/null @@ -1,162 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Io -import QtQuick -import QtQuick.Layouts - -Item { - id: root - - required property var list - readonly property string math: list.search.text.slice(`${Config.launcher.actionPrefix}calc `.length) - - function onClicked(): void { - Quickshell.execDetached(["sh", "-c", `qalc -t -m 100 '${root.math}' | wl-copy`]); - root.list.visibilities.launcher = false; - } - - implicitHeight: Config.launcher.sizes.itemHeight - - anchors.left: parent?.left - anchors.right: parent?.right - - onMathChanged: { - if (math) { - qalcProc.command = ["qalc", "-m", "100", math]; - qalcProc.running = true; - } - } - - StateLayer { - radius: Appearance.rounding.full - - function onClicked(): void { - root.onClicked(); - } - } - - Binding { - id: binding - - when: root.math.length > 0 - target: metrics - property: "text" - } - - Process { - id: qalcProc - - stdout: StdioCollector { - onStreamFinished: binding.value = text.trim() - } - } - - RowLayout { - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.larger - - spacing: Appearance.spacing.normal - - MaterialIcon { - text: "function" - font.pointSize: Appearance.font.size.extraLarge - Layout.alignment: Qt.AlignVCenter - } - - StyledText { - id: result - - color: { - if (metrics.text.includes("error: ")) - return Colours.palette.m3error; - if (!root.math) - return Colours.palette.m3onSurfaceVariant; - return Colours.palette.m3onSurface; - } - - text: metrics.elidedText - font.pointSize: Appearance.font.size.normal - - Layout.fillWidth: true - Layout.alignment: Qt.AlignVCenter - - TextMetrics { - id: metrics - - text: qsTr("Type an expression to calculate") - font.family: result.font.family - font.pointSize: result.font.pointSize - elide: Text.ElideRight - elideWidth: result.width - } - } - - StyledRect { - color: Colours.palette.m3tertiary - radius: Appearance.rounding.normal - clip: true - - implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Appearance.padding.small * 2 - - Layout.alignment: Qt.AlignVCenter - - StateLayer { - id: stateLayer - - color: Colours.palette.m3onTertiary - - function onClicked(): void { - Quickshell.execDetached(["app2unit", "--", "foot", "fish", "-C", `exec qalc -i '${root.math}'`]); - root.list.visibilities.launcher = false; - } - } - - StyledText { - id: label - - anchors.verticalCenter: parent.verticalCenter - anchors.right: icon.left - anchors.rightMargin: Appearance.spacing.small - - text: qsTr("Open in calculator") - color: Colours.palette.m3onTertiary - font.pointSize: Appearance.font.size.normal - - opacity: stateLayer.containsMouse ? 1 : 0 - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - MaterialIcon { - id: icon - - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: Appearance.padding.normal - - text: "open_in_new" - color: Colours.palette.m3onTertiary - font.pointSize: Appearance.font.size.large - } - - Behavior on implicitWidth { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/Content.qml b/modules/home/services/quickshell/shell/modules/launcher/Content.qml deleted file mode 100644 index e8c95fd8..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/Content.qml +++ /dev/null @@ -1,174 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick - -Item { - id: root - - required property PersistentProperties visibilities - readonly property int padding: Appearance.padding.large - readonly property int rounding: Appearance.rounding.large - - implicitWidth: listWrapper.width + padding * 2 - implicitHeight: searchWrapper.height + listWrapper.height + padding * 2 - - anchors.top: parent.top - anchors.horizontalCenter: parent.horizontalCenter - - Item { - id: listWrapper - - implicitWidth: list.width - implicitHeight: list.height + root.padding - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: searchWrapper.top - anchors.bottomMargin: root.padding - - ContentList { - id: list - - visibilities: root.visibilities - search: search - padding: root.padding - rounding: root.rounding - } - } - - StyledRect { - id: searchWrapper - - color: Colours.alpha(Colours.palette.m3surfaceContainer, true) - radius: Appearance.rounding.full - - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: root.padding - - implicitHeight: Math.max(searchIcon.implicitHeight, search.implicitHeight, clearIcon.implicitHeight) - - MaterialIcon { - id: searchIcon - - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: root.padding - - text: "search" - color: Colours.palette.m3onSurfaceVariant - } - - StyledTextField { - id: search - - anchors.left: searchIcon.right - anchors.right: clearIcon.left - anchors.leftMargin: Appearance.spacing.small - anchors.rightMargin: Appearance.spacing.small - - topPadding: Appearance.padding.larger - bottomPadding: Appearance.padding.larger - - placeholderText: qsTr("Type \"%1\" for commands").arg(Config.launcher.actionPrefix) - background: null - - onAccepted: { - const currentItem = list.currentList?.currentItem; - if (currentItem) { - if (list.showWallpapers) { - if (Colours.scheme === "dynamic" && currentItem.modelData.path !== Wallpapers.actualCurrent) - Wallpapers.previewColourLock = true; - Wallpapers.setWallpaper(currentItem.modelData.path); - root.visibilities.launcher = false; - } else if (text.startsWith(Config.launcher.actionPrefix)) { - if (text.startsWith(`${Config.launcher.actionPrefix}calc `)) - currentItem.onClicked(); - else - currentItem.modelData.onClicked(list.currentList); - } else { - Apps.launch(currentItem.modelData); - root.visibilities.launcher = false; - } - } - } - - Keys.onUpPressed: list.currentList?.decrementCurrentIndex() - Keys.onDownPressed: list.currentList?.incrementCurrentIndex() - - Keys.onEscapePressed: root.visibilities.launcher = false - - Connections { - target: root.visibilities - - function onLauncherChanged(): void { - if (root.visibilities.launcher) - search.focus = true; - else { - search.text = ""; - const current = list.currentList; - if (current) - current.currentIndex = 0; - } - } - - function onSessionChanged(): void { - if (root.visibilities.launcher && !root.visibilities.session) - search.focus = true; - } - } - } - - MaterialIcon { - id: clearIcon - - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: root.padding - - width: search.text ? implicitWidth : implicitWidth / 2 - opacity: { - if (!search.text) - return 0; - if (mouse.pressed) - return 0.7; - if (mouse.containsMouse) - return 0.8; - return 1; - } - - text: "close" - color: Colours.palette.m3onSurfaceVariant - - MouseArea { - id: mouse - - anchors.fill: parent - hoverEnabled: true - cursorShape: search.text ? Qt.PointingHandCursor : undefined - - onClicked: search.text = "" - } - - Behavior on width { - NumberAnimation { - duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/ContentList.qml b/modules/home/services/quickshell/shell/modules/launcher/ContentList.qml deleted file mode 100644 index cbcf9fe5..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/ContentList.qml +++ /dev/null @@ -1,182 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import Quickshell -import QtQuick -import QtQuick.Controls - -Item { - id: root - - required property PersistentProperties visibilities - required property TextField search - required property int padding - required property int rounding - - readonly property bool showWallpapers: search.text.startsWith(`${Config.launcher.actionPrefix}wallpaper `) - readonly property Item currentList: showWallpapers ? wallpaperList.item : appList.item - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - - clip: true - state: showWallpapers ? "wallpapers" : "apps" - - states: [ - State { - name: "apps" - - PropertyChanges { - root.implicitWidth: Config.launcher.sizes.itemWidth - root.implicitHeight: appList.implicitHeight > 0 ? appList.implicitHeight : empty.implicitHeight - appList.active: true - } - - AnchorChanges { - anchors.left: root.parent.left - anchors.right: root.parent.right - } - }, - State { - name: "wallpapers" - - PropertyChanges { - root.implicitWidth: Math.max(Config.launcher.sizes.itemWidth * 1.2, wallpaperList.implicitWidth) - root.implicitHeight: Config.launcher.sizes.wallpaperHeight - wallpaperList.active: true - } - } - ] - - Behavior on state { - SequentialAnimation { - NumberAnimation { - target: root - property: "opacity" - from: 1 - to: 0 - duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - PropertyAction {} - NumberAnimation { - target: root - property: "opacity" - from: 0 - to: 1 - duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - Loader { - id: appList - - active: false - asynchronous: true - - anchors.left: parent.left - anchors.right: parent.right - - sourceComponent: AppList { - search: root.search - visibilities: root.visibilities - } - } - - Loader { - id: wallpaperList - - active: false - asynchronous: true - - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - - sourceComponent: WallpaperList { - search: root.search - visibilities: root.visibilities - } - } - - Row { - id: empty - - opacity: root.currentList?.count === 0 ? 1 : 0 - scale: root.currentList?.count === 0 ? 1 : 0.5 - - spacing: Appearance.spacing.normal - padding: Appearance.padding.large - - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - - MaterialIcon { - text: root.state === "wallpapers" ? "wallpaper_slideshow" : "manage_search" - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.extraLarge - - anchors.verticalCenter: parent.verticalCenter - } - - Column { - anchors.verticalCenter: parent.verticalCenter - - StyledText { - text: root.state === "wallpapers" ? qsTr("No wallpapers found") : qsTr("No results") - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.larger - font.weight: 500 - } - - StyledText { - text: root.state === "wallpapers" && Wallpapers.list.length === 0 ? qsTr("Try putting some wallpapers in %1").arg(Paths.shortenHome(Config.paths.wallpaperDir)) : qsTr("Try searching for something else") - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.normal - } - } - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on scale { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - Behavior on implicitWidth { - enabled: root.visibilities.launcher - - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel - } - } - - Behavior on implicitHeight { - enabled: root.visibilities.launcher - - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/M3Variants.qml b/modules/home/services/quickshell/shell/modules/launcher/M3Variants.qml deleted file mode 100644 index a4b797ab..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/M3Variants.qml +++ /dev/null @@ -1,91 +0,0 @@ -pragma Singleton - -import "root:/utils/scripts/fuzzysort.js" as Fuzzy -import "root:/config" -import Quickshell -import QtQuick - -Singleton { - id: root - - readonly property list list: [ - Variant { - variant: "vibrant" - icon: "sentiment_very_dissatisfied" - name: "Vibrant" - description: "A high chroma palette. The primary palette's chroma is at maximum." - }, - Variant { - variant: "tonalspot" - icon: "android" - name: "Tonal Spot" - description: "Default for Material theme colours. A pastel palette with a low chroma." - }, - Variant { - variant: "expressive" - icon: "compare_arrows" - name: "Expressive" - description: "A medium chroma palette. The primary palette's hue is different from the seed colour, for variety." - }, - Variant { - variant: "fidelity" - icon: "compare" - name: "Fidelity" - description: "Matches the seed colour, even if the seed colour is very bright (high chroma)." - }, - Variant { - variant: "content" - icon: "sentiment_calm" - name: "Content" - description: "Almost identical to fidelity." - }, - Variant { - variant: "fruitsalad" - icon: "nutrition" - name: "Fruit Salad" - description: "A playful theme - the seed colour's hue does not appear in the theme." - }, - Variant { - variant: "rainbow" - icon: "looks" - name: "Rainbow" - description: "A playful theme - the seed colour's hue does not appear in the theme." - }, - Variant { - variant: "neutral" - icon: "contrast" - name: "Neutral" - description: "Close to grayscale, a hint of chroma." - }, - Variant { - variant: "monochrome" - icon: "filter_b_and_w" - name: "Monochrome" - description: "All colours are grayscale, no chroma." - } - ] - - readonly property list preppedVariants: list.map(v => ({ - name: Fuzzy.prepare(v.variant), - variant: v - })) - - function fuzzyQuery(search: string): var { - return Fuzzy.go(search.slice(`${Config.launcher.actionPrefix}variant `.length), preppedVariants, { - all: true, - key: "name" - }).map(r => r.obj.variant); - } - - component Variant: QtObject { - required property string variant - required property string icon - required property string name - required property string description - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Quickshell.execDetached(["caelestia", "scheme", "set", "-v", variant]); - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/SchemeItem.qml b/modules/home/services/quickshell/shell/modules/launcher/SchemeItem.qml deleted file mode 100644 index df635f5c..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/SchemeItem.qml +++ /dev/null @@ -1,93 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import QtQuick - -Item { - id: root - - required property Schemes.Scheme modelData - required property var list - - implicitHeight: Config.launcher.sizes.itemHeight - - anchors.left: parent?.left - anchors.right: parent?.right - - StateLayer { - radius: Appearance.rounding.full - - function onClicked(): void { - root.modelData?.onClicked(root.list); - } - } - - Item { - anchors.fill: parent - anchors.leftMargin: Appearance.padding.larger - anchors.rightMargin: Appearance.padding.larger - anchors.margins: Appearance.padding.smaller - - StyledRect { - id: preview - - anchors.verticalCenter: parent.verticalCenter - - border.width: 1 - border.color: Qt.alpha(`#${root.modelData?.colours?.outline}`, 0.5) - - color: `#${root.modelData?.colours?.surface}` - radius: Appearance.rounding.full - implicitWidth: parent.height * 0.8 - implicitHeight: parent.height * 0.8 - - Item { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.right: parent.right - - implicitWidth: parent.implicitWidth / 2 - clip: true - - StyledRect { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.right: parent.right - - implicitWidth: preview.implicitWidth - color: `#${root.modelData?.colours?.primary}` - radius: Appearance.rounding.full - } - } - } - - Column { - anchors.left: preview.right - anchors.leftMargin: Appearance.spacing.normal - anchors.verticalCenter: parent.verticalCenter - - width: parent.width - preview.width - spacing: 0 - - StyledText { - id: name - - text: root.modelData?.name ?? "" - font.pointSize: Appearance.font.size.normal - } - - StyledText { - id: comment - - text: root.modelData?.flavour ?? "" - font.pointSize: Appearance.font.size.small - color: Colours.palette.m3outline - - elide: Text.ElideRight - width: parent.width - Appearance.rounding.normal * 2 - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/Schemes.qml b/modules/home/services/quickshell/shell/modules/launcher/Schemes.qml deleted file mode 100644 index abdaaf2b..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/Schemes.qml +++ /dev/null @@ -1,67 +0,0 @@ -pragma Singleton - -import "root:/utils/scripts/fuzzysort.js" as Fuzzy -import "root:/config" -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - readonly property list preppedSchemes: schemes.instances.map(s => ({ - name: Fuzzy.prepare(s.name), - flavour: Fuzzy.prepare(s.flavour), - scheme: s - })) - - function fuzzyQuery(search: string): var { - return Fuzzy.go(search.slice(`${Config.launcher.actionPrefix}scheme `.length), preppedSchemes, { - all: true, - keys: ["name", "flavour"], - scoreFn: r => r[0].score > 0 ? r[0].score * 0.9 + r[1].score * 0.1 : 0 - }).map(r => r.obj.scheme); - } - - Variants { - id: schemes - - Scheme {} - } - - Process { - id: getSchemes - - running: true - command: ["caelestia", "scheme", "list"] - stdout: StdioCollector { - onStreamFinished: { - const schemeData = JSON.parse(text); - const list = Object.entries(schemeData).map(([name, f]) => Object.entries(f).map(([flavour, colours]) => ({ - name, - flavour, - colours - }))); - - const flat = []; - for (const s of list) - for (const f of s) - flat.push(f); - - schemes.model = flat; - } - } - } - - component Scheme: QtObject { - required property var modelData - readonly property string name: modelData.name - readonly property string flavour: modelData.flavour - readonly property var colours: modelData.colours - - function onClicked(list: AppList): void { - list.visibilities.launcher = false; - Quickshell.execDetached(["caelestia", "scheme", "set", "-n", name, "-f", flavour]); - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/VariantItem.qml b/modules/home/services/quickshell/shell/modules/launcher/VariantItem.qml deleted file mode 100644 index 2b5ae2e7..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/VariantItem.qml +++ /dev/null @@ -1,69 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -Item { - id: root - - required property M3Variants.Variant modelData - required property var list - - implicitHeight: Config.launcher.sizes.itemHeight - - anchors.left: parent?.left - anchors.right: parent?.right - - StateLayer { - radius: Appearance.rounding.full - - function onClicked(): void { - root.modelData?.onClicked(root.list); - } - } - - Item { - anchors.fill: parent - anchors.leftMargin: Appearance.padding.larger - anchors.rightMargin: Appearance.padding.larger - anchors.margins: Appearance.padding.smaller - - MaterialIcon { - id: icon - - text: root.modelData?.icon ?? "" - font.pointSize: Appearance.font.size.extraLarge - - anchors.verticalCenter: parent.verticalCenter - } - - Item { - anchors.left: icon.right - anchors.leftMargin: Appearance.spacing.larger - anchors.verticalCenter: icon.verticalCenter - - implicitWidth: parent.width - icon.width - implicitHeight: name.implicitHeight + desc.implicitHeight - - StyledText { - id: name - - text: root.modelData?.name ?? "" - font.pointSize: Appearance.font.size.normal - } - - StyledText { - id: desc - - text: root.modelData?.description ?? "" - font.pointSize: Appearance.font.size.small - color: Colours.alpha(Colours.palette.m3outline, true) - - elide: Text.ElideRight - width: root.width - icon.width - Appearance.rounding.normal * 2 - - anchors.top: name.bottom - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/WallpaperItem.qml b/modules/home/services/quickshell/shell/modules/launcher/WallpaperItem.qml deleted file mode 100644 index 862e910d..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/WallpaperItem.qml +++ /dev/null @@ -1,109 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick -import QtQuick.Effects - -StyledRect { - id: root - - required property Wallpapers.Wallpaper modelData - required property PersistentProperties visibilities - - scale: 0.5 - opacity: 0 - z: PathView.z ?? 0 - - Component.onCompleted: { - scale = Qt.binding(() => PathView.isCurrentItem ? 1 : PathView.onPath ? 0.8 : 0); - opacity = Qt.binding(() => PathView.onPath ? 1 : 0); - } - - implicitWidth: image.width + Appearance.padding.larger * 2 - implicitHeight: image.height + label.height + Appearance.spacing.small / 2 + Appearance.padding.large + Appearance.padding.normal - - StateLayer { - radius: Appearance.rounding.normal - - function onClicked(): void { - Wallpapers.setWallpaper(root.modelData.path); - root.visibilities.launcher = false; - } - } - - CachingImage { - id: image - - anchors.horizontalCenter: parent.horizontalCenter - y: Appearance.padding.large - - visible: false - path: root.modelData.path - smooth: !root.PathView.view.moving - - width: Config.launcher.sizes.wallpaperWidth - height: width / 16 * 9 - } - - Rectangle { - id: mask - - layer.enabled: true - layer.smooth: true - visible: false - anchors.fill: image - radius: Appearance.rounding.normal - } - - RectangularShadow { - opacity: root.PathView.isCurrentItem ? 0.7 : 0 - anchors.fill: mask - radius: mask.radius - color: Colours.palette.m3shadow - blur: 10 - spread: 3 - - Behavior on opacity { - Anim {} - } - } - - MultiEffect { - anchors.fill: image - source: image - maskEnabled: true - maskSource: mask - maskSpreadAtMin: 1 - maskThresholdMin: 0.5 - } - - StyledText { - id: label - - anchors.top: image.bottom - anchors.topMargin: Appearance.spacing.small / 2 - anchors.horizontalCenter: parent.horizontalCenter - - width: image.width - Appearance.padding.normal * 2 - horizontalAlignment: Text.AlignHCenter - elide: Text.ElideRight - renderType: Text.QtRendering - text: root.modelData.name - font.pointSize: Appearance.font.size.normal - } - - Behavior on scale { - Anim {} - } - - Behavior on opacity { - Anim {} - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/WallpaperList.qml b/modules/home/services/quickshell/shell/modules/launcher/WallpaperList.qml deleted file mode 100644 index fd82a2bb..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/WallpaperList.qml +++ /dev/null @@ -1,79 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick -import QtQuick.Controls - -PathView { - id: root - - required property TextField search - required property PersistentProperties visibilities - readonly property int numItems: { - const screenWidth = QsWindow.window?.screen.width * 0.8; - if (!screenWidth) - return 0; - const itemWidth = Config.launcher.sizes.wallpaperWidth * 0.8; - const max = Config.launcher.maxWallpapers; - if (max * itemWidth > screenWidth) { - const items = Math.floor(screenWidth / itemWidth); - return items > 1 && items % 2 === 0 ? items - 1 : items; - } - return max; - } - - model: ScriptModel { - readonly property string search: root.search.text.split(" ").slice(1).join(" ") - - values: { - const list = Wallpapers.fuzzyQuery(search); - if (list.length > 1 && list.length % 2 === 0) - list.length -= 1; // Always show odd number - return list; - } - onValuesChanged: root.currentIndex = search ? 0 : values.findIndex(w => w.path === Wallpapers.actualCurrent) - } - - Component.onCompleted: currentIndex = Wallpapers.list.findIndex(w => w.path === Wallpapers.actualCurrent) - Component.onDestruction: Wallpapers.stopPreview() - - onCurrentItemChanged: { - if (currentItem) - Wallpapers.preview(currentItem.modelData.path); - } - - implicitWidth: Math.min(numItems, count) * (Config.launcher.sizes.wallpaperWidth * 0.8 + Appearance.padding.larger * 2) - pathItemCount: numItems - cacheItemCount: 4 - - snapMode: PathView.SnapToItem - preferredHighlightBegin: 0.5 - preferredHighlightEnd: 0.5 - highlightRangeMode: PathView.StrictlyEnforceRange - - delegate: WallpaperItem { - visibilities: root.visibilities - } - - path: Path { - startY: root.height / 2 - - PathAttribute { - name: "z" - value: 0 - } - PathLine { - x: root.width / 2 - relativeY: 0 - } - PathAttribute { - name: "z" - value: 1 - } - PathLine { - x: root.width - relativeY: 0 - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/launcher/Wrapper.qml b/modules/home/services/quickshell/shell/modules/launcher/Wrapper.qml deleted file mode 100644 index 86c8b953..00000000 --- a/modules/home/services/quickshell/shell/modules/launcher/Wrapper.qml +++ /dev/null @@ -1,55 +0,0 @@ -import "root:/config" -import Quickshell -import QtQuick - -Item { - id: root - - required property PersistentProperties visibilities - - visible: height > 0 - implicitHeight: 0 - implicitWidth: content.implicitWidth - - states: State { - name: "visible" - when: root.visibilities.launcher - - PropertyChanges { - root.implicitHeight: content.implicitHeight - } - } - - transitions: [ - Transition { - from: "" - to: "visible" - - NumberAnimation { - target: root - property: "implicitHeight" - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial - } - }, - Transition { - from: "visible" - to: "" - - NumberAnimation { - target: root - property: "implicitHeight" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - ] - - Content { - id: content - - visibilities: root.visibilities - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/Backgrounds.qml b/modules/home/services/quickshell/shell/modules/lock/Backgrounds.qml deleted file mode 100644 index c8c5db08..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/Backgrounds.qml +++ /dev/null @@ -1,480 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Shapes -import QtQuick.Effects - -Item { - id: root - - required property bool locked - required property real weatherWidth - required property real buttonsWidth - required property real buttonsHeight - required property real statusWidth - required property real statusHeight - required property bool isNormal - required property bool isLarge - - readonly property real clockBottom: innerMask.anchors.margins + clockPath.height - readonly property real inputTop: innerMask.anchors.margins + inputPath.height - readonly property real weatherTop: innerMask.anchors.margins + weatherPath.height - readonly property real weatherRight: innerMask.anchors.margins + weatherPath.width - readonly property real buttonsTop: innerMask.anchors.margins + buttonsPath.height - readonly property real buttonsLeft: innerMask.anchors.margins + buttonsPath.width - readonly property real statusBottom: innerMask.anchors.margins + statusPath.height - readonly property real statusLeft: innerMask.anchors.margins + statusPath.width - - readonly property real mediaX: innerMask.anchors.margins + mediaPath.width - readonly property real mediaY: innerMask.anchors.margins + mediaPath.height - - anchors.fill: parent - - StyledRect { - id: base - - anchors.fill: parent - color: Colours.alpha(Colours.palette.m3surface, false) - visible: false - } - - Item { - id: mask - - anchors.fill: parent - layer.enabled: true - visible: false - - Rectangle { - id: innerMask - - anchors.fill: parent - anchors.margins: root.locked ? Config.lock.sizes.border : -radius / 2 - radius: Appearance.rounding.large * 2 - - Behavior on anchors.margins { - Anim {} - } - } - } - - MultiEffect { - anchors.fill: parent - source: base - maskEnabled: true - maskInverted: true - maskSource: mask - maskThresholdMin: 0.5 - maskSpreadAtMin: 1 - } - - Shape { - anchors.fill: parent - anchors.margins: Math.floor(innerMask.anchors.margins) - - preferredRendererType: Shape.CurveRenderer - - ShapePath { - id: clockPath - - readonly property int width: Config.lock.sizes.clockWidth - property real height: root.locked ? Config.lock.sizes.clockHeight : 0 - - readonly property real rounding: Appearance.rounding.large * 4 - readonly property bool flatten: height < rounding * 2 - readonly property real roundingY: flatten ? height / 2 : rounding - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - startX: (innerMask.width - width) / 2 - rounding - - PathArc { - relativeX: clockPath.rounding - relativeY: clockPath.roundingY - radiusX: clockPath.rounding - radiusY: Math.min(clockPath.rounding, clockPath.height) - } - PathLine { - relativeX: 0 - relativeY: clockPath.height - clockPath.roundingY * 2 - } - PathArc { - relativeX: clockPath.rounding - relativeY: clockPath.roundingY - radiusX: clockPath.rounding - radiusY: Math.min(clockPath.rounding, clockPath.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: clockPath.width - clockPath.rounding * 2 - relativeY: 0 - } - PathArc { - relativeX: clockPath.rounding - relativeY: -clockPath.roundingY - radiusX: clockPath.rounding - radiusY: Math.min(clockPath.rounding, clockPath.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: 0 - relativeY: -(clockPath.height - clockPath.roundingY * 2) - } - PathArc { - relativeX: clockPath.rounding - relativeY: -clockPath.roundingY - radiusX: clockPath.rounding - radiusY: Math.min(clockPath.rounding, clockPath.height) - } - - Behavior on height { - Anim {} - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - ShapePath { - id: inputPath - - readonly property int width: Config.lock.sizes.inputWidth - property real height: root.locked ? Config.lock.sizes.inputHeight : 0 - - readonly property real rounding: Appearance.rounding.large * 2 - readonly property bool flatten: height < rounding * 2 - readonly property real roundingY: flatten ? height / 2 : rounding - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - startX: (innerMask.width - width) / 2 - rounding - startY: Math.ceil(innerMask.height) - - PathArc { - relativeX: inputPath.rounding - relativeY: -inputPath.roundingY - radiusX: inputPath.rounding - radiusY: Math.min(inputPath.rounding, inputPath.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: 0 - relativeY: -(inputPath.height - inputPath.roundingY * 2) - } - PathArc { - relativeX: inputPath.rounding - relativeY: -inputPath.roundingY - radiusX: inputPath.rounding - radiusY: Math.min(inputPath.rounding, inputPath.height) - } - PathLine { - relativeX: inputPath.width - inputPath.rounding * 2 - relativeY: 0 - } - PathArc { - relativeX: inputPath.rounding - relativeY: inputPath.roundingY - radiusX: inputPath.rounding - radiusY: Math.min(inputPath.rounding, inputPath.height) - } - PathLine { - relativeX: 0 - relativeY: inputPath.height - inputPath.roundingY * 2 - } - PathArc { - relativeX: inputPath.rounding - relativeY: inputPath.roundingY - radiusX: inputPath.rounding - radiusY: Math.min(inputPath.rounding, inputPath.height) - direction: PathArc.Counterclockwise - } - - Behavior on height { - Anim {} - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - ShapePath { - id: weatherPath - - property int width: root.locked ? root.weatherWidth - Config.lock.sizes.border / 4 : 0 - property real height: root.locked ? Config.lock.sizes.weatherHeight : 0 - - readonly property real rounding: Appearance.rounding.large * 2 - readonly property real roundingX: width < rounding * 2 ? width / 2 : rounding - readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - startY: Math.ceil(innerMask.height) - height - roundingY - - PathArc { - relativeX: weatherPath.roundingX - relativeY: weatherPath.roundingY - radiusX: Math.min(weatherPath.rounding, weatherPath.width) - radiusY: Math.min(weatherPath.rounding, weatherPath.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: weatherPath.width - weatherPath.roundingX * 2 - relativeY: 0 - } - PathArc { - relativeX: weatherPath.roundingX - relativeY: weatherPath.roundingY - radiusX: Math.min(weatherPath.rounding, weatherPath.width) - radiusY: Math.min(weatherPath.rounding, weatherPath.height) - } - PathLine { - relativeX: 0 - relativeY: weatherPath.height - weatherPath.roundingY * 2 - } - PathArc { - relativeX: weatherPath.roundingX - relativeY: weatherPath.roundingY - radiusX: Math.min(weatherPath.rounding, weatherPath.width) - radiusY: Math.min(weatherPath.rounding, weatherPath.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: -weatherPath.width - weatherPath.roundingX - relativeY: 0 - } - - Behavior on width { - Anim {} - } - - Behavior on height { - Anim {} - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - ShapePath { - id: mediaPath - - property int width: root.locked ? (root.isLarge ? Config.lock.sizes.mediaWidth : Config.lock.sizes.mediaWidthSmall) - Config.lock.sizes.border / 4 : 0 - property real height: root.locked ? (root.isLarge ? Config.lock.sizes.mediaHeight : Config.lock.sizes.mediaHeightSmall) : 0 - - readonly property real rounding: Appearance.rounding.large * 2 - readonly property real roundingX: width < rounding * 2 ? width / 2 : rounding - readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding - - strokeWidth: -1 - fillColor: root.isNormal ? Colours.palette.m3surface : "transparent" - - startX: root.isLarge ? 0 : Math.ceil(innerMask.width) - startY: root.isLarge ? height + roundingY : Math.ceil(innerMask.height) - height - roundingY - - PathArc { - relativeX: mediaPath.roundingX * (root.isLarge ? 1 : -1) - relativeY: mediaPath.roundingY * (root.isLarge ? -1 : 1) - radiusX: Math.min(mediaPath.rounding, mediaPath.width) - radiusY: Math.min(mediaPath.rounding, mediaPath.height) - } - PathLine { - relativeX: (mediaPath.width - mediaPath.roundingX * 2) * (root.isLarge ? 1 : -1) - relativeY: 0 - } - PathArc { - relativeX: mediaPath.roundingX * (root.isLarge ? 1 : -1) - relativeY: mediaPath.roundingY * (root.isLarge ? -1 : 1) - radiusX: Math.min(mediaPath.rounding, mediaPath.width) - radiusY: Math.min(mediaPath.rounding, mediaPath.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: 0 - relativeY: (mediaPath.height - mediaPath.roundingY * 2) * (root.isLarge ? -1 : 1) - } - PathArc { - relativeX: mediaPath.roundingX * (root.isLarge ? 1 : -1) - relativeY: mediaPath.roundingY * (root.isLarge ? -1 : 1) - radiusX: Math.min(mediaPath.rounding, mediaPath.width) - radiusY: Math.min(mediaPath.rounding, mediaPath.height) - } - PathLine { - relativeX: (-mediaPath.width - mediaPath.roundingX) * (root.isLarge ? 1 : -1) - relativeY: 0 - } - - Behavior on width { - Anim {} - } - - Behavior on height { - Anim {} - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - ShapePath { - id: buttonsPath - - property int width: root.locked ? root.buttonsWidth - Config.lock.sizes.border / 4 : 0 - property real height: root.locked ? root.buttonsHeight - Config.lock.sizes.border / 4 : 0 - - readonly property real rounding: Appearance.rounding.large * 2 - readonly property real roundingX: width < rounding * 2 ? width / 2 : rounding - readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding - - strokeWidth: -1 - fillColor: root.isLarge ? Colours.palette.m3surface : "transparent" - - startX: Math.ceil(innerMask.width) - startY: Math.ceil(innerMask.height) - height - rounding - - PathArc { - relativeX: -buttonsPath.roundingX - relativeY: buttonsPath.rounding - radiusX: Math.min(buttonsPath.rounding, buttonsPath.width) - radiusY: buttonsPath.rounding, buttonsPath.height - } - PathLine { - relativeX: -(buttonsPath.width - buttonsPath.roundingX * 2) - relativeY: 0 - } - PathArc { - relativeX: -buttonsPath.roundingX - relativeY: buttonsPath.roundingY - radiusX: Math.min(buttonsPath.rounding, buttonsPath.width) - radiusY: Math.min(buttonsPath.rounding, buttonsPath.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: 0 - relativeY: buttonsPath.height - buttonsPath.roundingY * 2 - } - PathArc { - relativeX: -buttonsPath.roundingX - relativeY: buttonsPath.roundingY - radiusX: Math.min(buttonsPath.rounding, buttonsPath.width) - radiusY: Math.min(buttonsPath.rounding, buttonsPath.height) - } - PathLine { - relativeX: buttonsPath.width + buttonsPath.roundingX - relativeY: 0 - } - - Behavior on width { - Anim {} - } - - Behavior on height { - Anim {} - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - ShapePath { - id: statusPath - - property int width: root.locked ? root.statusWidth - Config.lock.sizes.border / 4 : 0 - property real height: root.locked ? root.statusHeight - Config.lock.sizes.border / 4 : 0 - - readonly property real rounding: Appearance.rounding.large * 2 - readonly property real roundingX: width < rounding * 2 ? width / 2 : rounding - readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding - - strokeWidth: -1 - fillColor: root.isLarge ? Colours.palette.m3surface : "transparent" - - startX: Math.ceil(innerMask.width) - startY: height + rounding - - PathArc { - relativeX: -statusPath.roundingX - relativeY: -statusPath.rounding - radiusX: Math.min(statusPath.rounding, statusPath.width) - radiusY: statusPath.rounding - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: -(statusPath.width - statusPath.roundingX * 2) - relativeY: 0 - } - PathArc { - relativeX: -statusPath.roundingX - relativeY: -statusPath.roundingY - radiusX: Math.min(statusPath.rounding, statusPath.width) - radiusY: Math.min(statusPath.rounding, statusPath.height) - } - PathLine { - relativeX: 0 - relativeY: -(statusPath.height - statusPath.roundingY * 2) - } - PathArc { - relativeX: -statusPath.roundingX - relativeY: -statusPath.roundingY - radiusX: Math.min(statusPath.rounding, statusPath.width) - radiusY: Math.min(statusPath.rounding, statusPath.height) - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: statusPath.width + statusPath.roundingX - relativeY: 0 - } - - Behavior on width { - Anim {} - } - - Behavior on height { - Anim {} - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/Buttons.qml b/modules/home/services/quickshell/shell/modules/lock/Buttons.qml deleted file mode 100644 index 51613b5e..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/Buttons.qml +++ /dev/null @@ -1,115 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import QtQuick -import QtQuick.Layouts - -WrapperItem { - readonly property real nonAnimMargin: handler.hovered ? Appearance.padding.large * 2 : Appearance.padding.large * 1.2 - readonly property real nonAnimWidth: handler.hovered ? Config.lock.sizes.buttonsWidth : Config.lock.sizes.buttonsWidthSmall - readonly property real nonAnimHeight: (nonAnimWidth + nonAnimMargin * 2) / 4 - - margin: nonAnimMargin - rightMargin: 0 - bottomMargin: 0 - implicitWidth: nonAnimWidth - implicitHeight: nonAnimHeight - - Behavior on margin { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - Behavior on implicitWidth { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - HoverHandler { - id: handler - - target: parent - } - - RowLayout { - id: layout - - spacing: Appearance.spacing.normal - - SessionButton { - icon: "logout" - command: ["loginctl", "terminate-user", ""] - } - - SessionButton { - icon: "power_settings_new" - command: ["systemctl", "poweroff"] - } - - SessionButton { - icon: "downloading" - command: ["systemctl", "hibernate"] - } - - SessionButton { - icon: "cached" - command: ["systemctl", "reboot"] - } - } - - component SessionButton: StyledRect { - required property string icon - required property list command - - Layout.fillWidth: true - Layout.preferredHeight: width - - radius: stateLayer.containsMouse ? Appearance.rounding.large * 2 : Appearance.rounding.large * 1.2 - color: Colours.palette.m3secondaryContainer - - StateLayer { - id: stateLayer - - color: Colours.palette.m3onSecondaryContainer - - function onClicked(): void { - Quickshell.execDetached(parent.command); - } - } - - MaterialIcon { - anchors.centerIn: parent - - text: parent.icon - color: Colours.palette.m3onSecondaryContainer - font.pointSize: (parent.width * 0.4) || 1 - font.weight: handler.hovered ? 500 : 400 - } - - Behavior on radius { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/Clock.qml b/modules/home/services/quickshell/shell/modules/lock/Clock.qml deleted file mode 100644 index 9d0ae3fb..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/Clock.qml +++ /dev/null @@ -1,53 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick.Layouts - -ColumnLayout { - id: root - - spacing: 0 - - RowLayout { - Layout.alignment: Qt.AlignHCenter - spacing: Appearance.spacing.small - - StyledText { - Layout.alignment: Qt.AlignVCenter - text: Time.format("HH") - color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge * 4 - font.family: Appearance.font.family.mono - font.weight: 800 - } - - StyledText { - Layout.alignment: Qt.AlignVCenter - text: ":" - color: Colours.palette.m3primary - font.pointSize: Appearance.font.size.extraLarge * 4 - font.family: Appearance.font.family.mono - font.weight: 800 - } - - StyledText { - Layout.alignment: Qt.AlignVCenter - text: Time.format("mm") - color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge * 4 - font.family: Appearance.font.family.mono - font.weight: 800 - } - } - - StyledText { - Layout.alignment: Qt.AlignHCenter - Layout.bottomMargin: Appearance.padding.large * 3 - - text: Time.format("dddd, d MMMM yyyy") - color: Colours.palette.m3tertiary - font.pointSize: Appearance.font.size.extraLarge - font.family: Appearance.font.family.mono - font.bold: true - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/Input.qml b/modules/home/services/quickshell/shell/modules/lock/Input.qml deleted file mode 100644 index f5b3c162..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/Input.qml +++ /dev/null @@ -1,260 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import Quickshell -import Quickshell.Wayland -import Quickshell.Services.Pam -import QtQuick -import QtQuick.Layouts - -ColumnLayout { - id: root - - required property WlSessionLockSurface lock - - property string passwordBuffer - - spacing: Appearance.spacing.large * 2 - - RowLayout { - Layout.alignment: Qt.AlignHCenter - Layout.topMargin: Appearance.padding.large * 3 - Layout.maximumWidth: Config.lock.sizes.inputWidth - Appearance.rounding.large * 2 - - spacing: Appearance.spacing.large - - StyledClippingRect { - Layout.alignment: Qt.AlignVCenter - implicitWidth: Config.lock.sizes.faceSize - implicitHeight: Config.lock.sizes.faceSize - - radius: Appearance.rounding.large - color: Colours.palette.m3surfaceContainer - - MaterialIcon { - anchors.centerIn: parent - - text: "person" - fill: 1 - grade: 200 - font.pointSize: Config.lock.sizes.faceSize / 2 - } - - CachingImage { - anchors.fill: parent - path: `${Paths.home}/.face` - } - } - - ColumnLayout { - Layout.fillWidth: true - Layout.alignment: Qt.AlignVCenter - spacing: Appearance.spacing.small - - StyledText { - Layout.fillWidth: true - text: qsTr("Welcome back, %1").arg(Quickshell.env("USER")) - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - elide: Text.ElideRight - } - - StyledText { - Layout.fillWidth: true - text: qsTr("Logging in to %1").arg(Quickshell.env("XDG_CURRENT_DESKTOP") || Quickshell.env("XDG_SESSION_DESKTOP")) - color: Colours.palette.m3tertiary - font.pointSize: Appearance.font.size.large - elide: Text.ElideRight - } - } - } - - StyledRect { - Layout.fillWidth: true - Layout.preferredWidth: charList.implicitWidth + Appearance.padding.large * 2 - Layout.preferredHeight: Appearance.font.size.normal + Appearance.padding.large * 2 - - focus: true - color: Colours.palette.m3surfaceContainer - radius: Appearance.rounding.small - clip: true - - onFocusChanged: { - if (!focus) - focus = true; - } - - Keys.onPressed: event => { - if (pam.active) - return; - - if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) { - placeholder.animate = false; - pam.start(); - } else if (event.key === Qt.Key_Backspace) { - if (event.modifiers & Qt.ControlModifier) { - charList.implicitWidth = charList.implicitWidth; // Break binding - root.passwordBuffer = ""; - } else { - root.passwordBuffer = root.passwordBuffer.slice(0, -1); - } - } else if (" abcdefghijklmnopqrstuvwxyz1234567890`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?".includes(event.text.toLowerCase())) { - charList.bindImWidth(); - root.passwordBuffer += event.text; - } - } - - PamContext { - id: pam - - onResponseRequiredChanged: { - if (!responseRequired) - return; - - respond(root.passwordBuffer); - charList.implicitWidth = charList.implicitWidth; // Break binding - root.passwordBuffer = ""; - placeholder.animate = true; - } - - onCompleted: res => { - if (res === PamResult.Success) - return root.lock.unlock(); - - if (res === PamResult.Error) - placeholder.pamState = "error"; - else if (res === PamResult.MaxTries) - placeholder.pamState = "max"; - else if (res === PamResult.Failed) - placeholder.pamState = "fail"; - - placeholderDelay.restart(); - } - } - - Timer { - id: placeholderDelay - - interval: 3000 - onTriggered: placeholder.pamState = "" - } - - StyledText { - id: placeholder - - property string pamState - - anchors.centerIn: parent - - text: { - if (pam.active) - return qsTr("Loading..."); - if (pamState === "error") - return qsTr("An error occured"); - if (pamState === "max") - return qsTr("You have reached the maximum number of tries"); - if (pamState === "fail") - return qsTr("Incorrect password"); - return qsTr("Enter your password"); - } - - animate: true - color: pam.active ? Colours.palette.m3secondary : pamState ? Colours.palette.m3error : Colours.palette.m3outline - font.pointSize: Appearance.font.size.larger - - opacity: root.passwordBuffer ? 0 : 1 - - Behavior on opacity { - Anim {} - } - } - - ListView { - id: charList - - function bindImWidth(): void { - imWidthBehavior.enabled = false; - implicitWidth = Qt.binding(() => Math.min(count * (Appearance.font.size.normal + spacing) - spacing, Config.lock.sizes.inputWidth - Appearance.rounding.large * 2 - Appearance.padding.large * 5)); - imWidthBehavior.enabled = true; - } - - anchors.centerIn: parent - - implicitWidth: Math.min(count * (Appearance.font.size.normal + spacing) - spacing, Config.lock.sizes.inputWidth - Appearance.rounding.large * 2 - Appearance.padding.large * 5) - implicitHeight: Appearance.font.size.normal - - orientation: Qt.Horizontal - spacing: Appearance.spacing.small / 2 - - model: ScriptModel { - values: root.passwordBuffer.split("") - } - - delegate: StyledRect { - id: ch - - implicitWidth: Appearance.font.size.normal - implicitHeight: Appearance.font.size.normal - - color: Colours.palette.m3onSurface - radius: Appearance.rounding.full - - opacity: 0 - scale: 0.5 - Component.onCompleted: { - opacity = 1; - scale = 1; - } - ListView.onRemove: removeAnim.start() - - SequentialAnimation { - id: removeAnim - - PropertyAction { - target: ch - property: "ListView.delayRemove" - value: true - } - ParallelAnimation { - Anim { - target: ch - property: "opacity" - to: 0 - } - Anim { - target: ch - property: "scale" - to: 0.5 - } - } - PropertyAction { - target: ch - property: "ListView.delayRemove" - value: false - } - } - - Behavior on opacity { - Anim {} - } - - Behavior on scale { - Anim {} - } - } - - Behavior on implicitWidth { - id: imWidthBehavior - - Anim {} - } - } - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/Lock.qml b/modules/home/services/quickshell/shell/modules/lock/Lock.qml deleted file mode 100644 index 1d5176fe..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/Lock.qml +++ /dev/null @@ -1,57 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import Quickshell -import Quickshell.Io -import Quickshell.Wayland - -Scope { - LazyLoader { - id: loader - - WlSessionLock { - id: lock - - property bool unlocked - - locked: true - - onLockedChanged: { - if (!locked) - loader.active = false; - } - - LockSurface { - lock: lock - } - } - } - - CustomShortcut { - name: "lock" - description: "Lock the current session" - onPressed: loader.activeAsync = true - } - - CustomShortcut { - name: "unlock" - description: "Unlock the current session" - onPressed: loader.item.locked = false - } - - IpcHandler { - target: "lock" - - function lock(): void { - loader.activeAsync = true; - } - - function unlock(): void { - loader.item.locked = false; - } - - function isLocked(): bool { - return loader.active; - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/LockSurface.qml b/modules/home/services/quickshell/shell/modules/lock/LockSurface.qml deleted file mode 100644 index 83fb89fe..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/LockSurface.qml +++ /dev/null @@ -1,191 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell.Wayland -import QtQuick -import QtQuick.Effects - -WlSessionLockSurface { - id: root - - required property WlSessionLock lock - - property bool thisLocked - readonly property bool locked: thisLocked && !lock.unlocked - - function unlock(): void { - lock.unlocked = true; - animDelay.start(); - } - - Component.onCompleted: thisLocked = true - - color: "transparent" - - Timer { - id: animDelay - - interval: Appearance.anim.durations.large - onTriggered: root.lock.locked = false - } - - Connections { - target: root.lock - - function onUnlockedChanged(): void { - background.opacity = 0; - } - } - - ScreencopyView { - id: screencopy - - anchors.fill: parent - captureSource: root.screen - visible: false - } - - MultiEffect { - id: background - - anchors.fill: parent - - source: screencopy - autoPaddingEnabled: false - blurEnabled: true - blur: root.locked ? 1 : 0 - blurMax: 64 - blurMultiplier: 1 - - Behavior on opacity { - Anim {} - } - - Behavior on blur { - Anim {} - } - } - - Backgrounds { - id: backgrounds - - locked: root.locked - weatherWidth: weather.implicitWidth - buttonsWidth: buttons.item?.nonAnimWidth ?? 0 - buttonsHeight: buttons.item?.nonAnimHeight ?? 0 - statusWidth: status.item?.nonAnimWidth ?? 0 - statusHeight: status.item?.nonAnimHeight ?? 0 - isNormal: root.screen.width > Config.lock.sizes.smallScreenWidth - isLarge: root.screen.width > Config.lock.sizes.largeScreenWidth - visible: false - } - - MultiEffect { - anchors.fill: source - source: backgrounds - shadowEnabled: true - blurMax: 15 - shadowColor: Qt.alpha(Colours.palette.m3shadow, 0.7) - } - - Clock { - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.top - anchors.bottomMargin: -backgrounds.clockBottom - } - - Input { - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.bottom - anchors.topMargin: -backgrounds.inputTop - - lock: root - } - - WeatherInfo { - id: weather - - anchors.top: parent.bottom - anchors.right: parent.left - anchors.topMargin: -backgrounds.weatherTop - anchors.rightMargin: -backgrounds.weatherRight - } - - Loader { - id: media - - active: root.screen.width > Config.lock.sizes.smallScreenWidth - asynchronous: true - - state: root.screen.width > Config.lock.sizes.largeScreenWidth ? "tl" : "br" - states: [ - State { - name: "tl" - - AnchorChanges { - target: media - anchors.bottom: media.parent.top - anchors.right: media.parent.left - } - - PropertyChanges { - media.anchors.bottomMargin: -backgrounds.mediaY - media.anchors.rightMargin: -backgrounds.mediaX - } - }, - State { - name: "br" - - AnchorChanges { - target: media - anchors.top: media.parent.bottom - anchors.left: media.parent.right - } - - PropertyChanges { - media.anchors.topMargin: -backgrounds.mediaY - media.anchors.leftMargin: -backgrounds.mediaX - } - } - ] - - sourceComponent: MediaPlaying { - isLarge: root.screen.width > Config.lock.sizes.largeScreenWidth - } - } - - Loader { - id: buttons - - active: root.screen.width > Config.lock.sizes.largeScreenWidth - asynchronous: true - - anchors.top: parent.bottom - anchors.left: parent.right - anchors.topMargin: -backgrounds.buttonsTop - anchors.leftMargin: -backgrounds.buttonsLeft - - sourceComponent: Buttons {} - } - - Loader { - id: status - - active: root.screen.width > Config.lock.sizes.largeScreenWidth - - anchors.bottom: parent.top - anchors.left: parent.right - anchors.bottomMargin: -backgrounds.statusBottom - anchors.leftMargin: -backgrounds.statusLeft - - sourceComponent: Status {} - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/MediaPlaying.qml b/modules/home/services/quickshell/shell/modules/lock/MediaPlaying.qml deleted file mode 100644 index fa632054..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/MediaPlaying.qml +++ /dev/null @@ -1,307 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell.Widgets -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls - -RowLayout { - id: root - - required property bool isLarge - - spacing: Appearance.spacing.large * (isLarge ? 2 : 1.5) - width: isLarge ? Config.lock.sizes.mediaWidth : Config.lock.sizes.mediaWidthSmall - - property real playerProgress: { - const active = Players.active; - return active?.length ? active.position / active.length : 0; - } - - Behavior on playerProgress { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Timer { - running: Players.active?.isPlaying ?? false - interval: Config.dashboard.mediaUpdateInterval - triggeredOnStart: true - repeat: true - onTriggered: Players.active?.positionChanged() - } - - Item { - Layout.alignment: Qt.AlignVCenter - Layout.topMargin: root.isLarge ? 0 : Config.lock.sizes.border / 2 - Layout.bottomMargin: root.isLarge ? Config.lock.sizes.border / 2 : 0 - Layout.leftMargin: root.isLarge ? 0 : Config.lock.sizes.border / 2 - - implicitWidth: root.isLarge ? Config.lock.sizes.mediaCoverSize : Config.lock.sizes.mediaCoverSizeSmall - implicitHeight: root.isLarge ? Config.lock.sizes.mediaCoverSize : Config.lock.sizes.mediaCoverSizeSmall - - ClippingWrapperRectangle { - anchors.fill: parent - - color: Colours.palette.m3surfaceContainerHigh - radius: Appearance.rounding.small - rotation: 9 - - Image { - anchors.fill: parent - - source: Players.active?.trackArtUrl ?? "" - asynchronous: true - fillMode: Image.PreserveAspectCrop - sourceSize.width: width - sourceSize.height: height - } - - Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - Rectangle { - anchors.fill: parent - anchors.margins: -1 - border.width: Config.lock.sizes.mediaCoverBorder - border.color: Colours.palette.m3primary - color: "transparent" - radius: Appearance.rounding.small - rotation: 9 - - Behavior on border.color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - StyledClippingRect { - anchors.fill: parent - - color: Colours.palette.m3surfaceContainerHigh - radius: Appearance.rounding.small - - border.width: Config.lock.sizes.mediaCoverBorder - border.color: Colours.palette.m3primary - - MaterialIcon { - anchors.centerIn: parent - - grade: 200 - text: "art_track" - color: Colours.palette.m3onSurfaceVariant - font.pointSize: (root.isLarge ? Config.lock.sizes.mediaCoverSize : Config.lock.sizes.mediaCoverSizeSmall) * 0.4 - } - - Image { - anchors.fill: parent - - source: Players.active?.trackArtUrl ?? "" - asynchronous: true - fillMode: Image.PreserveAspectCrop - sourceSize.width: width - sourceSize.height: height - } - } - } - - ColumnLayout { - Layout.alignment: Qt.AlignVCenter - Layout.topMargin: root.isLarge ? 0 : Config.lock.sizes.border / 2 - Layout.bottomMargin: root.isLarge ? Config.lock.sizes.border / 2 : 0 - Layout.rightMargin: root.isLarge ? Config.lock.sizes.border / 2 : 0 - Layout.fillWidth: true - - spacing: root.isLarge ? Appearance.spacing.small : Appearance.spacing.small / 2 - - StyledText { - Layout.fillWidth: true - - animate: true - text: (Players.active?.trackTitle ?? qsTr("No media")) || qsTr("Unknown title") - color: Colours.palette.m3primary - font.pointSize: root.isLarge ? Appearance.font.size.large : Appearance.font.size.larger - elide: Text.ElideRight - } - - StyledText { - Layout.fillWidth: true - - animate: true - text: (Players.active?.trackAlbum ?? qsTr("No media")) || qsTr("Unknown album") - color: Colours.palette.m3outline - font.pointSize: root.isLarge ? Appearance.font.size.larger : Appearance.font.size.normal - elide: Text.ElideRight - } - - StyledText { - Layout.fillWidth: true - - animate: true - text: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist") - color: Colours.palette.m3secondary - font.pointSize: root.isLarge ? Appearance.font.size.larger : Appearance.font.size.normal - elide: Text.ElideRight - } - - RowLayout { - id: controls - - Layout.fillWidth: true - - spacing: Appearance.spacing.small - - Slider { - id: slider - - Layout.rightMargin: root.isLarge ? Appearance.spacing.small : 0 - Layout.fillWidth: true - implicitHeight: Appearance.padding.normal * 3 - - value: root.playerProgress - onMoved: { - const active = Players.active; - if (active?.canSeek && active?.positionSupported) - active.position = value * active.length; - } - - background: Item { - StyledRect { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.topMargin: slider.implicitHeight / 3 - anchors.bottomMargin: slider.implicitHeight / 3 - - implicitWidth: slider.handle.x - slider.implicitHeight / 6 - - color: Colours.palette.m3primary - radius: Appearance.rounding.full - topRightRadius: slider.implicitHeight / 15 - bottomRightRadius: slider.implicitHeight / 15 - } - - StyledRect { - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.topMargin: slider.implicitHeight / 3 - anchors.bottomMargin: slider.implicitHeight / 3 - - implicitWidth: parent.width - slider.handle.x - slider.handle.implicitWidth - slider.implicitHeight / 6 - - color: Colours.palette.m3surfaceContainer - radius: Appearance.rounding.full - topLeftRadius: slider.implicitHeight / 15 - bottomLeftRadius: slider.implicitHeight / 15 - } - } - - handle: StyledRect { - id: rect - - x: slider.visualPosition * slider.availableWidth - - implicitWidth: slider.implicitHeight / 4.5 - implicitHeight: slider.implicitHeight - - color: Colours.palette.m3primary - radius: Appearance.rounding.full - - MouseArea { - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onPressed: event => event.accepted = false - } - } - } - - Control { - icon: "skip_previous" - canUse: Players.active?.canGoPrevious ?? false - fontSize: root.isLarge ? Appearance.font.size.extraLarge : Appearance.font.size.large * 1.2 - - function onClicked(): void { - Players.active?.previous(); - } - } - - Control { - icon: Players.active?.isPlaying ? "pause" : "play_arrow" - canUse: Players.active?.canTogglePlaying ?? false - fontSize: root.isLarge ? Appearance.font.size.extraLarge : Appearance.font.size.large * 1.2 - primary: true - - function onClicked(): void { - Players.active?.togglePlaying(); - } - } - - Control { - icon: "skip_next" - canUse: Players.active?.canGoNext ?? false - fontSize: root.isLarge ? Appearance.font.size.extraLarge : Appearance.font.size.large * 1.2 - - function onClicked(): void { - Players.active?.next(); - } - } - } - } - - component Control: StyledRect { - id: control - - required property string icon - required property bool canUse - required property int fontSize - property int padding - property bool fill: true - property bool primary - function onClicked(): void { - } - - implicitWidth: Math.max(icon.implicitWidth, icon.implicitHeight) + padding * 2 - implicitHeight: implicitWidth - - radius: Appearance.rounding.full - color: primary && canUse ? Colours.palette.m3primary : "transparent" - - StateLayer { - disabled: !control.canUse - radius: parent.radius - color: control.primary ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface - - function onClicked(): void { - control.onClicked(); - } - } - - MaterialIcon { - id: icon - - anchors.centerIn: parent - anchors.horizontalCenterOffset: -font.pointSize * 0.02 - anchors.verticalCenterOffset: font.pointSize * 0.02 - - animate: true - fill: control.fill ? 1 : 0 - text: control.icon - color: control.canUse ? control.primary ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface : Colours.palette.m3outline - font.pointSize: control.fontSize - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/Notification.qml b/modules/home/services/quickshell/shell/modules/lock/Notification.qml deleted file mode 100644 index 936edd46..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/Notification.qml +++ /dev/null @@ -1,217 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import Quickshell -import Quickshell.Widgets -import Quickshell.Services.Notifications -import QtQuick -import QtQuick.Layouts - -StyledRect { - id: root - - required property Notifs.Notif modelData - readonly property bool hasImage: modelData.image.length > 0 - readonly property bool hasAppIcon: modelData.appIcon.length > 0 - readonly property int nonAnimHeight: Math.max(image.height, details.implicitHeight) + Appearance.padding.normal * 2 - - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondaryContainer : Colours.palette.m3surfaceContainer - radius: Appearance.rounding.normal - implicitWidth: Config.notifs.sizes.width - - Component.onCompleted: implicitHeight = Qt.binding(() => nonAnimHeight) - - Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on x { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel - } - } - - RetainableLock { - object: root.modelData.notification - locked: true - } - - MouseArea { - anchors.fill: parent - hoverEnabled: true - cursorShape: pressed ? Qt.ClosedHandCursor : undefined - acceptedButtons: Qt.LeftButton | Qt.MiddleButton - preventStealing: true - - onEntered: root.modelData.timer.stop() - onExited: root.modelData.timer.start() - - drag.target: parent - drag.axis: Drag.XAxis - - onPressed: event => { - if (event.button === Qt.MiddleButton) - root.modelData.notification.dismiss(); - } - onReleased: event => { - if (Math.abs(root.x) < Config.notifs.sizes.width * Config.notifs.clearThreshold) - root.x = 0; - else - root.modelData.notification.dismiss(); // TODO: change back to popup when notif dock impled - } - } - - Loader { - id: image - - active: root.hasImage - asynchronous: true - - anchors.left: parent.left - anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Appearance.padding.normal - - width: Config.notifs.sizes.image - height: Config.notifs.sizes.image - visible: root.hasImage || root.hasAppIcon - - sourceComponent: ClippingRectangle { - radius: Appearance.rounding.full - implicitWidth: Config.notifs.sizes.image - implicitHeight: Config.notifs.sizes.image - - Image { - anchors.fill: parent - source: Qt.resolvedUrl(root.modelData.image) - fillMode: Image.PreserveAspectCrop - cache: false - asynchronous: true - } - } - } - - Loader { - id: appIcon - - active: root.hasAppIcon || !root.hasImage - asynchronous: true - - anchors.horizontalCenter: root.hasImage ? undefined : image.horizontalCenter - anchors.verticalCenter: root.hasImage ? undefined : image.verticalCenter - anchors.right: root.hasImage ? image.right : undefined - anchors.bottom: root.hasImage ? image.bottom : undefined - - sourceComponent: StyledRect { - radius: Appearance.rounding.full - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3surfaceContainerHighest : Colours.palette.m3tertiaryContainer - implicitWidth: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image - implicitHeight: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image - - Loader { - id: icon - - active: root.hasAppIcon - asynchronous: true - - anchors.centerIn: parent - visible: !root.modelData.appIcon.endsWith("symbolic") - - width: Math.round(parent.width * 0.6) - height: Math.round(parent.width * 0.6) - - sourceComponent: IconImage { - implicitSize: Math.round(parent.width * 0.6) - source: Quickshell.iconPath(root.modelData.appIcon) - asynchronous: true - } - } - - Loader { - active: root.modelData.appIcon.endsWith("symbolic") - asynchronous: true - anchors.fill: icon - - sourceComponent: Colouriser { - source: icon - colorizationColor: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onTertiaryContainer - } - } - - Loader { - active: !root.hasAppIcon - asynchronous: true - anchors.centerIn: parent - anchors.horizontalCenterOffset: -Appearance.font.size.large * 0.02 - anchors.verticalCenterOffset: Appearance.font.size.large * 0.02 - - sourceComponent: MaterialIcon { - text: Icons.getNotifIcon(root.modelData.summary.toLowerCase(), root.modelData.urgency) - - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onTertiaryContainer - font.pointSize: Appearance.font.size.large - } - } - } - } - - ColumnLayout { - id: details - - anchors.verticalCenter: parent.verticalCenter - anchors.left: image.right - anchors.right: parent.right - anchors.leftMargin: Appearance.spacing.smaller - anchors.rightMargin: Appearance.padding.larger - - spacing: 0 - - RowLayout { - Layout.fillWidth: true - - spacing: Appearance.spacing.small - - StyledText { - Layout.fillWidth: true - Layout.maximumWidth: implicitWidth - - animate: true - text: root.modelData.summary - elide: Text.ElideRight - maximumLineCount: 1 - } - - StyledText { - text: "•" - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - } - - StyledText { - animate: true - text: root.modelData.timeStr - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - } - } - - StyledText { - Layout.fillWidth: true - - animate: true - text: root.modelData.body - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - elide: Text.ElideRight - maximumLineCount: 1 - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/Status.qml b/modules/home/services/quickshell/shell/modules/lock/Status.qml deleted file mode 100644 index b93c4a14..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/Status.qml +++ /dev/null @@ -1,249 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import Quickshell -import Quickshell.Widgets -import Quickshell.Services.UPower -import QtQuick -import QtQuick.Layouts - -WrapperItem { - readonly property real nonAnimWidth: (notifs.count > 0 ? Config.notifs.sizes.width : status.implicitWidth) + margin - readonly property real nonAnimHeight: { - if (notifs.count > 0) { - const count = Math.min(notifs.count, Config.lock.maxNotifs); - let height = status.implicitHeight + Appearance.spacing.normal + Appearance.spacing.smaller * (count - 1); - for (let i = 0; i < count; i++) - height += notifs.itemAtIndex(i)?.nonAnimHeight ?? 0; - return height + margin; - } - - return status.implicitHeight + margin; - } - - implicitWidth: nonAnimWidth - implicitHeight: nonAnimHeight - - margin: Appearance.padding.large * 2 - rightMargin: 0 - topMargin: 0 - - Behavior on implicitWidth { - Anim { - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - Behavior on implicitHeight { - Anim { - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - - ColumnLayout { - spacing: Appearance.spacing.normal - - RowLayout { - id: status - - Layout.fillWidth: true - spacing: Appearance.spacing.small - - Loader { - Layout.alignment: Qt.AlignVCenter - Layout.fillWidth: true - - active: UPower.displayDevice.isLaptopBattery - asynchronous: true - - sourceComponent: StyledText { - animate: true - text: qsTr("%1%2 remaining").arg(UPower.onBattery ? "" : "(+) ").arg(UPower.displayDevice.percentage) - color: !UPower.onBattery || UPower.displayDevice.percentage > 0.2 ? Colours.palette.m3onSurface : Colours.palette.m3error - } - } - - MaterialIcon { - Layout.alignment: Qt.AlignVCenter - - animate: true - text: Network.active ? Icons.getNetworkIcon(Network.active.strength ?? 0) : "wifi_off" - font.pointSize: Appearance.font.size.large - } - - Loader { - Layout.alignment: Qt.AlignVCenter - Layout.fillWidth: true - Layout.maximumWidth: item?.implicitWidth ?? 0 - - active: !UPower.displayDevice.isLaptopBattery - asynchronous: true - - sourceComponent: StyledText { - animate: true - text: Network.active?.ssid ?? "" - font.pointSize: Appearance.font.size.normal - elide: Text.ElideRight - } - } - - MaterialIcon { - Layout.alignment: Qt.AlignVCenter - - animate: true - text: Bluetooth.powered ? "bluetooth" : "bluetooth_disabled" - font.pointSize: Appearance.font.size.large - } - - Loader { - Layout.alignment: Qt.AlignVCenter - active: !UPower.displayDevice.isLaptopBattery - asynchronous: true - - sourceComponent: StyledText { - animate: true - text: qsTr("%n device(s) connected", "", Bluetooth.devices.filter(d => d.connected).length) - font.pointSize: Appearance.font.size.normal - } - } - } - - ListView { - id: notifs - - Layout.fillWidth: true - Layout.fillHeight: true - - model: ScriptModel { - values: [...Notifs.list].reverse() - } - - orientation: Qt.Vertical - spacing: 0 - clip: true - interactive: false - - delegate: Item { - id: wrapper - - required property Notifs.Notif modelData - required property int index - readonly property alias nonAnimHeight: notif.nonAnimHeight - property int idx - - onIndexChanged: { - if (index !== -1) - idx = index; - } - - implicitWidth: notif.implicitWidth - implicitHeight: notif.nonAnimHeight + (idx === 0 ? 0 : Appearance.spacing.smaller) - - ListView.onRemove: removeAnim.start() - - SequentialAnimation { - id: removeAnim - - PropertyAction { - target: wrapper - property: "ListView.delayRemove" - value: true - } - PropertyAction { - target: wrapper - property: "enabled" - value: false - } - PropertyAction { - target: wrapper - property: "implicitHeight" - value: 0 - } - PropertyAction { - target: wrapper - property: "z" - value: 1 - } - Anim { - target: notif - property: "x" - to: (notif.x >= 0 ? Config.notifs.sizes.width : -Config.notifs.sizes.width) * 2 - duration: Appearance.anim.durations.normal - easing.bezierCurve: Appearance.anim.curves.emphasized - } - PropertyAction { - target: wrapper - property: "ListView.delayRemove" - value: false - } - } - - ClippingRectangle { - anchors.top: parent.top - anchors.topMargin: wrapper.idx === 0 ? 0 : Appearance.spacing.smaller - - color: "transparent" - radius: notif.radius - implicitWidth: notif.implicitWidth - implicitHeight: notif.nonAnimHeight - - Notification { - id: notif - - modelData: wrapper.modelData - } - } - } - - move: Transition { - Anim { - property: "y" - } - } - - displaced: Transition { - Anim { - property: "y" - } - } - - StyledRect { - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.margins: Appearance.padding.normal - - color: Colours.palette.m3tertiaryContainer - radius: Appearance.rounding.small - - implicitWidth: count.implicitWidth + Appearance.padding.normal * 2 - implicitHeight: count.implicitHeight + Appearance.padding.small * 2 - - scale: Notifs.popups.length > Config.lock.maxNotifs ? 1 : 0 - - StyledText { - id: count - - anchors.centerIn: parent - text: qsTr("+%1").arg(Notifs.popups.length - Config.lock.maxNotifs) - color: Colours.palette.m3onTertiaryContainer - } - - Behavior on scale { - Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial - } - } - } - } - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/lock/WeatherInfo.qml b/modules/home/services/quickshell/shell/modules/lock/WeatherInfo.qml deleted file mode 100644 index 1b840e67..00000000 --- a/modules/home/services/quickshell/shell/modules/lock/WeatherInfo.qml +++ /dev/null @@ -1,61 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Layouts - -RowLayout { - id: root - - Timer { - running: true - triggeredOnStart: true - repeat: true - interval: 900000 // 15 minutes - onTriggered: Weather.reload() - } - - spacing: Appearance.spacing.large - - MaterialIcon { - id: icon - - Layout.alignment: Qt.AlignVCenter - Layout.topMargin: Config.lock.sizes.border / 4 - - animate: true - text: Weather.icon || "cloud_alert" - color: Colours.palette.m3secondary - font.pointSize: Appearance.font.size.extraLarge * 2.5 - } - - ColumnLayout { - Layout.alignment: Qt.AlignVCenter - Layout.topMargin: Config.lock.sizes.border / 4 - Layout.rightMargin: Config.lock.sizes.border / 2 - - spacing: Appearance.spacing.small - - StyledText { - Layout.fillWidth: true - - animate: true - text: `${Weather.temperature}°C` - color: Colours.palette.m3primary - horizontalAlignment: Text.AlignHCenter - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - } - - StyledText { - Layout.fillWidth: true - Layout.maximumWidth: Config.lock.sizes.weatherWidth - icon.implicitWidth - - animate: true - text: Weather.description || qsTr("No weather") - horizontalAlignment: Text.AlignHCenter - font.pointSize: Appearance.font.size.large - elide: Text.ElideRight - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/notifications/Background.qml b/modules/home/services/quickshell/shell/modules/notifications/Background.qml deleted file mode 100644 index 8795b14d..00000000 --- a/modules/home/services/quickshell/shell/modules/notifications/Background.qml +++ /dev/null @@ -1,66 +0,0 @@ -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - required property Wrapper wrapper - readonly property real rounding: Config.border.rounding - readonly property bool flatten: wrapper.height < rounding * 2 - readonly property real roundingY: flatten ? wrapper.height / 2 : rounding - property real fullHeightRounding: wrapper.height >= QsWindow.window?.height - Config.border.thickness * 2 ? -rounding : rounding - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - PathLine { - relativeX: -(root.wrapper.width + root.rounding) - relativeY: 0 - } - PathArc { - relativeX: root.rounding - relativeY: root.roundingY - radiusX: root.rounding - radiusY: Math.min(root.rounding, root.wrapper.height) - } - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.roundingY * 2 - } - PathArc { - relativeX: root.fullHeightRounding - relativeY: root.roundingY - radiusX: Math.abs(root.fullHeightRounding) - radiusY: Math.min(root.rounding, root.wrapper.height) - direction: root.fullHeightRounding < 0 ? PathArc.Clockwise : PathArc.Counterclockwise - } - PathLine { - relativeX: root.wrapper.height > 0 ? root.wrapper.width - root.rounding - root.fullHeightRounding : root.wrapper.width - relativeY: 0 - } - PathArc { - relativeX: root.rounding - relativeY: root.rounding - radiusX: root.rounding - radiusY: root.rounding - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on fullHeightRounding { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/notifications/Content.qml b/modules/home/services/quickshell/shell/modules/notifications/Content.qml deleted file mode 100644 index 6983b959..00000000 --- a/modules/home/services/quickshell/shell/modules/notifications/Content.qml +++ /dev/null @@ -1,162 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Widgets -import QtQuick - -Item { - id: root - - readonly property int padding: Appearance.padding.large - - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.right: parent.right - - implicitWidth: Config.notifs.sizes.width + padding * 2 - implicitHeight: { - const count = list.count; - if (count === 0) - return 0; - - let height = (count - 1) * Appearance.spacing.smaller; - for (let i = 0; i < count; i++) - height += list.itemAtIndex(i)?.nonAnimHeight ?? 0; - - const screen = QsWindow.window?.screen; - const visibilities = Visibilities.screens[screen]; - const panel = Visibilities.panels[screen]; - if (visibilities && panel) { - if (visibilities.osd) { - const h = panel.osd.y - Config.border.rounding * 2; - if (height > h) - height = h; - } - - if (visibilities.session) { - const h = panel.session.y - Config.border.rounding * 2; - if (height > h) - height = h; - } - } - - return Math.min((screen?.height ?? 0) - Config.border.thickness * 2, height + padding * 2); - } - - ClippingWrapperRectangle { - anchors.fill: parent - anchors.margins: root.padding - - color: "transparent" - radius: Appearance.rounding.normal - - ListView { - id: list - - model: ScriptModel { - values: [...Notifs.popups].reverse() - } - - anchors.fill: parent - - orientation: Qt.Vertical - spacing: 0 - cacheBuffer: QsWindow.window?.screen.height ?? 0 - - delegate: Item { - id: wrapper - - required property Notifs.Notif modelData - required property int index - readonly property alias nonAnimHeight: notif.nonAnimHeight - property int idx - - onIndexChanged: { - if (index !== -1) - idx = index; - } - - implicitWidth: notif.implicitWidth - implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : Appearance.spacing.smaller) - - ListView.onRemove: removeAnim.start() - - SequentialAnimation { - id: removeAnim - - PropertyAction { - target: wrapper - property: "ListView.delayRemove" - value: true - } - PropertyAction { - target: wrapper - property: "enabled" - value: false - } - PropertyAction { - target: wrapper - property: "implicitHeight" - value: 0 - } - PropertyAction { - target: wrapper - property: "z" - value: 1 - } - Anim { - target: notif - property: "x" - to: (notif.x >= 0 ? Config.notifs.sizes.width : -Config.notifs.sizes.width) * 2 - duration: Appearance.anim.durations.normal - easing.bezierCurve: Appearance.anim.curves.emphasized - } - PropertyAction { - target: wrapper - property: "ListView.delayRemove" - value: false - } - } - - ClippingRectangle { - anchors.top: parent.top - anchors.topMargin: wrapper.idx === 0 ? 0 : Appearance.spacing.smaller - - color: "transparent" - radius: notif.radius - implicitWidth: notif.implicitWidth - implicitHeight: notif.implicitHeight - - Notification { - id: notif - - modelData: wrapper.modelData - } - } - } - - move: Transition { - Anim { - property: "y" - } - } - - displaced: Transition { - Anim { - property: "y" - } - } - } - } - - Behavior on implicitHeight { - Anim {} - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial - } -} diff --git a/modules/home/services/quickshell/shell/modules/notifications/Notification.qml b/modules/home/services/quickshell/shell/modules/notifications/Notification.qml deleted file mode 100644 index c97a3326..00000000 --- a/modules/home/services/quickshell/shell/modules/notifications/Notification.qml +++ /dev/null @@ -1,479 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import Quickshell -import Quickshell.Widgets -import Quickshell.Services.Notifications -import QtQuick -import QtQuick.Layouts - -StyledRect { - id: root - - required property Notifs.Notif modelData - readonly property bool hasImage: modelData.image.length > 0 - readonly property bool hasAppIcon: modelData.appIcon.length > 0 - readonly property int nonAnimHeight: summary.implicitHeight + (root.expanded ? appName.height + body.height + actions.height + actions.anchors.topMargin : bodyPreview.height) + inner.anchors.margins * 2 - property bool expanded - - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondaryContainer : Colours.palette.m3surfaceContainer - radius: Appearance.rounding.normal - implicitWidth: Config.notifs.sizes.width - implicitHeight: inner.implicitHeight - - x: Config.notifs.sizes.width - Component.onCompleted: x = 0 - - RetainableLock { - object: root.modelData.notification - locked: true - } - - MouseArea { - property int startY - - anchors.fill: parent - hoverEnabled: true - cursorShape: body.hoveredLink ? Qt.PointingHandCursor : pressed ? Qt.ClosedHandCursor : undefined - acceptedButtons: Qt.LeftButton | Qt.MiddleButton - preventStealing: true - - onEntered: root.modelData.timer.stop() - onExited: root.modelData.timer.start() - - drag.target: parent - drag.axis: Drag.XAxis - - onPressed: event => { - startY = event.y; - if (event.button === Qt.MiddleButton) - root.modelData.notification.dismiss(); - } - onReleased: event => { - if (Math.abs(root.x) < Config.notifs.sizes.width * Config.notifs.clearThreshold) - root.x = 0; - else - root.modelData.notification.dismiss(); // TODO: change back to popup when notif dock impled - } - onPositionChanged: event => { - if (pressed) { - const diffY = event.y - startY; - if (Math.abs(diffY) > Config.notifs.expandThreshold) - root.expanded = diffY > 0; - } - } - onClicked: event => { - if (!Config.notifs.actionOnClick || event.button !== Qt.LeftButton) - return; - - const actions = root.modelData.actions; - if (actions?.length === 1) - actions[0].invoke(); - } - } - - Behavior on x { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel - } - } - - Item { - id: inner - - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.margins: Appearance.padding.normal - - implicitHeight: root.nonAnimHeight - - Behavior on implicitHeight { - Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial - } - } - - Loader { - id: image - - active: root.hasImage - asynchronous: true - - anchors.left: parent.left - anchors.top: parent.top - width: Config.notifs.sizes.image - height: Config.notifs.sizes.image - visible: root.hasImage || root.hasAppIcon - - sourceComponent: ClippingRectangle { - radius: Appearance.rounding.full - implicitWidth: Config.notifs.sizes.image - implicitHeight: Config.notifs.sizes.image - - Image { - anchors.fill: parent - source: Qt.resolvedUrl(root.modelData.image) - fillMode: Image.PreserveAspectCrop - cache: false - asynchronous: true - } - } - } - - Loader { - id: appIcon - - active: root.hasAppIcon || !root.hasImage - asynchronous: true - - anchors.horizontalCenter: root.hasImage ? undefined : image.horizontalCenter - anchors.verticalCenter: root.hasImage ? undefined : image.verticalCenter - anchors.right: root.hasImage ? image.right : undefined - anchors.bottom: root.hasImage ? image.bottom : undefined - - sourceComponent: StyledRect { - radius: Appearance.rounding.full - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3surfaceContainerHighest : Colours.palette.m3tertiaryContainer - implicitWidth: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image - implicitHeight: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image - - Loader { - id: icon - - active: root.hasAppIcon - asynchronous: true - - anchors.centerIn: parent - visible: !root.modelData.appIcon.endsWith("symbolic") - - width: Math.round(parent.width * 0.6) - height: Math.round(parent.width * 0.6) - - sourceComponent: IconImage { - implicitSize: Math.round(parent.width * 0.6) - source: Quickshell.iconPath(root.modelData.appIcon) - asynchronous: true - } - } - - Loader { - active: root.modelData.appIcon.endsWith("symbolic") - asynchronous: true - anchors.fill: icon - - sourceComponent: Colouriser { - source: icon - colorizationColor: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onTertiaryContainer - } - } - - Loader { - active: !root.hasAppIcon - asynchronous: true - anchors.centerIn: parent - anchors.horizontalCenterOffset: -Appearance.font.size.large * 0.02 - anchors.verticalCenterOffset: Appearance.font.size.large * 0.02 - - sourceComponent: MaterialIcon { - text: Icons.getNotifIcon(root.modelData.summary.toLowerCase(), root.modelData.urgency) - - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onTertiaryContainer - font.pointSize: Appearance.font.size.large - } - } - } - } - - StyledText { - id: appName - - anchors.top: parent.top - anchors.left: image.right - anchors.leftMargin: Appearance.spacing.smaller - - animate: true - text: appNameMetrics.elidedText - maximumLineCount: 1 - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - - opacity: root.expanded ? 1 : 0 - - Behavior on opacity { - Anim {} - } - } - - TextMetrics { - id: appNameMetrics - - text: root.modelData.appName - font.family: appName.font.family - font.pointSize: appName.font.pointSize - elide: Text.ElideRight - elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - Appearance.spacing.small * 3 - } - - StyledText { - id: summary - - anchors.top: parent.top - anchors.left: image.right - anchors.leftMargin: Appearance.spacing.smaller - - animate: true - text: summaryMetrics.elidedText - maximumLineCount: 1 - height: implicitHeight - - states: State { - name: "expanded" - when: root.expanded - - PropertyChanges { - summary.maximumLineCount: undefined - } - - AnchorChanges { - target: summary - anchors.top: appName.bottom - } - } - - transitions: Transition { - PropertyAction { - target: summary - property: "maximumLineCount" - } - AnchorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on height { - Anim {} - } - } - - TextMetrics { - id: summaryMetrics - - text: root.modelData.summary - font.family: summary.font.family - font.pointSize: summary.font.pointSize - elide: Text.ElideRight - elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - Appearance.spacing.small * 3 - } - - StyledText { - id: timeSep - - anchors.top: parent.top - anchors.left: summary.right - anchors.leftMargin: Appearance.spacing.small - - text: "•" - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - - states: State { - name: "expanded" - when: root.expanded - - AnchorChanges { - target: timeSep - anchors.left: appName.right - } - } - - transitions: Transition { - AnchorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - StyledText { - id: time - - anchors.top: parent.top - anchors.left: timeSep.right - anchors.leftMargin: Appearance.spacing.small - - animate: true - horizontalAlignment: Text.AlignLeft - text: root.modelData.timeStr - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - } - - Item { - id: expandBtn - - anchors.right: parent.right - anchors.top: parent.top - - implicitWidth: expandIcon.height - implicitHeight: expandIcon.height - - StateLayer { - radius: Appearance.rounding.full - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - - function onClicked() { - root.expanded = !root.expanded; - } - } - - MaterialIcon { - id: expandIcon - - anchors.centerIn: parent - - animate: true - text: root.expanded ? "expand_less" : "expand_more" - font.pointSize: Appearance.font.size.normal - } - } - - StyledText { - id: bodyPreview - - anchors.left: summary.left - anchors.right: expandBtn.left - anchors.top: summary.bottom - anchors.rightMargin: Appearance.spacing.small - - animate: true - textFormat: Text.MarkdownText - text: bodyPreviewMetrics.elidedText - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - - opacity: root.expanded ? 0 : 1 - - Behavior on opacity { - Anim {} - } - } - - TextMetrics { - id: bodyPreviewMetrics - - text: root.modelData.body - font.family: bodyPreview.font.family - font.pointSize: bodyPreview.font.pointSize - elide: Text.ElideRight - elideWidth: bodyPreview.width - } - - StyledText { - id: body - - anchors.left: summary.left - anchors.right: expandBtn.left - anchors.top: summary.bottom - anchors.rightMargin: Appearance.spacing.small - - animate: true - textFormat: Text.MarkdownText - text: root.modelData.body - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - - onLinkActivated: link => { - Qt.openUrlExternally(link); - root.modelData.notification.dismiss(); // TODO: change back to popup when notif dock impled - } - - opacity: root.expanded ? 1 : 0 - - Behavior on opacity { - Anim {} - } - } - - RowLayout { - id: actions - - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: body.bottom - anchors.topMargin: Appearance.spacing.small - - spacing: Appearance.spacing.smaller - - opacity: root.expanded ? 1 : 0 - - Behavior on opacity { - Anim {} - } - - Repeater { - model: root.modelData.actions - - delegate: StyledRect { - id: action - - required property NotificationAction modelData - - radius: Appearance.rounding.full - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.palette.m3surfaceContainerHigh - - Layout.preferredWidth: actionText.width + Appearance.padding.normal * 2 - Layout.preferredHeight: actionText.height + Appearance.padding.small * 2 - implicitWidth: actionText.width + Appearance.padding.normal * 2 - implicitHeight: actionText.height + Appearance.padding.small * 2 - - StateLayer { - radius: Appearance.rounding.full - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurface - - function onClicked(): void { - action.modelData.invoke(); - } - } - - StyledText { - id: actionText - - anchors.centerIn: parent - text: actionTextMetrics.elidedText - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - } - - TextMetrics { - id: actionTextMetrics - - text: modelData.text - font.family: actionText.font.family - font.pointSize: actionText.font.pointSize - elide: Text.ElideRight - elideWidth: { - const numActions = root.modelData.actions.length; - return (inner.width - actions.spacing * (numActions - 1)) / numActions - Appearance.padding.normal * 2; - } - } - } - } - } - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/modules/notifications/Wrapper.qml b/modules/home/services/quickshell/shell/modules/notifications/Wrapper.qml deleted file mode 100644 index 27b92197..00000000 --- a/modules/home/services/quickshell/shell/modules/notifications/Wrapper.qml +++ /dev/null @@ -1,14 +0,0 @@ -import "root:/config" -import QtQuick - -Item { - id: root - - visible: height > 0 - implicitHeight: content.implicitHeight - implicitWidth: content.implicitWidth - - Content { - id: content - } -} diff --git a/modules/home/services/quickshell/shell/modules/osd/Background.qml b/modules/home/services/quickshell/shell/modules/osd/Background.qml deleted file mode 100644 index 0a5f9281..00000000 --- a/modules/home/services/quickshell/shell/modules/osd/Background.qml +++ /dev/null @@ -1,63 +0,0 @@ -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - required property Wrapper wrapper - readonly property real rounding: Config.border.rounding - readonly property bool flatten: wrapper.width < rounding * 2 - readonly property real roundingX: flatten ? wrapper.width / 2 : rounding - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - PathArc { - relativeX: -root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - } - PathLine { - relativeX: -(root.wrapper.width - root.roundingX * 2) - relativeY: 0 - } - PathArc { - relativeX: -root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.rounding * 2 - } - PathArc { - relativeX: root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: root.wrapper.width - root.roundingX * 2 - relativeY: 0 - } - PathArc { - relativeX: root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/osd/Content.qml b/modules/home/services/quickshell/shell/modules/osd/Content.qml deleted file mode 100644 index 4bd43af1..00000000 --- a/modules/home/services/quickshell/shell/modules/osd/Content.qml +++ /dev/null @@ -1,43 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -Column { - id: root - - required property Brightness.Monitor monitor - - padding: Appearance.padding.large - - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - - spacing: Appearance.spacing.normal - - VerticalSlider { - icon: { - if (Audio.muted) - return "no_sound"; - if (value >= 0.5) - return "volume_up"; - if (value > 0) - return "volume_down"; - return "volume_mute"; - } - value: Audio.volume - onMoved: Audio.setVolume(value) - - implicitWidth: Config.osd.sizes.sliderWidth - implicitHeight: Config.osd.sizes.sliderHeight - } - - VerticalSlider { - icon: `brightness_${(Math.round(value * 6) + 1)}` - value: root.monitor?.brightness ?? 0 - onMoved: root.monitor?.setBrightness(value) - - implicitWidth: Config.osd.sizes.sliderWidth - implicitHeight: Config.osd.sizes.sliderHeight - } -} diff --git a/modules/home/services/quickshell/shell/modules/osd/Interactions.qml b/modules/home/services/quickshell/shell/modules/osd/Interactions.qml deleted file mode 100644 index fa75aa0f..00000000 --- a/modules/home/services/quickshell/shell/modules/osd/Interactions.qml +++ /dev/null @@ -1,48 +0,0 @@ -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick - -Scope { - id: root - - required property ShellScreen screen - required property PersistentProperties visibilities - required property bool hovered - readonly property Brightness.Monitor monitor: Brightness.getMonitorForScreen(screen) - - function show(): void { - root.visibilities.osd = true; - timer.restart(); - } - - Connections { - target: Audio - - function onMutedChanged(): void { - root.show(); - } - - function onVolumeChanged(): void { - root.show(); - } - } - - Connections { - target: root.monitor - - function onBrightnessChanged(): void { - root.show(); - } - } - - Timer { - id: timer - - interval: Config.osd.hideDelay - onTriggered: { - if (!root.hovered) - root.visibilities.osd = false; - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/osd/Wrapper.qml b/modules/home/services/quickshell/shell/modules/osd/Wrapper.qml deleted file mode 100644 index 29690029..00000000 --- a/modules/home/services/quickshell/shell/modules/osd/Wrapper.qml +++ /dev/null @@ -1,57 +0,0 @@ -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick - -Item { - id: root - - required property ShellScreen screen - required property bool visibility - - visible: width > 0 - implicitWidth: 0 - implicitHeight: content.implicitHeight - - states: State { - name: "visible" - when: root.visibility - - PropertyChanges { - root.implicitWidth: content.implicitWidth - } - } - - transitions: [ - Transition { - from: "" - to: "visible" - - NumberAnimation { - target: root - property: "implicitWidth" - duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial - } - }, - Transition { - from: "visible" - to: "" - - NumberAnimation { - target: root - property: "implicitWidth" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } - } - ] - - Content { - id: content - - monitor: Brightness.getMonitorForScreen(root.screen) - } -} diff --git a/modules/home/services/quickshell/shell/modules/session/Background.qml b/modules/home/services/quickshell/shell/modules/session/Background.qml deleted file mode 100644 index 0a5f9281..00000000 --- a/modules/home/services/quickshell/shell/modules/session/Background.qml +++ /dev/null @@ -1,63 +0,0 @@ -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Shapes - -ShapePath { - id: root - - required property Wrapper wrapper - readonly property real rounding: Config.border.rounding - readonly property bool flatten: wrapper.width < rounding * 2 - readonly property real roundingX: flatten ? wrapper.width / 2 : rounding - - strokeWidth: -1 - fillColor: Colours.palette.m3surface - - PathArc { - relativeX: -root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - } - PathLine { - relativeX: -(root.wrapper.width - root.roundingX * 2) - relativeY: 0 - } - PathArc { - relativeX: -root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: 0 - relativeY: root.wrapper.height - root.rounding * 2 - } - PathArc { - relativeX: root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - direction: PathArc.Counterclockwise - } - PathLine { - relativeX: root.wrapper.width - root.roundingX * 2 - relativeY: 0 - } - PathArc { - relativeX: root.roundingX - relativeY: root.rounding - radiusX: Math.min(root.rounding, root.wrapper.width) - radiusY: root.rounding - } - - Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/session/Content.qml b/modules/home/services/quickshell/shell/modules/session/Content.qml deleted file mode 100644 index efcc5e88..00000000 --- a/modules/home/services/quickshell/shell/modules/session/Content.qml +++ /dev/null @@ -1,120 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import "root:/utils" -import Quickshell -import QtQuick - -Column { - id: root - - required property PersistentProperties visibilities - - padding: Appearance.padding.large - - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - - spacing: Appearance.spacing.large - - SessionButton { - id: logout - - icon: "logout" - command: ["loginctl", "terminate-user", ""] - - KeyNavigation.down: shutdown - - Connections { - target: root.visibilities - - function onSessionChanged(): void { - if (root.visibilities.session) - logout.focus = true; - } - - function onLauncherChanged(): void { - if (root.visibilities.session && !root.visibilities.launcher) - logout.focus = true; - } - } - } - - SessionButton { - id: shutdown - - icon: "power_settings_new" - command: ["systemctl", "poweroff"] - - KeyNavigation.up: logout - KeyNavigation.down: hibernate - } - - AnimatedImage { - width: Config.session.sizes.button - height: Config.session.sizes.button - sourceSize.width: width - sourceSize.height: height - - playing: visible - asynchronous: true - speed: 0.7 - source: Paths.expandTilde(Config.paths.sessionGif) - } - - SessionButton { - id: hibernate - - icon: "downloading" - command: ["systemctl", "hibernate"] - - KeyNavigation.up: shutdown - KeyNavigation.down: reboot - } - - SessionButton { - id: reboot - - icon: "cached" - command: ["systemctl", "reboot"] - - KeyNavigation.up: hibernate - } - - component SessionButton: StyledRect { - id: button - - required property string icon - required property list command - - implicitWidth: Config.session.sizes.button - implicitHeight: Config.session.sizes.button - - radius: Appearance.rounding.large - color: button.activeFocus ? Colours.palette.m3secondaryContainer : Colours.palette.m3surfaceContainer - - Keys.onEnterPressed: Quickshell.execDetached(button.command) - Keys.onReturnPressed: Quickshell.execDetached(button.command) - Keys.onEscapePressed: root.visibilities.session = false - - StateLayer { - radius: parent.radius - color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - - function onClicked(): void { - Quickshell.execDetached(button.command); - } - } - - MaterialIcon { - anchors.centerIn: parent - - text: button.icon - color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/session/Wrapper.qml b/modules/home/services/quickshell/shell/modules/session/Wrapper.qml deleted file mode 100644 index db7105e3..00000000 --- a/modules/home/services/quickshell/shell/modules/session/Wrapper.qml +++ /dev/null @@ -1,56 +0,0 @@ -import "root:/services" -import "root:/config" -import Quickshell -import QtQuick - -Item { - id: root - - required property PersistentProperties visibilities - - visible: width > 0 - implicitWidth: 0 - implicitHeight: content.implicitHeight - - states: State { - name: "visible" - when: root.visibilities.session - - PropertyChanges { - root.implicitWidth: content.implicitWidth - } - } - - transitions: [ - Transition { - from: "" - to: "visible" - - NumberAnimation { - target: root - property: "implicitWidth" - duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial - } - }, - Transition { - from: "visible" - to: "" - - NumberAnimation { - target: root - property: "implicitWidth" - duration: root.visibilities.osd ? Appearance.anim.durations.expressiveFastSpatial : Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: root.visibilities.osd ? Appearance.anim.curves.expressiveFastSpatial : Appearance.anim.curves.emphasized - } - } - ] - - Content { - id: content - - visibilities: root.visibilities - } -} diff --git a/modules/home/services/quickshell/shell/modules/windowinfo/Buttons.qml b/modules/home/services/quickshell/shell/modules/windowinfo/Buttons.qml deleted file mode 100644 index 6b24cf30..00000000 --- a/modules/home/services/quickshell/shell/modules/windowinfo/Buttons.qml +++ /dev/null @@ -1,185 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell.Widgets -import QtQuick -import QtQuick.Layouts - -ColumnLayout { - id: root - - required property var client - property bool moveToWsExpanded - - anchors.fill: parent - spacing: Appearance.spacing.small - - RowLayout { - Layout.topMargin: Appearance.padding.large - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large - - spacing: Appearance.spacing.normal - - StyledText { - Layout.fillWidth: true - text: qsTr("Move to workspace") - elide: Text.ElideRight - } - - StyledRect { - color: Colours.palette.m3primary - radius: Appearance.rounding.small - - implicitWidth: moveToWsIcon.implicitWidth + Appearance.padding.small * 2 - implicitHeight: moveToWsIcon.implicitHeight + Appearance.padding.small - - StateLayer { - color: Colours.palette.m3onPrimary - - function onClicked(): void { - root.moveToWsExpanded = !root.moveToWsExpanded; - } - } - - MaterialIcon { - id: moveToWsIcon - - anchors.centerIn: parent - - animate: true - text: root.moveToWsExpanded ? "expand_more" : "keyboard_arrow_right" - color: Colours.palette.m3onPrimary - font.pointSize: Appearance.font.size.large - } - } - } - - WrapperItem { - Layout.fillWidth: true - Layout.leftMargin: Appearance.padding.large * 2 - Layout.rightMargin: Appearance.padding.large * 2 - - Layout.preferredHeight: root.moveToWsExpanded ? implicitHeight : 0 - clip: true - - topMargin: Appearance.spacing.normal - bottomMargin: Appearance.spacing.normal - - GridLayout { - id: wsGrid - - rowSpacing: Appearance.spacing.smaller - columnSpacing: Appearance.spacing.normal - columns: 5 - - Repeater { - model: 10 - - Button { - required property int index - readonly property int wsId: Math.floor((Hyprland.activeWsId - 1) / 10) * 10 + index + 1 - readonly property bool isCurrent: root.client?.workspace.id === wsId - - color: isCurrent ? Colours.palette.m3surfaceContainerHighest : Colours.palette.m3tertiaryContainer - onColor: isCurrent ? Colours.palette.m3onSurface : Colours.palette.m3onTertiaryContainer - text: wsId - disabled: isCurrent - - function onClicked(): void { - Hyprland.dispatch(`movetoworkspace ${wsId},address:0x${root.client?.address}`); - } - } - } - } - - Behavior on Layout.preferredHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - RowLayout { - Layout.fillWidth: true - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large - Layout.bottomMargin: Appearance.padding.large - - spacing: root.client?.lastIpcObject.floating ? Appearance.spacing.normal : Appearance.spacing.small - - Button { - color: Colours.palette.m3secondaryContainer - onColor: Colours.palette.m3onSecondaryContainer - text: root.client?.lastIpcObject.floating ? qsTr("Tile") : qsTr("Float") - - function onClicked(): void { - Hyprland.dispatch(`togglefloating address:0x${root.client?.address}`); - } - } - - Loader { - active: root.client?.lastIpcObject.floating - asynchronous: true - Layout.fillWidth: active - Layout.leftMargin: active ? 0 : -parent.spacing - Layout.rightMargin: active ? 0 : -parent.spacing - - sourceComponent: Button { - color: Colours.palette.m3secondaryContainer - onColor: Colours.palette.m3onSecondaryContainer - text: root.client?.lastIpcObject.pinned ? qsTr("Unpin") : qsTr("Pin") - - function onClicked(): void { - Hyprland.dispatch(`pin address:0x${root.client?.address}`); - } - } - } - - Button { - color: Colours.palette.m3errorContainer - onColor: Colours.palette.m3onErrorContainer - text: qsTr("Kill") - - function onClicked(): void { - Hyprland.dispatch(`movetoworkspace ${wsId},address:0x${root.client?.address}`); - } - } - } - - component Button: StyledRect { - property color onColor: Colours.palette.m3onSurface - property alias disabled: stateLayer.disabled - property alias text: label.text - - function onClicked(): void { - } - - radius: Appearance.rounding.small - - Layout.fillWidth: true - implicitHeight: label.implicitHeight + Appearance.padding.small * 2 - - StateLayer { - id: stateLayer - - color: parent.onColor - - function onClicked(): void { - parent.onClicked(); - } - } - - StyledText { - id: label - - anchors.centerIn: parent - - animate: true - color: parent.onColor - font.pointSize: Appearance.font.size.normal - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/windowinfo/Details.qml b/modules/home/services/quickshell/shell/modules/windowinfo/Details.qml deleted file mode 100644 index 546ff285..00000000 --- a/modules/home/services/quickshell/shell/modules/windowinfo/Details.qml +++ /dev/null @@ -1,164 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell.Hyprland -import QtQuick -import QtQuick.Layouts - -ColumnLayout { - id: root - - required property HyprlandToplevel client - - anchors.fill: parent - spacing: Appearance.spacing.small - - Label { - Layout.topMargin: Appearance.padding.large * 2 - - text: root.client?.title ?? qsTr("No active client") - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - - font.pointSize: Appearance.font.size.large - font.weight: 500 - } - - Label { - text: root.client?.lastIpcObject.class ?? qsTr("No active client") - color: Colours.palette.m3tertiary - - font.pointSize: Appearance.font.size.larger - } - - StyledRect { - Layout.fillWidth: true - Layout.preferredHeight: 1 - Layout.leftMargin: Appearance.padding.large * 2 - Layout.rightMargin: Appearance.padding.large * 2 - Layout.topMargin: Appearance.spacing.normal - Layout.bottomMargin: Appearance.spacing.large - - color: Colours.palette.m3secondary - } - - Detail { - icon: "location_on" - text: qsTr("Address: %1").arg(`0x${root.client?.address}` ?? "unknown") - color: Colours.palette.m3primary - } - - Detail { - icon: "location_searching" - text: qsTr("Position: %1, %2").arg(root.client?.lastIpcObject.at[0] ?? -1).arg(root.client?.lastIpcObject.at[1] ?? -1) - } - - Detail { - icon: "resize" - text: qsTr("Size: %1 x %2").arg(root.client?.lastIpcObject.size[0] ?? -1).arg(root.client?.lastIpcObject.size[1] ?? -1) - color: Colours.palette.m3tertiary - } - - Detail { - icon: "workspaces" - text: qsTr("Workspace: %1 (%2)").arg(root.client?.workspace.name ?? -1).arg(root.client?.workspace.id ?? -1) - color: Colours.palette.m3secondary - } - - Detail { - icon: "desktop_windows" - text: { - const mon = root.client?.monitor; - if (mon) - return qsTr("Monitor: %1 (%2) at %3, %4").arg(mon.name).arg(mon.id).arg(mon.x).arg(mon.y); - return qsTr("Monitor: unknown"); - } - } - - Detail { - icon: "page_header" - text: qsTr("Initial title: %1").arg(root.client?.lastIpcObject.initialTitle ?? "unknown") - color: Colours.palette.m3tertiary - } - - Detail { - icon: "category" - text: qsTr("Initial class: %1").arg(root.client?.lastIpcObject.initialClass ?? "unknown") - } - - Detail { - icon: "account_tree" - text: qsTr("Process id: %1").arg(root.client?.lastIpcObject.pid ?? -1) - color: Colours.palette.m3primary - } - - Detail { - icon: "picture_in_picture_center" - text: qsTr("Floating: %1").arg(root.client?.lastIpcObject.floating ? "yes" : "no") - color: Colours.palette.m3secondary - } - - Detail { - icon: "gradient" - text: qsTr("Xwayland: %1").arg(root.client?.lastIpcObject.xwayland ? "yes" : "no") - } - - Detail { - icon: "keep" - text: qsTr("Pinned: %1").arg(root.client?.lastIpcObject.pinned ? "yes" : "no") - color: Colours.palette.m3secondary - } - - Detail { - icon: "fullscreen" - text: { - const fs = root.client?.lastIpcObject.fullscreen; - if (fs) - return qsTr("Fullscreen state: %1").arg(fs == 0 ? "off" : fs == 1 ? "maximised" : "on"); - return qsTr("Fullscreen state: unknown"); - } - color: Colours.palette.m3tertiary - } - - Item { - Layout.fillHeight: true - } - - component Detail: RowLayout { - id: detail - - required property string icon - required property string text - property alias color: icon.color - - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large - Layout.fillWidth: true - - spacing: Appearance.spacing.smaller - - MaterialIcon { - id: icon - - Layout.alignment: Qt.AlignVCenter - text: detail.icon - } - - StyledText { - Layout.fillWidth: true - Layout.alignment: Qt.AlignVCenter - - text: detail.text - elide: Text.ElideRight - font.pointSize: Appearance.font.size.normal - } - } - - component Label: StyledText { - Layout.leftMargin: Appearance.padding.large - Layout.rightMargin: Appearance.padding.large - Layout.fillWidth: true - elide: Text.ElideRight - horizontalAlignment: Text.AlignHCenter - animate: true - } -} diff --git a/modules/home/services/quickshell/shell/modules/windowinfo/Preview.qml b/modules/home/services/quickshell/shell/modules/windowinfo/Preview.qml deleted file mode 100644 index 094a9992..00000000 --- a/modules/home/services/quickshell/shell/modules/windowinfo/Preview.qml +++ /dev/null @@ -1,97 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Wayland -import Quickshell.Hyprland -import QtQuick -import QtQuick.Layouts - -Item { - id: root - - required property ShellScreen screen - required property HyprlandToplevel client - - Layout.preferredWidth: preview.implicitWidth + Appearance.padding.large * 2 - Layout.fillHeight: true - - StyledClippingRect { - id: preview - - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - anchors.bottom: label.top - anchors.topMargin: Appearance.padding.large - anchors.bottomMargin: Appearance.spacing.normal - - implicitWidth: view.implicitWidth - - color: Colours.palette.m3surfaceContainer - radius: Appearance.rounding.small - - Loader { - anchors.centerIn: parent - active: !root.client - asynchronous: true - - sourceComponent: ColumnLayout { - spacing: 0 - - MaterialIcon { - Layout.alignment: Qt.AlignHCenter - text: "web_asset_off" - color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.extraLarge * 3 - } - - StyledText { - Layout.alignment: Qt.AlignHCenter - text: qsTr("No active client") - color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.extraLarge - font.weight: 500 - } - - StyledText { - Layout.alignment: Qt.AlignHCenter - text: qsTr("Try switching to a window") - color: Colours.palette.m3outline - font.pointSize: Appearance.font.size.large - } - } - } - - ScreencopyView { - id: view - - anchors.centerIn: parent - - captureSource: root.client?.wayland ?? null - live: true - - constraintSize.width: parent.height * Math.min(root.screen.width / root.screen.height, root.client?.lastIpcObject.size[0] / root.client?.lastIpcObject.size[1]) - constraintSize.height: parent.height - } - } - - StyledText { - id: label - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - anchors.bottomMargin: Appearance.padding.large - - animate: true - text: { - const client = root.client; - if (!client) - return qsTr("No active client"); - - const mon = client.monitor; - return qsTr("%1 on monitor %2 at %3, %4").arg(client.title).arg(mon.name).arg(client.lastIpcObject.at[0]).arg(client.lastIpcObject.at[1]); - } - } -} diff --git a/modules/home/services/quickshell/shell/modules/windowinfo/WindowInfo.qml b/modules/home/services/quickshell/shell/modules/windowinfo/WindowInfo.qml deleted file mode 100644 index 8ac94efd..00000000 --- a/modules/home/services/quickshell/shell/modules/windowinfo/WindowInfo.qml +++ /dev/null @@ -1,64 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import Quickshell -import Quickshell.Hyprland -import QtQuick -import QtQuick.Layouts - -Item { - id: root - - required property ShellScreen screen - required property HyprlandToplevel client - - implicitWidth: child.implicitWidth - implicitHeight: screen.height * Config.winfo.sizes.heightMult - - RowLayout { - id: child - - anchors.fill: parent - anchors.margins: Appearance.padding.large - - spacing: Appearance.spacing.normal - - Preview { - screen: root.screen - client: root.client - } - - ColumnLayout { - spacing: Appearance.spacing.normal - - Layout.preferredWidth: Config.winfo.sizes.detailsWidth - Layout.fillHeight: true - - StyledRect { - Layout.fillWidth: true - Layout.fillHeight: true - - color: Colours.palette.m3surfaceContainer - radius: Appearance.rounding.normal - - Details { - client: root.client - } - } - - StyledRect { - Layout.fillWidth: true - Layout.preferredHeight: buttons.implicitHeight - - color: Colours.palette.m3surfaceContainer - radius: Appearance.rounding.normal - - Buttons { - id: buttons - - client: root.client - } - } - } - } -} diff --git a/modules/home/services/quickshell/shell/run.fish b/modules/home/services/quickshell/shell/run.fish deleted file mode 100755 index ada41525..00000000 --- a/modules/home/services/quickshell/shell/run.fish +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env fish - -set -l dbus 'quickshell.dbus.properties.warning = false;quickshell.dbus.dbusmenu.warning = false' # System tray dbus property errors -set -l notifs 'quickshell.service.notifications.warning = false' # Notification server warnings on reload -set -l sni 'quickshell.service.sni.host.warning = false' # StatusNotifierItem warnings on reload -set -l process 'QProcess: Destroyed while process' # Long running processes on reload -set -l cache "Cannot open: file://$XDG_CACHE_HOME/caelestia/imagecache/" - -qs -p (dirname (status filename)) --log-rules "$dbus;$notifs;$sni" | grep -vF -e $process -e $cache diff --git a/modules/home/services/quickshell/shell/services/Apps.qml b/modules/home/services/quickshell/shell/services/Apps.qml deleted file mode 100644 index 546a6eb5..00000000 --- a/modules/home/services/quickshell/shell/services/Apps.qml +++ /dev/null @@ -1,30 +0,0 @@ -pragma Singleton - -import "root:/utils/scripts/fuzzysort.js" as Fuzzy -import Quickshell - -Singleton { - id: root - - readonly property list list: DesktopEntries.applications.values.filter(a => !a.noDisplay).sort((a, b) => a.name.localeCompare(b.name)) - readonly property list preppedApps: list.map(a => ({ - name: Fuzzy.prepare(a.name), - comment: Fuzzy.prepare(a.comment), - entry: a - })) - - function fuzzyQuery(search: string): var { // Idk why list doesn't work - return Fuzzy.go(search, preppedApps, { - all: true, - keys: ["name", "comment"], - scoreFn: r => r[0].score > 0 ? r[0].score * 0.9 + r[1].score * 0.1 : 0 - }).map(r => r.obj.entry); - } - - function launch(entry: DesktopEntry): void { - if (entry.execString.startsWith("sh -c")) - Quickshell.execDetached(["sh", "-c", `app2unit -- ${entry.execString}`]); - else - Quickshell.execDetached(["sh", "-c", `app2unit -- '${entry.id}.desktop' || app2unit -- ${entry.execString}`]); - } -} diff --git a/modules/home/services/quickshell/shell/services/Audio.qml b/modules/home/services/quickshell/shell/services/Audio.qml deleted file mode 100644 index c91adbc3..00000000 --- a/modules/home/services/quickshell/shell/services/Audio.qml +++ /dev/null @@ -1,25 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Services.Pipewire - -Singleton { - id: root - - readonly property PwNode sink: Pipewire.defaultAudioSink - readonly property PwNode source: Pipewire.defaultAudioSource - - readonly property bool muted: sink?.audio?.muted ?? false - readonly property real volume: sink?.audio?.volume ?? 0 - - function setVolume(volume: real): void { - if (sink?.ready && sink?.audio) { - sink.audio.muted = false; - sink.audio.volume = volume; - } - } - - PwObjectTracker { - objects: [Pipewire.defaultAudioSink, Pipewire.defaultAudioSource] - } -} diff --git a/modules/home/services/quickshell/shell/services/BeatDetector.qml b/modules/home/services/quickshell/shell/services/BeatDetector.qml deleted file mode 100644 index 70994352..00000000 --- a/modules/home/services/quickshell/shell/services/BeatDetector.qml +++ /dev/null @@ -1,22 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Io - -Singleton { - id: root - - property real bpm - - Process { - running: true - command: [Quickshell.env("CAELESTIA_BD_PATH") || "/usr/lib/caelestia/beat_detector", "--no-log", "--no-stats", "--no-visual"] - stdout: SplitParser { - onRead: data => { - const match = data.match(/BPM: ([0-9]+\.[0-9])/); - if (match) - root.bpm = parseFloat(match[1]); - } - } - } -} diff --git a/modules/home/services/quickshell/shell/services/Bluetooth.qml b/modules/home/services/quickshell/shell/services/Bluetooth.qml deleted file mode 100644 index 0769095b..00000000 --- a/modules/home/services/quickshell/shell/services/Bluetooth.qml +++ /dev/null @@ -1,104 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - property bool powered - property bool discovering - readonly property list devices: [] - - Process { - running: true - command: ["bluetoothctl"] - stdout: SplitParser { - onRead: { - getInfo.running = true; - getDevices.running = true; - } - } - } - - Process { - id: getInfo - - running: true - command: ["bluetoothctl", "show"] - environment: ({ - LANG: "C", - LC_ALL: "C" - }) - stdout: StdioCollector { - onStreamFinished: { - root.powered = text.includes("Powered: yes"); - root.discovering = text.includes("Discovering: yes"); - } - } - } - - Process { - id: getDevices - - running: true - command: ["fish", "-c", ` - for a in (bluetoothctl devices) - if string match -q 'Device *' $a - bluetoothctl info $addr (string split ' ' $a)[2] - echo - end - end`] - environment: ({ - LANG: "C", - LC_ALL: "C" - }) - stdout: StdioCollector { - onStreamFinished: { - const devices = text.trim().split("\n\n").map(d => ({ - name: d.match(/Name: (.*)/)[1], - alias: d.match(/Alias: (.*)/)[1], - address: d.match(/Device ([0-9A-Z:]{17})/)[1], - icon: d.match(/Icon: (.*)/)[1], - connected: d.includes("Connected: yes"), - paired: d.includes("Paired: yes"), - trusted: d.includes("Trusted: yes") - })); - const rDevices = root.devices; - - const destroyed = rDevices.filter(rd => !devices.find(d => d.address === rd.address)); - for (const device of destroyed) - rDevices.splice(rDevices.indexOf(device), 1).forEach(d => d.destroy()); - - for (const device of devices) { - const match = rDevices.find(d => d.address === device.address); - if (match) { - match.lastIpcObject = device; - } else { - rDevices.push(deviceComp.createObject(root, { - lastIpcObject: device - })); - } - } - } - } - } - - component Device: QtObject { - required property var lastIpcObject - readonly property string name: lastIpcObject.name - readonly property string alias: lastIpcObject.alias - readonly property string address: lastIpcObject.address - readonly property string icon: lastIpcObject.icon - readonly property bool connected: lastIpcObject.connected - readonly property bool paired: lastIpcObject.paired - readonly property bool trusted: lastIpcObject.trusted - } - - Component { - id: deviceComp - - Device {} - } -} diff --git a/modules/home/services/quickshell/shell/services/Brightness.qml b/modules/home/services/quickshell/shell/services/Brightness.qml deleted file mode 100644 index 5a900aa7..00000000 --- a/modules/home/services/quickshell/shell/services/Brightness.qml +++ /dev/null @@ -1,113 +0,0 @@ -pragma Singleton -pragma ComponentBehavior: Bound - -import "root:/widgets" -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - property list ddcMonitors: [] - readonly property list monitors: variants.instances - - function getMonitorForScreen(screen: ShellScreen): var { - return monitors.find(m => m.modelData === screen); - } - - function increaseBrightness(): void { - const focusedName = Hyprland.focusedMonitor.name; - const monitor = monitors.find(m => focusedName === m.modelData.name); - if (monitor) - monitor.setBrightness(monitor.brightness + 0.1); - } - - function decreaseBrightness(): void { - const focusedName = Hyprland.focusedMonitor.name; - const monitor = monitors.find(m => focusedName === m.modelData.name); - if (monitor) - monitor.setBrightness(monitor.brightness - 0.1); - } - - reloadableId: "brightness" - - onMonitorsChanged: { - ddcMonitors = []; - ddcProc.running = true; - } - - Variants { - id: variants - - model: Quickshell.screens - - Monitor {} - } - - Process { - id: ddcProc - - command: ["ddcutil", "detect", "--brief"] - stdout: StdioCollector { - onStreamFinished: root.ddcMonitors = text.trim().split("\n\n").filter(d => d.startsWith("Display ")).map(d => ({ - model: d.match(/Monitor:.*:(.*):.*/)[1], - busNum: d.match(/I2C bus:[ ]*\/dev\/i2c-([0-9]+)/)[1] - })) - } - } - - Process { - id: setProc - } - - CustomShortcut { - name: "brightnessUp" - description: "Increase brightness" - onPressed: root.increaseBrightness() - } - - CustomShortcut { - name: "brightnessDown" - description: "Decrease brightness" - onPressed: root.decreaseBrightness() - } - - component Monitor: QtObject { - id: monitor - - required property ShellScreen modelData - readonly property bool isDdc: root.ddcMonitors.some(m => m.model === modelData.model) - readonly property string busNum: root.ddcMonitors.find(m => m.model === modelData.model)?.busNum ?? "" - property real brightness - - readonly property Process initProc: Process { - stdout: StdioCollector { - onStreamFinished: { - const [, , , current, max] = text.split(" "); - monitor.brightness = parseInt(current) / parseInt(max); - } - } - } - - function setBrightness(value: real): void { - value = Math.max(0, Math.min(1, value)); - const rounded = Math.round(value * 100); - if (Math.round(brightness * 100) === rounded) - return; - brightness = value; - setProc.command = isDdc ? ["ddcutil", "-b", busNum, "setvcp", "10", rounded] : ["brightnessctl", "s", `${rounded}%`]; - setProc.startDetached(); - } - - onBusNumChanged: { - initProc.command = isDdc ? ["ddcutil", "-b", busNum, "getvcp", "10", "--brief"] : ["sh", "-c", `echo "a b c $(brightnessctl g) $(brightnessctl m)"`]; - initProc.running = true; - } - - Component.onCompleted: { - initProc.command = isDdc ? ["ddcutil", "-b", busNum, "getvcp", "10", "--brief"] : ["sh", "-c", `echo "a b c $(brightnessctl g) $(brightnessctl m)"`]; - initProc.running = true; - } - } -} diff --git a/modules/home/services/quickshell/shell/services/Cava.qml b/modules/home/services/quickshell/shell/services/Cava.qml deleted file mode 100644 index 50539845..00000000 --- a/modules/home/services/quickshell/shell/services/Cava.qml +++ /dev/null @@ -1,23 +0,0 @@ -pragma Singleton - -import "root:/config" -import Quickshell -import Quickshell.Io - -Singleton { - id: root - - property list values - property int refCount - - Process { - running: true - command: ["sh", "-c", `printf '[general]\nframerate=60\nbars=${Config.dashboard.visualiserBars}\n[output]\nchannels=mono\nmethod=raw\nraw_target=/dev/stdout\ndata_format=ascii\nascii_max_range=100' | cava -p /dev/stdin`] - stdout: SplitParser { - onRead: data => { - if (root.refCount) - root.values = data.slice(0, -1).split(";").map(v => parseInt(v, 10)); - } - } - } -} diff --git a/modules/home/services/quickshell/shell/services/Colours.qml b/modules/home/services/quickshell/shell/services/Colours.qml deleted file mode 100644 index 3a26e845..00000000 --- a/modules/home/services/quickshell/shell/services/Colours.qml +++ /dev/null @@ -1,144 +0,0 @@ -pragma Singleton - -import "root:/config" -import "root:/utils" -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - readonly property list colourNames: ["rosewater", "flamingo", "pink", "mauve", "red", "maroon", "peach", "yellow", "green", "teal", "sky", "sapphire", "blue", "lavender"] - - property bool showPreview - property string scheme - property string flavour - property bool light - readonly property Colours palette: showPreview ? preview : current - readonly property Colours current: Colours {} - readonly property Colours preview: Colours {} - readonly property Transparency transparency: Transparency {} - - function alpha(c: color, layer: bool): color { - if (!transparency.enabled) - return c; - c = Qt.rgba(c.r, c.g, c.b, layer ? transparency.layers : transparency.base); - if (layer) - c.hsvValue = Math.max(0, Math.min(1, c.hslLightness + (light ? -0.2 : 0.2))); // TODO: edit based on colours (hue or smth) - return c; - } - - function on(c: color): color { - if (c.hslLightness < 0.5) - return Qt.hsla(c.hslHue, c.hslSaturation, 0.9, 1); - return Qt.hsla(c.hslHue, c.hslSaturation, 0.1, 1); - } - - function load(data: string, isPreview: bool): void { - const colours = isPreview ? preview : current; - const scheme = JSON.parse(data); - - if (!isPreview) { - root.scheme = scheme.name; - flavour = scheme.flavour; - } - - light = scheme.mode === "light"; - - for (const [name, colour] of Object.entries(scheme.colours)) { - const propName = colourNames.includes(name) ? name : `m3${name}`; - if (colours.hasOwnProperty(propName)) - colours[propName] = `#${colour}`; - } - } - - function setMode(mode: string): void { - Quickshell.execDetached(["caelestia", "scheme", "set", "--notify", "-m", mode]); - } - - FileView { - path: `${Paths.state}/scheme.json` - watchChanges: true - onFileChanged: reload() - onLoaded: root.load(text(), false) - } - - component Transparency: QtObject { - readonly property bool enabled: false - readonly property real base: 0.78 - readonly property real layers: 0.58 - } - - component Colours: QtObject { - property color m3primary_paletteKeyColor: "#7870AB" - property color m3secondary_paletteKeyColor: "#78748A" - property color m3tertiary_paletteKeyColor: "#976A7D" - property color m3neutral_paletteKeyColor: "#79767D" - property color m3neutral_variant_paletteKeyColor: "#797680" - property color m3background: "#141318" - property color m3onBackground: "#E5E1E9" - property color m3surface: "#141318" - property color m3surfaceDim: "#141318" - property color m3surfaceBright: "#3A383E" - property color m3surfaceContainerLowest: "#0E0D13" - property color m3surfaceContainerLow: "#1C1B20" - property color m3surfaceContainer: "#201F25" - property color m3surfaceContainerHigh: "#2B292F" - property color m3surfaceContainerHighest: "#35343A" - property color m3onSurface: "#E5E1E9" - property color m3surfaceVariant: "#48454E" - property color m3onSurfaceVariant: "#C9C5D0" - property color m3inverseSurface: "#E5E1E9" - property color m3inverseOnSurface: "#312F36" - property color m3outline: "#938F99" - property color m3outlineVariant: "#48454E" - property color m3shadow: "#000000" - property color m3scrim: "#000000" - property color m3surfaceTint: "#C8BFFF" - property color m3primary: "#C8BFFF" - property color m3onPrimary: "#30285F" - property color m3primaryContainer: "#473F77" - property color m3onPrimaryContainer: "#E5DEFF" - property color m3inversePrimary: "#5F5791" - property color m3secondary: "#C9C3DC" - property color m3onSecondary: "#312E41" - property color m3secondaryContainer: "#484459" - property color m3onSecondaryContainer: "#E5DFF9" - property color m3tertiary: "#ECB8CD" - property color m3onTertiary: "#482536" - property color m3tertiaryContainer: "#B38397" - property color m3onTertiaryContainer: "#000000" - property color m3error: "#EA8DC1" - property color m3onError: "#690005" - property color m3errorContainer: "#93000A" - property color m3onErrorContainer: "#FFDAD6" - property color m3primaryFixed: "#E5DEFF" - property color m3primaryFixedDim: "#C8BFFF" - property color m3onPrimaryFixed: "#1B1149" - property color m3onPrimaryFixedVariant: "#473F77" - property color m3secondaryFixed: "#E5DFF9" - property color m3secondaryFixedDim: "#C9C3DC" - property color m3onSecondaryFixed: "#1C192B" - property color m3onSecondaryFixedVariant: "#484459" - property color m3tertiaryFixed: "#FFD8E7" - property color m3tertiaryFixedDim: "#ECB8CD" - property color m3onTertiaryFixed: "#301121" - property color m3onTertiaryFixedVariant: "#613B4C" - - property color rosewater: "#B8C4FF" - property color flamingo: "#DBB9F8" - property color pink: "#F3B3E3" - property color mauve: "#D0BDFE" - property color red: "#F8B3D1" - property color maroon: "#F6B2DA" - property color peach: "#E4B7F4" - property color yellow: "#C3C0FF" - property color green: "#ADC6FF" - property color teal: "#D4BBFC" - property color sky: "#CBBEFF" - property color sapphire: "#BDC2FF" - property color blue: "#C7BFFF" - property color lavender: "#EAB5ED" - } -} diff --git a/modules/home/services/quickshell/shell/services/Hyprland.qml b/modules/home/services/quickshell/shell/services/Hyprland.qml deleted file mode 100644 index bef1c34f..00000000 --- a/modules/home/services/quickshell/shell/services/Hyprland.qml +++ /dev/null @@ -1,37 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Hyprland -import QtQuick - -Singleton { - id: root - - readonly property var toplevels: Hyprland.toplevels - readonly property var workspaces: Hyprland.workspaces - readonly property var monitors: Hyprland.monitors - readonly property HyprlandToplevel activeToplevel: Hyprland.activeToplevel - readonly property HyprlandWorkspace focusedWorkspace: Hyprland.focusedWorkspace - readonly property HyprlandMonitor focusedMonitor: Hyprland.focusedMonitor - readonly property int activeWsId: focusedWorkspace?.id ?? 1 - - function dispatch(request: string): void { - Hyprland.dispatch(request); - } - - Connections { - target: Hyprland - - function onRawEvent(event: HyprlandEvent): void { - if (event.name.endsWith("v2")) - return; - - if (event.name.includes("mon")) - Hyprland.refreshMonitors(); - else if (event.name.includes("workspace")) - Hyprland.refreshWorkspaces(); - else - Hyprland.refreshToplevels(); - } - } -} diff --git a/modules/home/services/quickshell/shell/services/Network.qml b/modules/home/services/quickshell/shell/services/Network.qml deleted file mode 100644 index 8515ef50..00000000 --- a/modules/home/services/quickshell/shell/services/Network.qml +++ /dev/null @@ -1,81 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - readonly property list networks: [] - readonly property AccessPoint active: networks.find(n => n.active) ?? null - - reloadableId: "network" - - Process { - running: true - command: ["nmcli", "m"] - stdout: SplitParser { - onRead: getNetworks.running = true - } - } - - Process { - id: getNetworks - running: true - command: ["nmcli", "-g", "ACTIVE,SIGNAL,FREQ,SSID,BSSID", "d", "w"] - environment: ({ - LANG: "C", - LC_ALL: "C" - }) - stdout: StdioCollector { - onStreamFinished: { - const PLACEHOLDER = "STRINGWHICHHOPEFULLYWONTBEUSED"; - const rep = new RegExp("\\\\:", "g"); - const rep2 = new RegExp(PLACEHOLDER, "g"); - - const networks = text.trim().split("\n").map(n => { - const net = n.replace(rep, PLACEHOLDER).split(":"); - return { - active: net[0] === "yes", - strength: parseInt(net[1]), - frequency: parseInt(net[2]), - ssid: net[3], - bssid: net[4]?.replace(rep2, ":") ?? "" - }; - }); - const rNetworks = root.networks; - - const destroyed = rNetworks.filter(rn => !networks.find(n => n.frequency === rn.frequency && n.ssid === rn.ssid && n.bssid === rn.bssid)); - for (const network of destroyed) - rNetworks.splice(rNetworks.indexOf(network), 1).forEach(n => n.destroy()); - - for (const network of networks) { - const match = rNetworks.find(n => n.frequency === network.frequency && n.ssid === network.ssid && n.bssid === network.bssid); - if (match) { - match.lastIpcObject = network; - } else { - rNetworks.push(apComp.createObject(root, { - lastIpcObject: network - })); - } - } - } - } - } - - component AccessPoint: QtObject { - required property var lastIpcObject - readonly property string ssid: lastIpcObject.ssid - readonly property string bssid: lastIpcObject.bssid - readonly property int strength: lastIpcObject.strength - readonly property int frequency: lastIpcObject.frequency - readonly property bool active: lastIpcObject.active - } - - Component { - id: apComp - - AccessPoint {} - } -} diff --git a/modules/home/services/quickshell/shell/services/Notifs.qml b/modules/home/services/quickshell/shell/services/Notifs.qml deleted file mode 100644 index 2ccb8a61..00000000 --- a/modules/home/services/quickshell/shell/services/Notifs.qml +++ /dev/null @@ -1,108 +0,0 @@ -pragma Singleton -pragma ComponentBehavior: Bound - -import "root:/widgets" -import "root:/config" -import Quickshell -import Quickshell.Io -import Quickshell.Services.Notifications -import QtQuick - -Singleton { - id: root - - readonly property list list: [] - readonly property list popups: list.filter(n => n.popup) - - NotificationServer { - id: server - - keepOnReload: false - actionsSupported: true - bodyHyperlinksSupported: true - bodyImagesSupported: true - bodyMarkupSupported: true - imageSupported: true - - onNotification: notif => { - notif.tracked = true; - - root.list.push(notifComp.createObject(root, { - popup: true, - notification: notif - })); - } - } - - CustomShortcut { - name: "clearNotifs" - description: "Clear all notifications" - onPressed: { - for (const notif of root.list) - notif.popup = false; - } - } - - IpcHandler { - target: "notifs" - - function clear(): void { - for (const notif of root.list) - notif.popup = false; - } - } - - component Notif: QtObject { - id: notif - - property bool popup - readonly property date time: new Date() - readonly property string timeStr: { - const diff = Time.date.getTime() - time.getTime(); - const m = Math.floor(diff / 60000); - const h = Math.floor(m / 60); - - if (h < 1 && m < 1) - return "now"; - if (h < 1) - return `${m}m`; - return `${h}h`; - } - - required property Notification notification - readonly property string summary: notification.summary - readonly property string body: notification.body - readonly property string appIcon: notification.appIcon - readonly property string appName: notification.appName - readonly property string image: notification.image - readonly property int urgency: notification.urgency - readonly property list actions: notification.actions - - readonly property Timer timer: Timer { - running: true - interval: notif.notification.expireTimeout > 0 ? notif.notification.expireTimeout : Config.notifs.defaultExpireTimeout - onTriggered: { - if (Config.notifs.expire) - notif.popup = false; - } - } - - readonly property Connections conn: Connections { - target: notif.notification.Retainable - - function onDropped(): void { - root.list.splice(root.list.indexOf(notif), 1); - } - - function onAboutToDestroy(): void { - notif.destroy(); - } - } - } - - Component { - id: notifComp - - Notif {} - } -} diff --git a/modules/home/services/quickshell/shell/services/Players.qml b/modules/home/services/quickshell/shell/services/Players.qml deleted file mode 100644 index e9a3de49..00000000 --- a/modules/home/services/quickshell/shell/services/Players.qml +++ /dev/null @@ -1,97 +0,0 @@ -pragma Singleton - -import "root:/widgets" -import Quickshell -import Quickshell.Io -import Quickshell.Services.Mpris - -Singleton { - id: root - - readonly property list list: Mpris.players.values - readonly property MprisPlayer active: manualActive ?? list.find(p => p.identity === "Spotify") ?? list[0] ?? null - property MprisPlayer manualActive - - CustomShortcut { - name: "mediaToggle" - description: "Toggle media playback" - onPressed: { - const active = root.active; - if (active && active.canTogglePlaying) - active.togglePlaying(); - } - } - - CustomShortcut { - name: "mediaPrev" - description: "Previous track" - onPressed: { - const active = root.active; - if (active && active.canGoPrevious) - active.previous(); - } - } - - CustomShortcut { - name: "mediaNext" - description: "Next track" - onPressed: { - const active = root.active; - if (active && active.canGoNext) - active.next(); - } - } - - CustomShortcut { - name: "mediaStop" - description: "Stop media playback" - onPressed: root.active?.stop() - } - - IpcHandler { - target: "mpris" - - function getActive(prop: string): string { - const active = root.active; - return active ? active[prop] ?? "Invalid property" : "No active player"; - } - - function list(): string { - return root.list.map(p => p.identity).join("\n"); - } - - function play(): void { - const active = root.active; - if (active?.canPlay) - active.play(); - } - - function pause(): void { - const active = root.active; - if (active?.canPause) - active.pause(); - } - - function playPause(): void { - const active = root.active; - if (active?.canTogglePlaying) - active.togglePlaying(); - } - - function previous(): void { - const active = root.active; - if (active?.canGoPrevious) - active.previous(); - } - - function next(): void { - const active = root.active; - if (active?.canGoNext) - active.next(); - } - - function stop(): void { - root.active?.stop(); - } - } -} diff --git a/modules/home/services/quickshell/shell/services/Requests.qml b/modules/home/services/quickshell/shell/services/Requests.qml deleted file mode 100644 index 36e91209..00000000 --- a/modules/home/services/quickshell/shell/services/Requests.qml +++ /dev/null @@ -1,36 +0,0 @@ -pragma Singleton - -import "root:/config" -import "root:/utils" -import Quickshell - -Singleton { - id: root - - function get(url: string, callback: var): void { - const xhr = new XMLHttpRequest(); - - const cleanup = () => { - xhr.abort(); - xhr.onreadystatechange = null; - xhr.onerror = null; - }; - - xhr.open("GET", url, true); - xhr.onreadystatechange = () => { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) - callback(xhr.responseText); - else - console.warn(`[REQUESTS] GET request to ${url} failed with status ${xhr.status}`); - cleanup(); - } - }; - xhr.onerror = () => { - console.warn(`[REQUESTS] GET request to ${url} failed`); - cleanup(); - }; - - xhr.send(); - } -} diff --git a/modules/home/services/quickshell/shell/services/SystemUsage.qml b/modules/home/services/quickshell/shell/services/SystemUsage.qml deleted file mode 100644 index 18921e7c..00000000 --- a/modules/home/services/quickshell/shell/services/SystemUsage.qml +++ /dev/null @@ -1,220 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - property real cpuPerc - property real cpuTemp - property string gpuType: "NONE" - property real gpuPerc - property real gpuTemp - property real memUsed - property real memTotal - readonly property real memPerc: memTotal > 0 ? memUsed / memTotal : 0 - property real storageUsed - property real storageTotal - property real storagePerc: storageTotal > 0 ? storageUsed / storageTotal : 0 - - property real lastCpuIdle - property real lastCpuTotal - - property int refCount - - function formatKib(kib: real): var { - const mib = 1024; - const gib = 1024 ** 2; - const tib = 1024 ** 3; - - if (kib >= tib) - return { - value: kib / tib, - unit: "TiB" - }; - if (kib >= gib) - return { - value: kib / gib, - unit: "GiB" - }; - if (kib >= mib) - return { - value: kib / mib, - unit: "MiB" - }; - return { - value: kib, - unit: "KiB" - }; - } - - Timer { - running: root.refCount > 0 - interval: 3000 - repeat: true - triggeredOnStart: true - onTriggered: { - stat.reload(); - meminfo.reload(); - storage.running = true; - gpuUsage.running = true; - sensors.running = true; - } - } - - FileView { - id: stat - - path: "/proc/stat" - onLoaded: { - const data = text().match(/^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/); - if (data) { - const stats = data.slice(1).map(n => parseInt(n, 10)); - const total = stats.reduce((a, b) => a + b, 0); - const idle = stats[3] + (stats[4] ?? 0); - - const totalDiff = total - root.lastCpuTotal; - const idleDiff = idle - root.lastCpuIdle; - root.cpuPerc = totalDiff > 0 ? (1 - idleDiff / totalDiff) : 0; - - root.lastCpuTotal = total; - root.lastCpuIdle = idle; - } - } - } - - FileView { - id: meminfo - - path: "/proc/meminfo" - onLoaded: { - const data = text(); - root.memTotal = parseInt(data.match(/MemTotal: *(\d+)/)[1], 10) || 1; - root.memUsed = (root.memTotal - parseInt(data.match(/MemAvailable: *(\d+)/)[1], 10)) || 0; - } - } - - Process { - id: storage - - command: ["sh", "-c", "df | grep '^/dev/' | awk '{print $1, $3, $4}'"] - stdout: StdioCollector { - onStreamFinished: { - const deviceMap = new Map(); - - for (const line of text.trim().split("\n")) { - if (line.trim() === "") - continue; - - const parts = line.trim().split(/\s+/); - if (parts.length >= 3) { - const device = parts[0]; - const used = parseInt(parts[1], 10) || 0; - const avail = parseInt(parts[2], 10) || 0; - - // Only keep the entry with the largest total space for each device - if (!deviceMap.has(device) || (used + avail) > (deviceMap.get(device).used + deviceMap.get(device).avail)) { - deviceMap.set(device, { - used: used, - avail: avail - }); - } - } - } - - let totalUsed = 0; - let totalAvail = 0; - - for (const [device, stats] of deviceMap) { - totalUsed += stats.used; - totalAvail += stats.avail; - } - - root.storageUsed = totalUsed; - root.storageTotal = totalUsed + totalAvail; - } - } - } - - Process { - id: gpuTypeCheck - - running: true - command: ["sh", "-c", "if ls /sys/class/drm/card*/device/gpu_busy_percent 2>/dev/null | grep -q .; then echo GENERIC; elif command -v nvidia-smi >/dev/null; then echo NVIDIA; else echo NONE; fi"] - stdout: StdioCollector { - onStreamFinished: root.gpuType = text.trim() - } - } - - Process { - id: gpuUsage - - command: root.gpuType === "GENERIC" ? ["sh", "-c", "cat /sys/class/drm/card*/device/gpu_busy_percent"] : root.gpuType === "NVIDIA" ? ["nvidia-smi", "--query-gpu=utilization.gpu,temperature.gpu", "--format=csv,noheader,nounits"] : ["echo"] - stdout: StdioCollector { - onStreamFinished: { - if (root.gpuType === "GENERIC") { - const percs = text.trim().split("\n"); - const sum = percs.reduce((acc, d) => acc + parseInt(d, 10), 0); - root.gpuPerc = sum / percs.length / 100; - } else if (root.gpuType === "NVIDIA") { - const [usage, temp] = text.trim().split(","); - root.gpuPerc = parseInt(usage, 10) / 100; - root.gpuTemp = parseInt(temp, 10); - } else { - root.gpuPerc = 0; - root.gpuTemp = 0; - } - } - } - } - - Process { - id: sensors - - command: ["sensors"] - environment: ({ - LANG: "C", - LC_ALL: "C" - }) - stdout: StdioCollector { - onStreamFinished: { - let cpuTemp = text.match(/(?:Package id [0-9]+|Tdie):\s+((\+|-)[0-9.]+)(°| )C/); - if (!cpuTemp) - // If AMD Tdie pattern failed, try fallback on Tctl - cpuTemp = text.match(/Tctl:\s+((\+|-)[0-9.]+)(°| )C/); - - if (cpuTemp) - root.cpuTemp = parseFloat(cpuTemp[1]); - - if (root.gpuType !== "GENERIC") - return; - - let eligible = false; - let sum = 0; - let count = 0; - - for (const line of text.trim().split("\n")) { - if (line === "Adapter: PCI adapter") - eligible = true; - else if (line === "") - eligible = false; - else if (eligible) { - let match = line.match(/^(temp[0-9]+|GPU core|edge)+:\s+\+([0-9]+\.[0-9]+)(°| )C/); - if (!match) - // Fall back to junction/mem if GPU doesn't have edge temp (for AMD GPUs) - match = line.match(/^(junction|mem)+:\s+\+([0-9]+\.[0-9]+)(°| )C/); - - if (match) { - sum += parseFloat(match[2]); - count++; - } - } - } - - root.gpuTemp = count > 0 ? sum / count : 0; - } - } - } -} diff --git a/modules/home/services/quickshell/shell/services/Time.qml b/modules/home/services/quickshell/shell/services/Time.qml deleted file mode 100644 index c4b39136..00000000 --- a/modules/home/services/quickshell/shell/services/Time.qml +++ /dev/null @@ -1,20 +0,0 @@ -pragma Singleton - -import Quickshell - -Singleton { - property alias enabled: clock.enabled - readonly property date date: clock.date - readonly property int hours: clock.hours - readonly property int minutes: clock.minutes - readonly property int seconds: clock.seconds - - function format(fmt: string): string { - return Qt.formatDateTime(clock.date, fmt); - } - - SystemClock { - id: clock - precision: SystemClock.Seconds - } -} diff --git a/modules/home/services/quickshell/shell/services/Visibilities.qml b/modules/home/services/quickshell/shell/services/Visibilities.qml deleted file mode 100644 index eb6ddfb7..00000000 --- a/modules/home/services/quickshell/shell/services/Visibilities.qml +++ /dev/null @@ -1,12 +0,0 @@ -pragma Singleton - -import Quickshell - -Singleton { - property var screens: ({}) - property var panels: ({}) - - function getForActive(): PersistentProperties { - return Object.entries(screens).find(s => s[0].slice(s[0].indexOf('"') + 1, s[0].lastIndexOf('"')) === Hyprland.focusedMonitor.name)[1]; - } -} diff --git a/modules/home/services/quickshell/shell/services/Wallpapers.qml b/modules/home/services/quickshell/shell/services/Wallpapers.qml deleted file mode 100644 index 5a84d8d9..00000000 --- a/modules/home/services/quickshell/shell/services/Wallpapers.qml +++ /dev/null @@ -1,140 +0,0 @@ -pragma Singleton - -import "root:/config" -import "root:/utils/scripts/fuzzysort.js" as Fuzzy -import "root:/utils" -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - id: root - - readonly property string currentNamePath: Paths.strip(`${Paths.state}/wallpaper/path.txt`) - readonly property list extensions: ["jpg", "jpeg", "png", "webp", "tif", "tiff"] - - readonly property list list: wallpapers.instances - property bool showPreview: false - readonly property string current: showPreview ? previewPath : actualCurrent - property string previewPath - property string actualCurrent - property bool previewColourLock - - readonly property list preppedWalls: list.map(w => ({ - name: Fuzzy.prepare(w.name), - path: Fuzzy.prepare(w.path), - wall: w - })) - - function fuzzyQuery(search: string): var { - return Fuzzy.go(search, preppedWalls, { - all: true, - keys: ["name", "path"], - scoreFn: r => r[0].score * 0.9 + r[1].score * 0.1 - }).map(r => r.obj.wall); - } - - function setWallpaper(path: string): void { - actualCurrent = path; - Quickshell.execDetached(["caelestia", "wallpaper", "-f", path]); - } - - function preview(path: string): void { - previewPath = path; - showPreview = true; - - if (Colours.scheme === "dynamic") - getPreviewColoursProc.running = true; - } - - function stopPreview(): void { - showPreview = false; - if (!previewColourLock) - Colours.showPreview = false; - } - - reloadableId: "wallpapers" - - IpcHandler { - target: "wallpaper" - - function get(): string { - return root.actualCurrent; - } - - function set(path: string): void { - root.setWallpaper(path); - } - - function list(): string { - return root.list.map(w => w.path).join("\n"); - } - } - - FileView { - path: root.currentNamePath - watchChanges: true - onFileChanged: reload() - onLoaded: { - root.actualCurrent = text().trim(); - root.previewColourLock = false; - } - } - - Process { - id: getPreviewColoursProc - - command: ["caelestia", "wallpaper", "-p", root.previewPath] - stdout: StdioCollector { - onStreamFinished: { - Colours.load(text, true); - Colours.showPreview = true; - } - } - } - - Process { - id: getWallsProc - - running: true - command: ["find", Paths.expandTilde(Config.paths.wallpaperDir), "-type", "d", "-path", '*/.*', "-prune", "-o", "-not", "-name", '.*', "-type", "f", "-print"] - stdout: StdioCollector { - onStreamFinished: wallpapers.model = text.trim().split("\n").filter(w => root.extensions.includes(w.slice(w.lastIndexOf(".") + 1))).sort() - } - } - - Process { - id: watchWallsProc - - running: true - command: ["inotifywait", "-r", "-e", "close_write,moved_to,create", "-m", Paths.expandTilde(Config.paths.wallpaperDir)] - stdout: SplitParser { - onRead: data => { - if (root.extensions.includes(data.slice(data.lastIndexOf(".") + 1))) - getWallsProc.running = true; - } - } - } - - Connections { - target: Config.paths - - function onWallpaperDirChanged(): void { - getWallsProc.running = true; - watchWallsProc.running = false; - watchWallsProc.running = true; - } - } - - Variants { - id: wallpapers - - Wallpaper {} - } - - component Wallpaper: QtObject { - required property string modelData - readonly property string path: modelData - readonly property string name: path.slice(path.lastIndexOf("/") + 1, path.lastIndexOf(".")) - } -} diff --git a/modules/home/services/quickshell/shell/services/Weather.qml b/modules/home/services/quickshell/shell/services/Weather.qml deleted file mode 100644 index ad80e484..00000000 --- a/modules/home/services/quickshell/shell/services/Weather.qml +++ /dev/null @@ -1,38 +0,0 @@ -pragma Singleton - -import "root:/config" -import "root:/utils" -import Quickshell -import QtQuick - -Singleton { - id: root - - property string loc - property string icon - property string description - property real temperature - - function reload(): void { - if (Config.dashboard.weatherLocation) - loc = Config.dashboard.weatherLocation; - else if (!loc || timer.elapsed() > 900) - Requests.get("https://ipinfo.io/json", text => { - loc = JSON.parse(text).loc ?? ""; - timer.restart(); - }); - } - - onLocChanged: Requests.get(`https://wttr.in/${loc}?format=j1`, text => { - const json = JSON.parse(text).current_condition[0]; - icon = Icons.getWeatherIcon(json.weatherCode); - description = json.weatherDesc[0].value; - temperature = parseFloat(json.temp_C); - }) - - Component.onCompleted: reload() - - ElapsedTimer { - id: timer - } -} diff --git a/modules/home/services/quickshell/shell/shell.qml b/modules/home/services/quickshell/shell/shell.qml deleted file mode 100644 index f649fed2..00000000 --- a/modules/home/services/quickshell/shell/shell.qml +++ /dev/null @@ -1,17 +0,0 @@ -//@ pragma Env QS_NO_RELOAD_POPUP=1 - -import "modules" -import "modules/drawers" -import "modules/background" -import "modules/areapicker" -import "modules/lock" -import Quickshell - -ShellRoot { - Background {} - Drawers {} - AreaPicker {} - Lock {} - - Shortcuts {} -} diff --git a/modules/home/services/quickshell/shell/utils/Icons.qml b/modules/home/services/quickshell/shell/utils/Icons.qml deleted file mode 100644 index b3081090..00000000 --- a/modules/home/services/quickshell/shell/utils/Icons.qml +++ /dev/null @@ -1,257 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Io -import Quickshell.Services.Notifications - -Singleton { - id: root - - readonly property var osIcons: ({ - almalinux: "", - alpine: "", - arch: "", - archcraft: "", - arcolinux: "", - artix: "", - centos: "", - debian: "", - devuan: "", - elementary: "", - endeavouros: "", - fedora: "", - freebsd: "", - garuda: "", - gentoo: "", - hyperbola: "", - kali: "", - linuxmint: "󰣭", - mageia: "", - openmandriva: "", - manjaro: "", - neon: "", - nixos: "", - opensuse: "", - suse: "", - sles: "", - sles_sap: "", - "opensuse-tumbleweed": "", - parrot: "", - pop: "", - raspbian: "", - rhel: "", - rocky: "", - slackware: "", - solus: "", - steamos: "", - tails: "", - trisquel: "", - ubuntu: "", - vanilla: "", - void: "", - zorin: "" - }) - - readonly property var weatherIcons: ({ - "113": "clear_day", - "116": "partly_cloudy_day", - "119": "cloud", - "122": "cloud", - "143": "foggy", - "176": "rainy", - "179": "rainy", - "182": "rainy", - "185": "rainy", - "200": "thunderstorm", - "227": "cloudy_snowing", - "230": "snowing_heavy", - "248": "foggy", - "260": "foggy", - "263": "rainy", - "266": "rainy", - "281": "rainy", - "284": "rainy", - "293": "rainy", - "296": "rainy", - "299": "rainy", - "302": "weather_hail", - "305": "rainy", - "308": "weather_hail", - "311": "rainy", - "314": "rainy", - "317": "rainy", - "320": "cloudy_snowing", - "323": "cloudy_snowing", - "326": "cloudy_snowing", - "329": "snowing_heavy", - "332": "snowing_heavy", - "335": "snowing", - "338": "snowing_heavy", - "350": "rainy", - "353": "rainy", - "356": "rainy", - "359": "weather_hail", - "362": "rainy", - "365": "rainy", - "368": "cloudy_snowing", - "371": "snowing", - "374": "rainy", - "377": "rainy", - "386": "thunderstorm", - "389": "thunderstorm", - "392": "thunderstorm", - "395": "snowing" - }) - - readonly property var desktopEntrySubs: ({ - "gimp-3.0": "gimp" - }) - - readonly property var categoryIcons: ({ - WebBrowser: "web", - Printing: "print", - Security: "security", - Network: "chat", - Archiving: "archive", - Compression: "archive", - Development: "code", - IDE: "code", - TextEditor: "edit_note", - Audio: "music_note", - Music: "music_note", - Player: "music_note", - Recorder: "mic", - Game: "sports_esports", - FileTools: "files", - FileManager: "files", - Filesystem: "files", - FileTransfer: "files", - Settings: "settings", - DesktopSettings: "settings", - HardwareSettings: "settings", - TerminalEmulator: "terminal", - ConsoleOnly: "terminal", - Utility: "build", - Monitor: "monitor_heart", - Midi: "graphic_eq", - Mixer: "graphic_eq", - AudioVideoEditing: "video_settings", - AudioVideo: "music_video", - Video: "videocam", - Building: "construction", - Graphics: "photo_library", - "2DGraphics": "photo_library", - RasterGraphics: "photo_library", - TV: "tv", - System: "host", - Office: "content_paste" - }) - - property string osIcon: "" - property string osName - - function getDesktopEntry(name: string): DesktopEntry { - name = name.toLowerCase().replace(/ /g, "-"); - - if (desktopEntrySubs.hasOwnProperty(name)) - name = desktopEntrySubs[name]; - - return DesktopEntries.applications.values.find(a => a.id.toLowerCase() === name) ?? null; - } - - function getAppIcon(name: string, fallback: string): string { - return Quickshell.iconPath(getDesktopEntry(name)?.icon, fallback); - } - - function getAppCategoryIcon(name: string, fallback: string): string { - const categories = getDesktopEntry(name)?.categories; - - if (categories) - for (const [key, value] of Object.entries(categoryIcons)) - if (categories.includes(key)) - return value; - return fallback; - } - - function getNetworkIcon(strength: int): string { - if (strength >= 80) - return "signal_wifi_4_bar"; - if (strength >= 60) - return "network_wifi_3_bar"; - if (strength >= 40) - return "network_wifi_2_bar"; - if (strength >= 20) - return "network_wifi_1_bar"; - return "signal_wifi_0_bar"; - } - - function getBluetoothIcon(icon: string): string { - if (icon.includes("headset") || icon.includes("headphones")) - return "headphones"; - if (icon.includes("audio")) - return "speaker"; - if (icon.includes("phone")) - return "smartphone"; - if (icon.includes("mouse")) - return "mouse"; - if (icon.includes("keyboard")) - return "keyboard"; - return "bluetooth"; - } - - function getWeatherIcon(code: string): string { - if (weatherIcons.hasOwnProperty(code)) - return weatherIcons[code]; - return "air"; - } - - function getNotifIcon(summary: string, urgency: int): string { - if (summary.includes("reboot")) - return "restart_alt"; - if (summary.includes("recording")) - return "screen_record"; - if (summary.includes("battery")) - return "power"; - if (summary.includes("screenshot")) - return "screenshot_monitor"; - if (summary.includes("welcome")) - return "waving_hand"; - if (summary.includes("time") || summary.includes("a break")) - return "schedule"; - if (summary.includes("installed")) - return "download"; - if (summary.includes("update")) - return "update"; - if (summary.includes("unable to")) - return "deployed_code_alert"; - if (summary.includes("profile")) - return "person"; - if (summary.includes("file")) - return "folder_copy"; - if (urgency === NotificationUrgency.Critical) - return "release_alert"; - return "chat"; - } - - FileView { - path: "/etc/os-release" - onLoaded: { - const lines = text().split("\n"); - let osId = lines.find(l => l.startsWith("ID="))?.split("=")[1]; - if (root.osIcons.hasOwnProperty(osId)) - root.osIcon = root.osIcons[osId]; - else { - const osIdLike = lines.find(l => l.startsWith("ID_LIKE="))?.split("=")[1]; - if (osIdLike) - for (const id of osIdLike.split(" ")) - if (root.osIcons.hasOwnProperty(id)) - return root.osIcon = root.osIcons[id]; - } - - let nameLine = lines.find(l => l.startsWith("PRETTY_NAME=")); - if (!nameLine) - nameLine = lines.find(l => l.startsWith("NAME=")); - root.osName = nameLine.split("=")[1].slice(1, -1); - } - } -} diff --git a/modules/home/services/quickshell/shell/utils/Paths.qml b/modules/home/services/quickshell/shell/utils/Paths.qml deleted file mode 100644 index ac95e807..00000000 --- a/modules/home/services/quickshell/shell/utils/Paths.qml +++ /dev/null @@ -1,38 +0,0 @@ -pragma Singleton - -import Quickshell -import Qt.labs.platform - -Singleton { - id: root - - readonly property url home: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0] - readonly property url pictures: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0] - - readonly property url data: `${StandardPaths.standardLocations(StandardPaths.GenericDataLocation)[0]}/caelestia` - readonly property url state: `${StandardPaths.standardLocations(StandardPaths.GenericStateLocation)[0]}/caelestia` - readonly property url cache: `${StandardPaths.standardLocations(StandardPaths.GenericCacheLocation)[0]}/caelestia` - readonly property url config: `${StandardPaths.standardLocations(StandardPaths.GenericConfigLocation)[0]}/caelestia` - - readonly property url imagecache: `${cache}/imagecache` - - function expandTilde(path: string): string { - return strip(path.replace("~", root.home.toString())); - } - - function shortenHome(path: string): string { - return path.replace(strip(root.home.toString()), "~"); - } - - function strip(path: url): string { - return path.toString().replace("file://", ""); - } - - function mkdir(path: url): void { - Quickshell.execDetached(["mkdir", "-p", strip(path)]); - } - - function copy(from: url, to: url): void { - Quickshell.execDetached(["cp", strip(from), strip(to)]); - } -} diff --git a/modules/home/services/quickshell/shell/utils/scripts/fuzzysort.js b/modules/home/services/quickshell/shell/utils/scripts/fuzzysort.js deleted file mode 100644 index f308fc65..00000000 --- a/modules/home/services/quickshell/shell/utils/scripts/fuzzysort.js +++ /dev/null @@ -1,679 +0,0 @@ -.pragma library - -var single = (search, target) => { - if(!search || !target) return NULL - - var preparedSearch = getPreparedSearch(search) - if(!isPrepared(target)) target = getPrepared(target) - - var searchBitflags = preparedSearch.bitflags - if((searchBitflags & target._bitflags) !== searchBitflags) return NULL - - return algorithm(preparedSearch, target) -} - -var go = (search, targets, options) => { - if(!search) return options?.all ? all(targets, options) : noResults - - var preparedSearch = getPreparedSearch(search) - var searchBitflags = preparedSearch.bitflags - var containsSpace = preparedSearch.containsSpace - - var threshold = denormalizeScore( options?.threshold || 0 ) - var limit = options?.limit || INFINITY - - var resultsLen = 0; var limitedCount = 0 - var targetsLen = targets.length - - function push_result(result) { - if(resultsLen < limit) { q.add(result); ++resultsLen } - else { - ++limitedCount - if(result._score > q.peek()._score) q.replaceTop(result) - } - } - - // This code is copy/pasted 3 times for performance reasons [options.key, options.keys, no keys] - - // options.key - if(options?.key) { - var key = options.key - for(var i = 0; i < targetsLen; ++i) { var obj = targets[i] - var target = getValue(obj, key) - if(!target) continue - if(!isPrepared(target)) target = getPrepared(target) - - if((searchBitflags & target._bitflags) !== searchBitflags) continue - var result = algorithm(preparedSearch, target) - if(result === NULL) continue - if(result._score < threshold) continue - - result.obj = obj - push_result(result) - } - - // options.keys - } else if(options?.keys) { - var keys = options.keys - var keysLen = keys.length - - outer: for(var i = 0; i < targetsLen; ++i) { var obj = targets[i] - - { // early out based on bitflags - var keysBitflags = 0 - for (var keyI = 0; keyI < keysLen; ++keyI) { - var key = keys[keyI] - var target = getValue(obj, key) - if(!target) { tmpTargets[keyI] = noTarget; continue } - if(!isPrepared(target)) target = getPrepared(target) - tmpTargets[keyI] = target - - keysBitflags |= target._bitflags - } - - if((searchBitflags & keysBitflags) !== searchBitflags) continue - } - - if(containsSpace) for(let i=0; i -1000) { - if(keysSpacesBestScores[i] > NEGATIVE_INFINITY) { - var tmp = (keysSpacesBestScores[i] + allowPartialMatchScores[i]) / 4/*bonus score for having multiple matches*/ - if(tmp > keysSpacesBestScores[i]) keysSpacesBestScores[i] = tmp - } - } - if(allowPartialMatchScores[i] > keysSpacesBestScores[i]) keysSpacesBestScores[i] = allowPartialMatchScores[i] - } - } - - if(containsSpace) { - for(let i=0; i -1000) { - if(score > NEGATIVE_INFINITY) { - var tmp = (score + result._score) / 4/*bonus score for having multiple matches*/ - if(tmp > score) score = tmp - } - } - if(result._score > score) score = result._score - } - } - - objResults.obj = obj - objResults._score = score - if(options?.scoreFn) { - score = options.scoreFn(objResults) - if(!score) continue - score = denormalizeScore(score) - objResults._score = score - } - - if(score < threshold) continue - push_result(objResults) - } - - // no keys - } else { - for(var i = 0; i < targetsLen; ++i) { var target = targets[i] - if(!target) continue - if(!isPrepared(target)) target = getPrepared(target) - - if((searchBitflags & target._bitflags) !== searchBitflags) continue - var result = algorithm(preparedSearch, target) - if(result === NULL) continue - if(result._score < threshold) continue - - push_result(result) - } - } - - if(resultsLen === 0) return noResults - var results = new Array(resultsLen) - for(var i = resultsLen - 1; i >= 0; --i) results[i] = q.poll() - results.total = resultsLen + limitedCount - return results -} - - -// this is written as 1 function instead of 2 for minification. perf seems fine ... -// except when minified. the perf is very slow -var highlight = (result, open='', close='') => { - var callback = typeof open === 'function' ? open : undefined - - var target = result.target - var targetLen = target.length - var indexes = result.indexes - var highlighted = '' - var matchI = 0 - var indexesI = 0 - var opened = false - var parts = [] - - for(var i = 0; i < targetLen; ++i) { var char = target[i] - if(indexes[indexesI] === i) { - ++indexesI - if(!opened) { opened = true - if(callback) { - parts.push(highlighted); highlighted = '' - } else { - highlighted += open - } - } - - if(indexesI === indexes.length) { - if(callback) { - highlighted += char - parts.push(callback(highlighted, matchI++)); highlighted = '' - parts.push(target.substr(i+1)) - } else { - highlighted += char + close + target.substr(i+1) - } - break - } - } else { - if(opened) { opened = false - if(callback) { - parts.push(callback(highlighted, matchI++)); highlighted = '' - } else { - highlighted += close - } - } - } - highlighted += char - } - - return callback ? parts : highlighted -} - - -var prepare = (target) => { - if(typeof target === 'number') target = ''+target - else if(typeof target !== 'string') target = '' - var info = prepareLowerInfo(target) - return new_result(target, {_targetLower:info._lower, _targetLowerCodes:info.lowerCodes, _bitflags:info.bitflags}) -} - -var cleanup = () => { preparedCache.clear(); preparedSearchCache.clear() } - - -// Below this point is only internal code -// Below this point is only internal code -// Below this point is only internal code -// Below this point is only internal code - - -class Result { - get ['indexes']() { return this._indexes.slice(0, this._indexes.len).sort((a,b)=>a-b) } - set ['indexes'](indexes) { return this._indexes = indexes } - ['highlight'](open, close) { return highlight(this, open, close) } - get ['score']() { return normalizeScore(this._score) } - set ['score'](score) { this._score = denormalizeScore(score) } -} - -class KeysResult extends Array { - get ['score']() { return normalizeScore(this._score) } - set ['score'](score) { this._score = denormalizeScore(score) } -} - -var new_result = (target, options) => { - const result = new Result() - result['target'] = target - result['obj'] = options.obj ?? NULL - result._score = options._score ?? NEGATIVE_INFINITY - result._indexes = options._indexes ?? [] - result._targetLower = options._targetLower ?? '' - result._targetLowerCodes = options._targetLowerCodes ?? NULL - result._nextBeginningIndexes = options._nextBeginningIndexes ?? NULL - result._bitflags = options._bitflags ?? 0 - return result -} - - -var normalizeScore = score => { - if(score === NEGATIVE_INFINITY) return 0 - if(score > 1) return score - return Math.E ** ( ((-score + 1)**.04307 - 1) * -2) -} -var denormalizeScore = normalizedScore => { - if(normalizedScore === 0) return NEGATIVE_INFINITY - if(normalizedScore > 1) return normalizedScore - return 1 - Math.pow((Math.log(normalizedScore) / -2 + 1), 1 / 0.04307) -} - - -var prepareSearch = (search) => { - if(typeof search === 'number') search = ''+search - else if(typeof search !== 'string') search = '' - search = search.trim() - var info = prepareLowerInfo(search) - - var spaceSearches = [] - if(info.containsSpace) { - var searches = search.split(/\s+/) - searches = [...new Set(searches)] // distinct - for(var i=0; i { - if(target.length > 999) return prepare(target) // don't cache huge targets - var targetPrepared = preparedCache.get(target) - if(targetPrepared !== undefined) return targetPrepared - targetPrepared = prepare(target) - preparedCache.set(target, targetPrepared) - return targetPrepared -} -var getPreparedSearch = (search) => { - if(search.length > 999) return prepareSearch(search) // don't cache huge searches - var searchPrepared = preparedSearchCache.get(search) - if(searchPrepared !== undefined) return searchPrepared - searchPrepared = prepareSearch(search) - preparedSearchCache.set(search, searchPrepared) - return searchPrepared -} - - -var all = (targets, options) => { - var results = []; results.total = targets.length // this total can be wrong if some targets are skipped - - var limit = options?.limit || INFINITY - - if(options?.key) { - for(var i=0;i= limit) return results - } - } else if(options?.keys) { - for(var i=0;i= 0; --keyI) { - var target = getValue(obj, options.keys[keyI]) - if(!target) { objResults[keyI] = noTarget; continue } - if(!isPrepared(target)) target = getPrepared(target) - target._score = NEGATIVE_INFINITY - target._indexes.len = 0 - objResults[keyI] = target - } - objResults.obj = obj - objResults._score = NEGATIVE_INFINITY - results.push(objResults); if(results.length >= limit) return results - } - } else { - for(var i=0;i= limit) return results - } - } - - return results -} - - -var algorithm = (preparedSearch, prepared, allowSpaces=false, allowPartialMatch=false) => { - if(allowSpaces===false && preparedSearch.containsSpace) return algorithmSpaces(preparedSearch, prepared, allowPartialMatch) - - var searchLower = preparedSearch._lower - var searchLowerCodes = preparedSearch.lowerCodes - var searchLowerCode = searchLowerCodes[0] - var targetLowerCodes = prepared._targetLowerCodes - var searchLen = searchLowerCodes.length - var targetLen = targetLowerCodes.length - var searchI = 0 // where we at - var targetI = 0 // where you at - var matchesSimpleLen = 0 - - // very basic fuzzy match; to remove non-matching targets ASAP! - // walk through target. find sequential matches. - // if all chars aren't found then exit - for(;;) { - var isMatch = searchLowerCode === targetLowerCodes[targetI] - if(isMatch) { - matchesSimple[matchesSimpleLen++] = targetI - ++searchI; if(searchI === searchLen) break - searchLowerCode = searchLowerCodes[searchI] - } - ++targetI; if(targetI >= targetLen) return NULL // Failed to find searchI - } - - var searchI = 0 - var successStrict = false - var matchesStrictLen = 0 - - var nextBeginningIndexes = prepared._nextBeginningIndexes - if(nextBeginningIndexes === NULL) nextBeginningIndexes = prepared._nextBeginningIndexes = prepareNextBeginningIndexes(prepared.target) - targetI = matchesSimple[0]===0 ? 0 : nextBeginningIndexes[matchesSimple[0]-1] - - // Our target string successfully matched all characters in sequence! - // Let's try a more advanced and strict test to improve the score - // only count it as a match if it's consecutive or a beginning character! - var backtrackCount = 0 - if(targetI !== targetLen) for(;;) { - if(targetI >= targetLen) { - // We failed to find a good spot for this search char, go back to the previous search char and force it forward - if(searchI <= 0) break // We failed to push chars forward for a better match - - ++backtrackCount; if(backtrackCount > 200) break // exponential backtracking is taking too long, just give up and return a bad match - - --searchI - var lastMatch = matchesStrict[--matchesStrictLen] - targetI = nextBeginningIndexes[lastMatch] - - } else { - var isMatch = searchLowerCodes[searchI] === targetLowerCodes[targetI] - if(isMatch) { - matchesStrict[matchesStrictLen++] = targetI - ++searchI; if(searchI === searchLen) { successStrict = true; break } - ++targetI - } else { - targetI = nextBeginningIndexes[targetI] - } - } - } - - // check if it's a substring match - var substringIndex = searchLen <= 1 ? -1 : prepared._targetLower.indexOf(searchLower, matchesSimple[0]) // perf: this is slow - var isSubstring = !!~substringIndex - var isSubstringBeginning = !isSubstring ? false : substringIndex===0 || prepared._nextBeginningIndexes[substringIndex-1] === substringIndex - - // if it's a substring match but not at a beginning index, let's try to find a substring starting at a beginning index for a better score - if(isSubstring && !isSubstringBeginning) { - for(var i=0; i { - var score = 0 - - var extraMatchGroupCount = 0 - for(var i = 1; i < searchLen; ++i) { - if(matches[i] - matches[i-1] !== 1) {score -= matches[i]; ++extraMatchGroupCount} - } - var unmatchedDistance = matches[searchLen-1] - matches[0] - (searchLen-1) - - score -= (12+unmatchedDistance) * extraMatchGroupCount // penality for more groups - - if(matches[0] !== 0) score -= matches[0]*matches[0]*.2 // penality for not starting near the beginning - - if(!successStrict) { - score *= 1000 - } else { - // successStrict on a target with too many beginning indexes loses points for being a bad target - var uniqueBeginningIndexes = 1 - for(var i = nextBeginningIndexes[0]; i < targetLen; i=nextBeginningIndexes[i]) ++uniqueBeginningIndexes - - if(uniqueBeginningIndexes > 24) score *= (uniqueBeginningIndexes-24)*10 // quite arbitrary numbers here ... - } - - score -= (targetLen - searchLen)/2 // penality for longer targets - - if(isSubstring) score /= 1+searchLen*searchLen*1 // bonus for being a full substring - if(isSubstringBeginning) score /= 1+searchLen*searchLen*1 // bonus for substring starting on a beginningIndex - - score -= (targetLen - searchLen)/2 // penality for longer targets - - return score - } - - if(!successStrict) { - if(isSubstring) for(var i=0; i { - var seen_indexes = new Set() - var score = 0 - var result = NULL - - var first_seen_index_last_search = 0 - var searches = preparedSearch.spaceSearches - var searchesLen = searches.length - var changeslen = 0 - - // Return _nextBeginningIndexes back to its normal state - var resetNextBeginningIndexes = () => { - for(let i=changeslen-1; i>=0; i--) target._nextBeginningIndexes[nextBeginningIndexesChanges[i*2 + 0]] = nextBeginningIndexesChanges[i*2 + 1] - } - - var hasAtLeast1Match = false - for(var i=0; i=0; i--) { - if(toReplace !== target._nextBeginningIndexes[i]) break - target._nextBeginningIndexes[i] = newBeginningIndex - nextBeginningIndexesChanges[changeslen*2 + 0] = i - nextBeginningIndexesChanges[changeslen*2 + 1] = toReplace - changeslen++ - } - } - } - - score += result._score / searchesLen - allowPartialMatchScores[i] = result._score / searchesLen - - // dock points based on order otherwise "c man" returns Manifest.cpp instead of CheatManager.h - if(result._indexes[0] < first_seen_index_last_search) { - score -= (first_seen_index_last_search - result._indexes[0]) * 2 - } - first_seen_index_last_search = result._indexes[0] - - for(var j=0; j score) { - if(allowPartialMatch) { - for(var i=0; i str.replace(/\p{Script=Latin}+/gu, match => match.normalize('NFD')).replace(/[\u0300-\u036f]/g, '') - -var prepareLowerInfo = (str) => { - str = remove_accents(str) - var strLen = str.length - var lower = str.toLowerCase() - var lowerCodes = [] // new Array(strLen) sparse array is too slow - var bitflags = 0 - var containsSpace = false // space isn't stored in bitflags because of how searching with a space works - - for(var i = 0; i < strLen; ++i) { - var lowerCode = lowerCodes[i] = lower.charCodeAt(i) - - if(lowerCode === 32) { - containsSpace = true - continue // it's important that we don't set any bitflags for space - } - - var bit = lowerCode>=97&&lowerCode<=122 ? lowerCode-97 // alphabet - : lowerCode>=48&&lowerCode<=57 ? 26 // numbers - // 3 bits available - : lowerCode<=127 ? 30 // other ascii - : 31 // other utf8 - bitflags |= 1< { - var targetLen = target.length - var beginningIndexes = []; var beginningIndexesLen = 0 - var wasUpper = false - var wasAlphanum = false - for(var i = 0; i < targetLen; ++i) { - var targetCode = target.charCodeAt(i) - var isUpper = targetCode>=65&&targetCode<=90 - var isAlphanum = isUpper || targetCode>=97&&targetCode<=122 || targetCode>=48&&targetCode<=57 - var isBeginning = isUpper && !wasUpper || !wasAlphanum || !isAlphanum - wasUpper = isUpper - wasAlphanum = isAlphanum - if(isBeginning) beginningIndexes[beginningIndexesLen++] = i - } - return beginningIndexes -} -var prepareNextBeginningIndexes = (target) => { - target = remove_accents(target) - var targetLen = target.length - var beginningIndexes = prepareBeginningIndexes(target) - var nextBeginningIndexes = [] // new Array(targetLen) sparse array is too slow - var lastIsBeginning = beginningIndexes[0] - var lastIsBeginningI = 0 - for(var i = 0; i < targetLen; ++i) { - if(lastIsBeginning > i) { - nextBeginningIndexes[i] = lastIsBeginning - } else { - lastIsBeginning = beginningIndexes[++lastIsBeginningI] - nextBeginningIndexes[i] = lastIsBeginning===undefined ? targetLen : lastIsBeginning - } - } - return nextBeginningIndexes -} - -var preparedCache = new Map() -var preparedSearchCache = new Map() - -// the theory behind these being globals is to reduce garbage collection by not making new arrays -var matchesSimple = []; var matchesStrict = [] -var nextBeginningIndexesChanges = [] // allows straw berry to match strawberry well, by modifying the end of a substring to be considered a beginning index for the rest of the search -var keysSpacesBestScores = []; var allowPartialMatchScores = [] -var tmpTargets = []; var tmpResults = [] - -// prop = 'key' 2.5ms optimized for this case, seems to be about as fast as direct obj[prop] -// prop = 'key1.key2' 10ms -// prop = ['key1', 'key2'] 27ms -// prop = obj => obj.tags.join() ??ms -var getValue = (obj, prop) => { - var tmp = obj[prop]; if(tmp !== undefined) return tmp - if(typeof prop === 'function') return prop(obj) // this should run first. but that makes string props slower - var segs = prop - if(!Array.isArray(prop)) segs = prop.split('.') - var len = segs.length - var i = -1 - while (obj && (++i < len)) obj = obj[segs[i]] - return obj -} - -var isPrepared = (x) => { return typeof x === 'object' && typeof x._bitflags === 'number' } -var INFINITY = Infinity; var NEGATIVE_INFINITY = -INFINITY -var noResults = []; noResults.total = 0 -var NULL = null - -var noTarget = prepare('') - -// Hacked version of https://github.com/lemire/FastPriorityQueue.js -var fastpriorityqueue=r=>{var e=[],o=0,a={},v=r=>{for(var a=0,v=e[a],c=1;c>1]=e[a],c=1+(a<<1)}for(var f=a-1>>1;a>0&&v._score>1)e[a]=e[f];e[a]=v};return a.add=(r=>{var a=o;e[o++]=r;for(var v=a-1>>1;a>0&&r._score>1)e[a]=e[v];e[a]=r}),a.poll=(r=>{if(0!==o){var a=e[0];return e[0]=e[--o],v(),a}}),a.peek=(r=>{if(0!==o)return e[0]}),a.replaceTop=(r=>{e[0]=r,v()}),a} -var q = fastpriorityqueue() // reuse this - diff --git a/modules/home/services/quickshell/shell/widgets/CachingImage.qml b/modules/home/services/quickshell/shell/widgets/CachingImage.qml deleted file mode 100644 index a786720b..00000000 --- a/modules/home/services/quickshell/shell/widgets/CachingImage.qml +++ /dev/null @@ -1,43 +0,0 @@ -import "root:/services" -import "root:/utils" -import Quickshell.Io -import QtQuick - -Image { - id: root - - property string path - property string hash - readonly property string cachePath: `${Paths.imagecache}/${hash}@${width}x${height}.png`.slice(7) - - asynchronous: true - cache: false - fillMode: Image.PreserveAspectCrop - sourceSize.width: width - sourceSize.height: height - - onPathChanged: shaProc.exec(["sha256sum", path.replace("file://", "")]) - - onCachePathChanged: { - if (hash) - source = cachePath; - } - - onStatusChanged: { - if (source == cachePath && status === Image.Error) - source = path; - else if (source == path && status === Image.Ready) { - Paths.mkdir(Paths.imagecache); - const grabPath = cachePath; - grabToImage(res => res.saveToFile(grabPath)); - } - } - - Process { - id: shaProc - - stdout: StdioCollector { - onStreamFinished: root.hash = text.split(" ")[0] - } - } -} diff --git a/modules/home/services/quickshell/shell/widgets/Colouriser.qml b/modules/home/services/quickshell/shell/widgets/Colouriser.qml deleted file mode 100644 index 3c06f5ab..00000000 --- a/modules/home/services/quickshell/shell/widgets/Colouriser.qml +++ /dev/null @@ -1,15 +0,0 @@ -import "root:/config" -import QtQuick -import QtQuick.Effects - -MultiEffect { - colorization: 1 - - Behavior on colorizationColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/widgets/CustomShortcut.qml b/modules/home/services/quickshell/shell/widgets/CustomShortcut.qml deleted file mode 100644 index aa35ed8f..00000000 --- a/modules/home/services/quickshell/shell/widgets/CustomShortcut.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Quickshell.Hyprland - -GlobalShortcut { - appid: "caelestia" -} diff --git a/modules/home/services/quickshell/shell/widgets/MaterialIcon.qml b/modules/home/services/quickshell/shell/widgets/MaterialIcon.qml deleted file mode 100644 index 6c219e2a..00000000 --- a/modules/home/services/quickshell/shell/widgets/MaterialIcon.qml +++ /dev/null @@ -1,16 +0,0 @@ -import "root:/services" -import "root:/config" - -StyledText { - property real fill - property int grade: Colours.light ? 0 : -25 - - font.family: Appearance.font.family.material - font.pointSize: Appearance.font.size.larger - font.variableAxes: ({ - FILL: fill.toFixed(1), - GRAD: grade, - opsz: fontInfo.pixelSize, - wght: fontInfo.weight - }) -} diff --git a/modules/home/services/quickshell/shell/widgets/Ref.qml b/modules/home/services/quickshell/shell/widgets/Ref.qml deleted file mode 100644 index 679f52f4..00000000 --- a/modules/home/services/quickshell/shell/widgets/Ref.qml +++ /dev/null @@ -1,9 +0,0 @@ -import Quickshell -import QtQuick - -QtObject { - required property Singleton service - - Component.onCompleted: service.refCount++ - Component.onDestruction: service.refCount-- -} diff --git a/modules/home/services/quickshell/shell/widgets/StateLayer.qml b/modules/home/services/quickshell/shell/widgets/StateLayer.qml deleted file mode 100644 index 9c289d7d..00000000 --- a/modules/home/services/quickshell/shell/widgets/StateLayer.qml +++ /dev/null @@ -1,102 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick - -MouseArea { - id: root - - property bool disabled - property color color: Colours.palette.m3onSurface - property real radius: parent?.radius ?? 0 - - function onClicked(): void { - } - - anchors.fill: parent - - cursorShape: disabled ? undefined : Qt.PointingHandCursor - hoverEnabled: true - - onPressed: event => { - rippleAnim.x = event.x; - rippleAnim.y = event.y; - - const dist = (ox, oy) => ox * ox + oy * oy; - rippleAnim.radius = Math.sqrt(Math.max(dist(0, 0), dist(0, width), dist(width, 0), dist(width, height))); - - rippleAnim.restart(); - } - - onClicked: event => !disabled && onClicked(event) - - SequentialAnimation { - id: rippleAnim - - property real x - property real y - property real radius - - PropertyAction { - target: ripple - property: "x" - value: rippleAnim.x - } - PropertyAction { - target: ripple - property: "y" - value: rippleAnim.y - } - PropertyAction { - target: ripple - property: "opacity" - value: 0.1 - } - ParallelAnimation { - Anim { - target: ripple - properties: "implicitWidth,implicitHeight" - from: 0 - to: rippleAnim.radius * 2 - duration: Appearance.anim.durations.large - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - Anim { - target: ripple - property: "opacity" - to: 0 - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - } - } - - StyledClippingRect { - id: hoverLayer - - anchors.fill: parent - - color: Qt.alpha(root.color, root.disabled ? 0 : root.pressed ? 0.1 : root.containsMouse ? 0.08 : 0) - radius: root.radius - - StyledRect { - id: ripple - - radius: Appearance.rounding.full - color: root.color - opacity: 0 - - transform: Translate { - x: -ripple.width / 2 - y: -ripple.height / 2 - } - } - } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } -} diff --git a/modules/home/services/quickshell/shell/widgets/StyledClippingRect.qml b/modules/home/services/quickshell/shell/widgets/StyledClippingRect.qml deleted file mode 100644 index 477ce86c..00000000 --- a/modules/home/services/quickshell/shell/widgets/StyledClippingRect.qml +++ /dev/null @@ -1,17 +0,0 @@ -import "root:/config" -import Quickshell.Widgets -import QtQuick - -ClippingRectangle { - id: root - - color: "transparent" - - Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/widgets/StyledRect.qml b/modules/home/services/quickshell/shell/widgets/StyledRect.qml deleted file mode 100644 index 108e5e04..00000000 --- a/modules/home/services/quickshell/shell/widgets/StyledRect.qml +++ /dev/null @@ -1,16 +0,0 @@ -import "root:/config" -import QtQuick - -Rectangle { - id: root - - color: "transparent" - - Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/widgets/StyledScrollBar.qml b/modules/home/services/quickshell/shell/widgets/StyledScrollBar.qml deleted file mode 100644 index c655536f..00000000 --- a/modules/home/services/quickshell/shell/widgets/StyledScrollBar.qml +++ /dev/null @@ -1,34 +0,0 @@ -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Controls - -ScrollBar { - id: root - - contentItem: StyledRect { - implicitWidth: 6 - opacity: root.pressed ? 1 : root.policy === ScrollBar.AlwaysOn || (root.active && root.size < 1) ? 0.8 : 0 - radius: Appearance.rounding.full - color: Colours.palette.m3secondary - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - MouseArea { - z: -1 - anchors.fill: parent - onWheel: event => { - if (event.angleDelta.y > 0) - root.decrease(); - else if (event.angleDelta.y < 0) - root.increase(); - } - } -} diff --git a/modules/home/services/quickshell/shell/widgets/StyledText.qml b/modules/home/services/quickshell/shell/widgets/StyledText.qml deleted file mode 100644 index 5cd4986d..00000000 --- a/modules/home/services/quickshell/shell/widgets/StyledText.qml +++ /dev/null @@ -1,52 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/services" -import "root:/config" -import QtQuick - -Text { - id: root - - property bool animate: false - property string animateProp: "scale" - property real animateFrom: 0 - property real animateTo: 1 - property int animateDuration: Appearance.anim.durations.normal - - renderType: Text.NativeRendering - textFormat: Text.PlainText - color: Colours.palette.m3onSurface - font.family: Appearance.font.family.sans - font.pointSize: Appearance.font.size.smaller - - Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on text { - enabled: root.animate - - SequentialAnimation { - Anim { - to: root.animateFrom - easing.bezierCurve: Appearance.anim.curves.standardAccel - } - PropertyAction {} - Anim { - to: root.animateTo - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - } - } - - component Anim: NumberAnimation { - target: root - property: root.animateProp - duration: root.animateDuration / 2 - easing.type: Easing.BezierSpline - } -} diff --git a/modules/home/services/quickshell/shell/widgets/StyledTextField.qml b/modules/home/services/quickshell/shell/widgets/StyledTextField.qml deleted file mode 100644 index 1209ec19..00000000 --- a/modules/home/services/quickshell/shell/widgets/StyledTextField.qml +++ /dev/null @@ -1,68 +0,0 @@ -pragma ComponentBehavior: Bound - -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Controls - -TextField { - id: root - - color: Colours.palette.m3onSurface - placeholderTextColor: Colours.palette.m3outline - font.family: Appearance.font.family.sans - font.pointSize: Appearance.font.size.smaller - - cursorDelegate: StyledRect { - id: cursor - - property bool disableBlink - - implicitWidth: 2 - color: Colours.palette.m3primary - radius: Appearance.rounding.normal - onXChanged: { - opacity = 1; - disableBlink = true; - enableBlink.start(); - } - - Timer { - id: enableBlink - - interval: 100 - onTriggered: cursor.disableBlink = false - } - - Timer { - running: root.cursorVisible && !cursor.disableBlink - repeat: true - interval: 500 - onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1 - } - - Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - - Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Behavior on placeholderTextColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/shell/widgets/StyledWindow.qml b/modules/home/services/quickshell/shell/widgets/StyledWindow.qml deleted file mode 100644 index 67280b68..00000000 --- a/modules/home/services/quickshell/shell/widgets/StyledWindow.qml +++ /dev/null @@ -1,11 +0,0 @@ -import "root:/utils" -import "root:/config" -import Quickshell -import Quickshell.Wayland - -PanelWindow { - required property string name - - WlrLayershell.namespace: `caelestia-${name}` - color: "transparent" -} diff --git a/modules/home/services/quickshell/shell/widgets/VerticalSlider.qml b/modules/home/services/quickshell/shell/widgets/VerticalSlider.qml deleted file mode 100644 index fc20befe..00000000 --- a/modules/home/services/quickshell/shell/widgets/VerticalSlider.qml +++ /dev/null @@ -1,136 +0,0 @@ -import "root:/widgets" -import "root:/services" -import "root:/config" -import QtQuick -import QtQuick.Controls -import QtQuick.Effects - -Slider { - id: root - - required property string icon - property real oldValue - - orientation: Qt.Vertical - - background: StyledRect { - color: Colours.alpha(Colours.palette.m3surfaceContainer, true) - radius: Appearance.rounding.full - - StyledRect { - anchors.left: parent.left - anchors.right: parent.right - - y: root.handle.y - implicitHeight: parent.height - y - - color: Colours.alpha(Colours.palette.m3secondary, true) - radius: Appearance.rounding.full - } - } - - handle: Item { - id: handle - - property bool moving - - y: root.visualPosition * (root.availableHeight - height) - implicitWidth: root.width - implicitHeight: root.width - - RectangularShadow { - anchors.fill: parent - radius: rect.radius - color: Colours.palette.m3shadow - blur: 5 - spread: 0 - } - - StyledRect { - id: rect - - anchors.fill: parent - - color: Colours.alpha(Colours.palette.m3inverseSurface, true) - radius: Appearance.rounding.full - - MouseArea { - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onPressed: event => event.accepted = false - } - - MaterialIcon { - id: icon - - property bool moving: handle.moving - - function update(): void { - animate = !moving; - text = moving ? Qt.binding(() => Math.round(root.value * 100)) : Qt.binding(() => root.icon); - font.pointSize = moving ? Appearance.font.size.small : Appearance.font.size.larger; - font.family = moving ? Appearance.font.family.sans : Appearance.font.family.material; - } - - animate: true - text: root.icon - color: Colours.palette.m3inverseOnSurface - anchors.centerIn: parent - - Behavior on moving { - SequentialAnimation { - NumberAnimation { - target: icon - property: "scale" - from: 1 - to: 0 - duration: Appearance.anim.durations.normal / 2 - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardAccel - } - ScriptAction { - script: icon.update() - } - NumberAnimation { - target: icon - property: "scale" - from: 0 - to: 1 - duration: Appearance.anim.durations.normal / 2 - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standardDecel - } - } - } - } - } - } - - onPressedChanged: handle.moving = pressed - - onValueChanged: { - if (Math.abs(value - oldValue) < 0.01) - return; - oldValue = value; - handle.moving = true; - stateChangeDelay.restart(); - } - - Timer { - id: stateChangeDelay - - interval: 500 - onTriggered: { - if (!root.pressed) - handle.moving = false; - } - } - - Behavior on value { - NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - } -} diff --git a/modules/home/services/quickshell/utils/Colors.qml b/modules/home/services/quickshell/utils/Colors.qml deleted file mode 100644 index 1608de82..00000000 --- a/modules/home/services/quickshell/utils/Colors.qml +++ /dev/null @@ -1,9 +0,0 @@ -import Quickshell -pragma Singleton - -Singleton { - property var bgBar: Qt.rgba(0, 0, 0, 0.21) - property var bgBlur: Qt.rgba(0, 0, 0, 0.3) - property var fg: "white" - property list monitorColors: ["#e06c75", "#e5c07b", "#98c379", "#61afef"] -} diff --git a/modules/home/services/quickshell/utils/HyprlandUtils.qml b/modules/home/services/quickshell/utils/HyprlandUtils.qml deleted file mode 100644 index 66200614..00000000 --- a/modules/home/services/quickshell/utils/HyprlandUtils.qml +++ /dev/null @@ -1,67 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Hyprland -import QtQuick - -Singleton { - id: hyprland - - property list workspaces: sortWorkspaces(Hyprland.workspaces.values) - property HyprlandWorkspace focusedWorkspace: Hyprland.focusedMonitor?.activeWorkspace - property int maxWorkspace: findMaxId() - - function sortWorkspaces(ws) { - return [...ws].sort((a, b) => a?.id - b?.id); - } - - function switchWorkspace(w: int): void { - console.log(`workspace: focus ${focusedWorkspace.id} -> ${w}`); - Hyprland.dispatch(`workspace ${w}`); - } - - function findMaxId(): int { - let num = hyprland.workspaces.length; - return hyprland.workspaces[num - 1]?.id; - } - - Connections { - target: Hyprland - function onRawEvent(event) { - // console.log("EVENT NAME", event.name); - // consow.wg("EVENT DATA", event.data); - let eventName = event.name; - - switch (eventName) { - // Both of these are required in order to detect workspace changes - // even when switching monitors. - // case "workspacev2": - // { - // // hyprland.focusedWorkspace = Hyprland.focusedMonitor?.activeWorkspace; - // console.log(`workspace: ${hyprland.focusedWorkspace.id}`); - // console.log(`num workspaces ${hyprland.workspaces.length}`) - // console.log(`num workspaces (real) ${Hyprland.workspaces.values.length}`) - // break; - // } - // case "focusedmonv2": - // { - // // hyprland.focusedWorkspace = Hyprland.focusedMonitor?.activeWorkspace; - // console.log(`workspace: ${hyprland.focusedWorkspace.id}`); - // console.log(`num workspaces ${hyprland.workspaces.length}`) - // console.log(`num workspaces (real) ${Hyprland.workspaces.values.length}`) - // break; - // } - case "createworkspacev2": - { - hyprland.workspaces = hyprland.sortWorkspaces(Hyprland.workspaces.values); - hyprland.maxWorkspace = findMaxId(); - } - case "destroyworkspacev2": - { - hyprland.workspaces = hyprland.sortWorkspaces(Hyprland.workspaces.values); - hyprland.maxWorkspace = findMaxId(); - } - } - } - } -} diff --git a/modules/home/services/quickshell/utils/Resources.qml b/modules/home/services/quickshell/utils/Resources.qml deleted file mode 100644 index 3a19d805..00000000 --- a/modules/home/services/quickshell/utils/Resources.qml +++ /dev/null @@ -1,67 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - property int cpu_percent - property string cpu_freq - property int mem_percent - property string mem_used - - Process { - id: process_cpu_percent - running: true - command: ["sh", "-c", "top -bn1 | rg '%Cpu' | awk '{print 100-$8}'"] - stdout: SplitParser { - onRead: data => cpu_percent = Math.round(data) - } - } - - Process { - id: process_cpu_freq - running: true - command: ["sh", "-c", "lscpu --parse=MHZ"] - stdout: SplitParser { - onRead: data => { - // delete the first 4 lines (comments) - const mhz = data.split("\n").slice(4); - // compute mean frequency - const freq = mhz.reduce((acc, e) => acc + Number(e), 0) / mhz.length; - - cpu_freq = Math.round(freq) + " MHz"; - } - } - } - - Process { - id: process_mem_percent - running: true - command: ["sh", "-c", "free | awk 'NR==2{print $3/$2*100}'"] - stdout: SplitParser { - onRead: data => mem_percent = Math.round(data) - } - } - - Process { - id: process_mem_used - running: true - command: ["sh", "-c", "free --si -h | awk 'NR==2{print $3}'"] - stdout: SplitParser { - onRead: data => mem_used = data - } - } - - Timer { - interval: 2000 - running: true - repeat: true - onTriggered: () => { - process_cpu_percent.running = true - process_cpu_freq.running = true - process_mem_percent.running = true - process_mem_used.running = true - } - } -} diff --git a/modules/home/services/quickshell/utils/Time.qml b/modules/home/services/quickshell/utils/Time.qml deleted file mode 100644 index f03e1344..00000000 --- a/modules/home/services/quickshell/utils/Time.qml +++ /dev/null @@ -1,29 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Io -import QtQuick - -Singleton { - property var locale: Qt.locale() - - function createDate(): string { - let date = new Date(); - let hh = date.getHours().toString().padStart(2, 0); - let mm = date.getMinutes().toString().padStart(2, 0) - let weekday = locale.dayName(date.getDay(), Locale.ShortFormat) - let month = locale.monthName(date.getMonth(), Locale.ShortFormat) - let day = date.getDate() - - return `${weekday} ${month} ${day} ${hh}:${mm}` - } - - property var time: createDate() - - Timer { - interval: 1000 - running: true - repeat: true - onTriggered: time = createDate() - } -} diff --git a/modules/home/services/quickshell/windows/Bar.qml b/modules/home/services/quickshell/windows/Bar.qml deleted file mode 100644 index d1c8884e..00000000 --- a/modules/home/services/quickshell/windows/Bar.qml +++ /dev/null @@ -1,79 +0,0 @@ -//@ pragma NativeTextRendering - -import Quickshell -import QtQuick -import QtQuick.Layouts -import "../utils" -import "../components/bar" -import "../components/bar/workspaces" - -Scope { - PanelWindow { - id: barWindow - screen: Quickshell.screens[0] - - anchors { - top: true - left: true - right: true - } - implicitHeight: 28 - - color: "transparent" - - Rectangle { - id: bar - anchors.fill: parent - - color: Colors.bgBlur - - // left - RowLayout { - id: barLeft - - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.top: parent.top - - anchors.leftMargin: height / 4 - anchors.rightMargin: height / 4 - spacing: height / 4 - - Workspaces {} - } - - // middle - RowLayout { - id: barMiddle - - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - - anchors.leftMargin: height / 4 - anchors.rightMargin: height / 4 - spacing: height / 4 - - Mpris {} - } - - // right - RowLayout { - id: barRight - - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.top: parent.top - - anchors.leftMargin: height / 4 - anchors.rightMargin: height / 4 - spacing: height / 4 - - Tray {} - Resources {} - Battery {} - Clock {} - } - } - } -} diff --git a/modules/home/services/swaync/default.nix b/modules/home/services/swaync/default.nix deleted file mode 100644 index 8d5a9242..00000000 --- a/modules/home/services/swaync/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.home.services.swaync; -in { - options = { - home.services.swaync.enable = mkEnableOption "Enables swaync"; - }; - config = mkIf cfg.enable { - services.swaync = { - enable = true; - settings = { - schema = "/etc/xdg/swaync/configSchema.json"; - positionX = "right"; - positionY = "top"; - layer = "overlay"; - control-center-margin-top = 10; - control-center-margin-bottom = 10; - control-center-margin-right = 10; - control-center-margin-left = 10; - notification-icon-size = 64; - notification-body-image-height = 100; - notification-body-image-width = 200; - timeout = 3; - timeout-low = 2; - timeout-critical = 0; - fit-to-screen = false; - control-center-width = 500; - control-center-height = 1025; - notification-window-width = 440; - keyboard-shortcuts = true; - image-visibility = "when-available"; - transition-time = 200; - hide-on-clear = true; - hide-on-action = true; - script-fail-notify = true; - widgets = [ - "title" - "dnd" - "notifications" - "mpris" - "volume" - "buttons-grid" - ]; - widget-config = { - title = { - text = "Notification Center"; - clear-all-button = true; - button-text = "󰆴 Clear All"; - }; - dnd = { - text = "Do Not Disturb"; - }; - label = { - max-lines = 1; - text = "Notification Center"; - }; - mpris = { - image-size = 96; - image-radius = 7; - }; - volume = { - label = "󰕾"; - show-per-app = true; - }; - buttons-grid = { - actions = [ - { - label = "󰐥"; - command = "systemctl poweroff"; - } - { - label = "󰜉"; - command = "systemctl reboot"; - } - { - label = "󰌾"; - command = "$HOME/.config/hypr/scripts/lock-session.sh"; - } - { - label = "󰍃"; - command = "hyprctl dispatch exit"; - } - { - label = "󰤄"; - command = "systemctl suspend"; - } - { - label = "󰕾"; - command = "swayosd-client --output-volume mute-toggle"; - } - { - label = "󰍬"; - command = "swayosd-client --input-volume mute-toggle"; - } - { - label = "󰖩"; - command = "$HOME/.local/bin/shved/rofi-menus/wifi-menu.sh"; - } - { - label = "󰂯"; - command = "blueman-manager"; - } - { - label = ""; - command = "obs"; - } - ]; - }; - }; - }; - }; - }; -} diff --git a/users/cnst/modules/home.nix b/users/cnst/modules/home.nix index 144bb3a9..0aa89f30 100644 --- a/users/cnst/modules/home.nix +++ b/users/cnst/modules/home.nix @@ -138,9 +138,6 @@ protonmail-bridge = { enable = false; }; - swaync = { - enable = false; - }; syncthing = { enable = true; }; diff --git a/users/cnstlab/modules/home.nix b/users/cnstlab/modules/home.nix index 9c8bd950..61226095 100644 --- a/users/cnstlab/modules/home.nix +++ b/users/cnstlab/modules/home.nix @@ -140,9 +140,6 @@ protonmail-bridge = { enable = false; }; - swaync = { - enable = false; - }; syncthing = { enable = true; };