Merge changes

Signed-off-by: AnErrupTion <anerruption@disroot.org>

res/config.ini

@@ -41,6 +41,11 @@ asterisk = *
 # The number of failed authentications before a special animation is played... ;)
 auth_fails = 10
 
+# Identifier for battery whose charge to display at top left
+# Primary battery is usually BAT0 or BAT1
+# If set to null, battery status won't be shown
+battery_id = null
+
 # Background color id
 bg = 0x00000000
 
@@ -183,15 +188,11 @@ gameoflife_initial_density = 0.4
 # Remove main box borders
 hide_borders = false
 
-# Remove version number from the top left corner
-hide_version_string = false
-
 # Remove power management command hints
 hide_key_hints = false
 
-# Set to null to disable battery status display
-# Default is BAT0, the typical identifier for the primary battery
-battery_id = null
+# Remove version number from the top left corner
+hide_version_string = false
 
 # Initial text to show on the info line
 # If set to null, the info line defaults to the hostname

src/config/Config.zig

@@ -11,6 +11,7 @@ animation: Animation = .none,
 animation_timeout_sec: u12 = 0,
 asterisk: ?u32 = '*',
 auth_fails: u64 = 10,
+battery_id: ?[]const u8 = null,
 bg: u32 = 0x00000000,
 bigclock: Bigclock = .none,
 bigclock_12hr: bool = false,
@@ -47,9 +48,8 @@ gameoflife_entropy_interval: usize = 10,
 gameoflife_frame_delay: usize = 6,
 gameoflife_initial_density: f32 = 0.4,
 hide_borders: bool = false,
-hide_version_string: bool = false,
 hide_key_hints: bool = false,
-battery_id: ?[]const u8 = "BAT0",
+hide_version_string: bool = false,
 initial_info_text: ?[]const u8 = null,
 input_len: u8 = 34,
 lang: []const u8 = "en",