Brightness, fully working (at least on my machine)

Modules/Bar/Bar.qml

@@ -139,7 +139,6 @@ Variants {
         //     demoPanel.isLoaded = !demoPanel.isLoaded
         //   }
         // }
-
         NIconButton {
           id: sidePanelToggle
           icon: "widgets"

Modules/Bar/Brightness.qml

@@ -17,7 +17,8 @@ Item {
 
   function getIcon() {
     var brightness = BrightnessService.getMonitorForScreen(screen).brightness
-    return brightness <= 0 ? "brightness_1" : brightness < 0.33 ? "brightness_low" : brightness < 0.66 ? "brightness_medium" : "brightness_high"
+    return brightness <= 0 ? "brightness_1" : brightness < 0.33 ? "brightness_low" : brightness
+                                                                  < 0.66 ? "brightness_medium" : "brightness_high"
   }
 
   // Connection used to open the pill when brightness changes
@@ -26,7 +27,7 @@ Item {
     function onBrightnessUpdated() {
       Logger.log("Bar-Brightness", "OnBrightnessUpdated")
 
-      var monitor = BrightnessService.getMonitorForScreen(screen);
+      var monitor = BrightnessService.getMonitorForScreen(screen)
       var currentBrightness = monitor.brightness
 
       // Ignore if this is the first time or if brightness hasn't actually changed

Modules/SettingsPanel/SettingsPanel.qml

@@ -130,7 +130,7 @@ NLoader {
           "label": "Audio",
           "icon": "volume_up",
           "source": audioTab
-        },{
+        }, {
           "id": SettingsPanel.Tab.Display,
           "label": "Display",
           "icon": "monitor",

Modules/SettingsPanel/Tabs/BrightnessTab.qml

@@ -143,6 +143,8 @@ Item {
           }
 
           // Single monitor display using the same data source as the bar icon
+          Repeater {
+            model: BrightnessService.monitors
             Rectangle {
               Layout.fillWidth: true
               radius: Style.radiusMedium * scaling
@@ -162,7 +164,7 @@ Item {
                   spacing: Style.marginMedium * scaling
 
                   NText {
-                  text: "Primary Monitor"
+                    text: `${model.modelData.name} [${model.modelData.model}]`
                     font.pointSize: Style.fontSizeLarge * scaling
                     font.weight: Style.fontWeightBold
                     color: Color.mSecondary
@@ -173,7 +175,7 @@ Item {
                   }
 
                   NText {
-                  text: BrightnessService.currentMethod === "ddcutil" ? "External (DDC)" : "Internal"
+                    text: model.method
                     font.pointSize: Style.fontSizeSmall * scaling
                     color: Color.mOnSurfaceVariant
                     Layout.alignment: Qt.AlignRight
@@ -193,53 +195,25 @@ Item {
                   NSlider {
                     Layout.fillWidth: true
                     from: 0
-                  to: 100
+                    to: 1
-                  value: BrightnessService.brightness
+                    value: model.brightness
-                  stepSize: 1
+                    stepSize: 0.05
-                  enabled: BrightnessService.available
                     onPressedChanged: {
-                    if (!pressed && BrightnessService.available) {
+                      if (!pressed) {
-                      BrightnessService.setBrightness(value)
+                        var monitor = BrightnessService.getMonitorForScreen(model.modelData)
+                        monitor.setBrightness(value)
                       }
                     }
                   }
 
                   NText {
-                  text: BrightnessService.available ? Math.round(BrightnessService.brightness) + "%" : "N/A"
+                    text: Math.round(model.brightness * 100) + "%"
                     font.pointSize: Style.fontSizeMedium * scaling
                     font.weight: Style.fontWeightBold
-                  color: BrightnessService.available ? Color.mPrimary : Color.mOnSurfaceVariant
+                    color: Color.mPrimary
                     Layout.alignment: Qt.AlignRight
                   }
                 }
-
-              RowLayout {
-                Layout.fillWidth: true
-                spacing: Style.marginMedium * scaling
-
-                NText {
-                  text: "Method:"
-                  font.pointSize: Style.fontSizeSmall * scaling
-                  color: Color.mOnSurfaceVariant
-                }
-
-                NText {
-                  text: BrightnessService.currentMethod || "Unknown"
-                  font.pointSize: Style.fontSizeSmall * scaling
-                  color: Color.mOnSurface
-                  Layout.alignment: Qt.AlignLeft
-                }
-
-                Item {
-                  Layout.fillWidth: true
-                }
-
-                NText {
-                  text: BrightnessService.available ? "Available" : "Unavailable"
-                  font.pointSize: Style.fontSizeSmall * scaling
-                  color: BrightnessService.available ? Color.mPrimary : Color.mError
-                  Layout.alignment: Qt.AlignRight
-                }
               }
             }
           }

Modules/SidePanel/PowerMenu.qml

@@ -384,8 +384,6 @@ NPanel {
     running: false
   }
 
-
-
   Process {
     id: logoutProcess
 

Services/BrightnessService.qml

@@ -66,7 +66,6 @@ Singleton {
         root.ddcMonitors = displays.map(d => {
                                           var modelMatch = d.match(/Monitor:.*:(.*):.*/)
                                           var busMatch = d.match(/I2C bus:[ ]*\/dev\/i2c-([0-9]+)/)
-                                          console.log(modelMatch)
                                           return {
                                             "model": modelMatch ? modelMatch[1] : "",
                                             "busNum": busMatch ? busMatch[1] : ""
@@ -96,7 +95,7 @@ Singleton {
     readonly property Process initProc: Process {
       stdout: StdioCollector {
         onStreamFinished: {
-          var dataText = text.trim();
+          var dataText = text.trim()
           if (dataText === "") {
             return
           }

Services/CompositorService.qml

@@ -25,10 +25,10 @@ Singleton {
   property bool inOverview: false
 
   // Generic events
-  signal workspaceChanged()
+  signal workspaceChanged
-  signal activeWindowChanged()
+  signal activeWindowChanged
-  signal overviewStateChanged()
+  signal overviewStateChanged
-  signal windowListChanged()
+  signal windowListChanged
 
   // Compositor detection
   Component.onCompleted: {
@@ -54,8 +54,6 @@ Singleton {
     }
   }
 
-
-
   function detectCompositor() {
     try {
       // Try Hyprland first
@@ -67,6 +65,7 @@ Singleton {
         return
       }
     } catch (e) {
+
       // Hyprland not available
     }
 
@@ -98,12 +97,12 @@ Singleton {
     }
   }
 
-  function setupHyprlandConnections() {
+  function setupHyprlandConnections() {// Connections are set up at the top level, this function just marks that Hyprland is ready
-    // Connections are set up at the top level, this function just marks that Hyprland is ready
   }
 
   function updateHyprlandWorkspaces() {
-    if (!isHyprland) return
+    if (!isHyprland)
+      return
 
     workspaces.clear()
     try {
@@ -145,14 +144,16 @@ Singleton {
   }
 
   function updateNiriWorkspaces() {
-    if (!isNiri) return
+    if (!isNiri)
+      return
 
     // Get workspaces from the Niri process
     niriWorkspaceProcess.running = true
   }
 
   function updateNiriWindows() {
-    if (!isNiri) return
+    if (!isNiri)
+      return
 
     // Get windows from the Niri process
     niriWindowsProcess.running = true

Widgets/NPanel.qml

@@ -12,7 +12,9 @@ PanelWindow {
   property bool showOverlay: Settings.data.general.dimDesktop
   property int topMargin: Style.barHeight * scaling
   // Show dimming if this panel is opened OR if we're in a transition (to prevent flickering)
-  property color overlayColor: (showOverlay && (PanelService.openedPanel === root || isTransitioning)) ? Color.applyOpacity(Color.mShadow, "AA") : Color.transparent
+  property color overlayColor: (showOverlay && (PanelService.openedPanel === root
+                                                || isTransitioning)) ? Color.applyOpacity(Color.mShadow,
+                                                                                          "AA") : Color.transparent
   property bool isTransitioning: false
   signal dismissed