Merge branch 'end-4:main' into clean-testing

.config/hypr/hyprland/keybinds.conf

@@ -200,9 +200,9 @@ bind = Ctrl+Super, Up, workspace, r-5 # [hidden]
 bind = Ctrl+Super, Down, workspace, r+5 # [hidden]
 
 ##! Virtual machines
-bind = Ctrl+Super, F11, exec, notify-send 'Entered Virtual Machine submap' 'Keybinds disabled. Hit Ctrl+Super+F11 to escape' -a 'Hyprland' && hyprctl dispatch submap virtual-machine # Disable keybinds
+bind = Super+Alt, F1, exec, notify-send 'Entered Virtual Machine submap' 'Keybinds disabled. Hit Ctrl+Super+F11 to escape' -a 'Hyprland' && hyprctl dispatch submap virtual-machine # Disable keybinds
 submap = virtual-machine
-bind = Ctrl+Super, F11, exec, notify-send 'Exited Virtual Machine submap' 'Keybinds re-enabled' -a 'Hyprland' && hyprctl dispatch submap global # [hidden]
+bind = Super+Alt, F1, exec, notify-send 'Exited Virtual Machine submap' 'Keybinds re-enabled' -a 'Hyprland' && hyprctl dispatch submap global # [hidden]
 submap = global
 
 #!

.config/quickshell/ii/GlobalStates.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.modules.common
 import qs.services
 import QtQuick

.config/quickshell/ii/killDialog.qml

@@ -13,7 +13,6 @@ import QtQuick.Window
 import Quickshell
 import Quickshell.Io
 import Quickshell.Hyprland
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/background/Background.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 import qs
 import qs.services
 import qs.modules.common
-import qs.modules.common.models
 import qs.modules.common.widgets
 import qs.modules.common.functions as CF
 import QtQuick

.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml

