FIX: made borders of notifications rounded

.gitignore

@@ -3,4 +3,5 @@ Colors.qml
 modules/wlogout/scripts/helper.sh
 config/path/ConfigPath.qml
 config/path/WallpaperPath.qml
-modules/notification/assets/notification.ogg
+modules/notification/assets/notification.ogg
+*.json

modules/bar/Bar.qml

@@ -83,4 +83,4 @@ PanelWindow {
 
         }
     }
-}
+}

modules/bar/BarLoader.qml

@@ -11,7 +11,7 @@ Item {
             active: true // loads object
             sourceComponent: Bar {
                 screen: modelData
-                visible: !Hyprland.monitorFor(modelData).activeWorkspace.hasFullscreen
+                visible: !Hyprland.monitorFor(modelData).activeWorkspace?.hasFullscreen
             } // creates instance of bar component
         }
     }

modules/bar/states/Apps/AppsState.qml

@@ -183,6 +183,8 @@ Item {
         "lightburn":                "󱇣",
         "wofi":                     "",
         // Screenshare
-        "moonlight":                "󰍹ßß"
+        "moonlight":                "󰍹",
+        // PCB
+        "kicad":                    "",
     })
 }

modules/bar/states/Battery/BatteryState.qml

@@ -1,21 +1,144 @@
 pragma Singleton
 import QtQuick
 import Quickshell
+import Quickshell.Io
 import Quickshell.Services.UPower
