diff --git a/.config/hypr/hyprland/keybinds.conf b/.config/hypr/hyprland/keybinds.conf
index e2c9c0001..f8c29c863 100644
--- a/.config/hypr/hyprland/keybinds.conf
+++ b/.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
#!
diff --git a/.config/quickshell/ii/GlobalStates.qml b/.config/quickshell/ii/GlobalStates.qml
index 62eb69ce6..507f5d191 100644
--- a/.config/quickshell/ii/GlobalStates.qml
+++ b/.config/quickshell/ii/GlobalStates.qml
@@ -1,4 +1,3 @@
-import qs
import qs.modules.common
import qs.services
import QtQuick
diff --git a/.config/quickshell/ii/killDialog.qml b/.config/quickshell/ii/killDialog.qml
index 62f1a4a71..ff36fb5e6 100644
--- a/.config/quickshell/ii/killDialog.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/background/Background.qml b/.config/quickshell/ii/modules/background/Background.qml
index d48564cde..a15347c09 100644
--- a/.config/quickshell/ii/modules/background/Background.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml b/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml
index 2385bd075..9b5ae0265 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml
+++ b/.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") {
diff --git a/.config/quickshell/ii/modules/background/cookieClock/CookieQuote.qml b/.config/quickshell/ii/modules/background/cookieClock/CookieQuote.qml
index 8fef7313a..45b726fa3 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/CookieQuote.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/background/cookieClock/TimeColumn.qml b/.config/quickshell/ii/modules/background/cookieClock/TimeColumn.qml
index bcad89538..e2d00c23c 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/TimeColumn.qml
+++ b/.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 {
diff --git a/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/BubbleDate.qml b/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/BubbleDate.qml
index 8f7f0286f..c0f072895 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/BubbleDate.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/DateIndicator.qml b/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/DateIndicator.qml
index 3f503659c..66b1852ee 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/DateIndicator.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/RectangleDate.qml b/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/RectangleDate.qml
index 47653dae3..d8ea9ab2e 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/RectangleDate.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/RotatingDate.qml b/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/RotatingDate.qml
index ec4303dba..e27d64bd4 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/RotatingDate.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/ActiveWindow.qml b/.config/quickshell/ii/modules/bar/ActiveWindow.qml
index 9e7eeba1f..b4f1c69cf 100644
--- a/.config/quickshell/ii/modules/bar/ActiveWindow.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/Bar.qml b/.config/quickshell/ii/modules/bar/Bar.qml
index 93587c398..74f8b5f1b 100644
--- a/.config/quickshell/ii/modules/bar/Bar.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/BatteryPopup.qml b/.config/quickshell/ii/modules/bar/BatteryPopup.qml
index 1f96155e0..5bc07d18c 100644
--- a/.config/quickshell/ii/modules/bar/BatteryPopup.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/ClockWidget.qml b/.config/quickshell/ii/modules/bar/ClockWidget.qml
index 52d0aebfd..4d6fb61f2 100644
--- a/.config/quickshell/ii/modules/bar/ClockWidget.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/ClockWidgetTooltip.qml b/.config/quickshell/ii/modules/bar/ClockWidgetTooltip.qml
index de6ad0935..734d89b22 100644
--- a/.config/quickshell/ii/modules/bar/ClockWidgetTooltip.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/LeftSidebarButton.qml b/.config/quickshell/ii/modules/bar/LeftSidebarButton.qml
index 3deb075f9..5ea1bf5a9 100644
--- a/.config/quickshell/ii/modules/bar/LeftSidebarButton.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/NotificationUnreadCount.qml b/.config/quickshell/ii/modules/bar/NotificationUnreadCount.qml
index f6afb0b1b..baf735152 100644
--- a/.config/quickshell/ii/modules/bar/NotificationUnreadCount.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/Resource.qml b/.config/quickshell/ii/modules/bar/Resource.qml
index 6d1dec043..7c626a55f 100644
--- a/.config/quickshell/ii/modules/bar/Resource.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/ResourcesPopup.qml b/.config/quickshell/ii/modules/bar/ResourcesPopup.qml
index 6aeedf76a..7c54a751a 100644
--- a/.config/quickshell/ii/modules/bar/ResourcesPopup.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/ScrollHint.qml b/.config/quickshell/ii/modules/bar/ScrollHint.qml
index 37b6a4886..e63d64d67 100644
--- a/.config/quickshell/ii/modules/bar/ScrollHint.qml
+++ b/.config/quickshell/ii/modules/bar/ScrollHint.qml
@@ -1,4 +1,3 @@
-import qs
import qs.modules.common
import qs.modules.common.widgets
import QtQuick
diff --git a/.config/quickshell/ii/modules/bar/SysTrayMenu.qml b/.config/quickshell/ii/modules/bar/SysTrayMenu.qml
index d9569e608..8dc6dc608 100644
--- a/.config/quickshell/ii/modules/bar/SysTrayMenu.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/weather/WeatherBar.qml b/.config/quickshell/ii/modules/bar/weather/WeatherBar.qml
index aed2a7ff8..66923834d 100644
--- a/.config/quickshell/ii/modules/bar/weather/WeatherBar.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml b/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml
index 2f3567562..bd93c2662 100644
--- a/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/cheatsheet/Cheatsheet.qml b/.config/quickshell/ii/modules/cheatsheet/Cheatsheet.qml
index 6009392ab..eaa59ee3d 100644
--- a/.config/quickshell/ii/modules/cheatsheet/Cheatsheet.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/cheatsheet/CheatsheetKeybinds.qml b/.config/quickshell/ii/modules/cheatsheet/CheatsheetKeybinds.qml
index bce9dccc3..0cf6d40c8 100644
--- a/.config/quickshell/ii/modules/cheatsheet/CheatsheetKeybinds.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/cheatsheet/CheatsheetPeriodicTable.qml b/.config/quickshell/ii/modules/cheatsheet/CheatsheetPeriodicTable.qml
index c21ddc825..158e707d3 100644
--- a/.config/quickshell/ii/modules/cheatsheet/CheatsheetPeriodicTable.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/AddressBar.qml b/.config/quickshell/ii/modules/common/widgets/AddressBar.qml
index 5648beb7a..e608e9c49 100644
--- a/.config/quickshell/ii/modules/common/widgets/AddressBar.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/FocusedScrollMouseArea.qml b/.config/quickshell/ii/modules/common/widgets/FocusedScrollMouseArea.qml
index 9b48d1997..70829f64f 100644
--- a/.config/quickshell/ii/modules/common/widgets/FocusedScrollMouseArea.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/GroupButton.qml b/.config/quickshell/ii/modules/common/widgets/GroupButton.qml
index d1b07c74e..ce6547c7f 100644
--- a/.config/quickshell/ii/modules/common/widgets/GroupButton.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/LightDarkPreferenceButton.qml b/.config/quickshell/ii/modules/common/widgets/LightDarkPreferenceButton.qml
index efef4c1af..e886bd90d 100644
--- a/.config/quickshell/ii/modules/common/widgets/LightDarkPreferenceButton.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/NotificationGroup.qml b/.config/quickshell/ii/modules/common/widgets/NotificationGroup.qml
index b05ea76d4..ed14d75b7 100644
--- a/.config/quickshell/ii/modules/common/widgets/NotificationGroup.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/NotificationListView.qml b/.config/quickshell/ii/modules/common/widgets/NotificationListView.qml
index 389a5a8bf..1b68059d0 100644
--- a/.config/quickshell/ii/modules/common/widgets/NotificationListView.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/PrimaryTabBar.qml b/.config/quickshell/ii/modules/common/widgets/PrimaryTabBar.qml
index 63f5e1759..7d792de56 100644
--- a/.config/quickshell/ii/modules/common/widgets/PrimaryTabBar.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/SelectionDialog.qml b/.config/quickshell/ii/modules/common/widgets/SelectionDialog.qml
index 6044cbfea..68d67a32c 100644
--- a/.config/quickshell/ii/modules/common/widgets/SelectionDialog.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/StyledListView.qml b/.config/quickshell/ii/modules/common/widgets/StyledListView.qml
index 083321424..2db1f094a 100644
--- a/.config/quickshell/ii/modules/common/widgets/StyledListView.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/common/widgets/StyledText.qml b/.config/quickshell/ii/modules/common/widgets/StyledText.qml
index ffc4e827d..8ee4d1910 100644
--- a/.config/quickshell/ii/modules/common/widgets/StyledText.qml
+++ b/.config/quickshell/ii/modules/common/widgets/StyledText.qml
@@ -1,6 +1,5 @@
import qs.modules.common
import QtQuick
-import QtQuick.Layouts
Text {
id: root
diff --git a/.config/quickshell/ii/modules/crosshair/Crosshair.qml b/.config/quickshell/ii/modules/crosshair/Crosshair.qml
index 31c25f0dc..f47902132 100644
--- a/.config/quickshell/ii/modules/crosshair/Crosshair.qml
+++ b/.config/quickshell/ii/modules/crosshair/Crosshair.qml
@@ -39,7 +39,7 @@ Scope {
}
IpcHandler {
- target: "sidebarRight"
+ target: "crosshair"
function toggle(): void {
GlobalStates.crosshairOpen = !GlobalStates.crosshairOpen;
diff --git a/.config/quickshell/ii/modules/dock/DockAppButton.qml b/.config/quickshell/ii/modules/dock/DockAppButton.qml
index 132a82909..406eb3f57 100644
--- a/.config/quickshell/ii/modules/dock/DockAppButton.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/dock/DockApps.qml b/.config/quickshell/ii/modules/dock/DockApps.qml
index 4c118630c..2bba6553a 100644
--- a/.config/quickshell/ii/modules/dock/DockApps.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/dock/DockButton.qml b/.config/quickshell/ii/modules/dock/DockButton.qml
index 8d366bc5f..4decdaeaa 100644
--- a/.config/quickshell/ii/modules/dock/DockButton.qml
+++ b/.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 {
diff --git a/.config/quickshell/ii/modules/dock/DockSeparator.qml b/.config/quickshell/ii/modules/dock/DockSeparator.qml
index 419b0fedc..f8a1645c5 100644
--- a/.config/quickshell/ii/modules/dock/DockSeparator.qml
+++ b/.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 {
diff --git a/.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml b/.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml
index da4ad575c..f127440f8 100644
--- a/.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml
+++ b/.config/quickshell/ii/modules/onScreenDisplay/indicators/BrightnessIndicator.qml
@@ -1,4 +1,3 @@
-import qs
import qs.services
import QtQuick
import Quickshell
diff --git a/.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml b/.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml
index 675410355..7f7b5f47f 100644
--- a/.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml
+++ b/.config/quickshell/ii/modules/onScreenDisplay/indicators/VolumeIndicator.qml
@@ -1,4 +1,3 @@
-import qs
import qs.services
import QtQuick
import "../"
diff --git a/.config/quickshell/ii/modules/onScreenKeyboard/OskContent.qml b/.config/quickshell/ii/modules/onScreenKeyboard/OskContent.qml
index df37969ad..8a2fe471f 100644
--- a/.config/quickshell/ii/modules/onScreenKeyboard/OskContent.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sessionScreen/SessionScreen.qml b/.config/quickshell/ii/modules/sessionScreen/SessionScreen.qml
index d5b075670..15b30299d 100644
--- a/.config/quickshell/ii/modules/sessionScreen/SessionScreen.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/settings/About.qml b/.config/quickshell/ii/modules/settings/About.qml
index 7c5dbab55..adf1e1b1a 100644
--- a/.config/quickshell/ii/modules/settings/About.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/settings/AdvancedConfig.qml b/.config/quickshell/ii/modules/settings/AdvancedConfig.qml
index 1a400cddf..811cf7ca6 100644
--- a/.config/quickshell/ii/modules/settings/AdvancedConfig.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/settings/BarConfig.qml b/.config/quickshell/ii/modules/settings/BarConfig.qml
index 5e4ea61d9..01a1d9ee9 100644
--- a/.config/quickshell/ii/modules/settings/BarConfig.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/settings/GeneralConfig.qml b/.config/quickshell/ii/modules/settings/GeneralConfig.qml
index 74ed1cdf2..0794aef6e 100644
--- a/.config/quickshell/ii/modules/settings/GeneralConfig.qml
+++ b/.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 {
diff --git a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml
index 95a6c00b8..fffeaa13a 100644
--- a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/settings/QuickConfig.qml b/.config/quickshell/ii/modules/settings/QuickConfig.qml
index 66055a5d8..aff06a384 100644
--- a/.config/quickshell/ii/modules/settings/QuickConfig.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/settings/ServicesConfig.qml b/.config/quickshell/ii/modules/settings/ServicesConfig.qml
index e6be25e2a..fae5bf4de 100644
--- a/.config/quickshell/ii/modules/settings/ServicesConfig.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarLeft/DescriptionBox.qml b/.config/quickshell/ii/modules/sidebarLeft/DescriptionBox.qml
index 5287ecc4d..102d886dd 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/DescriptionBox.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarLeft/SidebarLeftContent.qml b/.config/quickshell/ii/modules/sidebarLeft/SidebarLeftContent.qml
index 341e73e64..37014b4b7 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/SidebarLeftContent.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarLeft/Translator.qml b/.config/quickshell/ii/modules/sidebarLeft/Translator.qml
index b56681fb2..18a8cf5b9 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/Translator.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarLeft/aiChat/AiMessage.qml b/.config/quickshell/ii/modules/sidebarLeft/aiChat/AiMessage.qml
index a85986575..62f1dc794 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/aiChat/AiMessage.qml
+++ b/.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 {
diff --git a/.config/quickshell/ii/modules/sidebarLeft/aiChat/AttachedFileIndicator.qml b/.config/quickshell/ii/modules/sidebarLeft/aiChat/AttachedFileIndicator.qml
index 2df576505..8b01f3348 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/aiChat/AttachedFileIndicator.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarLeft/aiChat/MessageCodeBlock.qml b/.config/quickshell/ii/modules/sidebarLeft/aiChat/MessageCodeBlock.qml
index dbe31d45d..c72905688 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/aiChat/MessageCodeBlock.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarLeft/aiChat/MessageThinkBlock.qml b/.config/quickshell/ii/modules/sidebarLeft/aiChat/MessageThinkBlock.qml
index 326c26dfc..8407a0b56 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/aiChat/MessageThinkBlock.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarLeft/anime/BooruImage.qml b/.config/quickshell/ii/modules/sidebarLeft/anime/BooruImage.qml
index 1fd18394a..262321999 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/anime/BooruImage.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarLeft/translator/TextCanvas.qml b/.config/quickshell/ii/modules/sidebarLeft/translator/TextCanvas.qml
index c29265c9d..7b4841217 100644
--- a/.config/quickshell/ii/modules/sidebarLeft/translator/TextCanvas.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/BottomWidgetGroup.qml b/.config/quickshell/ii/modules/sidebarRight/BottomWidgetGroup.qml
index a620c0cbb..a7a895af1 100644
--- a/.config/quickshell/ii/modules/sidebarRight/BottomWidgetGroup.qml
+++ b/.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"
diff --git a/.config/quickshell/ii/modules/sidebarRight/CenterWidgetGroup.qml b/.config/quickshell/ii/modules/sidebarRight/CenterWidgetGroup.qml
index dccf89456..35b185ef6 100644
--- a/.config/quickshell/ii/modules/sidebarRight/CenterWidgetGroup.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/bluetoothDevices/BluetoothDeviceItem.qml b/.config/quickshell/ii/modules/sidebarRight/bluetoothDevices/BluetoothDeviceItem.qml
index c2d281e2e..8c713d3ca 100644
--- a/.config/quickshell/ii/modules/sidebarRight/bluetoothDevices/BluetoothDeviceItem.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/calendar/CalendarWidget.qml b/.config/quickshell/ii/modules/sidebarRight/calendar/CalendarWidget.qml
index 393407a92..66055acae 100644
--- a/.config/quickshell/ii/modules/sidebarRight/calendar/CalendarWidget.qml
+++ b/.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 {
diff --git a/.config/quickshell/ii/modules/sidebarRight/notifications/NotificationList.qml b/.config/quickshell/ii/modules/sidebarRight/notifications/NotificationList.qml
index 882829b85..a54c65d01 100644
--- a/.config/quickshell/ii/modules/sidebarRight/notifications/NotificationList.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroTimer.qml b/.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroTimer.qml
index a7a5cc48f..b8dce71e1 100644
--- a/.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroTimer.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroWidget.qml b/.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroWidget.qml
index 729d45809..ca7723db3 100644
--- a/.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroWidget.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/pomodoro/Stopwatch.qml b/.config/quickshell/ii/modules/sidebarRight/pomodoro/Stopwatch.qml
index ffc706568..8b1dbba13 100644
--- a/.config/quickshell/ii/modules/sidebarRight/pomodoro/Stopwatch.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/quickToggles/CloudflareWarp.qml b/.config/quickshell/ii/modules/sidebarRight/quickToggles/CloudflareWarp.qml
index 1aebffa9a..d12394a66 100644
--- a/.config/quickshell/ii/modules/sidebarRight/quickToggles/CloudflareWarp.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/quickToggles/GameMode.qml b/.config/quickshell/ii/modules/sidebarRight/quickToggles/GameMode.qml
index e2b03ebef..a64c336d9 100644
--- a/.config/quickshell/ii/modules/sidebarRight/quickToggles/GameMode.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/quickToggles/IdleInhibitor.qml b/.config/quickshell/ii/modules/sidebarRight/quickToggles/IdleInhibitor.qml
index b6bce02f5..99bd5bef1 100644
--- a/.config/quickshell/ii/modules/sidebarRight/quickToggles/IdleInhibitor.qml
+++ b/.config/quickshell/ii/modules/sidebarRight/quickToggles/IdleInhibitor.qml
@@ -1,5 +1,4 @@
import qs.modules.common.widgets
-import qs
import qs.services
QuickToggleButton {
diff --git a/.config/quickshell/ii/modules/sidebarRight/quickToggles/NightLight.qml b/.config/quickshell/ii/modules/sidebarRight/quickToggles/NightLight.qml
index 5fda831e1..3e112a16b 100644
--- a/.config/quickshell/ii/modules/sidebarRight/quickToggles/NightLight.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/todo/TodoWidget.qml b/.config/quickshell/ii/modules/sidebarRight/todo/TodoWidget.qml
index 50c659adc..976f5b2b1 100644
--- a/.config/quickshell/ii/modules/sidebarRight/todo/TodoWidget.qml
+++ b/.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 {
diff --git a/.config/quickshell/ii/modules/sidebarRight/volumeMixer/AudioDeviceSelectorButton.qml b/.config/quickshell/ii/modules/sidebarRight/volumeMixer/AudioDeviceSelectorButton.qml
index c8ac2df8d..7857f2909 100644
--- a/.config/quickshell/ii/modules/sidebarRight/volumeMixer/AudioDeviceSelectorButton.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/sidebarRight/volumeMixer/VolumeMixer.qml b/.config/quickshell/ii/modules/sidebarRight/volumeMixer/VolumeMixer.qml
index 1544bee39..a7e7ccc53 100644
--- a/.config/quickshell/ii/modules/sidebarRight/volumeMixer/VolumeMixer.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/verticalBar/Resource.qml b/.config/quickshell/ii/modules/verticalBar/Resource.qml
index b5055351b..fe128c243 100644
--- a/.config/quickshell/ii/modules/verticalBar/Resource.qml
+++ b/.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
diff --git a/.config/quickshell/ii/modules/wallpaperSelector/WallpaperDirectoryItem.qml b/.config/quickshell/ii/modules/wallpaperSelector/WallpaperDirectoryItem.qml
index cf196da7c..23f7915ef 100644
--- a/.config/quickshell/ii/modules/wallpaperSelector/WallpaperDirectoryItem.qml
+++ b/.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
diff --git a/.config/quickshell/ii/screenshot.qml b/.config/quickshell/ii/screenshot.qml
index 7f3d5d4ef..378470e64 100644
--- a/.config/quickshell/ii/screenshot.qml
+++ b/.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
diff --git a/.config/quickshell/ii/scripts/images/find-regions-venv.sh b/.config/quickshell/ii/scripts/images/find-regions-venv.sh
index 8064256cb..d31fe4a27 100755
--- a/.config/quickshell/ii/scripts/images/find-regions-venv.sh
+++ b/.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
diff --git a/.config/quickshell/ii/scripts/images/least-busy-region-venv.sh b/.config/quickshell/ii/scripts/images/least-busy-region-venv.sh
index c45e9ee04..3a5e90dcb 100755
--- a/.config/quickshell/ii/scripts/images/least-busy-region-venv.sh
+++ b/.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
diff --git a/.config/quickshell/ii/scripts/thumbnails/thumbgen-venv.sh b/.config/quickshell/ii/scripts/thumbnails/thumbgen-venv.sh
new file mode 100755
index 000000000..fc7d8729e
--- /dev/null
+++ b/.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
+
diff --git a/.config/quickshell/ii/scripts/thumbnails/thumbgen.py b/.config/quickshell/ii/scripts/thumbnails/thumbgen.py
index 4d6326aba..69f630721 100755
--- a/.config/quickshell/ii/scripts/thumbnails/thumbgen.py
+++ b/.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.
diff --git a/.config/quickshell/ii/services/Ai.qml b/.config/quickshell/ii/services/Ai.qml
index 028b1c6b5..e348d4459 100644
--- a/.config/quickshell/ii/services/Ai.qml
+++ b/.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
diff --git a/.config/quickshell/ii/services/Battery.qml b/.config/quickshell/ii/services/Battery.qml
index aa2f322ff..0a19b70f1 100644
--- a/.config/quickshell/ii/services/Battery.qml
+++ b/.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
diff --git a/.config/quickshell/ii/services/Booru.qml b/.config/quickshell/ii/services/Booru.qml
index 07fbd210f..c87efe419 100644
--- a/.config/quickshell/ii/services/Booru.qml
+++ b/.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;
diff --git a/.config/quickshell/ii/services/ConflictKiller.qml b/.config/quickshell/ii/services/ConflictKiller.qml
index fc94e3384..547a4d3e2 100644
--- a/.config/quickshell/ii/services/ConflictKiller.qml
+++ b/.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
diff --git a/.config/quickshell/ii/services/Idle.qml b/.config/quickshell/ii/services/Idle.qml
index db63b5bb0..ad938f3c3 100644
--- a/.config/quickshell/ii/services/Idle.qml
+++ b/.config/quickshell/ii/services/Idle.qml
@@ -1,4 +1,3 @@
-import qs
import qs.modules.common
import QtQuick
import Quickshell
diff --git a/.config/quickshell/ii/services/KeyringStorage.qml b/.config/quickshell/ii/services/KeyringStorage.qml
index ce6b8eb50..508247966 100644
--- a/.config/quickshell/ii/services/KeyringStorage.qml
+++ b/.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;
diff --git a/.config/quickshell/ii/services/MprisController.qml b/.config/quickshell/ii/services/MprisController.qml
index 60923a6e6..1dc42da2b 100644
--- a/.config/quickshell/ii/services/MprisController.qml
+++ b/.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
diff --git a/.config/quickshell/ii/services/Notifications.qml b/.config/quickshell/ii/services/Notifications.qml
index 16d8b760f..d5b010091 100644
--- a/.config/quickshell/ii/services/Notifications.qml
+++ b/.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));
diff --git a/.config/quickshell/ii/services/TimerService.qml b/.config/quickshell/ii/services/TimerService.qml
index e6c8906bc..a75893681 100644
--- a/.config/quickshell/ii/services/TimerService.qml
+++ b/.config/quickshell/ii/services/TimerService.qml
@@ -1,7 +1,6 @@
pragma Singleton
pragma ComponentBehavior: Bound
-import qs
import qs.modules.common
import Quickshell
diff --git a/.config/quickshell/ii/Translation.qml b/.config/quickshell/ii/services/Translation.qml
similarity index 100%
rename from .config/quickshell/ii/Translation.qml
rename to .config/quickshell/ii/services/Translation.qml
diff --git a/.config/quickshell/ii/services/Wallpapers.qml b/.config/quickshell/ii/services/Wallpapers.qml
index 8ee9b7dae..95c7d0ec1 100644
--- a/.config/quickshell/ii/services/Wallpapers.qml
+++ b/.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())
diff --git a/.config/quickshell/ii/settings.qml b/.config/quickshell/ii/settings.qml
index 61f51d47f..6ab96c937 100644
--- a/.config/quickshell/ii/settings.qml
+++ b/.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
diff --git a/.config/quickshell/ii/welcome.qml b/.config/quickshell/ii/welcome.qml
index 84d6b8170..78b1e2543 100644
--- a/.config/quickshell/ii/welcome.qml
+++ b/.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
diff --git a/README.md b/README.md
index acd1cd2bd..4f507da25 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ Widget system: Quickshell | Support: Yes
| AI, settings app | Some widgets |
|:---|:---------------|
-|
|
|
+|
|
|
| Window management | Weeb power |
|
|
|