@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
@@ -55,7 +54,7 @@ Item {
         } else if (category == "anime") {
             applyStyle(12, "dots", "fill", "bold", "dot", "bubble")
         } else if (category == "city" || category == "space") {
-            applyStyle(23, "full", "hollow", "medium", "classic", "bubble")
+            applyStyle(23, "full", "hollow", "thin", "classic", "bubble")
         } else if (category == "minimalist") {
             applyStyle(6, "none", "fill", "bold", "dot", "hide")
         } else if (category == "landscape") {

.config/quickshell/ii/modules/background/cookieClock/CookieQuote.qml

@@ -1,5 +1,3 @@
-import qs
-import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import QtQuick

.config/quickshell/ii/modules/background/cookieClock/TimeColumn.qml

@@ -1,10 +1,8 @@
 pragma ComponentBehavior: Bound
 
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.modules.common.functions
 import QtQuick
 
 Column {

.config/quickshell/ii/modules/background/cookieClock/dateIndicator/BubbleDate.qml

@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
@@ -15,9 +14,9 @@ Item {
 
     MaterialCookie {
         z: 5
-        sides: isMonth ? 1 : 4
+        sides: root.isMonth ? 1 : 4
         anchors.centerIn: parent
-        color: isMonth ? Appearance.colors.colPrimaryContainer : Appearance.colors.colTertiaryContainer
+        color: root.isMonth ? Appearance.colors.colPrimaryContainer : Appearance.colors.colTertiaryContainer
         implicitSize: targetSize
         constantlyRotate: Config.options.background.clock.cookie.constantlyRotate
     }
@@ -26,7 +25,7 @@ Item {
         id: bubbleText
         z: 6
         anchors.centerIn: parent
-        color: isMonth ? Appearance.colors.colPrimary : Appearance.colors.colTertiary
+        color: root.isMonth ? Appearance.colors.colPrimary : Appearance.colors.colTertiary
         opacity: root.style === "bubble" ? 1 : 0
         font {
             family: Appearance.font.family.expressive

.config/quickshell/ii/modules/background/cookieClock/dateIndicator/DateIndicator.qml

@@ -1,7 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import qs
-import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions

.config/quickshell/ii/modules/background/cookieClock/dateIndicator/RectangleDate.qml

@@ -1,5 +1,4 @@
 
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/background/cookieClock/dateIndicator/RotatingDate.qml

@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
@@ -31,7 +30,7 @@ Item {
     Repeater {
         model: root.dateText.length 
 
-        delegate: Text {
+        delegate: StyledText {
             required property int index
             property real angle: index * root.angleStep - Math.PI / 2
             x: root.width / 2 + root.radius * Math.cos(angle) - width / 2

.config/quickshell/ii/modules/bar/ActiveWindow.qml

@@ -1,7 +1,6 @@
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
-import qs
 import QtQuick
 import QtQuick.Layouts
 import Quickshell

.config/quickshell/ii/modules/bar/Bar.qml

@@ -1,4 +1,3 @@
-import "./weather"
 import QtQuick
 import Quickshell
 import Quickshell.Io
@@ -8,7 +7,6 @@ import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.modules.common.functions
 
 Scope {
     id: bar

.config/quickshell/ii/modules/bar/BatteryPopup.qml

@@ -1,7 +1,6 @@
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services
-import qs
 import QtQuick
 import QtQuick.Layouts
 

.config/quickshell/ii/modules/bar/ClockWidget.qml

@@ -1,10 +1,8 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services
 import QtQuick
 import QtQuick.Layouts
-import Quickshell
 
 Item {
     id: root

.config/quickshell/ii/modules/bar/ClockWidgetTooltip.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services

.config/quickshell/ii/modules/bar/LeftSidebarButton.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Layouts
 import qs
 import qs.services
 import qs.modules.common

.config/quickshell/ii/modules/bar/NotificationUnreadCount.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/bar/Resource.qml

@@ -1,10 +1,7 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.services
 import QtQuick
 import QtQuick.Layouts
-import Quickshell
 
 Item {
     id: root

.config/quickshell/ii/modules/bar/ResourcesPopup.qml

@@ -1,10 +1,8 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services
 import QtQuick
 import QtQuick.Layouts
-import Quickshell
 
 StyledPopup {
     id: root

.config/quickshell/ii/modules/bar/ScrollHint.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
 import QtQuick

.config/quickshell/ii/modules/bar/SysTrayMenu.qml

@@ -1,11 +1,10 @@
-import qs
+import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
-import Quickshell.Wayland
 
 PopupWindow {
     id: root

.config/quickshell/ii/modules/bar/weather/WeatherBar.qml

@@ -1,8 +1,8 @@
 pragma ComponentBehavior: Bound
+
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services
-import qs
 import Quickshell
 import QtQuick
 import QtQuick.Layouts

.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/cheatsheet/Cheatsheet.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/cheatsheet/CheatsheetKeybinds.qml

@@ -1,9 +1,8 @@
 pragma ComponentBehavior: Bound
-import qs
+
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.modules.common.functions
 import QtQuick
 import QtQuick.Layouts
 

.config/quickshell/ii/modules/cheatsheet/CheatsheetPeriodicTable.qml

@@ -1,11 +1,5 @@
-import qs
-import qs.services
-import qs.modules.common
-import qs.modules.common.widgets
-import qs.modules.common.functions
 import "periodic_table.js" as PTable
 import QtQuick
-import QtQuick.Layouts
 
 Item {
     id: root

.config/quickshell/ii/modules/common/widgets/AddressBar.qml

@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import qs
+import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions

.config/quickshell/ii/modules/common/widgets/FocusedScrollMouseArea.qml

@@ -1,12 +1,4 @@
 import QtQuick
-import QtQuick.Layouts
-import Quickshell
-import Quickshell.Services.UPower
-import qs
-import qs.services
-import qs.modules.common
-import qs.modules.common.widgets
-import qs.modules.common.functions
 
 MouseArea { // Right side | scroll to change volume
     id: root

.config/quickshell/ii/modules/common/widgets/GroupButton.qml

@@ -27,8 +27,8 @@ Button {
     property var parentGroup: root.parent
     property int clickIndex: parentGroup?.clickIndex ?? -1
 
-    Layout.fillWidth: (clickIndex - 1 <= parentGroup.children.indexOf(root) && parentGroup.children.indexOf(root) <= clickIndex + 1)
-    Layout.fillHeight: (clickIndex - 1 <= parentGroup.children.indexOf(root) && parentGroup.children.indexOf(root) <= clickIndex + 1)
+    Layout.fillWidth: (clickIndex - 1 <= parentGroup?.children.indexOf(root) && parentGroup?.children.indexOf(root) <= clickIndex + 1)
+    Layout.fillHeight: (clickIndex - 1 <= parentGroup?.children.indexOf(root) && parentGroup?.children.indexOf(root) <= clickIndex + 1)
     implicitWidth: (root.down && bounce) ? clickedWidth : baseWidth
     implicitHeight: (root.down && bounce) ? clickedHeight : baseHeight
 

.config/quickshell/ii/modules/common/widgets/LightDarkPreferenceButton.qml

@@ -1,4 +1,4 @@
-import qs
+import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions

.config/quickshell/ii/modules/common/widgets/NotificationGroup.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.functions

.config/quickshell/ii/modules/common/widgets/NotificationListView.qml

@@ -1,5 +1,5 @@
-import qs
-import qs.modules.common
+pragma ComponentBehavior: Bound
+
 import qs.modules.common.widgets
 import qs.services
 import QtQuick

.config/quickshell/ii/modules/common/widgets/PrimaryTabBar.qml

@@ -1,5 +1,5 @@
 import qs.modules.common
-import qs
+import qs.services
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

.config/quickshell/ii/modules/common/widgets/SelectionDialog.qml

@@ -1,7 +1,6 @@
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services
-import qs
 import QtQuick
 import QtQuick.Layouts
 import Quickshell

.config/quickshell/ii/modules/common/widgets/StyledListView.qml

@@ -1,7 +1,5 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.services
 import QtQuick
 import QtQuick.Controls
 

.config/quickshell/ii/modules/common/widgets/StyledText.qml

@@ -1,6 +1,5 @@
 import qs.modules.common
 import QtQuick
-import QtQuick.Layouts
 
 Text {
     id: root

.config/quickshell/ii/modules/crosshair/Crosshair.qml

@@ -39,7 +39,7 @@ Scope {
     }
 
     IpcHandler {
-        target: "sidebarRight"
+        target: "crosshair"
 
         function toggle(): void {
             GlobalStates.crosshairOpen = !GlobalStates.crosshairOpen;

.config/quickshell/ii/modules/dock/DockAppButton.qml

@@ -1,11 +1,8 @@
-import qs
 import qs.services
 import qs.modules.common
-import qs.modules.common.widgets
 import qs.modules.common.functions
 import Qt5Compat.GraphicalEffects
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Widgets

.config/quickshell/ii/modules/dock/DockApps.qml

@@ -1,5 +1,3 @@
-import qs
-import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions

.config/quickshell/ii/modules/dock/DockButton.qml

@@ -1,8 +1,6 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 
 RippleButton {

.config/quickshell/ii/modules/dock/DockSeparator.qml

@@ -1,7 +1,5 @@
-import qs
 import qs.modules.common
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 
 Rectangle {

.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import QtQuick
 import Quickshell

.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import QtQuick
 import "../"

.config/quickshell/ii/modules/onScreenKeyboard/OskContent.qml

@@ -1,15 +1,7 @@
-import qs
-import qs.services
 import qs.modules.common
-import qs.modules.common.widgets
 import "layouts.js" as Layouts
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
-import Quickshell
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
 
 Item {
     id: root    

.config/quickshell/ii/modules/sessionScreen/SessionScreen.qml

@@ -1,6 +1,6 @@
-import qs.modules.common
 import qs
 import qs.services
+import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions
 import QtQuick

.config/quickshell/ii/modules/settings/About.qml

@@ -2,7 +2,6 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Widgets
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/settings/AdvancedConfig.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/settings/BarConfig.qml

@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/settings/GeneralConfig.qml

@@ -1,10 +1,8 @@
 import QtQuick
 import Quickshell
 import QtQuick.Layouts
-import qs
 import qs.services
 import qs.modules.common
-import qs.modules.common.functions
 import qs.modules.common.widgets
 
 ContentPage {

.config/quickshell/ii/modules/settings/InterfaceConfig.qml

@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/settings/QuickConfig.qml

@@ -1,10 +1,8 @@
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import Quickshell
 import Quickshell.Io
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/settings/ServicesConfig.qml

@@ -1,11 +1,8 @@
 import QtQuick
 import QtQuick.Layouts
-import qs
 import qs.services
 import qs.modules.common
-import qs.modules.common.functions
 import qs.modules.common.widgets
-import Quickshell
 
 ContentPage {
     forceWidth: true

.config/quickshell/ii/modules/sidebarLeft/DescriptionBox.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/sidebarLeft/SidebarLeftContent.qml

@@ -1,8 +1,6 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.services
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

.config/quickshell/ii/modules/sidebarLeft/Translator.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/sidebarLeft/aiChat/AiMessage.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
@@ -6,7 +5,6 @@ import qs.modules.common.functions
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import Quickshell.Io
 import Quickshell
 
 Rectangle {

.config/quickshell/ii/modules/sidebarLeft/aiChat/AttachedFileIndicator.qml

@@ -4,7 +4,6 @@ import QtQuick
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import Quickshell.Io
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services

.config/quickshell/ii/modules/sidebarLeft/aiChat/MessageCodeBlock.qml

@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/sidebarLeft/aiChat/MessageThinkBlock.qml

@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/sidebarLeft/anime/BooruImage.qml

@@ -1,4 +1,4 @@
-import qs
+import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions

.config/quickshell/ii/modules/sidebarLeft/translator/TextCanvas.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/sidebarRight/BottomWidgetGroup.qml

@@ -1,6 +1,5 @@
 import qs.modules.common
 import qs.modules.common.widgets
-import qs
 import qs.services
 import "./calendar"
 import "./todo"

.config/quickshell/ii/modules/sidebarRight/CenterWidgetGroup.qml

@@ -3,7 +3,6 @@ import qs.modules.common.widgets
 import qs.services
 import "./notifications"
 import "./volumeMixer"
-import qs
 import Qt5Compat.GraphicalEffects
 import QtQuick
 import QtQuick.Controls

.config/quickshell/ii/modules/sidebarRight/bluetoothDevices/BluetoothDeviceItem.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services

.config/quickshell/ii/modules/sidebarRight/calendar/CalendarWidget.qml

@@ -1,9 +1,8 @@
+import qs.services
 import qs.modules.common
-import qs
 import qs.modules.common.widgets
 import "./calendar_layout.js" as CalendarLayout
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 
 Item {

.config/quickshell/ii/modules/sidebarRight/notifications/NotificationList.qml

@@ -1,7 +1,6 @@
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services
-import qs
 import Qt5Compat.GraphicalEffects
 import QtQuick
 import QtQuick.Controls

.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroTimer.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroWidget.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/sidebarRight/pomodoro/Stopwatch.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/modules/sidebarRight/quickToggles/CloudflareWarp.qml

@@ -1,6 +1,6 @@
 import qs.modules.common
 import qs.modules.common.widgets
-import qs
+import qs.services
 import QtQuick
 import Quickshell.Io
 import Quickshell

.config/quickshell/ii/modules/sidebarRight/quickToggles/GameMode.qml

@@ -1,6 +1,6 @@
 import qs.modules.common
 import qs.modules.common.widgets
-import qs
+import qs.services
 import Quickshell
 import Quickshell.Io
 

.config/quickshell/ii/modules/sidebarRight/quickToggles/IdleInhibitor.qml

@@ -1,5 +1,4 @@
 import qs.modules.common.widgets
-import qs
 import qs.services
 
 QuickToggleButton {

.config/quickshell/ii/modules/sidebarRight/quickToggles/NightLight.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import qs.modules.common
 import qs.modules.common.widgets
-import qs
 import qs.services
 import Quickshell.Io
 

.config/quickshell/ii/modules/sidebarRight/todo/TodoWidget.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
@@ -84,7 +83,7 @@ Item {
                 id: indicator
                 property int tabCount: root.tabButtonList.length
                 property real fullTabSize: root.width / tabCount;
-                property real targetWidth: tabBar.contentItem.children[0].children[tabBar.currentIndex].tabContentWidth
+                property real targetWidth: tabBar?.contentItem?.children[0]?.children[tabBar.currentIndex]?.tabContentWidth ?? 0
 
                 implicitWidth: targetWidth
                 anchors {

.config/quickshell/ii/modules/sidebarRight/volumeMixer/AudioDeviceSelectorButton.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services

.config/quickshell/ii/modules/sidebarRight/volumeMixer/VolumeMixer.qml

@@ -1,7 +1,6 @@
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.services
-import qs
 import Qt5Compat.GraphicalEffects
 import QtQuick
 import QtQuick.Controls

.config/quickshell/ii/modules/verticalBar/Resource.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.modules.common
 import qs.modules.common.functions
 import qs.modules.common.widgets

.config/quickshell/ii/modules/wallpaperSelector/WallpaperDirectoryItem.qml

@@ -1,14 +1,10 @@
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
-import Quickshell
-import Quickshell.Io
 
 MouseArea {
     id: root

.config/quickshell/ii/screenshot.qml

@@ -7,7 +7,6 @@
 //@ pragma Env QT_SCALE_FACTOR=1
 
 pragma ComponentBehavior: "Bound"
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/scripts/images/find-regions-venv.sh

@@ -3,4 +3,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate
 "$SCRIPT_DIR/find_regions.py" "$@"
-
+deactivate

.config/quickshell/ii/scripts/images/least-busy-region-venv.sh

@@ -3,4 +3,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate
 "$SCRIPT_DIR/least_busy_region.py" "$@"
-
+deactivate

.config/quickshell/ii/scripts/thumbnails/thumbgen-venv.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate
+"$SCRIPT_DIR/thumbgen.py" "$@"
+deactivate
+

.config/quickshell/ii/scripts/thumbnails/thumbgen.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S\_/bin/sh\_-c\_"source\_\$(eval\_echo\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@""
+#!/usr/bin/env python3
 
 # From https://github.com/difference-engine/thumbnail-generator-ubuntu (MIT License)
 # Since the script is small and the maintainers seem inactive to accept my PR (#11) I decided to just copy it over.

.config/quickshell/ii/services/Ai.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 
 import qs.modules.common.functions as CF
 import qs.modules.common
-import qs
 import Quickshell
 import Quickshell.Io
 import Quickshell.Wayland

.config/quickshell/ii/services/Battery.qml

@@ -1,6 +1,6 @@
 pragma Singleton
 
-import qs
+import qs.services
 import qs.modules.common
 import Quickshell
 import Quickshell.Services.UPower

.config/quickshell/ii/services/Booru.qml

@@ -2,7 +2,7 @@ pragma Singleton
 pragma ComponentBehavior: Bound
 
 import qs.modules.common
-import qs
+import qs.services
 import Quickshell;
 import QtQuick;
 

.config/quickshell/ii/services/ConflictKiller.qml

@@ -1,6 +1,5 @@
 pragma Singleton
 
-import qs
 import qs.modules.common
 import qs.modules.common.functions
 import QtQuick

.config/quickshell/ii/services/Idle.qml

@@ -1,4 +1,3 @@
-import qs
 import qs.modules.common
 import QtQuick
 import Quickshell

.config/quickshell/ii/services/KeyringStorage.qml

@@ -1,6 +1,6 @@
 pragma Singleton
 pragma ComponentBehavior: Bound
-import qs
+
 import qs.modules.common
 import qs.modules.common.functions
 import Quickshell;

.config/quickshell/ii/services/MprisController.qml

@@ -4,7 +4,6 @@ pragma ComponentBehavior: Bound
 // From https://git.outfoxxed.me/outfoxxed/nixnew
 // It does not have a license, but the author is okay with redistribution.
 
-import qs
 import QtQml.Models
 import QtQuick
 import Quickshell

.config/quickshell/ii/services/Notifications.qml

@@ -172,9 +172,8 @@ Singleton {
                         "interval": notification.expireTimeout < 0 ? (Config?.options.notifications.timeout ?? 7000) : notification.expireTimeout,
                     });
                 }
+                root.unread++;
             }
-
-            root.unread++;
             root.notify(newNotifObject);
             // console.log(notifToString(newNotifObject));
             notifFileView.setText(stringifyList(root.list));

.config/quickshell/ii/services/TimerService.qml

@@ -1,7 +1,6 @@
 pragma Singleton
 pragma ComponentBehavior: Bound
 
-import qs
 import qs.modules.common
 
 import Quickshell

.config/quickshell/ii/services/Wallpapers.qml

@@ -15,7 +15,7 @@ pragma ComponentBehavior: Bound
 Singleton {
     id: root
 
-    property string thumbgenScriptPath: `${FileUtils.trimFileProtocol(Directories.scriptPath)}/thumbnails/thumbgen.py`
+    property string thumbgenScriptPath: `${FileUtils.trimFileProtocol(Directories.scriptPath)}/thumbnails/thumbgen-venv.sh`
     property string generateThumbnailsMagickScriptPath: `${FileUtils.trimFileProtocol(Directories.scriptPath)}/thumbnails/generate-thumbnails-magick.sh`
     property alias directory: folderModel.folder
     readonly property string effectiveDirectory: FileUtils.trimFileProtocol(folderModel.folder.toString())

.config/quickshell/ii/settings.qml

@@ -10,7 +10,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

.config/quickshell/ii/welcome.qml

@@ -12,7 +12,6 @@ import QtQuick.Layouts
 import QtQuick.Window
 import Quickshell
 import Quickshell.Io
-import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets

README.md

@@ -78,7 +78,7 @@ Widget system: Quickshell | Support: Yes
 
 | AI, settings app | Some widgets |
 |:---|:---------------|
-| <img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/22aa335a-0a23-4789-8ce9-c601b9f95858" /> | <img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/50009d7f-e456-4200-bc41-49b29abbafe3" /> |
+| <img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/7b98a354-4489-4a46-aa6a-d08616e77399" /> | <img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/50009d7f-e456-4200-bc41-49b29abbafe3" /> |
 | Window management | Weeb power |
 | <img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/e77a7c96-1905-4126-a2a0-434f818825a2" /> | <img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/c8544e99-8881-477f-b83a-d6e35c0184a1" /> |