diff --git a/configs/i3.nix b/configs/i3.nix index 052b0be..1ab5f13 100644 --- a/configs/i3.nix +++ b/configs/i3.nix @@ -64,6 +64,7 @@ in with config.niveum; { statusCommand = "${pkgs.unstable.i3status-rust}/bin/i3status-rs ${pkgs.writeText "i3status-rust.toml" ( import { wifi-interface = networkInterfaces.wireless; + batteryBlock = batteryBlocks.default; inherit (config.niveum) colours; } )}"; diff --git a/dot/i3status-rust.nix b/dot/i3status-rust.nix index 60dc6b5..0dcec74 100644 --- a/dot/i3status-rust.nix +++ b/dot/i3status-rust.nix @@ -1,4 +1,4 @@ -{ wifi-interface, colours }: '' +{ wifi-interface, colours, batteryBlock }: '' [theme] name = "plain" [theme.overrides] @@ -56,6 +56,7 @@ [[block]] block = "battery" + device = "${batteryBlock}" show = "both" [[block]] diff --git a/modules/constants.nix b/modules/constants.nix index 7b100fa..213bad8 100644 --- a/modules/constants.nix +++ b/modules/constants.nix @@ -66,6 +66,8 @@ in { networkInterfaces.wireless = mkOption { type = types.str; }; + batteryBlocks.default = mkOption { type = types.str; }; + promptColours = let colours16 = types.enum [ "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" ]; in { diff --git a/systems/homeros/configuration.nix b/systems/homeros/configuration.nix index 2930e23..e6c6a46 100644 --- a/systems/homeros/configuration.nix +++ b/systems/homeros/configuration.nix @@ -10,6 +10,7 @@ environment.systemPackages = [ pkgs.unstable.zeroad pkgs.minecraft ]; niveum = { + batteryBlocks.default = "BAT1"; networkInterfaces.wireless = "wlp3s0"; promptColours.success = "green"; }; diff --git a/systems/wilde/configuration.nix b/systems/wilde/configuration.nix index 39376c6..f73a85a 100644 --- a/systems/wilde/configuration.nix +++ b/systems/wilde/configuration.nix @@ -8,6 +8,7 @@ ]; niveum = { + batteryBlocks.default = "BAT0"; networkInterfaces.wireless = "wlp3s0"; promptColours.success = "cyan"; };