diff --git a/hosts/altair/variables.nix b/hosts/altair/variables.nix
index 6a00ccf..03862a0 100644
--- a/hosts/altair/variables.nix
+++ b/hosts/altair/variables.nix
@@ -6,6 +6,8 @@ in
   config.var = {
     hostname = "altair";
 
+    has_battery = true;
+
     hyprsunset.temperature = 2000;
 
     hyprland = {
@@ -24,4 +26,4 @@ in
       ];
     };
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/polaris/variables.nix b/hosts/polaris/variables.nix
index 8ad7280..4059d33 100644
--- a/hosts/polaris/variables.nix
+++ b/hosts/polaris/variables.nix
@@ -7,6 +7,8 @@ in
   config.var = {
     hostname = "polaris";
 
+    has_battery = false;
+
     hyprsunset.temperature = 3500;
 
     hyprland = {
@@ -26,4 +28,4 @@ in
       ];
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/hyprpanel.nix b/modules/home-manager/hyprpanel.nix
index 4342ca2..717d646 100644
--- a/modules/home-manager/hyprpanel.nix
+++ b/modules/home-manager/hyprpanel.nix
@@ -1,6 +1,6 @@
 # Hyprpanel is the bar on top of the screen
 # Display information like workspaces, battery, wifi, ...
-{ config, ... }:
+{ config, lib, ... }:
 let
   transparentButtons = config.theme.bar.transparentButtons;
 
@@ -46,11 +46,11 @@ in
           middle = [
             "media"
           ];
-          right = [
+          right = lib.flatten [
             "systray"
             "volume"
             "bluetooth"
-            "battery"
+            (lib.optional config.var.has_battery "battery")
             "network"
             "clock"
             "notifications"