+import "../../../../config"
 
 Item {
-    property bool available: UPower.displayDevice.isLaptopBattery
+    id: root
+    // show widget for laptop battery *or* UPS (your main PC), hide otherwise
+    // displayDevice is aggregate - for UPS it is type Ups, isLaptopBattery is false
+    property bool available: {
+        const d = UPower.displayDevice
+        if (d && d.ready && d.isPresent && (d.isLaptopBattery || d.type === UPowerDeviceType.Ups)) return true
+        // fallback: scan all devices (some systems don't set DisplayDevice to UPS)
+        const devs = UPower.devices.values
+        for (let i = 0; i < devs.length; i++) {
+            const dev = devs[i]
+            if (dev.isPresent && (dev.isLaptopBattery || dev.type === UPowerDeviceType.Ups)) return true
+        }
+        return false
+    }
     property real percentage: UPower.displayDevice.percentage*100
-    property string state: UPowerDeviceState.toString(UPower.displayDevice.state)
+    // 'state' shadows Item.state (qmllint) -> use chargeState
-    property bool charging: state == "Charging"
+    property string chargeState: UPowerDeviceState.toString(UPower.displayDevice.state)
-    property bool full: state == "FullyCharged"
+    // keep alias via getter would still shadow, so expose via function if needed; prefer chargeState
+    property bool charging: chargeState == "Charging"
+    property bool full: chargeState == "FullyCharged"
     property real energy: UPower.displayDevice.energy
     property real energy_formated: Math.round(energy*10)/10
     property real time_to_empty: UPower.displayDevice.timeToEmpty
+    property real time_to_full: UPower.displayDevice.timeToFull
     property real hour_to_empty: Math.floor(time_to_empty/3600)
     property real min_to_empty: Math.floor((time_to_empty%3600)/60)
+    property real hour_to_full: Math.floor(time_to_full/3600)
+    property real min_to_full: Math.floor((time_to_full%3600)/60)
     property real energy_rate: UPower.displayDevice.changeRate
     property real energy_rate_formated: Math.round(energy_rate*10)/10
     property bool healthSupported: UPower.displayDevice.healthSupported
     property real health: healthSupported ? UPower.displayDevice.healthPercentage : NaN
-}
+
+    property int _maxHistory: 60*60 // 1h window
+
+    property var percentageHistory: [{time: Date.now() - _maxHistory*1000, value: 0}, {time: Date.now(), value: 0}]
+    property var percentageHistoryExists: false
+    property var energyHistory: [{time: Date.now() - _maxHistory*1000, value: 0}, {time: Date.now(), value: 0}]
+    property var energyHistoryExists: false
+    property var usageHistory: [{time: Date.now() - _maxHistory*1000, value: 0}, {time: Date.now(), value: 0}]
+    property var usageHistoryExists: false
+
+    // ---- persistence: survives reload AND close (FileView -> disk) ----
+    // use Config.configDir (base dir) so path is stable and visible in repo
+    readonly property string _historyPath: Config.configDir + "/modules/bar/states/Battery/battery_history.json"
+    // guard: don't try to read non-existent file (avoids FileView warning)
+    Process {
+        id: historyFileExistsCheck
+        command: ["test", "-f", root._historyPath]
+        onExited: function(exitCode, exitStatus) {
+            if (exitCode === 0) historyFile.path = root._historyPath
+            // else keep historyFile.path empty -> no read attempt, writes will set it later
+        }
+        Component.onCompleted: running = true
+    }
+    FileView {
+        id: historyFile
+        printErrors: false
+        // adapter holds json, synced to disk via writeAdapter()
+        adapter: JsonAdapter {
+            property var percentageHistory: []
+            property var energyHistory: []
+            property var usageHistory: []
+        }
+        onLoaded: {
+            function prune(arr) {
+                if (!arr || typeof arr.length !== "number" || arr.length===0) return null
+                const f = arr.filter(p => p && typeof p.time==="number" && typeof p.value==="number")
+                if (f.length < 2) return null
+                return f.length > root._maxHistory ? f.slice(-root._maxHistory) : f
+            }
+            const p = prune(adapter.percentageHistory)
+            if (p) { root.percentageHistory = p; root.percentageHistoryExists = p.some(i=>i.value!==0) }
+            const e = prune(adapter.energyHistory)
+            if (e) { root.energyHistory = e; root.energyHistoryExists = e.some(i=>i.value!==0) }
+            const u = prune(adapter.usageHistory)
+            if (u) { root.usageHistory = u; root.usageHistoryExists = u.some(i=>i.value!==0) }
+        }
+        onLoadFailed: {} // first run, file missing -> keep defaults
+    }
+
+    // periodic save every 10s (debounce-restart would never fire while statsTimer pushes every 1s)
+    Timer {
+        id: saveTimer
+        interval: 10000
+        repeat: true
+        running: true
+        onTriggered: {
+            if (historyFile.path === "") historyFile.path = root._historyPath
+            historyFile.adapter.percentageHistory = root.percentageHistory
+            historyFile.adapter.energyHistory = root.energyHistory
+            historyFile.adapter.usageHistory = root.usageHistory
+            historyFile.writeAdapter()
+        }
+    }
+
+    Timer {
+        id: statsTimer
+        interval: 1000
+        repeat: true
+        running: true
+        onTriggered: {
+            const now = Date.now()
+
+            // Creating percentage History
+            let pHist = root.percentageHistory.slice()
+            pHist.push({time: now, value: percentage})
+            if (pHist.length > root._maxHistory) pHist.shift()
+            root.percentageHistoryExists = pHist.some(item => item.value !== 0 && item.value !== undefined)
+            root.percentageHistory = pHist
+
+            // Creating energy History
+            let eHist = root.energyHistory.slice()
+            eHist.push({time: now, value: energy_formated})
+            if (eHist.length > root._maxHistory) eHist.shift()
+            root.energyHistoryExists = eHist.some(item => item.value !== 0 && item.value !== undefined)
+            root.energyHistory = eHist
+
+            // Creating usage History
+            let uHist = root.usageHistory.slice()
+            uHist.push({time: now, value: energy_rate_formated})
+            if (uHist.length > root._maxHistory) uHist.shift()
+            root.usageHistoryExists = uHist.some(item => item.value !== 0 && item.value !== undefined)
+            root.usageHistory = uHist
+        }
+    }
+
+    // ensure save on clean close / reload (best-effort, reload preserves via FileView anyway)
+    Component.onDestruction: {
+        if (historyFile.path === "") historyFile.path = root._historyPath
+        historyFile.adapter.percentageHistory = root.percentageHistory
+        historyFile.adapter.energyHistory = root.energyHistory
+        historyFile.adapter.usageHistory = root.usageHistory
+        historyFile.writeAdapter()
+    }
+}

modules/bar/states/Network/NetworkState.qml

