t14: fix battery indicator config

home/modules/defaultDesktopPack.nix

@@ -9,6 +9,10 @@ with lib; let
 in {
   options.local.defaultDesktopPack = {
     enable = mkEnableOption "common desktop programs and services";
+    laptop = mkOption {
+      type = types.bool;
+      default = false;
+    };
   };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [

home/modules/gui/waybar.nix

@@ -6,7 +6,7 @@
 }:
 with lib; let
   cfg = config.local.gui;
-  laptop = config.trivium.laptop.enable;
+  laptop = config.local.defaultDesktopPack.laptop;
 in {
   config = mkIf cfg.enable {
     programs.waybar = {
@@ -26,20 +26,22 @@ in {
             "clock"
           ];
 
-          modules-right = [
-            "privacy"
-            "cpu"
-            "memory"
-            "disk"
-            "temperature"
-            "keyboard-state"
-            "tray"
-          ] ++ lists.optionals laptop [
-            "battery"
-          ];
+          modules-right =
+            [
+              "privacy"
+              "cpu"
+              "memory"
+              "disk"
+              "temperature"
+              "keyboard-state"
+              "tray"
+            ]
+            ++ lists.optionals laptop [
+              "battery"
+            ];
           "battery" = mkIf laptop {
-              format = "{capacity}% {icon}";
-              format-icons = ["" "" "" "" ""];
+            format = "{capacity}% {icon}";
+            format-icons = ["" "" "" "" ""];
           };
           "keyboard-state" = {
             numlock = true;