M Icons.qml → Icons.qml

@@ -11,14 +11,10 @@ property var modules: {
     "sunset": "󰖚",
     "ram": "󰍛",
     "tasklist": "",
-    "battery": "",
-    "headphones": "",
-    "mewi": "",
   }
   property var workspaces: {
     "volume_mixer": "",
     "download": "",
-
   }
   property var volume: {
     "mute": "",
@@ -38,6 +34,11 @@ "one_bar_alert": "󰣵",
     "two_bar_alert": "󰣹",
     "three_bar_alert": "󰣹",
     "full_bar_alert": "󰣻",
+  }
+  property var devices: {
+    "battery": "",
+    "headphones": "",
+    "mewi": "",
   }
 }
 

M bar/modules/Battery.qml → bar/modules/Battery.qml

@@ -16,17 +16,20 @@ // text: UPowerDeviceState.toString(modelData.state)
       text: modelData.percentage*100+"%"
     }
     Class.BottombarIcon {
-      text: modelData.isLaptopBattery ? Resources.icons.battery : ({
-        "Jupiter of the Monkey": Icons.modules.headphones,
-        "mix4": Icons.modules.mewi,
-      })[modelData.model] ?? modelData.model
+      text: modelData.isLaptopBattery
+            ? Icons.devices.battery
+            : {
+                "Jupiter of the Monkey": Icons.devices.headphones,
+                "mix4": Icons.devices.mewi,
+              }[modelData.model] ?? modelData.model
 
-      color: ({
-        "Charging": Resources.palette.saffron,
-        "Discharging": Resources.palette.orange,
-        "FullyCharged": Resources.palette.cyan,
-        "Empty": Resources.palette.scarlet,
-      })[UPowerDeviceState.toString(modelData.state)] ?? Resources.palette.orange
+      color:
+        ({
+          "Charging": Resources.palette.saffron,
+          "Discharging": Resources.palette.orange,
+          "FullyCharged": Resources.palette.cyan,
+          "Empty": Resources.palette.scarlet,
+        })[UPowerDeviceState.toString(modelData.state)] ?? Resources.palette.orange
     }
     Class.BotSep{}
   }