modules/Backlight.qml

@@ -16,8 +16,7 @@ M.BarSection {
     property bool _osdActive: false
     readonly property bool _showPanel: root._hovered || _panelHovered || _osdActive
 
-    onPercentChanged: if (percent > 0)
+    onPercentChanged: if (percent > 0) _flashPanel()
-        _flashPanel()
 
     function _flashPanel() {
         _osdActive = true;
@@ -57,8 +56,7 @@ M.BarSection {
         stdout: StdioCollector {
             onStreamFinished: {
                 const dev = text.trim();
-                if (dev)
+                if (dev) root._blDev = "/sys/class/backlight/" + dev;
-                    root._blDev = "/sys/class/backlight/" + dev;
             }
         }
     }
@@ -116,7 +114,10 @@ M.BarSection {
         anchors.left: true
 
         margins.top: 0
-        margins.left: Math.max(0, Math.min(Math.round(root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0) - implicitWidth / 2), (panel.screen?.width ?? 1920) - implicitWidth))
+        margins.left: Math.max(0, Math.min(
+            Math.round(root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0) - implicitWidth / 2),
+            (panel.screen?.width ?? 1920) - implicitWidth
+        ))
 
         implicitWidth: panelContent.width
         implicitHeight: panelContent.height
@@ -137,38 +138,14 @@ M.BarSection {
 
         ParallelAnimation {
             id: showAnim
-            NumberAnimation {
+            NumberAnimation { target: panelContent; property: "opacity"; to: 1; duration: 120; easing.type: Easing.OutCubic }
-                target: panelContent
+            NumberAnimation { target: panelContent; property: "y"; to: 0; duration: 150; easing.type: Easing.OutCubic }
-                property: "opacity"
-                to: 1
-                duration: 120
-                easing.type: Easing.OutCubic
-            }
-            NumberAnimation {
-                target: panelContent
-                property: "y"
-                to: 0
-                duration: 150
-                easing.type: Easing.OutCubic
-            }
         }
 
         ParallelAnimation {
             id: hideAnim
-            NumberAnimation {
+            NumberAnimation { target: panelContent; property: "opacity"; to: 0; duration: 150; easing.type: Easing.InCubic }
-                target: panelContent
+            NumberAnimation { target: panelContent; property: "y"; to: -panelContent.height; duration: 150; easing.type: Easing.InCubic }
-                property: "opacity"
-                to: 0
-                duration: 150
-                easing.type: Easing.InCubic
-            }
-            NumberAnimation {
-                target: panelContent
-                property: "y"
-                to: -panelContent.height
-                duration: 150
-                easing.type: Easing.InCubic
-            }
             onFinished: panel._winVisible = false
         }
 
@@ -233,11 +210,7 @@ M.BarSection {
                         color: M.Theme.base0A
                         radius: 3
 
-                        Behavior on width {
+                        Behavior on width { NumberAnimation { duration: 80 } }
-                            NumberAnimation {
-                                duration: 80
-                            }
-                        }
                     }
 
                     MouseArea {
@@ -245,10 +218,7 @@ M.BarSection {
                         anchors.margins: -6
                         cursorShape: Qt.PointingHandCursor
                         onPressed: mouse => _set(mouse)
-                        onPositionChanged: mouse => {
+                        onPositionChanged: mouse => { if (pressed) _set(mouse); }
-                            if (pressed)
-                                _set(mouse);
-                        }
                         function _set(mouse) {
                             root.setPercent(mouse.x / slider.width * 100);
                         }

modules/Bar.qml

@@ -34,14 +34,8 @@ PanelWindow {
         height: 3
         gradient: Gradient {
             orientation: Gradient.Horizontal
-            GradientStop {
+            GradientStop { position: 0; color: M.Theme.base0C }
-                position: 0
+            GradientStop { position: 1; color: M.Theme.base09 }
-                color: M.Theme.base0C
-            }
-            GradientStop {
-                position: 1
-                color: M.Theme.base09
-            }
         }
     }
 
@@ -59,12 +53,8 @@ PanelWindow {
 
             M.BarGroup {
                 borderColor: M.Theme.base0D
-                M.Clock {
+                M.Clock { visible: M.Modules.clock.enable }
-                    visible: M.Modules.clock.enable
+                M.Notifications { visible: M.Modules.notifications.enable }
-                }
-                M.Notifications {
-                    visible: M.Modules.notifications.enable
-                }
             }
         }
 
@@ -77,17 +67,11 @@ PanelWindow {
 
             M.BarGroup {
                 borderColor: M.Theme.base0D
-                M.Workspaces {
+                M.Workspaces { bar: bar; visible: M.Modules.workspaces.enable }
-                    bar: bar
-                    visible: M.Modules.workspaces.enable
-                }
             }
             M.BarGroup {
                 borderColor: M.Theme.base0D
-                M.Tray {
+                M.Tray { bar: bar; visible: M.Modules.tray.enable }
-                    bar: bar
-                    visible: M.Modules.tray.enable
-                }
             }
             M.BarGroup {
                 borderColor: M.Theme.base0D
@@ -96,9 +80,7 @@ PanelWindow {
                     visible: M.Modules.windowTitle.enable
                 }
             }
-            Item {
+            Item { Layout.fillWidth: true }
-                Layout.fillWidth: true
-            }
         }
 
         // ---- right ----
@@ -108,73 +90,45 @@ PanelWindow {
             anchors.verticalCenter: parent.verticalCenter
             spacing: M.Theme.barSpacing
 
-            Item {
+            Item { Layout.fillWidth: true }
-                Layout.fillWidth: true
-            }
 
             // Media
             M.BarGroup {
                 borderColor: M.Theme.base0E
-                M.Mpris {
+                M.Mpris { bar: bar }
-                    bar: bar
+                M.Volume { visible: M.Modules.volume.enable }
-                }
-                M.Volume {
-                    visible: M.Modules.volume.enable
-                }
             }
 
             // Connectivity
             M.BarGroup {
                 borderColor: M.Theme.base0D
-                M.Network {
+                M.Network { bar: bar; visible: M.Modules.network.enable }
-                    bar: bar
+                M.Bluetooth { bar: bar }
-                    visible: M.Modules.network.enable
-                }
-                M.Bluetooth {
-                    bar: bar
-                }
             }
 
             // Controls
             M.BarGroup {
                 borderColor: M.Theme.base0A
                 M.Backlight {}
-                M.PowerProfile {
+                M.PowerProfile { visible: M.Modules.powerProfile.enable }
-                    visible: M.Modules.powerProfile.enable
+                M.IdleInhibitor { visible: M.Modules.idleInhibitor.enable }
-                }
-                M.IdleInhibitor {
-                    visible: M.Modules.idleInhibitor.enable
-                }
             }
 
             // Stats
             M.BarGroup {
                 borderColor: M.Theme.base08
-                M.Cpu {
+                M.Cpu { visible: M.Modules.cpu.enable }
-                    visible: M.Modules.cpu.enable
+                M.Memory { visible: M.Modules.memory.enable }
-                }
+                M.Temperature { visible: M.Modules.temperature.enable }
-                M.Memory {
+                M.Weather { visible: M.Modules.weather.enable }
-                    visible: M.Modules.memory.enable
+                M.Disk { visible: M.Modules.disk.enable }
-                }
-                M.Temperature {
-                    visible: M.Modules.temperature.enable
-                }
-                M.Weather {
-                    visible: M.Modules.weather.enable
-                }
-                M.Disk {
-                    visible: M.Modules.disk.enable
-                }
             }
 
             // Power
             M.BarGroup {
                 borderColor: M.Theme.base08
                 M.Battery {}
-                M.Power {
+                M.Power { bar: bar; visible: M.Modules.power.enable }
-                    bar: bar
-                    visible: M.Modules.power.enable
-                }
             }
         }
     }

modules/BarGroup.qml

@@ -41,14 +41,8 @@ Item {
         anchors.fill: parent
         radius: M.Theme.radius
         gradient: Gradient {
-            GradientStop {
+            GradientStop { position: 0; color: Qt.rgba(root.borderColor.r, root.borderColor.g, root.borderColor.b, 0.15) }
-                position: 0
+            GradientStop { position: 1; color: "transparent" }
-                color: Qt.rgba(root.borderColor.r, root.borderColor.g, root.borderColor.b, 0.15)
-            }
-            GradientStop {
-                position: 1
-                color: "transparent"
-            }
         }
     }
 

modules/BarIcon.qml

@@ -21,23 +21,9 @@ Text {
 
     SequentialAnimation {
         id: _crossfade
-        NumberAnimation {
+        NumberAnimation { target: root; property: "opacity"; to: 0; duration: 60; easing.type: Easing.InQuad }
-            target: root
+        ScriptAction { script: root._displayIcon = root._pendingIcon }
-            property: "opacity"
+        NumberAnimation { target: root; property: "opacity"; to: 1; duration: 100; easing.type: Easing.OutQuad }
-            to: 0
-            duration: 60
-            easing.type: Easing.InQuad
-        }
-        ScriptAction {
-            script: root._displayIcon = root._pendingIcon
-        }
-        NumberAnimation {
-            target: root
-            property: "opacity"
-            to: 1
-            duration: 100
-            easing.type: Easing.OutQuad
-        }
     }
     color: M.Theme.base05
     font.pixelSize: M.Theme.fontSize + 1

modules/BarSection.qml

@@ -8,11 +8,7 @@ Row {
     property string tooltip: ""
     property bool _hovered: false
 
-    Behavior on opacity {
+    Behavior on opacity { NumberAnimation { duration: 150 } }
-        NumberAnimation {
-            duration: 150
-        }
-    }
 
     layer.enabled: _hovered
     layer.effect: MultiEffect {

modules/Battery.qml

@@ -28,37 +28,19 @@ M.BarSection {
     SequentialAnimation {
         running: root._critical
         loops: Animation.Infinite
-        NumberAnimation {
+        NumberAnimation { target: root; property: "_blinkOpacity"; to: 0.2; duration: 400; easing.type: Easing.InOutQuad }
-            target: root
+        NumberAnimation { target: root; property: "_blinkOpacity"; to: 1;   duration: 400; easing.type: Easing.InOutQuad }
-            property: "_blinkOpacity"
+        onRunningChanged: if (!running) root._blinkOpacity = 1
-            to: 0.2
-            duration: 400
-            easing.type: Easing.InOutQuad
-        }
-        NumberAnimation {
-            target: root
-            property: "_blinkOpacity"
-            to: 1
-            duration: 400
-            easing.type: Easing.InOutQuad
-        }
-        onRunningChanged: if (!running)
-            root._blinkOpacity = 1
     }
 
     property bool _warnSent: false
     property bool _critSent: false
 
-    onChargingChanged: {
+    onChargingChanged: { _warnSent = false; _critSent = false; }
-        _warnSent = false;
-        _critSent = false;
-    }
     onPctChanged: {
-        if (charging)
+        if (charging) return;
-            return;
         if (pct < _critThresh && !_critSent) {
-            _critSent = true;
+            _critSent = true; _warnSent = true;
-            _warnSent = true;
             _notif.command = ["notify-send", "--urgency=critical", "--icon=battery-low", "--category=device", "Very Low Battery", "Connect to power now!"];
             _notif.running = true;
         } else if (pct < _warnThresh && !_warnSent) {
@@ -68,9 +50,7 @@ M.BarSection {
         }
     }
 
-    Process {
+    Process { id: _notif }
-        id: _notif
-    }
 
     M.BarIcon {
         icon: {

modules/Bluetooth.qml

@@ -72,10 +72,7 @@ M.BarSection {
     TapHandler {
         acceptedButtons: Qt.LeftButton
         cursorShape: Qt.PointingHandCursor
-        onTapped: {
+        onTapped: menuLoader.active = !menuLoader.active
-            menuLoader.active = !menuLoader.active;
-            M.FlyoutState.visible = false;
-        }
     }
 
     TapHandler {

modules/BluetoothMenu.qml

@@ -13,18 +13,23 @@ M.PopupPanel {
     property Process _scanner: Process {
         id: scanner
         running: true
-        command: ["sh", "-c", "bluetoothctl devices Paired 2>/dev/null | while read -r _ mac name; do " + "info=$(bluetoothctl info \"$mac\" 2>/dev/null); " + "conn=$(echo \"$info\" | grep -c 'Connected: yes'); " + "bat=$(echo \"$info\" | awk -F'[(): ]' '/Battery Percentage/{for(i=1;i<=NF;i++) if($i+0==$i && $i!=\"\") print $i}'); " + "echo \"$mac:$conn:${bat:-}:$name\"; " + "done"]
+        command: ["sh", "-c",
+            "bluetoothctl devices Paired 2>/dev/null | while read -r _ mac name; do " +
+            "info=$(bluetoothctl info \"$mac\" 2>/dev/null); " +
+            "conn=$(echo \"$info\" | grep -c 'Connected: yes'); " +
+            "bat=$(echo \"$info\" | awk -F'[(): ]' '/Battery Percentage/{for(i=1;i<=NF;i++) if($i+0==$i && $i!=\"\") print $i}'); " +
+            "echo \"$mac:$conn:${bat:-}:$name\"; " +
+            "done"
+        ]
         stdout: StdioCollector {
             onStreamFinished: {
                 const devs = [];
                 for (const line of text.trim().split("\n")) {
-                    if (!line)
+                    if (!line) continue;
-                        continue;
                     const i1 = line.indexOf(":");
                     const i2 = line.indexOf(":", i1 + 1);
                     const i3 = line.indexOf(":", i2 + 1);
-                    if (i3 < 0)
+                    if (i3 < 0) continue;
-                        continue;
                     devs.push({
                         mac: line.slice(0, i1),
                         connected: line.slice(i1 + 1, i2) === "1",
@@ -33,8 +38,7 @@ M.PopupPanel {
                     });
                 }
                 devs.sort((a, b) => {
-                    if (a.connected !== b.connected)
+                    if (a.connected !== b.connected) return a.connected ? -1 : 1;
-                        return a.connected ? -1 : 1;
                     return a.name.localeCompare(b.name);
                 });
                 menuWindow._devices = devs;
@@ -47,8 +51,7 @@ M.PopupPanel {
         property string action: ""
         property string mac: ""
         command: ["bluetoothctl", action, mac]
-        onRunningChanged: if (!running)
+        onRunningChanged: if (!running) scanner.running = true
-            scanner.running = true
     }
 
     Repeater {

modules/Flyout.qml

@@ -33,45 +33,24 @@ PanelWindow {
     anchors.left: true
 
     margins.top: 0
-    margins.left: Math.max(0, Math.min(Math.round(M.FlyoutState.itemX - implicitWidth / 2), screen.width - implicitWidth))
+    margins.left: Math.max(0, Math.min(
+        Math.round(M.FlyoutState.itemX - implicitWidth / 2),
+        screen.width - implicitWidth
+    ))
 
     implicitWidth: label.implicitWidth + M.Theme.barPadding * 2
     implicitHeight: label.implicitHeight + M.Theme.barPadding * 2
 
     ParallelAnimation {
         id: showAnim
-        NumberAnimation {
+        NumberAnimation { target: content; property: "opacity"; to: 1; duration: 120; easing.type: Easing.OutCubic }
-            target: content
+        NumberAnimation { target: content; property: "y"; to: 0; duration: 150; easing.type: Easing.OutCubic }
-            property: "opacity"
-            to: 1
-            duration: 120
-            easing.type: Easing.OutCubic
-        }
-        NumberAnimation {
-            target: content
-            property: "y"
-            to: 0
-            duration: 150
-            easing.type: Easing.OutCubic
-        }
     }
 
     ParallelAnimation {
         id: hideAnim
-        NumberAnimation {
+        NumberAnimation { target: content; property: "opacity"; to: 0; duration: 150; easing.type: Easing.InCubic }
-            target: content
+        NumberAnimation { target: content; property: "y"; to: -content.height; duration: 150; easing.type: Easing.InCubic }
-            property: "opacity"
-            to: 0
-            duration: 150
-            easing.type: Easing.InCubic
-        }
-        NumberAnimation {
-            target: content
-            property: "y"
-            to: -content.height
-            duration: 150
-            easing.type: Easing.InCubic
-        }
         onFinished: root._winVisible = false
     }
 

modules/Modules.qml

@@ -7,77 +7,25 @@ import Quickshell.Io
 QtObject {
     id: root
 
-    property var workspaces: ({
+    property var workspaces: ({ enable: true })
-            enable: true
+    property var tray: ({ enable: true })
-        })
+    property var windowTitle: ({ enable: true })
-    property var tray: ({
+    property var clock: ({ enable: true })
-            enable: true
+    property var notifications: ({ enable: true })
-        })
+    property var mpris: ({ enable: true })
-    property var windowTitle: ({
+    property var volume: ({ enable: true })
-            enable: true
+    property var bluetooth: ({ enable: true, interval: 5000 })
-        })
+    property var backlight: ({ enable: true, step: 5 })
-    property var clock: ({
+    property var network: ({ enable: true, interval: 5000 })
-            enable: true
+    property var powerProfile: ({ enable: true, interval: 5000 })
-        })
+    property var idleInhibitor: ({ enable: true })
-    property var notifications: ({
+    property var weather: ({ enable: true, args: ["--nerd"], interval: 3600000 })
-            enable: true
+    property var temperature: ({ enable: true, interval: 2000, warm: 60, hot: 80 })
-        })
+    property var cpu: ({ enable: true, interval: 1000 })
-    property var mpris: ({
+    property var memory: ({ enable: true, interval: 2000 })
-            enable: true
+    property var disk: ({ enable: true, interval: 30000 })
-        })
+    property var battery: ({ enable: true, warning: 25, critical: 15 })
-    property var volume: ({
+    property var power: ({ enable: true })
-            enable: true
-        })
-    property var bluetooth: ({
-            enable: true,
-            interval: 5000
-        })
-    property var backlight: ({
-            enable: true,
-            step: 5
-        })
-    property var network: ({
-            enable: true,
-            interval: 5000
-        })
-    property var powerProfile: ({
-            enable: true,
-            interval: 5000
-        })
-    property var idleInhibitor: ({
-            enable: true
-        })
-    property var weather: ({
-            enable: true,
-            args: ["--nerd"],
-            interval: 3600000
-        })
-    property var temperature: ({
-            enable: true,
-            interval: 2000,
-            warm: 60,
-            hot: 80
-        })
-    property var cpu: ({
-            enable: true,
-            interval: 1000
-        })
-    property var memory: ({
-            enable: true,
-            interval: 2000
-        })
-    property var disk: ({
-            enable: true,
-            interval: 30000
-        })
-    property var battery: ({
-            enable: true,
-            warning: 25,
-            critical: 15
-        })
-    property var power: ({
-            enable: true
-        })
 
     property FileView _file: FileView {
         path: (Quickshell.env("XDG_CONFIG_HOME") || (Quickshell.env("HOME") + "/.config")) + "/nova-shell/modules.json"
@@ -94,15 +42,12 @@ QtObject {
             return;
         }
         for (const k of Object.keys(data)) {
-            if (!(k in root))
+            if (!(k in root)) continue;
-                continue;
             const v = data[k];
             if (typeof v === "object" && v !== null)
                 root[k] = Object.assign({}, root[k], v);
             else if (typeof v === "boolean")
-                root[k] = Object.assign({}, root[k], {
+                root[k] = Object.assign({}, root[k], { enable: v });
-                    enable: v
-                });
         }
     }
 }

modules/Mpris.qml

@@ -19,12 +19,8 @@ M.BarSection {
     // Cache art URL at root level so it's captured even when panel is hidden
     readonly property string _artUrl: player?.trackArtUrl ?? ""
     readonly property string _currentTrack: player?.trackTitle ?? ""
-    on_ArtUrlChanged: if (_artUrl)
+    on_ArtUrlChanged: if (_artUrl) _cachedArt = _artUrl
-        _cachedArt = _artUrl
+    on_CurrentTrackChanged: if (_currentTrack !== _artTrack) { _artTrack = _currentTrack; _cachedArt = _artUrl || "" }
-    on_CurrentTrackChanged: if (_currentTrack !== _artTrack) {
-        _artTrack = _currentTrack;
-        _cachedArt = _artUrl || "";
-    }
 
     // Preload art while panel is hidden — ensures QML image cache has the pixels
     Image {
@@ -93,7 +89,10 @@ M.BarSection {
         anchors.left: true
 
         margins.top: 0
-        margins.left: Math.max(0, Math.min(Math.round(root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0) - implicitWidth / 2), (panel.screen?.width ?? 1920) - implicitWidth))
+        margins.left: Math.max(0, Math.min(
+            Math.round(root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0) - implicitWidth / 2),
+            (panel.screen?.width ?? 1920) - implicitWidth
+        ))
 
         implicitWidth: panelContent.width
         implicitHeight: panelContent.height
@@ -114,38 +113,14 @@ M.BarSection {
 
         ParallelAnimation {
             id: showAnim
-            NumberAnimation {
+            NumberAnimation { target: panelContent; property: "opacity"; to: 1; duration: 120; easing.type: Easing.OutCubic }
-                target: panelContent
+            NumberAnimation { target: panelContent; property: "y"; to: 0; duration: 150; easing.type: Easing.OutCubic }
-                property: "opacity"
-                to: 1
-                duration: 120
-                easing.type: Easing.OutCubic
-            }
-            NumberAnimation {
-                target: panelContent
-                property: "y"
-                to: 0
-                duration: 150
-                easing.type: Easing.OutCubic
-            }
         }
 
         ParallelAnimation {
             id: hideAnim
-            NumberAnimation {
+            NumberAnimation { target: panelContent; property: "opacity"; to: 0; duration: 150; easing.type: Easing.InCubic }
-                target: panelContent
+            NumberAnimation { target: panelContent; property: "y"; to: -panelContent.height; duration: 150; easing.type: Easing.InCubic }
-                property: "opacity"
-                to: 0
-                duration: 150
-                easing.type: Easing.InCubic
-            }
-            NumberAnimation {
-                target: panelContent
-                property: "y"
-                to: -panelContent.height
-                duration: 150
-                easing.type: Easing.InCubic
-            }
             onFinished: panel._winVisible = false
         }
 
@@ -197,14 +172,10 @@ M.BarSection {
                     source: root._cachedArt
 
                     property bool _hasArt: false
-                    onStatusChanged: if (status === Image.Ready)
+                    onStatusChanged: if (status === Image.Ready) _hasArt = true
-                        _hasArt = true
                     Connections {
                         target: root
-                        function on_CachedArtChanged() {
+                        function on_CachedArtChanged() { if (!root._cachedArt) _artImg._hasArt = false }
-                            if (!root._cachedArt)
-                                _artImg._hasArt = false;
-                        }
                     }
                 }
 
@@ -215,14 +186,8 @@ M.BarSection {
                     height: 40
                     visible: _artImg.visible
                     gradient: Gradient {
-                        GradientStop {
+                        GradientStop { position: 0; color: "transparent" }
-                            position: 0
+                        GradientStop { position: 1; color: M.Theme.base01 }
-                            color: "transparent"
-                        }
-                        GradientStop {
-                            position: 1
-                            color: M.Theme.base01
-                        }
                     }
                 }
 
@@ -264,8 +229,7 @@ M.BarSection {
                         width: parent.width
                         text: {
                             const p = root.player;
-                            if (!p)
+                            if (!p) return "";
-                                return "";
                             const artist = Array.isArray(p.trackArtists) ? p.trackArtists.join(", ") : (p.trackArtists || "");
                             return [artist, p.trackAlbum].filter(s => s).join(" \u2014 ");
                         }

modules/Network.qml

@@ -10,8 +10,7 @@ M.BarSection {
         const parts = [];
         if (root.state === "wifi") {
             parts.push("WiFi: " + root.essid);
-            if (root.signal)
+            if (root.signal) parts.push("Signal: " + root.signal + "%");
-                parts.push("Signal: " + root.signal + "%");
         } else if (root.state === "eth") {
             parts.push("Ethernet");
         } else if (root.state === "linked") {
@@ -19,10 +18,8 @@ M.BarSection {
         } else {
             return "Disconnected";
         }
-        if (root.ipAddr)
+        if (root.ipAddr) parts.push("IP: " + root.ipAddr);
-            parts.push("IP: " + root.ipAddr);
+        if (root.ifname) parts.push("Interface: " + root.ifname);
-        if (root.ifname)
-            parts.push("Interface: " + root.ifname);
         return parts.join("\n");
     }
 
@@ -99,10 +96,7 @@ M.BarSection {
 
     TapHandler {
         cursorShape: Qt.PointingHandCursor
-        onTapped: {
+        onTapped: menuLoader.active = !menuLoader.active
-            menuLoader.active = !menuLoader.active;
-            M.FlyoutState.visible = false;
-        }
     }
 
     Loader {

modules/NetworkMenu.qml

@@ -13,7 +13,12 @@ M.PopupPanel {
     property Process _scanner: Process {
         id: scanner
         running: true
-        command: ["sh", "-c", "echo '---CONNS---';" + "nmcli -t -f NAME,UUID,TYPE,ACTIVE connection show 2>/dev/null;" + "echo '---WIFI---';" + "nmcli -t -f SSID,SIGNAL device wifi list --rescan no 2>/dev/null"]
+        command: ["sh", "-c",
+            "echo '---CONNS---';" +
+            "nmcli -t -f NAME,UUID,TYPE,ACTIVE connection show 2>/dev/null;" +
+            "echo '---WIFI---';" +
+            "nmcli -t -f SSID,SIGNAL device wifi list --rescan no 2>/dev/null"
+        ]
         stdout: StdioCollector {
             onStreamFinished: {
                 const sections = text.split("---WIFI---");
@@ -23,19 +28,16 @@ M.PopupPanel {
                 // Visible SSIDs with signal
                 const visible = {};
                 for (const l of wifiLines.trim().split("\n")) {
-                    if (!l)
+                    if (!l) continue;
-                        continue;
                     const parts = l.split(":");
                     const ssid = parts[0];
-                    if (ssid)
+                    if (ssid) visible[ssid] = parseInt(parts[1]) || 0;
-                        visible[ssid] = parseInt(parts[1]) || 0;
                 }
 
                 // Saved connections — filter: show wired always, wifi only if visible
                 const nets = [];
                 for (const l of connLines.trim().split("\n")) {
-                    if (!l)
+                    if (!l) continue;
-                        continue;
                     const parts = l.split(":");
                     const name = parts[0];
                     const uuid = parts[1];
@@ -43,8 +45,7 @@ M.PopupPanel {
                     const active = parts[3] === "yes";
                     const isWifi = type.includes("wireless");
 
-                    if (isWifi && !(name in visible))
+                    if (isWifi && !(name in visible)) continue;
-                        continue;
 
                     nets.push({
                         name: name,
@@ -57,10 +58,8 @@ M.PopupPanel {
 
                 // Active first, then by signal (wifi) or name
                 nets.sort((a, b) => {
-                    if (a.active !== b.active)
+                    if (a.active !== b.active) return a.active ? -1 : 1;
-                        return a.active ? -1 : 1;
+                    if (a.signal >= 0 && b.signal >= 0) return b.signal - a.signal;
-                    if (a.signal >= 0 && b.signal >= 0)
-                        return b.signal - a.signal;
                     return a.name.localeCompare(b.name);
                 });
 
@@ -73,16 +72,14 @@ M.PopupPanel {
         id: connectProc
         property string uuid: ""
         command: ["nmcli", "connection", "up", uuid]
-        onRunningChanged: if (!running)
+        onRunningChanged: if (!running) scanner.running = true
-            scanner.running = true
     }
 
     property Process _disconnectProc: Process {
         id: disconnectProc
         property string uuid: ""
         command: ["nmcli", "connection", "down", uuid]
-        onRunningChanged: if (!running)
+        onRunningChanged: if (!running) scanner.running = true
-            scanner.running = true
     }
 
     Repeater {

modules/Notifications.qml

@@ -57,31 +57,17 @@ M.BarSection {
             id: countScale
             origin.x: countLabel.width / 2
             origin.y: countLabel.height / 2
-            xScale: 1
+            xScale: 1; yScale: 1
-            yScale: 1
         }
 
         SequentialAnimation {
             id: popAnim
-            NumberAnimation {
+            NumberAnimation { target: countScale; properties: "xScale,yScale"; to: 1.4; duration: 100; easing.type: Easing.OutQuad }
-                target: countScale
+            NumberAnimation { target: countScale; properties: "xScale,yScale"; to: 1.0; duration: 200; easing.type: Easing.OutElastic }
-                properties: "xScale,yScale"
-                to: 1.4
-                duration: 100
-                easing.type: Easing.OutQuad
-            }
-            NumberAnimation {
-                target: countScale
-                properties: "xScale,yScale"
-                to: 1.0
-                duration: 200
-                easing.type: Easing.OutElastic
-            }
         }
     }
 
-    onCountChanged: if (count > 0)
+    onCountChanged: if (count > 0) popAnim.start()
-        popAnim.start()
 
     TapHandler {
         acceptedButtons: Qt.LeftButton

modules/Osd.qml

@@ -35,45 +35,24 @@ PanelWindow {
     anchors.left: true
 
     margins.top: 0
-    margins.left: Math.max(0, Math.min(Math.round(M.OsdState.itemX - implicitWidth / 2), screen.width - implicitWidth))
+    margins.left: Math.max(0, Math.min(
+        Math.round(M.OsdState.itemX - implicitWidth / 2),
+        screen.width - implicitWidth
+    ))
 
     implicitWidth: 200
     implicitHeight: 48
 
     ParallelAnimation {
         id: showAnim
-        NumberAnimation {
+        NumberAnimation { target: content; property: "opacity"; to: 1; duration: 150; easing.type: Easing.OutCubic }
-            target: content
+        NumberAnimation { target: content; property: "y"; to: 0; duration: 200; easing.type: Easing.OutCubic }
-            property: "opacity"
-            to: 1
-            duration: 150
-            easing.type: Easing.OutCubic
-        }
-        NumberAnimation {
-            target: content
-            property: "y"
-            to: 0
-            duration: 200
-            easing.type: Easing.OutCubic
-        }
     }
 
     ParallelAnimation {
         id: hideAnim
-        NumberAnimation {
+        NumberAnimation { target: content; property: "opacity"; to: 0; duration: 250; easing.type: Easing.InCubic }
-            target: content
+        NumberAnimation { target: content; property: "y"; to: -content.height; duration: 250; easing.type: Easing.InCubic }
-            property: "opacity"
-            to: 0
-            duration: 250
-            easing.type: Easing.InCubic
-        }
-        NumberAnimation {
-            target: content
-            property: "y"
-            to: -content.height
-            duration: 250
-            easing.type: Easing.InCubic
-        }
         onFinished: root._winVisible = false
     }
 
@@ -125,10 +104,7 @@ PanelWindow {
                     radius: 3
 
                     Behavior on width {
-                        NumberAnimation {
+                        NumberAnimation { duration: 120; easing.type: Easing.OutCubic }
-                            duration: 120
-                            easing.type: Easing.OutCubic
-                        }
                     }
                 }
             }

modules/PopupPanel.qml

@@ -14,7 +14,7 @@ PanelWindow {
     required property real anchorX
     property real panelWidth: 220
 
-    signal dismissed
+    signal dismissed()
 
     visible: true
     color: "transparent"
@@ -44,7 +44,10 @@ PanelWindow {
     Item {
         id: panel
 
-        x: Math.max(0, Math.min(Math.round(root.anchorX - contentCol.width / 2), root.width - contentCol.width))
+        x: Math.max(0, Math.min(
+            Math.round(root.anchorX - contentCol.width / 2),
+            root.width - contentCol.width
+        ))
         y: 0
         width: contentCol.width
         height: contentCol.height
@@ -76,40 +79,14 @@ PanelWindow {
 
     ParallelAnimation {
         id: showAnim
-        NumberAnimation {
+        NumberAnimation { target: panel; property: "opacity"; from: 0; to: 1; duration: 150; easing.type: Easing.OutCubic }
-            target: panel
+        NumberAnimation { target: panel; property: "y"; from: -panel.height; to: 0; duration: 200; easing.type: Easing.OutCubic }
-            property: "opacity"
-            from: 0
-            to: 1
-            duration: 150
-            easing.type: Easing.OutCubic
-        }
-        NumberAnimation {
-            target: panel
-            property: "y"
-            from: -panel.height
-            to: 0
-            duration: 200
-            easing.type: Easing.OutCubic
-        }
     }
 
     ParallelAnimation {
         id: hideAnim
-        NumberAnimation {
+        NumberAnimation { target: panel; property: "opacity"; to: 0; duration: 150; easing.type: Easing.InCubic }
-            target: panel
+        NumberAnimation { target: panel; property: "y"; to: -panel.height; duration: 150; easing.type: Easing.InCubic }
-            property: "opacity"
-            to: 0
-            duration: 150
-            easing.type: Easing.InCubic
-        }
-        NumberAnimation {
-            target: panel
-            property: "y"
-            to: -panel.height
-            duration: 150
-            easing.type: Easing.InCubic
-        }
         onFinished: root.dismissed()
     }
 }

modules/Power.qml

@@ -18,10 +18,7 @@ M.BarIcon {
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
-        onClicked: {
+        onClicked: menuLoader.active = !menuLoader.active
-            menuLoader.active = !menuLoader.active;
-            M.FlyoutState.visible = false;
-        }
     }
 
     Loader {

modules/PowerMenu.qml

@@ -18,36 +18,11 @@ M.PopupPanel {
 
     Repeater {
         model: [
-            {
+            { label: "Lock",     icon: "\uF023", cmd: ["loginctl", "lock-session"],                                          color: M.Theme.base0D },
-                label: "Lock",
+            { label: "Suspend",  icon: "\uF186", cmd: ["systemctl", "suspend"],                                              color: M.Theme.base0E },
-                icon: "\uF023",
+            { label: "Logout",   icon: "\uF2F5", cmd: menuWindow._isNiri ? ["niri", "msg", "action", "quit"] : ["loginctl", "terminate-user", ""], color: M.Theme.base0A },
-                cmd: ["loginctl", "lock-session"],
+            { label: "Reboot",   icon: "\uF021", cmd: ["systemctl", "reboot"],                                               color: M.Theme.base09 },
-                color: M.Theme.base0D
+            { label: "Shutdown", icon: "\uF011", cmd: ["systemctl", "poweroff"],                                              color: M.Theme.base08 }
-            },
-            {
-                label: "Suspend",
-                icon: "\uF186",
-                cmd: ["systemctl", "suspend"],
-                color: M.Theme.base0E
-            },
-            {
-                label: "Logout",
-                icon: "\uF2F5",
-                cmd: menuWindow._isNiri ? ["niri", "msg", "action", "quit"] : ["loginctl", "terminate-user", ""],
-                color: M.Theme.base0A
-            },
-            {
-                label: "Reboot",
-                icon: "\uF021",
-                cmd: ["systemctl", "reboot"],
-                color: M.Theme.base09
-            },
-            {
-                label: "Shutdown",
-                icon: "\uF011",
-                cmd: ["systemctl", "poweroff"],
-                color: M.Theme.base08
-            }
         ]
 
         delegate: Item {

modules/Temperature.qml

@@ -8,12 +8,9 @@ M.BarSection {
     tooltip: "Temperature: " + root.celsius + "\u00B0C"
 
     property int celsius: 0
-    property color _stateColor: celsius > (M.Modules.temperature.hot || 80) ? M.Theme.base09 : celsius > (M.Modules.temperature.warm || 60) ? M.Theme.base0A : M.Theme.base08
+    property color _stateColor: celsius > (M.Modules.temperature.hot || 80) ? M.Theme.base09
-    Behavior on _stateColor {
+        : celsius > (M.Modules.temperature.warm || 60) ? M.Theme.base0A : M.Theme.base08
-        ColorAnimation {
+    Behavior on _stateColor { ColorAnimation { duration: 300 } }
-            duration: 300
-        }
-    }
 
     FileView {
         id: thermal

modules/Tray.qml

@@ -30,22 +30,9 @@ RowLayout {
             SequentialAnimation {
                 running: iconItem._needsAttention
                 loops: Animation.Infinite
-                NumberAnimation {
+                NumberAnimation { target: iconItem; property: "_pulseOpacity"; to: 0.3; duration: 400; easing.type: Easing.InOutQuad }
-                    target: iconItem
+                NumberAnimation { target: iconItem; property: "_pulseOpacity"; to: 1;   duration: 400; easing.type: Easing.InOutQuad }
-                    property: "_pulseOpacity"
+                onRunningChanged: if (!running) iconItem._pulseOpacity = 1
-                    to: 0.3
-                    duration: 400
-                    easing.type: Easing.InOutQuad
-                }
-                NumberAnimation {
-                    target: iconItem
-                    property: "_pulseOpacity"
-                    to: 1
-                    duration: 400
-                    easing.type: Easing.InOutQuad
-                }
-                onRunningChanged: if (!running)
-                    iconItem._pulseOpacity = 1
             }
 
             Item {
@@ -94,7 +81,6 @@ RowLayout {
                             if (root._activeMenu && root._activeMenu !== menuLoader)
                                 root._activeMenu.active = false;
                             menuLoader.active = true;
-                            M.FlyoutState.visible = false;
                             root._activeMenu = menuLoader;
                         } else {
                             iconItem.modelData.secondaryActivate();

modules/Volume.qml

@@ -120,7 +120,10 @@ M.BarSection {
         anchors.left: true
 
         margins.top: 0
-        margins.left: Math.max(0, Math.min(Math.round(root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0) - implicitWidth / 2), (panel.screen?.width ?? 1920) - implicitWidth))
+        margins.left: Math.max(0, Math.min(
+            Math.round(root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0) - implicitWidth / 2),
+            (panel.screen?.width ?? 1920) - implicitWidth
+        ))
 
         implicitWidth: panelContent.width
         implicitHeight: panelContent.height
@@ -143,38 +146,14 @@ M.BarSection {
 
         ParallelAnimation {
             id: showAnim
-            NumberAnimation {
+            NumberAnimation { target: panelContent; property: "opacity"; to: 1; duration: 120; easing.type: Easing.OutCubic }
-                target: panelContent
+            NumberAnimation { target: panelContent; property: "y"; to: 0; duration: 150; easing.type: Easing.OutCubic }
-                property: "opacity"
-                to: 1
-                duration: 120
-                easing.type: Easing.OutCubic
-            }
-            NumberAnimation {
-                target: panelContent
-                property: "y"
-                to: 0
-                duration: 150
-                easing.type: Easing.OutCubic
-            }
         }
 
         ParallelAnimation {
             id: hideAnim
-            NumberAnimation {
+            NumberAnimation { target: panelContent; property: "opacity"; to: 0; duration: 150; easing.type: Easing.InCubic }
-                target: panelContent
+            NumberAnimation { target: panelContent; property: "y"; to: -panelContent.height; duration: 150; easing.type: Easing.InCubic }
-                property: "opacity"
-                to: 0
-                duration: 150
-                easing.type: Easing.InCubic
-            }
-            NumberAnimation {
-                target: panelContent
-                property: "y"
-                to: -panelContent.height
-                duration: 150
-                easing.type: Easing.InCubic
-            }
             onFinished: panel._winVisible = false
         }
 
@@ -224,8 +203,7 @@ M.BarSection {
                     MouseArea {
                         anchors.fill: parent
                         cursorShape: Qt.PointingHandCursor
-                        onClicked: if (root.sink?.audio)
+                        onClicked: if (root.sink?.audio) root.sink.audio.muted = !root.sink.audio.muted
-                            root.sink.audio.muted = !root.sink.audio.muted
                     }
                 }
 
@@ -251,11 +229,7 @@ M.BarSection {
                         color: root._volumeColor
                         radius: 3
 
-                        Behavior on width {
+                        Behavior on width { NumberAnimation { duration: 80 } }
-                            NumberAnimation {
-                                duration: 80
-                            }
-                        }
                     }
 
                     MouseArea {
@@ -263,13 +237,9 @@ M.BarSection {
                         anchors.margins: -6
                         cursorShape: Qt.PointingHandCursor
                         onPressed: mouse => _setVol(mouse)
-                        onPositionChanged: mouse => {
+                        onPositionChanged: mouse => { if (pressed) _setVol(mouse); }
-                            if (pressed)
-                                _setVol(mouse);
-                        }
                         function _setVol(mouse) {
-                            if (!root.sink?.audio)
+                            if (!root.sink?.audio) return;
-                                return;
                             root.sink.audio.volume = Math.max(0, Math.min(1, mouse.x / slider.width));
                         }
                     }
@@ -311,12 +281,7 @@ M.BarSection {
 
                 property real _targetHeight: root._expanded ? implicitHeight : 0
                 height: _targetHeight
-                Behavior on height {
+                Behavior on height { NumberAnimation { duration: 200; easing.type: Easing.OutCubic } }
-                    NumberAnimation {
-                        duration: 200
-                        easing.type: Easing.OutCubic
-                    }
-                }
 
                 // Separator
                 Rectangle {
@@ -480,13 +445,9 @@ M.BarSection {
                                 anchors.margins: -6
                                 cursorShape: Qt.PointingHandCursor
                                 onPressed: mouse => _set(mouse)
-                                onPositionChanged: mouse => {
+                                onPositionChanged: mouse => { if (pressed) _set(mouse); }
-                                    if (pressed)
-                                        _set(mouse);
-                                }
                                 function _set(mouse) {
-                                    if (!streamEntry.modelData.audio)
+                                    if (!streamEntry.modelData.audio) return;
-                                        return;
                                     streamEntry.modelData.audio.volume = Math.max(0, Math.min(1, mouse.x / streamSlider.width));
                                 }
                             }
@@ -507,10 +468,7 @@ M.BarSection {
                 }
 
                 // Bottom padding
-                Item {
+                Item { width: 1; height: 4 }
-                    width: 1
-                    height: 4
-                }
             }
         }
     }

modules/Workspaces.qml

@@ -90,11 +90,7 @@ Row {
             height: 20
             radius: M.Theme.radius
             color: pill.active ? M.Theme.base0D : (pill._hovered ? M.Theme.base03 : M.Theme.base02)
-            Behavior on color {
+            Behavior on color { ColorAnimation { duration: 150 } }
-                ColorAnimation {
-                    duration: 150
-                }
-            }
 
             Text {
                 anchors.centerIn: parent

nix/hm-module.nix

@@ -66,8 +66,7 @@ in
                   default = true;
                   description = "Enable the ${name} module.";
                 };
-              }
+              } // extra;
-              // extra;
             };
           };
         intervalOpt = default: {
@@ -104,21 +103,18 @@ in
             description = "Brightness adjustment step (%).";
           };
         };
-        temperature = moduleOpt "temperature" (
+        temperature = moduleOpt "temperature" ((intervalOpt 2000) // {
-          (intervalOpt 2000)
+          warm = lib.mkOption {
-          // {
+            type = lib.types.int;
-            warm = lib.mkOption {
+            default = 60;
-              type = lib.types.int;
+            description = "Temperature threshold for warm state (°C).";
-              default = 60;
+          };
-              description = "Temperature threshold for warm state (°C).";
+          hot = lib.mkOption {
-            };
+            type = lib.types.int;
-            hot = lib.mkOption {
+            default = 80;
-              type = lib.types.int;
+            description = "Temperature threshold for hot state (°C).";
-              default = 80;
+          };
-              description = "Temperature threshold for hot state (°C).";
+        });
-            };
-          }
-        );
         battery = moduleOpt "battery" {
           warning = lib.mkOption {
             type = lib.types.int;
@@ -131,21 +127,18 @@ in
             description = "Battery percentage for critical notification and blink.";
           };
         };
-        weather = moduleOpt "weather" (
+        weather = moduleOpt "weather" ((intervalOpt 3600000) // {
-          (intervalOpt 3600000)
+          args = lib.mkOption {
-          // {
+            type = lib.types.listOf lib.types.str;
-            args = lib.mkOption {
+            default = [ "--nerd" ];
-              type = lib.types.listOf lib.types.str;
+            description = "Arguments passed to wttrbar.";
-              default = [ "--nerd" ];
+            example = [
-              description = "Arguments passed to wttrbar.";
+              "--nerd"
-              example = [
+              "--location"
-                "--nerd"
+              "Berlin"
-                "--location"
+            ];
-                "Berlin"
+          };
-              ];
+        });
-            };
-          }
-        );
       };
 
     theme = lib.mkOption {
@@ -181,8 +174,7 @@ in
     ++ lib.optional cfg.modules.weather.enable pkgs.wttrbar;
 
     xdg.configFile."nova-shell/modules.json".source =
-      (pkgs.formats.json { }).generate "nova-shell-modules.json"
+      (pkgs.formats.json { }).generate "nova-shell-modules.json" cfg.modules;
-        cfg.modules;
 
     xdg.configFile."nova-shell/theme.json".source =
       let