fix(agsV2 brightness): add safety around kbd levels and related OSD

nixosModules/ags-v2/config/services/brightness.ts

@@ -11,11 +11,10 @@ const SCREEN_ICONS: Record<number, string> = {
 
 const INTERVAL = 500;
 
-
 @register()
 class Brightness extends GObject.Object {
-    declare private _kbd: string;
+    declare private _kbd: string | undefined;
-    declare private _caps: string;
+    declare private _caps: string | undefined;
 
     declare private _screen: number;
 
@@ -51,15 +50,28 @@ class Brightness extends GObject.Object {
         return this._screenIcon;
     }
 
-    declare private _kbdMax: number;
+    public hasKbd = false;
-    declare private _kbdLevel: number;
+    declare private _kbdMax: number | undefined;
+    declare private _kbdLevel: number | undefined;
 
     @property(Number)
     get kbdLevel() {
+        if (!this._kbdMax) {
+            console.error('[get kbdLevel] No Keyboard brightness');
+
+            return -1;
+        }
+
         return this._kbdLevel;
     }
 
     set kbdLevel(value) {
+        if (!this._kbdMax || !value) {
+            console.error('[set kbdLevel] No Keyboard brightness');
+
+            return;
+        }
+
         if (value < 0 || value > this._kbdMax) {
             return;
         }
@@ -94,19 +106,22 @@ class Brightness extends GObject.Object {
      * @param o.kbd  name of kbd in brightnessctl
      * @param o.caps name of caps_lock in brightnessctl
      */
-    public async initService({ kbd = '', caps = '' }) {
+    public async initService({ kbd, caps }: { kbd?: string, caps?: string }) {
-        this._kbd = kbd;
-        this._caps = caps;
         try {
+            if (kbd) {
+                this.hasKbd = true;
+                this._kbd = kbd;
                 this._monitorKbdState();
                 this._kbdMax = Number(await execAsync(`brightnessctl -d ${this._kbd} m`));
+            }
 
+            this._caps = caps;
             this._screen = Number(await execAsync('brightnessctl g')) /
                 Number(await execAsync('brightnessctl m'));
             this.notify('screen');
         }
         catch (_e) {
-            console.error('missing dependancy: brightnessctl');
+            console.error('missing dependency: brightnessctl');
         }
     }
 
@@ -124,14 +139,16 @@ class Brightness extends GObject.Object {
 
     private _monitorKbdState() {
         const timer = interval(INTERVAL, () => {
-            execAsync(`brightnessctl -d ${this._kbd} g`).then(
+            execAsync(`brightnessctl -d ${this._kbd} g`)
+                .then(
                     (out) => {
                         if (parseInt(out) !== this._kbdLevel) {
                             this._kbdLevel = parseInt(out);
                             this.notify('kbd-level');
                         }
                     },
-            ).catch(() => {
+                )
+                .catch(() => {
                     timer?.cancel();
                 });
         });

nixosModules/ags-v2/config/widgets/osd/main.tsx

@@ -138,6 +138,8 @@ export default () => {
                     </box>
                 </box>
 
+                {
+                    Brightness.hasKbd && (
                         <box
                             name="keyboard"
                             css="margin-bottom: 80px;"
@@ -152,12 +154,14 @@ export default () => {
                                 <icon icon="keyboard-brightness-symbolic" />
 
                                 <ProgressBar
-                            fraction={bind(Brightness, 'kbdLevel').as((v) => v / 2)}
+                                    fraction={bind(Brightness, 'kbdLevel').as((v) => (v ?? 0) / 2)}
                                     sensitive={bind(Brightness, 'kbdLevel').as((v) => v !== 0)}
                                     valign={Gtk.Align.CENTER}
                                 />
                             </box>
                         </box>
+                    )
+                }
 
                 <box
                     name="caps"