From f2e4508cfc9303331d49fb1ca9a7464456f61949 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 21 Oct 2025 22:36:56 +0200 Subject: [PATCH 1/2] refactor import to be compatible with new version of quickshell --- .../ii/modules/background/Background.qml | 2 +- .../background/cookieClock/CookieClock.qml | 4 +- .../quickshell/ii/modules/bar/BarContent.qml | 2 +- .../ii/modules/bar/weather/WeatherPopup.qml | 4 +- .../indicators/BrightnessIndicator.qml | 2 +- .../indicators/VolumeIndicator.qml | 2 +- .../ii/modules/sidebarLeft/AiChat.qml | 2 +- .../ii/modules/sidebarLeft/Anime.qml | 2 +- .../ii/modules/sidebarLeft/Translator.qml | 2 +- .../sidebarLeft/anime/BooruResponse.qml | 4 +- .../sidebarRight/BottomWidgetGroup.qml | 8 ++-- .../sidebarRight/CenterWidgetGroup.qml | 4 +- .../sidebarRight/SidebarRightContent.qml | 10 ++--- .../quickToggles/AndroidQuickPanel.qml | 2 +- .../quickToggles/ClassicQuickPanel.qml | 2 +- .../classicStyle/NetworkToggle.qml | 2 +- .../modules/verticalBar/BatteryIndicator.qml | 2 +- .../ii/modules/verticalBar/Resources.qml | 2 +- .../verticalBar/VerticalBarContent.qml | 2 +- .../verticalBar/VerticalClockWidget.qml | 2 +- .../verticalBar/VerticalDateWidget.qml | 2 +- .../ii/modules/verticalBar/VerticalMedia.qml | 2 +- dots/.config/quickshell/ii/services/Ai.qml | 2 +- .../quickshell/ii/services/Network.qml | 2 +- dots/.config/quickshell/ii/shell.qml | 40 +++++++++---------- 25 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dots/.config/quickshell/ii/modules/background/Background.qml b/dots/.config/quickshell/ii/modules/background/Background.qml index c997d847b..4aed1c08c 100644 --- a/dots/.config/quickshell/ii/modules/background/Background.qml +++ b/dots/.config/quickshell/ii/modules/background/Background.qml @@ -13,7 +13,7 @@ import Quickshell.Io import Quickshell.Wayland import Quickshell.Hyprland -import "./cookieClock" +import qs.modules.background.cookieClock Variants { id: root diff --git a/dots/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml b/dots/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml index 9b5ae0265..d08056909 100644 --- a/dots/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml +++ b/dots/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml @@ -9,8 +9,8 @@ import QtQuick.Layouts import Qt5Compat.GraphicalEffects import Quickshell.Io -import "./dateIndicator" -import "./minuteMarks" +import qs.modules.background.cookieClock.dateIndicator +import qs.modules.background.cookieClock.minuteMarks Item { id: root diff --git a/dots/.config/quickshell/ii/modules/bar/BarContent.qml b/dots/.config/quickshell/ii/modules/bar/BarContent.qml index 7e8ca9e77..77ed8db69 100644 --- a/dots/.config/quickshell/ii/modules/bar/BarContent.qml +++ b/dots/.config/quickshell/ii/modules/bar/BarContent.qml @@ -1,4 +1,4 @@ -import "./weather" +import qs.modules.bar.weather import QtQuick import QtQuick.Layouts import Quickshell diff --git a/dots/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml b/dots/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml index bd93c2662..0c06932f7 100644 --- a/dots/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml +++ b/dots/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml @@ -4,7 +4,7 @@ import qs.modules.common.widgets import QtQuick import QtQuick.Layouts -import "../" +import qs.modules.bar StyledPopup { id: root @@ -101,4 +101,4 @@ StyledPopup { } } } -} \ No newline at end of file +} diff --git a/dots/.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml b/dots/.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml index f127440f8..30661b911 100644 --- a/dots/.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml +++ b/dots/.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml @@ -2,7 +2,7 @@ import qs.services import QtQuick import Quickshell import Quickshell.Hyprland -import "../" +import qs.modules.onScreenDisplay OsdValueIndicator { id: root diff --git a/dots/.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml b/dots/.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml index 7f7b5f47f..487befdac 100644 --- a/dots/.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml +++ b/dots/.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml @@ -1,6 +1,6 @@ import qs.services import QtQuick -import "../" +import qs.modules.onScreenDisplay OsdValueIndicator { id: osdValues diff --git a/dots/.config/quickshell/ii/modules/sidebarLeft/AiChat.qml b/dots/.config/quickshell/ii/modules/sidebarLeft/AiChat.qml index 280c57583..6d00752bc 100644 --- a/dots/.config/quickshell/ii/modules/sidebarLeft/AiChat.qml +++ b/dots/.config/quickshell/ii/modules/sidebarLeft/AiChat.qml @@ -3,7 +3,7 @@ import qs.services import qs.modules.common import qs.modules.common.widgets import qs.modules.common.functions -import "./aiChat/" +import qs.modules.sidebarLeft.aiChat import QtQuick import QtQuick.Controls import QtQuick.Layouts diff --git a/dots/.config/quickshell/ii/modules/sidebarLeft/Anime.qml b/dots/.config/quickshell/ii/modules/sidebarLeft/Anime.qml index 42c314a10..cab251cb8 100644 --- a/dots/.config/quickshell/ii/modules/sidebarLeft/Anime.qml +++ b/dots/.config/quickshell/ii/modules/sidebarLeft/Anime.qml @@ -3,7 +3,7 @@ import qs.services import qs.modules.common import qs.modules.common.widgets import qs.modules.common.functions -import "./anime/" +import qs.modules.sidebarLeft.anime import QtQuick import QtQuick.Controls import QtQuick.Layouts diff --git a/dots/.config/quickshell/ii/modules/sidebarLeft/Translator.qml b/dots/.config/quickshell/ii/modules/sidebarLeft/Translator.qml index 18a8cf5b9..41f4fffab 100644 --- a/dots/.config/quickshell/ii/modules/sidebarLeft/Translator.qml +++ b/dots/.config/quickshell/ii/modules/sidebarLeft/Translator.qml @@ -2,7 +2,7 @@ import qs.services import qs.modules.common import qs.modules.common.widgets import qs.modules.common.functions -import "./translator/" +import qs.modules.sidebarLeft.translator import QtQuick import QtQuick.Layouts import Quickshell diff --git a/dots/.config/quickshell/ii/modules/sidebarLeft/anime/BooruResponse.qml b/dots/.config/quickshell/ii/modules/sidebarLeft/anime/BooruResponse.qml index cfb2a7f9d..7c9f7fd09 100644 --- a/dots/.config/quickshell/ii/modules/sidebarLeft/anime/BooruResponse.qml +++ b/dots/.config/quickshell/ii/modules/sidebarLeft/anime/BooruResponse.qml @@ -3,7 +3,7 @@ import qs.services import qs.modules.common import qs.modules.common.widgets import qs.modules.common.functions -import "../" +import qs.modules.sidebarLeft import qs.services import QtQuick import QtQuick.Controls @@ -287,4 +287,4 @@ Rectangle { } } } -} \ No newline at end of file +} diff --git a/dots/.config/quickshell/ii/modules/sidebarRight/BottomWidgetGroup.qml b/dots/.config/quickshell/ii/modules/sidebarRight/BottomWidgetGroup.qml index a7a895af1..96313289a 100644 --- a/dots/.config/quickshell/ii/modules/sidebarRight/BottomWidgetGroup.qml +++ b/dots/.config/quickshell/ii/modules/sidebarRight/BottomWidgetGroup.qml @@ -1,9 +1,9 @@ import qs.modules.common import qs.modules.common.widgets import qs.services -import "./calendar" -import "./todo" -import "./pomodoro" +import qs.modules.sidebarRight.calendar +import qs.modules.sidebarRight.todo +import qs.modules.sidebarRight.pomodoro import QtQuick import QtQuick.Layouts @@ -248,4 +248,4 @@ Rectangle { anchors.margins: 5 } } -} \ No newline at end of file +} diff --git a/dots/.config/quickshell/ii/modules/sidebarRight/CenterWidgetGroup.qml b/dots/.config/quickshell/ii/modules/sidebarRight/CenterWidgetGroup.qml index 85d3b823a..007006ca9 100644 --- a/dots/.config/quickshell/ii/modules/sidebarRight/CenterWidgetGroup.qml +++ b/dots/.config/quickshell/ii/modules/sidebarRight/CenterWidgetGroup.qml @@ -1,8 +1,8 @@ import qs.modules.common import qs.modules.common.widgets import qs.services -import "./notifications" -import "./volumeMixer" +import qs.modules.sidebarRight.notifications +import qs.modules.sidebarRight.volumeMixer import Qt5Compat.GraphicalEffects import QtQuick import QtQuick.Controls diff --git a/dots/.config/quickshell/ii/modules/sidebarRight/SidebarRightContent.qml b/dots/.config/quickshell/ii/modules/sidebarRight/SidebarRightContent.qml index 239377142..cf228d365 100644 --- a/dots/.config/quickshell/ii/modules/sidebarRight/SidebarRightContent.qml +++ b/dots/.config/quickshell/ii/modules/sidebarRight/SidebarRightContent.qml @@ -9,11 +9,11 @@ import Quickshell import Quickshell.Bluetooth import Quickshell.Hyprland -import "./quickToggles/" -import "./quickToggles/classicStyle/" -import "./wifiNetworks/" -import "./bluetoothDevices/" -import "./volumeMixer/" +import qs.modules.sidebarRight.quickToggles +import qs.modules.sidebarRight.quickToggles.classicStyle +import qs.modules.sidebarRight.wifiNetworks +import qs.modules.sidebarRight.bluetoothDevices +import qs.modules.sidebarRight.volumeMixer Item { id: root diff --git a/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/AndroidQuickPanel.qml b/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/AndroidQuickPanel.qml index eb7793fba..f307c7a51 100644 --- a/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/AndroidQuickPanel.qml +++ b/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/AndroidQuickPanel.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts import Quickshell import Quickshell.Bluetooth -import "./androidStyle/" +import qs.modules.sidebarRight.quickToggles.androidStyle AbstractQuickPanel { id: root diff --git a/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/ClassicQuickPanel.qml b/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/ClassicQuickPanel.qml index c6855dfaa..cf52886a0 100644 --- a/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/ClassicQuickPanel.qml +++ b/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/ClassicQuickPanel.qml @@ -5,7 +5,7 @@ import QtQuick import QtQuick.Layouts import Quickshell.Bluetooth -import "./classicStyle/" +import qs.modules.sidebarRight.quickToggles.classicStyle AbstractQuickPanel { id: root diff --git a/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/classicStyle/NetworkToggle.qml b/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/classicStyle/NetworkToggle.qml index 5fd8e3e8d..cc3ac3fca 100644 --- a/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/classicStyle/NetworkToggle.qml +++ b/dots/.config/quickshell/ii/modules/sidebarRight/quickToggles/classicStyle/NetworkToggle.qml @@ -2,7 +2,7 @@ import qs.services import qs.modules.common import qs.modules.common.widgets import qs.modules.common.functions -import "../" +import qs.modules.sidebarRight.quickToggles import qs import QtQuick import Quickshell diff --git a/dots/.config/quickshell/ii/modules/verticalBar/BatteryIndicator.qml b/dots/.config/quickshell/ii/modules/verticalBar/BatteryIndicator.qml index 27d704884..49afde713 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/BatteryIndicator.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/BatteryIndicator.qml @@ -3,7 +3,7 @@ import qs.modules.common.widgets import qs.services import QtQuick import QtQuick.Layouts -import "./../bar" as Bar +import qs.modules.verticalBar.bar as Bar MouseArea { id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/Resources.qml b/dots/.config/quickshell/ii/modules/verticalBar/Resources.qml index e4bba0187..430596104 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/Resources.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/Resources.qml @@ -2,7 +2,7 @@ import qs.services import qs.modules.common import QtQuick import QtQuick.Layouts -import "../bar" as Bar +import qs.modules.verticalBar.bar as Bar MouseArea { id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/VerticalBarContent.qml b/dots/.config/quickshell/ii/modules/verticalBar/VerticalBarContent.qml index e594a0ae4..46ae164ca 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/VerticalBarContent.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/VerticalBarContent.qml @@ -8,7 +8,7 @@ import qs.services import qs.modules.common import qs.modules.common.widgets import qs.modules.common.functions -import "../bar" as Bar +import qs.modules.verticalBar.bar as Bar Item { // Bar content region id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/VerticalClockWidget.qml b/dots/.config/quickshell/ii/modules/verticalBar/VerticalClockWidget.qml index 1c19f2828..0aabf9ecf 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/VerticalClockWidget.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/VerticalClockWidget.qml @@ -3,7 +3,7 @@ import qs.modules.common.widgets import qs.services import QtQuick import QtQuick.Layouts -import "../bar" as Bar +import qs.modules.verticalBar.bar as Bar Item { id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/VerticalDateWidget.qml b/dots/.config/quickshell/ii/modules/verticalBar/VerticalDateWidget.qml index 8ff9386c3..07255de78 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/VerticalDateWidget.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/VerticalDateWidget.qml @@ -4,7 +4,7 @@ import qs.services import QtQuick import QtQuick.Shapes import QtQuick.Layouts -import "../bar" as Bar +import qs.modules.verticalBar.bar as Bar Item { // Full hitbox id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml b/dots/.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml index 24eed8b4f..81786be7a 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml @@ -8,7 +8,7 @@ import QtQuick import QtQuick.Layouts import Quickshell.Services.Mpris -import "../bar" as Bar +import qs.modules.verticalBar.bar as Bar MouseArea { id: root diff --git a/dots/.config/quickshell/ii/services/Ai.qml b/dots/.config/quickshell/ii/services/Ai.qml index e348d4459..26657b0d1 100644 --- a/dots/.config/quickshell/ii/services/Ai.qml +++ b/dots/.config/quickshell/ii/services/Ai.qml @@ -7,7 +7,7 @@ import Quickshell import Quickshell.Io import Quickshell.Wayland import QtQuick -import "./ai/" +import qs.services.ai /** * Basic service to handle LLM chats. Supports Google's and OpenAI's API formats. diff --git a/dots/.config/quickshell/ii/services/Network.qml b/dots/.config/quickshell/ii/services/Network.qml index 181e76cf4..7d16a9450 100644 --- a/dots/.config/quickshell/ii/services/Network.qml +++ b/dots/.config/quickshell/ii/services/Network.qml @@ -6,7 +6,7 @@ pragma ComponentBehavior: Bound import Quickshell import Quickshell.Io import QtQuick -import "./network" +import qs.services.network /** * Network service with nmcli. diff --git a/dots/.config/quickshell/ii/shell.qml b/dots/.config/quickshell/ii/shell.qml index 1dd1627f4..9cb90f102 100644 --- a/dots/.config/quickshell/ii/shell.qml +++ b/dots/.config/quickshell/ii/shell.qml @@ -7,30 +7,30 @@ //@ pragma Env QT_SCALE_FACTOR=1 -import "./modules/common/" -import "./modules/background/" -import "./modules/bar/" -import "./modules/cheatsheet/" -import "./modules/crosshair/" -import "./modules/dock/" -import "./modules/lock/" -import "./modules/mediaControls/" -import "./modules/notificationPopup/" -import "./modules/onScreenDisplay/" -import "./modules/onScreenKeyboard/" -import "./modules/overview/" -import "./modules/regionSelector/" -import "./modules/screenCorners/" -import "./modules/sessionScreen/" -import "./modules/sidebarLeft/" -import "./modules/sidebarRight/" -import "./modules/verticalBar/" -import "./modules/wallpaperSelector/" +import qs.modules.common +import qs.modules.background +import qs.modules.bar +import qs.modules.cheatsheet +import qs.modules.crosshair +import qs.modules.dock +import qs.modules.lock +import qs.modules.mediaControls +import qs.modules.notificationPopup +import qs.modules.onScreenDisplay +import qs.modules.onScreenKeyboard +import qs.modules.overview +import qs.modules.regionSelector +import qs.modules.screenCorners +import qs.modules.sessionScreen +import qs.modules.sidebarLeft +import qs.modules.sidebarRight +import qs.modules.verticalBar +import qs.modules.wallpaperSelector import QtQuick import QtQuick.Window import Quickshell -import "./services/" +import qs.services ShellRoot { // Enable/disable modules here. False = not loaded at all, so rest assured From ecd7a225e97126cb21ae1b7fb4f00f1df9069f82 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 21 Oct 2025 22:43:54 +0200 Subject: [PATCH 2/2] fix bar module reference --- .../quickshell/ii/modules/verticalBar/BatteryIndicator.qml | 2 +- dots/.config/quickshell/ii/modules/verticalBar/Resources.qml | 2 +- .../quickshell/ii/modules/verticalBar/VerticalBarContent.qml | 2 +- .../quickshell/ii/modules/verticalBar/VerticalClockWidget.qml | 2 +- .../quickshell/ii/modules/verticalBar/VerticalDateWidget.qml | 2 +- .../.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dots/.config/quickshell/ii/modules/verticalBar/BatteryIndicator.qml b/dots/.config/quickshell/ii/modules/verticalBar/BatteryIndicator.qml index 49afde713..b134b12fe 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/BatteryIndicator.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/BatteryIndicator.qml @@ -3,7 +3,7 @@ import qs.modules.common.widgets import qs.services import QtQuick import QtQuick.Layouts -import qs.modules.verticalBar.bar as Bar +import qs.modules.bar as Bar MouseArea { id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/Resources.qml b/dots/.config/quickshell/ii/modules/verticalBar/Resources.qml index 430596104..ddbb1c399 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/Resources.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/Resources.qml @@ -2,7 +2,7 @@ import qs.services import qs.modules.common import QtQuick import QtQuick.Layouts -import qs.modules.verticalBar.bar as Bar +import qs.modules.bar as Bar MouseArea { id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/VerticalBarContent.qml b/dots/.config/quickshell/ii/modules/verticalBar/VerticalBarContent.qml index 46ae164ca..ac6be80cd 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/VerticalBarContent.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/VerticalBarContent.qml @@ -8,7 +8,7 @@ import qs.services import qs.modules.common import qs.modules.common.widgets import qs.modules.common.functions -import qs.modules.verticalBar.bar as Bar +import qs.modules.bar as Bar Item { // Bar content region id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/VerticalClockWidget.qml b/dots/.config/quickshell/ii/modules/verticalBar/VerticalClockWidget.qml index 0aabf9ecf..391d2e78c 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/VerticalClockWidget.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/VerticalClockWidget.qml @@ -3,7 +3,7 @@ import qs.modules.common.widgets import qs.services import QtQuick import QtQuick.Layouts -import qs.modules.verticalBar.bar as Bar +import qs.modules.bar as Bar Item { id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/VerticalDateWidget.qml b/dots/.config/quickshell/ii/modules/verticalBar/VerticalDateWidget.qml index 07255de78..aaf17ca4f 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/VerticalDateWidget.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/VerticalDateWidget.qml @@ -4,7 +4,7 @@ import qs.services import QtQuick import QtQuick.Shapes import QtQuick.Layouts -import qs.modules.verticalBar.bar as Bar +import qs.modules.bar as Bar Item { // Full hitbox id: root diff --git a/dots/.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml b/dots/.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml index 81786be7a..7a512564a 100644 --- a/dots/.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml +++ b/dots/.config/quickshell/ii/modules/verticalBar/VerticalMedia.qml @@ -8,7 +8,7 @@ import QtQuick import QtQuick.Layouts import Quickshell.Services.Mpris -import qs.modules.verticalBar.bar as Bar +import qs.modules.bar as Bar MouseArea { id: root