nix/base/base_packages.nix

@@ -23,6 +23,7 @@
     morewaita-icon-theme
     kdePackages.breeze-icons
     gnome.seahorse
+    upower
   ];
 
   gtk.iconCache.enable = false;
@@ -42,6 +43,7 @@
   '';
 
   programs.dconf.enable = true;
+  services.upower.enable = true;
   services.printing.enable = true;
   services.dbus.enable = true;
   services.dbus.packages = with pkgs; [

nix/flake.nix

@@ -37,7 +37,7 @@
           # because allowing rust nightly is too hard by default....
           (import (fetchTarball {
             url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz";
-            sha256 = "sha256:02p0zzglgi3980iyam46wv8ajr83wj6myjhrjjfv96vkafl6pycg";
+            sha256 = "sha256:1aaza47rqi74ypi77ksz396q9l7rrxfrdnhi2pfjb0yqmz7l69wl";
           }))
         ];
       };
@@ -55,7 +55,7 @@
         };
         modules = [
           ./hardware/marmo/default.nix
-        ];
+        ] ++ base_imports;
       };
       nixosConfigurations."overheating" = inputs.nixpkgs.lib.nixosSystem {
         specialArgs = {
@@ -64,7 +64,7 @@
         };
         modules = [
           ./hardware/overheating/default.nix
-        ];
+        ] ++ base_imports;
       };
       nixosConfigurations."spaceship" = inputs.nixpkgs.lib.nixosSystem {
         specialArgs = {

nix/hardware/overheating/base_config.nix

@@ -10,4 +10,7 @@
     ",highrr,auto,1"
   ];
   programs.ironbar.monitor = "eDP-1";
+  programs.ironbar.battery = [
+    { type = "upower"; class = "memory-usage"; }
+  ];
 }

nix/hardware/spaceship/base_config.nix

@@ -43,5 +43,5 @@
     wallpaper = HDMI-A-1,/home/dashie/Pictures/backgrounds/shinobu_1200.jpg
     splash = true
   '';
-  programs.hyprland.extra_autostart= [ "streamdeck -n" ];
+  programs.hyprland.extra_autostart = [ "streamdeck -n" ];
 }

nix/modules/ironbar_config.nix

@@ -8,5 +8,10 @@
         Extra settings for foo.
       '';
     };
+
+    battery = lib.mkOption {
+      default = [];
+      example = [];
+    };
   };
 }

nix/programs/hyprland/ironbar.nix

@@ -142,7 +142,7 @@
       ];
       config = {
         monitors."${config.programs.ironbar.monitor}" = {
-          end = [
+          end = config.programs.ironbar.battery ++ [
             {
               type = "sys_info";
               format = [