Merge branch 'main' of https://github.com/end-4/dots-hyprland into sticky-merge-main

dots/.config/quickshell/ii/modules/common/Config.qml

@@ -76,6 +76,12 @@ Singleton {
 
         JsonAdapter {
             id: configOptionsJsonAdapter
+
+            property list<string> enabledPanels: [
+                "iiBar", "iiBackground", "iiCheatsheet", "iiDock", "iiLock", "iiMediaControls", "iiNotificationPopup", "iiOnScreenDisplay", "iiOnScreenKeyboard", "iiOverlay", "iiOverview", "iiPolkit", "iiRegionSelector", "iiReloadPopup", "iiScreenCorners", "iiSessionScreen", "iiSidebarLeft", "iiSidebarRight", "iiVerticalBar", "iiWallpaperSelector"
+            ]
+            property string panelFamily: "ii" // "ii", "w"
+
             property JsonObject policies: JsonObject {
                 property int ai: 1 // 0: No | 1: Yes | 2: Local
                 property int weeb: 1 // 0: No | 1: Open | 2: Closet
@@ -148,6 +154,7 @@ Singleton {
                 property JsonObject widgets: JsonObject {
                     property JsonObject clock: JsonObject {
                         property bool enable: true
+                        property bool showOnlyWhenLocked: false
                         property string placementStrategy: "leastBusy" // "free", "leastBusy", "mostBusy"
                         property real x: 100
                         property real y: 100
@@ -274,7 +281,7 @@ Singleton {
                 // 10:  | 11:  | 12:  | 13:  | 14: 󱄛
                 property string superKey: ""
                 property bool useMacSymbol: false
-                property bool splitButtons: true
+                property bool splitButtons: false
                 property bool useMouseSymbol: false
                 property bool useFnSymbol: false
                 property JsonObject fontSize: JsonObject {
@@ -380,7 +387,11 @@ Singleton {
             property JsonObject overlay: JsonObject {
                 property bool openingZoomAnimation: true
                 property bool darkenScreen: true
-                property real clickthroughOpacity: 0.7
+                property real clickthroughOpacity: 0.8
+                property JsonObject floatingImage: JsonObject {
+                    property string imageSource: "https://media.tenor.com/H5U5bJzj3oAAAAAi/kukuru.gif"
+                    property real scale: 0.5
+                }
             }
 
             property JsonObject overview: JsonObject {
@@ -511,6 +522,7 @@ Singleton {
                 // https://doc.qt.io/qt-6/qtime.html#toString
                 property string format: "hh:mm"
                 property string shortDateFormat: "dd/MM"
+                property string dateWithYearFormat: "dd/MM/yyyy"
                 property string dateFormat: "ddd, dd/MM"
                 property JsonObject pomodoro: JsonObject {
                     property int breakTime: 300
@@ -545,6 +557,13 @@ Singleton {
                     property list<string> linkKeywords: ["hentai", "porn", "sukebei", "hitomi.la", "rule34", "gelbooru", "fanbox", "dlsite"]
                 }
             }
+
+            property JsonObject waffles: JsonObject {
+                property JsonObject bar: JsonObject {
+                    property bool bottom: true
+                    property bool leftAlignApps: false
+                }
+            }
         }
     }
 }

dots/.config/quickshell/ii/modules/common/Directories.qml

@@ -24,6 +24,7 @@ Singleton {
     property string scriptPath: Quickshell.shellPath("scripts")
     property string favicons: FileUtils.trimFileProtocol(`${Directories.cache}/media/favicons`)
     property string coverArt: FileUtils.trimFileProtocol(`${Directories.cache}/media/coverart`)
+    property string tempImages: "/tmp/quickshell/media/images"
     property string booruPreviews: FileUtils.trimFileProtocol(`${Directories.cache}/media/boorus`)
     property string booruDownloads: FileUtils.trimFileProtocol(Directories.pictures  + "/homework")
     property string booruDownloadsNsfw: FileUtils.trimFileProtocol(Directories.pictures + "/homework/🌶️")
@@ -54,5 +55,6 @@ Singleton {
         Quickshell.execDetached(["bash", "-c", `rm -rf '${latexOutput}'; mkdir -p '${latexOutput}'`])
         Quickshell.execDetached(["bash", "-c", `rm -rf '${cliphistDecode}'; mkdir -p '${cliphistDecode}'`])
         Quickshell.execDetached(["mkdir", "-p", `${aiChats}`])
+        Quickshell.execDetached(["rm", "-rf", `${tempImages}`])
     }
 }

dots/.config/quickshell/ii/modules/common/Persistent.qml

@@ -89,6 +89,22 @@ Singleton {
                     property real width: 250
                     property real height: 100
                 }
+                property JsonObject floatingImage: JsonObject {
+                    property bool pinned: false
+                    property bool clickthrough: false
+                    property real x: 1650
+                    property real y: 390
+                    property real width: 0
+                    property real height: 0
+                }
+                property JsonObject fpsLimiter: JsonObject {
+                    property bool pinned: false
+                    property bool clickthrough: false
+                    property real x: 1570
+                    property real y: 615
+                    property real width: 280
+                    property real height: 80
+                }
                 property JsonObject recorder: JsonObject {
                     property bool pinned: false
                     property bool clickthrough: false
@@ -115,14 +131,6 @@ Singleton {
                     property real height: 600
                     property int tabIndex: 0
                 }
-                property JsonObject fpsLimiter: JsonObject {
-                    property bool pinned: false
-                    property bool clickthrough: false
-                    property real x: 1576
-                    property real y: 630
-                    property real width: 280
-                    property real height: 80
-                }
                 property JsonObject stickypad: JsonObject {
                     property bool pinned: true
                     property bool clickthrough: false

dots/.config/quickshell/ii/modules/common/utils/ImageDownloaderProcess.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.modules.common
+import qs.modules.common.functions
+
+Process {
+    id: root
+
+    signal done(string path, int width, int height);
+    required property string filePath;
+    required property string sourceUrl;
+    property string downloadUserAgent: Config.options?.networking.userAgent ?? ""
+    
+    function processFilePath() {
+        return StringUtils.shellSingleQuoteEscape(FileUtils.trimFileProtocol(filePath));
+    }
+
+    running: true
+    command: ["bash", "-c", 
+        `mkdir -p $(dirname '${processFilePath(filePath)}'); [ -f '${processFilePath(filePath)}' ] || curl -sSL '${sourceUrl}' -o '${processFilePath(filePath)}' && magick identify -format '%w %h' '${processFilePath(filePath)}'[0]`
+    ]
+    stdout: StdioCollector {
+        id: imageSizeOutputCollector
+        onStreamFinished: {
+            const output = imageSizeOutputCollector.text.trim();
+            const [width, height] = output.split(" ").map(Number);
+            root.done(root.filePath, width, height);
+        }
+    }
+}

dots/.config/quickshell/ii/modules/common/widgets/ConfigSwitch.qml

@@ -34,7 +34,6 @@ RippleButton {
         StyledSwitch {
             id: switchWidget
             down: root.down
-            scale: 0.6
             Layout.fillWidth: false
             checked: root.checked
             onClicked: root.clicked()

dots/.config/quickshell/ii/modules/common/widgets/PopupToolTip.qml

@@ -1,3 +1,4 @@
+pragma ComponentBehavior: Bound
 import qs.modules.common
 import qs.modules.common.widgets
 import QtQuick
@@ -13,15 +14,24 @@ Item {
     property real horizontalPadding: 10
     property real verticalPadding: 5
 
+    readonly property bool internalVisibleCondition: (extraVisibleCondition && (parent.hovered === undefined || parent?.hovered)) || alternativeVisibleCondition
     property var anchorEdges: Edges.Top
     property var anchorGravity: anchorEdges
 
-    readonly property bool internalVisibleCondition: (extraVisibleCondition && (parent.hovered === undefined || parent?.hovered)) || alternativeVisibleCondition
+    property Item contentItem: StyledToolTipContent {
+        id: contentItem
+        anchors.centerIn: parent
+        text: root.text
+        shown: false
+        Component.onCompleted: shown = true
+        horizontalPadding: root.horizontalPadding
+        verticalPadding: root.verticalPadding
+    }
 
     Loader {
         id: tooltipLoader
         anchors.fill: parent
-        active: internalVisibleCondition
+        active: root.internalVisibleCondition
         sourceComponent: PopupWindow {
             visible: true
             anchor {
@@ -35,18 +45,10 @@ Item {
             }
 
             color: "transparent"
-            implicitWidth: contentItem.implicitWidth + root.horizontalPadding * 2
-            implicitHeight: contentItem.implicitHeight + root.verticalPadding * 2
+            implicitWidth: root.contentItem.implicitWidth + root.horizontalPadding * 2
+            implicitHeight: root.contentItem.implicitHeight + root.verticalPadding * 2
 
-            StyledToolTipContent {
-                id: contentItem
-                anchors.centerIn: parent
-                text: root.text
-                shown: false
-                Component.onCompleted: shown = true
-                horizontalPadding: root.horizontalPadding
-                verticalPadding: root.verticalPadding
-            }
+            data: [root.contentItem]
         }
     }
 }

dots/.config/quickshell/ii/modules/common/widgets/StyledSwitch.qml

@@ -9,7 +9,7 @@ import Qt5Compat.GraphicalEffects
  */
 Switch {
     id: root
-    property real scale: 0.6 // Default in m3 spec is huge af
+    property real scale: 0.75 // Default in m3 spec is huge af
     implicitHeight: 32 * root.scale
     implicitWidth: 52 * root.scale
     property color activeColor: Appearance?.colors.colPrimary ?? "#685496"

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

@@ -14,9 +14,9 @@ import Quickshell.Io
 import Quickshell.Wayland
 import Quickshell.Hyprland
 
-import qs.modules.background.widgets
-import qs.modules.background.widgets.clock
-import qs.modules.background.widgets.weather
+import qs.modules.ii.background.widgets
+import qs.modules.ii.background.widgets.clock
+import qs.modules.ii.background.widgets.weather
 
 Variants {
     id: root

dots/.config/quickshell/ii/modules/ii/background/widgets/clock/ClockWidget.qml

@@ -6,7 +6,7 @@ import qs.modules.common
 import qs.modules.common.functions
 import qs.modules.common.widgets
 import qs.modules.common.widgets.widgetCanvas
-import qs.modules.background.widgets
+import qs.modules.ii.background.widgets
 
 AbstractBackgroundWidget {
     id: root
@@ -16,8 +16,9 @@ AbstractBackgroundWidget {
     implicitHeight: contentColumn.implicitHeight
     implicitWidth: contentColumn.implicitWidth
 
-    property string clockStyle: Config.options.background.widgets.clock.style
-    property bool forceCenter: (GlobalStates.screenLocked && Config.options.lock.centerClock)
+    readonly property string clockStyle: Config.options.background.widgets.clock.style
+    readonly property bool forceCenter: (GlobalStates.screenLocked && Config.options.lock.centerClock)
+    readonly property bool shouldShow: (!Config.options.background.widgets.clock.showOnlyWhenLocked || GlobalStates.screenLocked)
     property bool wallpaperSafetyTriggered: false
     needsColText: clockStyle === "digital"
     x: forceCenter ? ((root.screenWidth - root.width) / 2) : targetX
@@ -37,13 +38,14 @@ AbstractBackgroundWidget {
     Column {
         id: contentColumn
         anchors.centerIn: parent
-        spacing: 6
+        spacing: 10
 
         FadeLoader {
             id: cookieClockLoader
             anchors.horizontalCenter: parent.horizontalCenter
-            shown: root.clockStyle === "cookie"
+            shown: root.clockStyle === "cookie" && (root.shouldShow)
             sourceComponent: Column {
+                spacing: 10
                 CookieClock {
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
@@ -58,7 +60,7 @@ AbstractBackgroundWidget {
         FadeLoader {
             id: digitalClockLoader
             anchors.horizontalCenter: parent.horizontalCenter
-            shown: root.clockStyle === "digital"
+            shown: root.clockStyle === "digital" && (root.shouldShow)
             sourceComponent: ColumnLayout {
                 id: clockColumn
                 spacing: 6
@@ -69,7 +71,7 @@ AbstractBackgroundWidget {
                 }
                 ClockText {
                     Layout.topMargin: -5
-                    text: DateTime.date
+                    text: DateTime.longDate
                 }
                 StyledText {
                     // Somehow gets fucked up if made a ClockText???
@@ -87,61 +89,64 @@ AbstractBackgroundWidget {
                 }
             }
         }
-        Item {
-            id: statusText
+        StatusRow {
             anchors.horizontalCenter: parent.horizontalCenter
-            implicitHeight: statusTextBg.implicitHeight
-            implicitWidth: statusTextBg.implicitWidth
-            StyledRectangularShadow {
-                target: statusTextBg
-                visible: statusTextBg.visible && root.clockStyle === "cookie"
-                opacity: statusTextBg.opacity
+        }
+    }
+
+    component StatusRow: Item {
+        id: statusText
+        implicitHeight: statusTextBg.implicitHeight
+        implicitWidth: statusTextBg.implicitWidth
+        StyledRectangularShadow {
+            target: statusTextBg
+            visible: statusTextBg.visible && root.clockStyle === "cookie"
+            opacity: statusTextBg.opacity
+        }
+        Rectangle {
+            id: statusTextBg
+            anchors.centerIn: parent
+            clip: true
+            opacity: (safetyStatusText.shown || lockStatusText.shown) ? 1 : 0
+            visible: opacity > 0
+            implicitHeight: statusTextRow.implicitHeight + 5 * 2
+            implicitWidth: statusTextRow.implicitWidth + 5 * 2
+            radius: Appearance.rounding.small
+            color: ColorUtils.transparentize(Appearance.colors.colSecondaryContainer, root.clockStyle === "cookie" ? 0 : 1)
+
+            Behavior on implicitWidth {
+                animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
             }
-            Rectangle {
-                id: statusTextBg
+            Behavior on implicitHeight {
+                animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
+            }
+            Behavior on opacity {
+                animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
+            }
+
+            RowLayout {
+                id: statusTextRow
                 anchors.centerIn: parent
-                clip: true
-                opacity: (safetyStatusText.shown || lockStatusText.shown) ? 1 : 0
-                visible: opacity > 0
-                implicitHeight: statusTextRow.implicitHeight + 5 * 2
-                implicitWidth: statusTextRow.implicitWidth + 5 * 2
-                radius: Appearance.rounding.small
-                color: ColorUtils.transparentize(Appearance.colors.colSecondaryContainer, root.clockStyle === "cookie" ? 0 : 1)
-
-                Behavior on implicitWidth {
-                    animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
+                spacing: 14
+                Item {
+                    Layout.fillWidth: root.textHorizontalAlignment !== Text.AlignLeft
+                    implicitWidth: 1
                 }
-                Behavior on implicitHeight {
-                    animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
+                ClockStatusText {
+                    id: safetyStatusText
+                    shown: root.wallpaperSafetyTriggered
+                    statusIcon: "hide_image"
+                    statusText: Translation.tr("Wallpaper safety enforced")
                 }
-                Behavior on opacity {
-                    animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
+                ClockStatusText {
+                    id: lockStatusText
+                    shown: GlobalStates.screenLocked && Config.options.lock.showLockedText
+                    statusIcon: "lock"
+                    statusText: Translation.tr("Locked")
                 }
-
-                RowLayout {
-                    id: statusTextRow
-                    anchors.centerIn: parent
-                    spacing: 14
-                    Item {
-                        Layout.fillWidth: root.textHorizontalAlignment !== Text.AlignLeft
-                        implicitWidth: 1
-                    }
-                    ClockStatusText {
-                        id: safetyStatusText
-                        shown: root.wallpaperSafetyTriggered
-                        statusIcon: "hide_image"
-                        statusText: Translation.tr("Wallpaper safety enforced")
-                    }
-                    ClockStatusText {
-                        id: lockStatusText
-                        shown: GlobalStates.screenLocked && Config.options.lock.showLockedText
-                        statusIcon: "lock"
-                        statusText: Translation.tr("Locked")
-                    }
-                    Item {
-                        Layout.fillWidth: root.textHorizontalAlignment !== Text.AlignRight
-                        implicitWidth: 1
-                    }
+                Item {
+                    Layout.fillWidth: root.textHorizontalAlignment !== Text.AlignRight
+                    implicitWidth: 1
                 }
             }
         }

dots/.config/quickshell/ii/modules/ii/background/widgets/clock/CookieClock.qml

@@ -9,8 +9,8 @@ import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import Quickshell.Io
 
-import qs.modules.background.widgets.clock.dateIndicator
-import qs.modules.background.widgets.clock.minuteMarks
+import qs.modules.ii.background.widgets.clock.dateIndicator
+import qs.modules.ii.background.widgets.clock.minuteMarks
 
 Item {
     id: root

dots/.config/quickshell/ii/modules/ii/background/widgets/clock/CookieQuote.qml

@@ -12,9 +12,6 @@ Item {
     implicitWidth: quoteBox.implicitWidth
     implicitHeight: quoteBox.implicitHeight
 
-    anchors.bottom: parent.bottom
-    anchors.bottomMargin: -24
-
     DropShadow {
         source: quoteBox 
         anchors.fill: quoteBox
@@ -29,14 +26,16 @@ Item {
     Rectangle {
         id: quoteBox
 
-        implicitWidth: quoteStyledText.width + quoteIcon.width + 16 // for spacing on both sides
-        implicitHeight: quoteStyledText.height + 8 
+        implicitWidth: quoteRow.implicitWidth + 8 * 2
+        implicitHeight: quoteRow.implicitHeight + 4 * 2
         radius: Appearance.rounding.small
         color: Appearance.colors.colSecondaryContainer
 
         Row {
+            id: quoteRow
             anchors.centerIn: parent
             spacing: 4
+            
             MaterialSymbol {
                 id: quoteIcon
                 anchors.top: parent.top
@@ -57,4 +56,4 @@ Item {
             }
         }
     }
-}
+}

dots/.config/quickshell/ii/modules/ii/background/widgets/weather/WeatherWidget.qml

@@ -5,7 +5,7 @@ import qs.modules.common
 import qs.modules.common.functions
 import qs.modules.common.widgets
 import qs.modules.common.widgets.widgetCanvas
-import qs.modules.background.widgets
+import qs.modules.ii.background.widgets
 
 AbstractBackgroundWidget {
     id: root

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

@@ -29,10 +29,6 @@ Scope {
                 id: barRoot
                 screen: barLoader.modelData
 
-                property var brightnessMonitor: Brightness.getMonitorForScreen(barLoader.modelData)
-                property real useShortenedForm: (Appearance.sizes.barHellaShortenScreenWidthThreshold >= screen.width) ? 2 : (Appearance.sizes.barShortenScreenWidthThreshold >= screen.width) ? 1 : 0
-                readonly property int centerSideModuleWidth: (useShortenedForm == 2) ? Appearance.sizes.barCenterSideModuleWidthHellaShortened : (useShortenedForm == 1) ? Appearance.sizes.barCenterSideModuleWidthShortened : Appearance.sizes.barCenterSideModuleWidth
-
                 Timer {
                     id: showBarTimer
                     interval: (Config?.options.bar.autoHide.showWhenPressingSuper.delay ?? 100)

dots/.config/quickshell/ii/modules/ii/bar/BarContent.qml

@@ -1,4 +1,4 @@
-import qs.modules.bar.weather
+import qs.modules.ii.bar.weather
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
@@ -178,7 +178,7 @@ Item { // Bar content region
                 }
 
                 BatteryIndicator {
-                    visible: (root.useShortenedForm < 2 && UPower.displayDevice.isLaptopBattery)
+                    visible: (root.useShortenedForm < 2 && Battery.available)
                     Layout.alignment: Qt.AlignVCenter
                 }
             }

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

@@ -33,7 +33,7 @@ Item {
             visible: root.showDate
             font.pixelSize: Appearance.font.pixelSize.small
             color: Appearance.colors.colOnLayer1
-            text: DateTime.date
+            text: DateTime.longDate
         }
     }
 

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

@@ -4,7 +4,7 @@ import qs.modules.common.widgets
 
 import QtQuick
 import QtQuick.Layouts
-import qs.modules.bar
+import qs.modules.ii.bar
 
 StyledPopup {
     id: root

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

@@ -127,13 +127,12 @@ Item {
                                             const keybind = keybindSection.modelData.keybinds[i];
 
                                             if (!Config.options.cheatsheet.splitButtons) {
-
-                                              for (var j = 0; j < keybind.mods.length; j++) {
-                                                  keybind.mods[j] = keySubstitutions[keybind.mods[j]] || keybind.mods[j];
-                                              }
-                                              keybind.mods = [keybind.mods.join(' ') ]
-                                              keybind.mods[0] += !keyBlacklist.includes(keybind.key) && keybind.mods[0].length ? ' ' : ''
-                                              keybind.mods[0] += !keyBlacklist.includes(keybind.key) ? (keySubstitutions[keybind.key] || keybind.key) : ''
+                                                for (var j = 0; j < keybind.mods.length; j++) {
+                                                    keybind.mods[j] = keySubstitutions[keybind.mods[j]] || keybind.mods[j];
+                                                }
+                                                keybind.mods = [keybind.mods.join(' ') ]
+                                                keybind.mods[0] += !keyBlacklist.includes(keybind.key) && keybind.mods[0].length ? ' ' : ''
+                                                keybind.mods[0] += !keyBlacklist.includes(keybind.key) ? (keySubstitutions[keybind.key] || keybind.key) : ''
                                             } 
 
                                             result.push({

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

@@ -17,8 +17,8 @@ DockButton {
     property real countDotHeight: 4
     property bool appIsActive: appToplevel.toplevels.find(t => (t.activated == true)) !== undefined
 
-    property bool isSeparator: appToplevel.appId === "SEPARATOR"
-    property var desktopEntry: DesktopEntries.heuristicLookup(appToplevel.appId)
+    readonly property bool isSeparator: appToplevel.appId === "SEPARATOR"
+    readonly property var desktopEntry: DesktopEntries.heuristicLookup(appToplevel.appId)
     enabled: !isSeparator
     implicitWidth: isSeparator ? 1 : implicitHeight - topInset - bottomInset
 

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

@@ -1,6 +1,3 @@
-import qs.modules.common
-import qs.modules.common.widgets
-import qs.modules.common.functions
 import Qt5Compat.GraphicalEffects
 import QtQuick
 import QtQuick.Controls
@@ -8,6 +5,10 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
+import qs.services
+import qs.modules.common
+import qs.modules.common.widgets
+import qs.modules.common.functions
 
 Item {
     id: root
@@ -40,44 +41,7 @@ Item {
 
         model: ScriptModel {
             objectProp: "appId"
-            values: {
-                var map = new Map();
-
-                // Pinned apps
-                const pinnedApps = Config.options?.dock.pinnedApps ?? [];
-                for (const appId of pinnedApps) {
-                    if (!map.has(appId.toLowerCase())) map.set(appId.toLowerCase(), ({
-                        pinned: true,
-                        toplevels: []
-                    }));
-                }
-
-                // Separator
-                if (pinnedApps.length > 0) {
-                    map.set("SEPARATOR", { pinned: false, toplevels: [] });
-                }
-
-                // Ignored apps
-                const ignoredRegexStrings = Config.options?.dock.ignoredAppRegexes ?? [];
-                const ignoredRegexes = ignoredRegexStrings.map(pattern => new RegExp(pattern, "i"));
-                // Open windows
-                for (const toplevel of ToplevelManager.toplevels.values) {
-                    if (ignoredRegexes.some(re => re.test(toplevel.appId))) continue;
-                    if (!map.has(toplevel.appId.toLowerCase())) map.set(toplevel.appId.toLowerCase(), ({
-                        pinned: false,
-                        toplevels: []
-                    }));
-                    map.get(toplevel.appId.toLowerCase()).toplevels.push(toplevel);
-                }
-
-                var values = [];
-
-                for (const [key, value] of map) {
-                    values.push({ appId: key, toplevels: value.toplevels, pinned: value.pinned });
-                }
-
-                return values;
-            }
+            values: TaskbarApps.apps
         }
         delegate: DockAppButton {
             required property var modelData

dots/.config/quickshell/ii/modules/ii/lock/Lock.qml

@@ -3,7 +3,6 @@ import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.functions
-import qs.modules.lock
 import QtQuick
 import Quickshell
 import Quickshell.Io

dots/.config/quickshell/ii/modules/ii/lock/LockSurface.qml

@@ -7,7 +7,7 @@ import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions
-import qs.modules.bar as Bar
+import qs.modules.ii.bar as Bar
 import Quickshell
 import Quickshell.Services.SystemTray
 
@@ -288,7 +288,7 @@ MouseArea {
         opacity: root.toolbarOpacity
 
         IconAndTextPair {
-            visible: UPower.displayDevice.isLaptopBattery
+            visible: Battery.available
             icon: Battery.isCharging ? "bolt" : "battery_android_full"
             text: Math.round(Battery.percentage * 100)
             color: (Battery.isLow && !Battery.isCharging) ? Appearance.colors.colError : Appearance.colors.colOnSurfaceVariant

dots/.config/quickshell/ii/modules/ii/mediaControls/MediaControls.qml

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

dots/.config/quickshell/ii/modules/ii/notificationPopup/NotificationPopup.qml

@@ -4,7 +4,6 @@ import qs.modules.common.widgets
 import qs.services
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Layouts
 import Quickshell
 import Quickshell.Wayland
 import Quickshell.Hyprland

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

@@ -2,7 +2,7 @@ import qs.services
 import QtQuick
 import Quickshell
 import Quickshell.Hyprland
-import qs.modules.onScreenDisplay
+import qs.modules.ii.onScreenDisplay
 
 OsdValueIndicator {
     id: root

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

@@ -1,6 +1,6 @@
 import qs.services
 import QtQuick
-import qs.modules.onScreenDisplay
+import qs.modules.ii.onScreenDisplay
 
 OsdValueIndicator {
     id: osdValues

dots/.config/quickshell/ii/modules/ii/overlay/OverlayBackground.qml

@@ -0,0 +1,8 @@
+import QtQuick
+import qs.modules.common
+
+Rectangle {
+    id: contentItem
+    anchors.fill: parent
+    color: Appearance.colors.colSurfaceContainer
+}

dots/.config/quickshell/ii/modules/ii/overlay/OverlayContent.qml

@@ -8,8 +8,6 @@ import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.widgets.widgetCanvas
 
-import qs.modules.overlay.crosshair
-
 Item {
     id: root
     focus: true

dots/.config/quickshell/ii/modules/ii/overlay/OverlayContext.qml

@@ -6,12 +6,13 @@ Singleton {
     id: root
     
     readonly property list<var> availableWidgets: [
-        { identifier: "recorder", materialSymbol: "screen_record" },
-        { identifier: "volumeMixer", materialSymbol: "volume_up" },
         { identifier: "crosshair", materialSymbol: "point_scan" },
         { identifier: "fpsLimiter", materialSymbol: "animation" },
+        { identifier: "floatingImage", materialSymbol: "imagesmode" },
+        { identifier: "recorder", materialSymbol: "screen_record" },
         { identifier: "resources", materialSymbol: "browse_activity" },
-        { identifier: "stickypad", materialSymbol: "note_stack" }
+        { identifier: "stickypad", materialSymbol: "note_stack" },
+        { identifier: "volumeMixer", materialSymbol: "volume_up" },
     ]
     
     readonly property bool hasPinnedWidgets: root.pinnedWidgetIdentifiers.length > 0

dots/.config/quickshell/ii/modules/ii/overlay/OverlayTaskbar.qml

@@ -49,8 +49,13 @@ Rectangle {
         }
 
         Separator {}
-
         TimeWidget {}
+        Separator {
+            visible: Battery.available
+        }
+        BatteryWidget {
+            visible: Battery.available
+        }
     }
 
     component Separator: Rectangle {
@@ -67,12 +72,44 @@ Rectangle {
         Layout.rightMargin: 6
 
         text: DateTime.time
+        color: Appearance.colors.colOnSurface
         font {
             family: Appearance.font.family.numbers
             variableAxes: Appearance.font.variableAxes.numbers
             pixelSize: 22
         }
     }
+    
+    component BatteryWidget: Row {
+        id: batteryWidget
+        Layout.alignment: Qt.AlignVCenter
+        Layout.leftMargin: 6
+        Layout.rightMargin: 6
+        spacing: 2
+        property color colText: Battery.isLowAndNotCharging ? Appearance.colors.colError : Appearance.colors.colOnSurface
+
+        MaterialSymbol {
+            id: boltIcon
+            anchors.verticalCenter: parent.verticalCenter
+            fill: 1
+            text: Battery.isCharging ? "bolt" : "battery_android_full"
+            color: batteryWidget.colText
+            iconSize: 24
+            animateChange: true
+        }
+        
+        StyledText {
+            id: batteryText
+            anchors.verticalCenter: parent.verticalCenter
+            text: Math.round(Battery.percentage * 100) + "%"
+            color: batteryWidget.colText
+            font {
+                family: Appearance.font.family.numbers
+                variableAxes: Appearance.font.variableAxes.numbers
+                pixelSize: 18
+            }
+        }
+    }
 
     component WidgetButton: RippleButton {
         id: widgetButton

dots/.config/quickshell/ii/modules/ii/overlay/OverlayWidgetDelegateChooser.qml

@@ -6,21 +6,23 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Bluetooth
-import qs.modules.overlay.crosshair
-import qs.modules.overlay.volumeMixer
-import qs.modules.overlay.fpsLimiter
-import qs.modules.overlay.recorder
-import qs.modules.overlay.resources
-import qs.modules.overlay.stickypad
+import qs.modules.ii.overlay.crosshair
+import qs.modules.ii.overlay.volumeMixer
+import qs.modules.ii.overlay.floatingImage
+import qs.modules.ii.overlay.fpsLimiter
+import qs.modules.ii.overlay.recorder
+import qs.modules.ii.overlay.resources
+import qs.modules.ii.overlay.stickypad
 
 DelegateChooser {
     id: root
     role: "identifier"
 
     DelegateChoice { roleValue: "crosshair"; Crosshair {} }
-    DelegateChoice { roleValue: "volumeMixer"; VolumeMixer {} }
+    DelegateChoice { roleValue: "floatingImage"; FloatingImage {} }
     DelegateChoice { roleValue: "fpsLimiter"; FpsLimiter {} }
     DelegateChoice { roleValue: "recorder"; Recorder {} }
     DelegateChoice { roleValue: "resources"; Resources {} }
     DelegateChoice { roleValue: "stickypad"; Stickypad {} }
+    DelegateChoice { roleValue: "volumeMixer"; VolumeMixer {} }
 }

dots/.config/quickshell/ii/modules/ii/overlay/StyledOverlayWidget.qml

@@ -33,8 +33,8 @@ AbstractOverlayWidget {
     property string title: identifier.replace(/([A-Z])/g, " $1").replace(/^./, function(str){ return str.toUpperCase(); })
     property var persistentStateEntry: Persistent.states.overlay[identifier]
     property real radius: Appearance.rounding.windowRounding
-    property real minimumWidth: 250
-    property real minimumHeight: 100
+    property real minimumWidth: contentItem.implicitWidth
+    property real minimumHeight: contentItem.implicitHeight
     property real resizeMargin: 8
     property real padding: 6
     property real contentRadius: radius - padding
@@ -238,8 +238,8 @@ AbstractOverlayWidget {
                     }
                     
                     StyledText {
-                        text: root.title
                         Layout.fillWidth: true
+                        text: root.title
                         elide: Text.ElideRight
                     }
 

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

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.modules.common
-import qs.modules.overlay
+import qs.modules.ii.overlay
 
 StyledOverlayWidget {
     id: root

dots/.config/quickshell/ii/modules/ii/overlay/floatingImage/FloatingImage.qml

@@ -0,0 +1,95 @@
+pragma ComponentBehavior: Bound
+import QtQuick
+import Qt5Compat.GraphicalEffects
+import qs.modules.common
+import qs.modules.common.functions
+import qs.modules.common.utils
+import qs.modules.ii.overlay
+
+StyledOverlayWidget {
+    id: root
+    showClickabilityButton: false
+    resizable: false
+    clickthrough: true
+
+    property string imageSource: Config.options.overlay.floatingImage.imageSource
+    property real scaleFactor: Config.options.overlay.floatingImage.scale
+    property int imageWidth: 0
+    property int imageHeight: 0
+
+    // Override to always save 0 size
+    function savePosition(xPos = root.x, yPos = root.y, width = 0, height = 0) {
+        root.persistentStateEntry.x = Math.round(xPos);
+        root.persistentStateEntry.y = Math.round(yPos);
+        root.persistentStateEntry.width = 0
+        root.persistentStateEntry.height = 0
+    }
+
+    onImageSourceChanged: {
+        imageDownloader.running = false;
+        imageDownloader.sourceUrl = root.imageSource;
+        imageDownloader.filePath = Qt.resolvedUrl(Directories.tempImages + "/" + Qt.md5(root.imageSource))
+        imageDownloader.running = true;
+    }
+    onScaleFactorChanged: {
+        setSize();
+    }
+
+    function setSize() {
+        bg.implicitWidth = root.imageWidth * root.scaleFactor;
+        bg.implicitHeight = root.imageHeight * root.scaleFactor;
+    }
+
+    contentItem: OverlayBackground {
+        id: bg
+        color: ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainer, root.actuallyPinned ? 1 : 0)
+        radius: root.contentRadius
+
+        WheelHandler {
+            onWheel: (event) => {
+                if (event.angleDelta.y < 0) {
+                    Config.options.overlay.floatingImage.scale = Math.max(0.1, Config.options.overlay.floatingImage.scale - 0.1);
+                }
+                else if (event.angleDelta.y > 0) {
+                    Config.options.overlay.floatingImage.scale = Math.min(5.0, Config.options.overlay.floatingImage.scale + 0.1);
+                }
+            }
+            acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad
+        }
+
+        layer.enabled: true
+        layer.effect: OpacityMask {
+            maskSource: Rectangle {
+                width: bg.width
+                height: bg.height
+                radius: bg.radius
+            }
+        }
+
+        AnimatedImage {
+            id: animatedImage
+            anchors.centerIn: parent
+            width: root.imageWidth * root.scaleFactor
+            height: root.imageHeight * root.scaleFactor
+            sourceSize.width: width
+            sourceSize.height: height
+
+            playing: visible
+            asynchronous: true
+            source: ""
+
+            ImageDownloaderProcess {
+                id: imageDownloader
+                filePath: Qt.resolvedUrl(Directories.tempImages + "/" + Qt.md5(root.imageSource))
+                sourceUrl: root.imageSource
+
+                onDone: (path, width, height) => {
+                    root.imageWidth = width;
+                    root.imageHeight = height;
+                    root.setSize();
+                    animatedImage.source = path;
+                }
+            }
+        }
+    }
+}

dots/.config/quickshell/ii/modules/ii/overlay/fpsLimiter/FpsLimiter.qml

@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import qs.modules.common
-import qs.modules.overlay
+import qs.modules.ii.overlay
 
 StyledOverlayWidget {
     id: root

dots/.config/quickshell/ii/modules/ii/overlay/fpsLimiter/FpsLimiterContent.qml

@@ -6,16 +6,15 @@ import Quickshell
 import Quickshell.Io
 import qs.modules.common
 import qs.modules.common.widgets
+import qs.modules.ii.overlay
 
-Rectangle {
+OverlayBackground {
     id: root
 
     enum State { Normal, Success, Error }
 
-    anchors.fill: parent
     property real padding: 16
     property var currentState: FpsLimiterContent.State.Normal
-    color: Appearance.m3colors.m3surfaceContainer
     implicitWidth: content.implicitWidth + (padding * 2)
     implicitHeight: content.implicitHeight + (padding * 2)
 

dots/.config/quickshell/ii/modules/ii/overlay/recorder/Recorder.qml

@@ -5,18 +5,16 @@ import Quickshell
 import qs
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.modules.overlay
+import qs.modules.ii.overlay
 
 StyledOverlayWidget {
     id: root
     minimumWidth: 310
     minimumHeight: 130
 
-    contentItem: Rectangle {
+    contentItem: OverlayBackground {
         id: contentItem
-        anchors.fill: parent
         radius: root.contentRadius
-        color: Appearance.m3colors.m3surfaceContainer
         property real padding: 8
         ColumnLayout {
             id: contentColumn

dots/.config/quickshell/ii/modules/ii/overlay/resources/Resources.qml

@@ -10,7 +10,7 @@ import qs
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.modules.overlay
+import qs.modules.ii.overlay
 
 StyledOverlayWidget {
     id: root
@@ -37,10 +37,8 @@ StyledOverlayWidget {
         },
     ]
 
-    contentItem: Rectangle {
+    contentItem: OverlayBackground {
         id: contentItem
-        anchors.fill: parent
-        color: Appearance.m3colors.m3surfaceContainer
         radius: root.contentRadius
         property real padding: 4
         ColumnLayout {

dots/.config/quickshell/ii/modules/ii/overlay/volumeMixer/VolumeMixer.qml

@@ -5,17 +5,15 @@ import Quickshell
 import qs.services
 import qs.modules.common
 import qs.modules.common.widgets
-import qs.modules.overlay
-import qs.modules.sidebarRight.volumeMixer
+import qs.modules.ii.overlay
+import qs.modules.ii.sidebarRight.volumeMixer
 
 StyledOverlayWidget {
     id: root
     minimumWidth: 300
     minimumHeight: 380
 
-    contentItem: Rectangle {
-        anchors.fill: parent
-        color: Appearance.m3colors.m3surfaceContainer
+    contentItem: OverlayBackground {
         radius: root.contentRadius
         property real padding: 6