M Resources.qml → Resources.qml

@@ -27,6 +27,7 @@ "topbar_text": 12,
     "topbar_icon": 16,
     "bottombar_text": 8,
     "bottombar_icon": 8,
+    "moonphase": 16
   }
 }
 

M TODO.txt → TODO.txt

@@ -1,4 +1,5 @@
 Network
+Moonphase doesn't work when launched from sway
 Battery
   - laptop battery on top
   - charging indicator

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

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

M bar/modules/Moonphase.qml → bar/modules/Moonphase.qml

@@ -10,6 +10,7 @@ Class.RightRowLayout {
   Class.TopbarText {
     id: moonphase
     color: Resources.palette.saffron
+    font.pixelSize: Resources.fontsize.moonphase
 
     Process {
       id: moonphase_script