From 87d5dd6371632edc9027a3e75ec6e1afc5b9d825 Mon Sep 17 00:00:00 2001
From: Aspen Smith <root@gws.fyi>
Date: Sun, 31 Mar 2024 14:23:21 -0400
Subject: feat(aspen/system): Make battery index configurable

My new laptop has the battery at index 1, not index 0

Change-Id: I64fa16e7f0eecf6b623361645d73b1176e1e5d48
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11311
Tested-by: BuildkiteCI
Autosubmit: aspen <root@gws.fyi>
Reviewed-by: aspen <root@gws.fyi>
---
 users/aspen/system/home/machines/ogopogo.nix |  2 +-
 users/aspen/system/home/modules/i3.nix       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/users/aspen/system/home/machines/ogopogo.nix b/users/aspen/system/home/machines/ogopogo.nix
index 46cf7232ec..37396a5aa1 100644
--- a/users/aspen/system/home/machines/ogopogo.nix
+++ b/users/aspen/system/home/machines/ogopogo.nix
@@ -23,7 +23,7 @@ in
   system.machine = {
     wirelessInterface = "wlp4s0";
     i3FontSize = 9;
-    battery = false;
+    battery = null;
   };
 
   home.packages = with pkgs; [
diff --git a/users/aspen/system/home/modules/i3.nix b/users/aspen/system/home/modules/i3.nix
index 34bd7f1b2a..58ec3d2814 100644
--- a/users/aspen/system/home/modules/i3.nix
+++ b/users/aspen/system/home/modules/i3.nix
@@ -39,9 +39,9 @@ in
       };
 
       battery = mkOption {
-        description = "Does this system have a battery?";
-        default = true;
-        type = types.bool;
+        description = "Battery index for this system's battery";
+        default = 0;
+        type = types.nullOr types.int;
       };
     };
   };
@@ -242,8 +242,8 @@ in
                   order += "wireless ${config.system.machine.wirelessInterface}"
                   # order += "ethernet enp3s0f0"
                   order += "cpu_usage"
-                  ${lib.optionalString (config.system.machine.battery) ''
-                      order += "battery 0"
+                  ${lib.optionalString (!isNull config.system.machine.battery) ''
+                    order += "battery ${toString config.system.machine.battery}"
                   ''}
                   # order += "volume master"
                   order += "time"
@@ -263,7 +263,7 @@ in
                       format_down = "E: -"
                   }
 
-                  battery 0 {
+                  battery ${toString config.system.machine.battery} {
                       format = "%status %percentage"
                       path = "/sys/class/power_supply/BAT%d/uevent"
                       low_threshold = 10
-- 
cgit 1.4.1