@@ -3,6 +3,7 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import Quickshell.Networking
+import "../../../../config"
 
 QtObject {
     id: root
@@ -38,6 +39,62 @@ QtObject {
 
     readonly property var networking: Networking
 
+    // ---- persistence: survives reload AND close (disk) ----
+    // use Config.configDir (base dir) so path is stable and visible in repo
+    readonly property string _historyPath: Config.configDir + "/modules/bar/states/Network/network_history.json"
+    // guard: don't try to read non-existent file
+    property Process historyFileExistsCheck: Process {
+        command: ["test", "-f", root._historyPath]
+        onExited: function(exitCode, exitStatus) {
+            if (exitCode === 0) root.historyFile.path = root._historyPath
+        }
+        Component.onCompleted: running = true
+    }
+    // QtObject has no default property, so hold FileView as typed property
+    property FileView historyFile: FileView {
+        printErrors: false
+        adapter: JsonAdapter {
+            property var downloadHistory: []
+            property var uploadHistory: []
+            property var pingHistory: []
+        }
+        onLoaded: {
+            function prune(arr) {
+                if (!arr || typeof arr.length !== "number" || arr.length===0) return null
+                const f = arr.filter(p => p && typeof p.time==="number" && typeof p.value==="number")
+                if (f.length < 2) return null
+                return f.length > root._maxHistory ? f.slice(-root._maxHistory) : f
+            }
+            const d = prune(adapter.downloadHistory)
+            if (d) root.downloadHistory = d
+            const u = prune(adapter.uploadHistory)
+            if (u) root.uploadHistory = u
+            const p = prune(adapter.pingHistory)
+            if (p) root.pingHistory = p
+        }
+        onLoadFailed: {} // first run
+    }
+    // periodic save every 10s (restart-debounce would never fire while statsTimer pushes every 1s)
+    property Timer saveTimer: Timer {
+        interval: 10000
+        repeat: true
+        running: true
+        onTriggered: {
+            if (root.historyFile.path === "") root.historyFile.path = root._historyPath
+            root.historyFile.adapter.downloadHistory = root.downloadHistory
+            root.historyFile.adapter.uploadHistory = root.uploadHistory
+            root.historyFile.adapter.pingHistory = root.pingHistory
+            root.historyFile.writeAdapter()
+        }
+    }
+    Component.onDestruction: {
+        if (root.historyFile.path === "") root.historyFile.path = root._historyPath
+        root.historyFile.adapter.downloadHistory = root.downloadHistory
+        root.historyFile.adapter.uploadHistory = root.uploadHistory
+        root.historyFile.adapter.pingHistory = root.pingHistory
+        root.historyFile.writeAdapter()
+    }
+
     function findAllConnectedDevices() {
         var devs = networking.devices.values
         var result = []
@@ -70,7 +127,8 @@ QtObject {
                 var nets = dev.networks.values
                 for (var j = 0; j < nets.length; j++) {
                     if (nets[j].connected) {
-                        sig += ":" + nets[j].name
+                        // include signalStrength & name so hover updates live on signal change
+                        sig += ":" + nets[j].name + ":" + Math.round(nets[j].signalStrength*100)
                         break
                     }
                 }
@@ -354,4 +412,4 @@ QtObject {
     Component.onCompleted: {
         root.updateAll()
     }
-}
+}

modules/bar/widgets/Battery.qml

@@ -1,6 +1,5 @@
 import QtQuick
 import Quickshell
-import Quickshell.Hyprland
 import "../../../config"
 import "../states/Battery"
 
@@ -13,7 +12,7 @@ MouseArea {
     visible: BatteryState.available
 
     property bool expanded: false
-    
+
     Rectangle {
         anchors.fill: parent
         color: batteryButton.containsMouse ? Colors.tertiary : Qt.alpha(Colors.tertiaryContainer, 0.25)
@@ -24,7 +23,7 @@ MouseArea {
 
         Text {
             id: batteryText
-            visible : !expanded
+            visible : !batteryButton.expanded
             anchors.centerIn: parent
             text:(
                 BatteryState.percentage >= 90 ? "" :
@@ -37,7 +36,7 @@ MouseArea {
             font.family: Config.font
             color: (
                 BatteryState.charging ? (
-                    BatteryState.full ? Colors.secondary : 
+                    BatteryState.full ? Colors.secondary :
                     Colors.tertiary
                 ) :
                 BatteryState.percentage <= 5 ? Colors.errorContainer :
@@ -49,7 +48,7 @@ MouseArea {
 
         Text {
             id: chargeIcon
-            visible : !expanded && BatteryState.charging
+            visible : !batteryButton.expanded && BatteryState.charging
             anchors.centerIn: parent
             text: "󱐋"
             font.pixelSize: Config.iconSize(batteryButton.height)
@@ -61,7 +60,7 @@ MouseArea {
 
         Row {
             id: expandedRow
-            visible: expanded
+            visible: batteryButton.expanded
             anchors.centerIn: parent
             spacing: Config.bar_spacing_fun(batteryButton.height)
 
@@ -89,7 +88,7 @@ MouseArea {
                 color: (
                     BatteryState.percentage <= 5 ? Colors.errorContainer :
                     BatteryState.charging ? (
-                        BatteryState.full ? Colors.secondary : 
+                        BatteryState.full ? Colors.secondary :
                         Colors.tertiary
                     ) :
                     BatteryState.percentage < 10 ? "yellow" :
@@ -100,7 +99,7 @@ MouseArea {
 
             Text {
                 id: batteryPercentageText
-                text: BatteryState.percentage + "%"
+                text: Math.round(BatteryState.percentage) + "%"
 
                 font.pixelSize: Config.labelSize(batteryButton.height)
                 font.family: Config.font
@@ -125,9 +124,87 @@ MouseArea {
         radiusValue: Config.radius_fun(batteryButton.height)
 
         Column {
-            spacing: parent.spacing
+            spacing: batteryPopup.spacingValue
             Text {
-                text: "percentage: " + BatteryState.percentage + "%"
+                text: "State: " + BatteryState.chargeState
+                wrapMode: Text.WordWrap
+                color: Colors.primary
+                anchors.horizontalCenter: parent.horizontalCenter
+                font.pixelSize: Config.font_size_tiny(bar.height)
+                font.family: Config.font
+            }
+            Column {
+                width: parent.width
+                spacing: 2
+                visible: BatteryState.percentageHistoryExists
+
+                Text {
+                    text: "percentage: " + Math.round(BatteryState.percentage) + "%"
+                    color: Colors.primary
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    font.pixelSize: Config.font_size_tiny(bar.height)
+                    font.family: Config.font
+                }
+
+                Sparkline {
+                    values: BatteryState.percentageHistory
+                    lineColor: Colors.primary
+                    width: parent.width
+                    windowMs: BatteryState._maxHistory * 1000
+                }
+            }
+            Column {
+                width: parent.width
+                spacing: 2
+                visible: BatteryState.energyHistoryExists
+
+                Text {
+                    text: "energy: " + BatteryState.energy_formated + " Wh"
+                    color: Colors.primary
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    font.pixelSize: Config.font_size_tiny(bar.height)
+                    font.family: Config.font
+                }
+
+                Sparkline {
+                    values: BatteryState.energyHistory
+                    lineColor: Colors.primary
+                    width: parent.width
+                    windowMs: BatteryState._maxHistory * 1000
+                }
+            }
+            Column {
+                width: parent.width
+                spacing: 2
+                visible: BatteryState.usageHistoryExists
+
+                Text {
+                    text: "Usage: " + BatteryState.energy_rate_formated + " W"
+                    color: Colors.primary
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    font.pixelSize: Config.font_size_tiny(bar.height)
+                    font.family: Config.font
+                }
+
+                Sparkline {
+                    values: BatteryState.usageHistory
+                    lineColor: Colors.primary
+                    width: parent.width
+                    windowMs: BatteryState._maxHistory * 1000
+                }
+            }
+            Text {
+                text: {
+                    if (BatteryState.charging) {
+                        if (BatteryState.hour_to_full > 0) return "Remaining: " + BatteryState.hour_to_full + "h " + BatteryState.min_to_full + "min (to full)"
+                        if (BatteryState.min_to_full > 0) return "Remaining: " + BatteryState.min_to_full + "min (to full)"
+                        return BatteryState.full ? "Fully charged" : "Calculating..."
+                    } else {
+                        if (BatteryState.hour_to_empty > 0) return "Remaining: " + BatteryState.hour_to_empty + "h " + BatteryState.min_to_empty + "min"
+                        if (BatteryState.min_to_empty > 0) return "Remaining: " + BatteryState.min_to_empty + "min"
+                        return "Calculating..."
+                    }
+                }
                 wrapMode: Text.WordWrap
                 color: Colors.primary
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -135,42 +212,7 @@ MouseArea {
                 font.family: Config.font
             }
             Text {
-                text: "State: " + BatteryState.state
+                text: "Health: " + Math.round(BatteryState.health) + " %"
-                wrapMode: Text.WordWrap
-                color: Colors.primary
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: Config.font_size_tiny(bar.height)
-                font.family: Config.font
-            }
-            Text {
-                text: "energy: " + Math.round(BatteryState.energy*10)/10 + " W"
-                wrapMode: Text.WordWrap
-                color: Colors.primary
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: Config.font_size_tiny(bar.height)
-                font.family: Config.font
-            }
-            Text {
-                text: (
-                    BatteryState.hour_to_empty > 0 ? "Remaining: " + BatteryState.hour_to_empty + "h " + BatteryState.min_to_empty + "min" :
-                    BatteryState.min_to_empty > 0 ? "Remaining: " + BatteryState.min_to_empty + "min" :
-                    "NaN")
-                wrapMode: Text.WordWrap
-                color: Colors.primary
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: Config.font_size_tiny(bar.height)
-                font.family: Config.font
-            }
-            Text {
-                text: "Usage: " + BatteryState.energy_rate_formated + " W"
-                wrapMode: Text.WordWrap
-                color: Colors.primary
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: Config.font_size_tiny(bar.height)
-                font.family: Config.font
-            }
-            Text {
-                text: "Health: " + BatteryState.health + " %"
                 visible: BatteryState.healthSupported
                 wrapMode: Text.WordWrap
                 color: Colors.primary

modules/bar/widgets/NotificationButton.qml

@@ -13,11 +13,20 @@ MouseArea {
     cursorShape: Qt.PointingHandCursor
 
     onClicked: {
-        // NotificationS.soundEnabled = !NotificationS.soundEnabled
+        // NotificationS.notificationPopupEnabled = !NotificationS.notificationPopupEnabled
         console.log("[NotificationButton] Opening NotificationHistory")
         root.toggleNotificationHistory()
     }
 
+    // ── Report hover to NotificationServer for auto-close logic ──
+    onContainsMouseChanged: NotificationS.buttonHovered = containsMouse
+    Component.onDestruction: {
+        if (containsMouse) NotificationS.buttonHovered = false
+    }
+    onVisibleChanged: {
+        if (!visible && NotificationS.buttonHovered) NotificationS.buttonHovered = false
+    }
+
 
     Item {
         anchors.top: parent.topBar
@@ -37,7 +46,7 @@ MouseArea {
             color: Colors.secondaryContainer_fg
         }
     }
-    
+
     Rectangle {
         anchors.fill: parent
         color: "transparent"
@@ -46,18 +55,11 @@ MouseArea {
         Text {
             id: notificationText
             anchors.centerIn: parent
-            // text: Quickshell.iconPath("discord") 
+            // text: Quickshell.iconPath("discord")
-            text: NotificationS.soundEnabled ? "󰂚" : "󰂛"
+            text: NotificationS.notificationPopupEnabled ? "󰂚" : "󰂛"
             font.pixelSize: Config.bigIconSize(bar.height)
             font.family: Config.font
             color: Colors.secondaryContainer_fg
         }
-
-        // Image{
-        //     id: iconImage
-        //     source: Quickshell.iconPath("discord")
-        //     width: Config.bigIconSize(notificationButton.height)
-        //     height: Config.bigIconSize(notificationButton.height)
-        // }
     }
 }

modules/notification/NotificationBody.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import Quickshell
 import "../../config"
+import "./notificationServer"
 import QtQuick.Layouts
 import QtQuick.Controls
 
@@ -34,8 +35,7 @@ Rectangle {
 
     implicitWidth: screen.width/7
     // implicitHeight: screen.height/7
-    implicitHeight: contentRowRectangle.height+(actionRowRectangle.visible?actionRowRectangle.height:0)+(inlineReplyRectangle.visible?inlineReplyRectangle.height:0)+(progressBar.visible?progressBar
+    implicitHeight: contentRowRectangle.height+(actionRowRectangle.visible?actionRowRectangle.height:0)+(inlineReplyRectangle.visible?inlineReplyRectangle.height:0)+(progressBar.visible?progressBar.height:0)
-.height:0)
 
     color: textBGColor
     border.width: Config.border_width
@@ -46,6 +46,18 @@ Rectangle {
     property color textColor: urgency != 3 ? Colors.primary : Colors.tertiary
     property color textBGColor: urgency != 3 ? Qt.alpha(Colors.primaryContainer, 0.75) : Qt.alpha(Colors.tertiaryContainer, 0.75)
 
+    // Expose hover state for history auto-close (reuse paused logic)
+    readonly property bool isHovered: mouseArea.containsMouse || closingMouseArea.containsMouse || inlineReplyButtonMouseArea.containsMouse || _hoveredActionCount > 0 || inlineReplyTextField.hovered || inlineReplyTextField.activeFocus
+
+    HoverHandler {
+        enabled: root.isHistory
+        blocking: false
+        grabPermissions: PointerHandler.CanTakeOverFromAnything
+        onHoveredChanged: if (hovered) NotificationS.historyHovered = true
+    }
+    // When in history, also keep historyHovered true while any inner element is hovered
+    onIsHoveredChanged: if (isHistory && isHovered) NotificationS.historyHovered = true
+
     function closeNotification(dismiss){
         if (closing) {
             return
@@ -82,8 +94,8 @@ Rectangle {
             height: Math.max(iconRectangle.height, contentRectangle.height)+contentRow.anchors.margins*2
             width: parent.width
             color: "transparent"
-            border.width: Config.border_width
+            // border.width: Config.border_width
-            border.color: textColor
+            // border.color: textColor
 
             MouseArea {
                 id: closingMouseArea
@@ -239,8 +251,8 @@ Rectangle {
             id: actionRowRectangle
             width: root.width
             height: Config.screen_height_to_font_tiny(screen.height)+2*Config.spacing
-            border.width: Config.border_width
+            // border.width: Config.border_width
-            border.color: textColor
+            // border.color: textColor
             color: "transparent"
             visible: notification.actions.length > 0
             Row{
@@ -324,8 +336,8 @@ Rectangle {
             id: inlineReplyRectangle
             width: root.width
             height: Config.screen_height_to_font_small(screen.height)+2*Config.spacing
-            border.width: Config.border_width
+            // border.width: Config.border_width
-            border.color: textColor
+            // border.color: textColor
             color: "transparent"
             visible: notification.hasInlineReply
 
@@ -420,7 +432,7 @@ Rectangle {
                 from: 1.0
                 to: 0.0
                 duration: root.duration
-                paused: (mouseArea.containsMouse || closingMouseArea.containsMouse || inlineReplyButtonMouseArea.containsMouse || root._hoveredActionCount > 0 || inlineReplyTextField.hovered || inlineReplyTextField.activeFocus) && !isHistory
+                paused: isHovered && !isHistory
                 onFinished: root.closeNotification(false)
             }
         }

modules/notification/NotificationHistory.qml

@@ -31,8 +31,7 @@ PanelWindow {
 
     property var grouped: {
         const vals = NotificationS.trackedNotifications.values
-        const len = vals.length
+        if (!vals || vals.length === 0) return []
-        if (len < 0) return []
         let map = {}
         for (let i = 0; i < vals.length; ++i) {
             const n = vals[i]
@@ -65,22 +64,54 @@ PanelWindow {
         expandedGroups = ({})
     }
 
+    function closeNHistory() {
+        console.log("[NotificationHistory] closeNHistory() requested")
+        NotificationS.historyHovered = false
+        NotificationS.closeHistoryRequested()
+    }
+
+    property bool _allowAutoClose: false
+
+    Timer {
+        id: graceTimer
+        interval: 500
+        running: root.visible && !_allowAutoClose
+        repeat: false
+        onTriggered: _allowAutoClose = true
+    }
+
+    Timer {
+        id: hoverCloseTimer
+        interval: NotificationS.historyAutoCloseDelay
+        running: root.visible && _allowAutoClose && !NotificationS.historyHovered && !NotificationS.buttonHovered
+        repeat: false
+        onTriggered: {
+            if (!NotificationS.historyHovered && !NotificationS.buttonHovered) {
+                console.log("[NotificationHistory] Auto-closing after hover timeout (" + interval + "ms)")
+                root.closeNHistory()
+            }
+        }
+    }
+
+    onVisibleChanged: {
+        if (!visible) {
+            NotificationS.historyHovered = false
+            _allowAutoClose = false
+        }
+    }
+    Component.onDestruction: NotificationS.historyHovered = false
 
     FocusScope {
         id: nHistoryScope
+        anchors.fill: parent
         focus: true
 
         Keys.onReleased: function(event) {
             if (event.key === Qt.Key_Escape) {
-                console.log("Pressed Escape, closing JLearner")
+                console.log("Pressed Escape, closing NotificationHistory")
-                notifificationHistoryLoader.active = false
+                root.closeNHistory()
             }
         }
-
-        Rectangle {
-            anchors.fill: parent
-            color: "lightblue"
-        }
     }
 
     Rectangle {
@@ -92,23 +123,16 @@ PanelWindow {
         border.color: textColor
         radius: Config.screen_big_radius_fun(screen.height)
 
-        // Text {
-        //     anchors.centerIn: parent
-        //     font.family: Config.font
-        //     font.pixelSize: bigFontSize
-        //     color: textColor
-        //     wrapMode: Text.Wrap
-        //     text: NotificationS.trackedNotifications.values[0]
-        // }
 
-        // Component.onCompleted: {
+        HoverHandler {
-        //     for (var notification in NotificationS.trackedNotifications.values) {
+            id: backgroundHoverHandler
-        //         console.log("[NotificationHistory]: " + notification.appName + " Notifications")
+            blocking: false
-        //     }
+            grabPermissions: PointerHandler.CanTakeOverFromAnything
-        //     for (var i =0; i < NotificationS.notificationNum; i++) {
+            onHoveredChanged: {
-        //         console.log("[NotificationHistory]: " + NotificationS.trackedNotifications.values[i].appName + " Notifications")
+                NotificationS.historyHovered = hovered
-        //     }
+                if (Config.debug == "Notification") console.log("[NotificationHistory] background hovered:", hovered)
-        // }
+            }
+        }
 
         Column{
             id: bgColumn
@@ -140,12 +164,6 @@ PanelWindow {
                     }
                 }
 
-                // Row{
-                //     id: backgroundCenter
-                //     anchors.centerIn: parent
-                //     spacing: Config.screen_small_bar_spacing_fun(screen.height)
-                // }
-
                 Row{
                     id: backgroundRight
                     anchors.verticalCenter: parent.verticalCenter
@@ -154,7 +172,7 @@ PanelWindow {
                     spacing: Config.screen_spacing_fun(screen.height)
 
                     Text{
-                        text: NotificationS.soundEnabled ? "󰂚" : "󰂛"
+                        text: NotificationS.notificationPopupEnabled ? "󰂚" : "󰂛"
                         font.family: Config.font
                         font.pixelSize: topBar.height*0.75
                         color: textColor
@@ -166,7 +184,16 @@ PanelWindow {
                         implicitWidth: notificationVolumeSwitch.height*2
                         implicitHeight: topBar.height*0.75
                         anchors.verticalCenter: parent.verticalCenter
-                        checked: NotificationS.soundEnabled
+                        checked: NotificationS.notificationPopupEnabled
+                        hoverEnabled: true
+
+                        HoverHandler {
+                            id: switchHoverHandler
+                            cursorShape: Qt.PointingHandCursor
+                            blocking: false
+                            grabPermissions: PointerHandler.CanTakeOverFromAnything
+                            onHoveredChanged: if (hovered) NotificationS.historyHovered = true
+                        }
 
                         indicator: Rectangle {
                             implicitWidth: notificationVolumeSwitch.width
@@ -203,8 +230,8 @@ PanelWindow {
                         }
 
                         onCheckedChanged: {
-                            NotificationS.soundEnabled = notificationVolumeSwitch.checked
+                            NotificationS.notificationPopupEnabled = notificationVolumeSwitch.checked
-                            console.log("NotificationS.soundEnabled:", NotificationS.soundEnabled)
+                            console.log("NotificationS.notificationPopupEnabled:", NotificationS.notificationPopupEnabled)
                         }
                     }
 
@@ -215,6 +242,8 @@ PanelWindow {
                         anchors.verticalCenter: parent.verticalCenter
                         hoverEnabled: true
                         cursorShape: Qt.PointingHandCursor
+
+                        onContainsMouseChanged: if (containsMouse) NotificationS.historyHovered = true
                         Rectangle{
                             anchors.fill: parent
                             color: closeArea.containsMouse ? "red" : textBGColor
@@ -231,7 +260,6 @@ PanelWindow {
                         }
                         onClicked: {
                             root.clearAll()
-                            // closeNHistory()
                         }
                     }
                 }
@@ -239,7 +267,7 @@ PanelWindow {
 
             Rectangle {
                 width: parent.width
-                height: parent.height - topBar.height - bgColumn.spacing //- bgColumn.anchors.margins*2
+                height: parent.height - topBar.height - bgColumn.spacing
                 color: textBGColor
                 radius: Config.screen_big_radius_fun(screen.height)
                 border.width: Config.border_width
@@ -270,12 +298,6 @@ PanelWindow {
                         width: flick.width
                         spacing: Config.spacing
 
-                        // ── Grouped view (only groups with >1 notification are grouped) ──
-                        // Uses root.grouped (sorted by appName). Each app group with
-                        // more than one notification is rendered as a collapsible
-                        // card with a header (appName + count + expand/collapse +
-                        // clear-group). Singletons are rendered directly as a
-                        // NotificationBody without a header.
                         Repeater {
                             id: groupedRepeater
                             model: root.grouped
@@ -288,11 +310,15 @@ PanelWindow {
                                 property bool isExpanded: root.expandedGroups[group.appName] === true
 
                                 width: contentColumn.width
-                                // height adapts to which component is visible
                                 implicitHeight: isGrouped ? groupedCard.implicitHeight : singleBody.implicitHeight
                                 height: implicitHeight
 
-                                // ── Singleton: plain NotificationBody ──
+                                HoverHandler {
+                                    blocking: false
+                                    grabPermissions: PointerHandler.CanTakeOverFromAnything
+                                    onHoveredChanged: if (hovered) NotificationS.historyHovered = true
+                                }
+
                                 NotificationBody {
                                     id: singleBody
                                     visible: !delegateRoot.isGrouped
@@ -306,7 +332,6 @@ PanelWindow {
                                     }
                                 }
 
-                                // ── Grouped card (count > 1) ──
                                 Rectangle {
                                     id: groupedCard
                                     visible: delegateRoot.isGrouped
@@ -336,6 +361,8 @@ PanelWindow {
                                             MouseArea {
                                                 anchors.fill: parent
                                                 cursorShape: Qt.PointingHandCursor
+                                                hoverEnabled: true
+                                                onContainsMouseChanged: if (containsMouse) NotificationS.historyHovered = true
                                                 onClicked: root.toggleGroup(group.appName)
                                             }
 
@@ -387,6 +414,7 @@ PanelWindow {
                                                     height: bigFontSize + Config.spacing
                                                     hoverEnabled: true
                                                     cursorShape: Qt.PointingHandCursor
+                                                    onContainsMouseChanged: if (containsMouse) NotificationS.historyHovered = true
                                                     onClicked: function(mouse) {
                                                         mouse.accepted = true
                                                         root.clearGroup(group.appName)

modules/notification/NotificationHistoryLoader.qml

@@ -15,10 +15,20 @@ Item {  // container, invisible
         active: false
         NotificationHistory {
             id: nHistory
+            // closeNHistory() is defined inside NotificationHistory.qml and
+            // emits NotificationS.closeHistoryRequested(); the loader listens below
+            // and actually deactivates. Keeping instance id for potential direct access.
+        }
+    }
 
-            function closeNHistory() {
+    // React to close requests coming from NotificationHistory (hover timer, Escape)
-                nHistoryLoader.closeNHistory()
+    // or any other component via the singleton signal. This is the single
-            }
+    // source of truth for deactivating the history panel.
+    Connections {
+        target: NotificationS
+        function onCloseHistoryRequested() {
+            console.log("[NotificationHistoryLoader] closeHistoryRequested received -> closing")
+            nHistoryLoader.closeNHistory()
         }
     }
 
@@ -37,11 +47,19 @@ Item {  // container, invisible
     }
 
     function closeNHistory() {
+        // Reset hover states so timer doesn't immediately re-trigger on next open
+        NotificationS.historyHovered = false
+        // buttonHovered is managed by the button itself; don't force false here
+        // in case button is still hovered when history closes
         notifificationHistoryLoader.active = false
     }
 
     function toggleNHistory() {
-        notifificationHistoryLoader.active = !notifificationHistoryLoader.active
+        if (notifificationHistoryLoader.active) {
+            closeNHistory()
+        } else {
+            openNHistory()
+        }
     }
 
     Component.onCompleted: {

modules/notification/notificationServer/NotificationServer.qml

@@ -12,13 +12,24 @@ Item {
 
     property var focusedMonitor: null
     property var newestNotification: null
-    property bool soundEnabled: true
+    property bool notificationPopupEnabled: true
 
     property alias trackedNotifications: notificationServer.trackedNotifications
     property int notificationNum: trackedNotifications.values.length
 
     signal notificationReceived(var notification)
 
+    // ── Hover state for history auto-close ──
+    // Updated by NotificationHistory.qml (PanelWindow hover) and NotificationButton.qml (bar button hover)
+    property bool historyHovered: false
+    property bool buttonHovered: false
+    property int historyAutoCloseDelay: 1000
+    signal closeHistoryRequested()
+
+    // Debug logging for hover transitions
+    onHistoryHoveredChanged: Config.debug == "Notification" && console.log("[NotificationServer] historyHovered:", historyHovered)
+    onButtonHoveredChanged: Config.debug == "Notification" && console.log("[NotificationServer] buttonHovered:", buttonHovered)
+
     function correctMonitor(screen) {
         return (Hyprland.monitorFor(screen) === focusedMonitor)
     }
@@ -83,7 +94,7 @@ Item {
             repeat: false
 
             onTriggered: {
-                if((!notification.lastGeneration && notificationServerState.soundEnabled) || Config.debug == "Notification"){
+                if((!notification.lastGeneration && notificationServerState.notificationPopupEnabled) || Config.debug == "Notification"){
                     focusedMonitor = Hyprland.focusedMonitor
                     notificationReceived(notification)
                     notificationSound.play()