feat: update laptop config

modules/base/fireproof.nix

@@ -8,5 +8,12 @@
       type = lib.types.str;
       description = "The primary username for the machine";
     };
+    hardware = {
+      battery = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Enable battery support (UPower, battery widget, etc.)";
+      };
+    };
   };
 }

modules/desktop/dms/background.nix

@@ -46,12 +46,12 @@ in {
         };
       };
 
-      programs.dankMaterialShell.default.settings = {
+      programs.dank-material-shell.default.settings = {
         # Disables wallpaper management in DMS to avoid conflicts with Hyprpaper
         screenPreferences.wallpaper = [];
       };
 
-      programs.dankMaterialShell.default.session = {
+      programs.dank-material-shell.default.session = {
         # Attempt to set a default wallpaper on first run
         wallpaperPath = unknownPng;
       };

modules/desktop/dms/bar.nix

@@ -70,13 +70,14 @@
       centerWidgets = [
         "focusedWindow"
       ];
-      rightWidgets = [
-        "music"
-        "systemTray"
-        "cpuUsage"
-        "controlCenterButton"
-        "notificationButton"
-      ];
+      rightWidgets =
+        [
+          "music"
+          "systemTray"
+          "cpuUsage"
+          "controlCenterButton"
+        ]
+        ++ lib.optional config.fireproof.hardware.battery "battery" ++ ["notificationButton"];
     }
     // commonBarSettings;
 
@@ -123,7 +124,7 @@
 in {
   config = lib.mkIf config.fireproof.desktop.enable {
     fireproof.home-manager = {
-      programs.dankMaterialShell.default.settings = {
+      programs.dank-material-shell.default.settings = {
         launcherLogoMode = "os";
         launcherLogoContrast = 1;
         launcherLogoSizeOffset = 3;

modules/desktop/dms/default.nix

@@ -16,10 +16,10 @@
 
     fireproof.home-manager = {
       imports = [
-        inputs.dankMaterialShell.homeModules.dankMaterialShell.default
+        inputs.dank-material-shell.homeModules.dank-material-shell
       ];
 
-      programs.dankMaterialShell = {
+      programs.dank-material-shell = {
         enable = true;
 
         enableDynamicTheming = false;

modules/desktop/dms/theme.nix

@@ -30,7 +30,7 @@ in {
         matugen_type = "scheme-expressive";
       };
 
-      programs.dankMaterialShell.default.settings = {
+      programs.dank-material-shell.default.settings = {
         # Color theme
         currentThemeName = "custom";
         customThemeFile = "/home/${username}/.config/DankMaterialShell/colors.json";

modules/homelab/glance.nix

@@ -8,7 +8,7 @@ lib.mkIf config.fireproof.homelab.enable (let
   domain = "glance.nickolaj.com";
   port = 8088;
 
-  glance-fork = pkgs.glance.overrideAttrs (oldAttrs: {
+  glance-fork = pkgs.glance.overrideAttrs (_oldAttrs: {
     src = pkgs.fetchFromGitHub {
       owner = "nickolaj-jepsen";
       repo = "glance";

modules/programs/pycharm.nix

@@ -5,7 +5,7 @@
   pkgsUnstable,
   ...
 }: let
-  pycharmPkg = pkgsUnstable.jetbrains.pycharm-professional.override {
+  pycharmPkg = pkgsUnstable.jetbrains.pycharm.override {
     # -Dide.browser.jcef.enabled causes crashes on wayland
     vmopts = ''
       -Dide.browser.jcef.enabled=false

modules/system/battery.nix

@@ -0,0 +1,9 @@
+{
+  config,
+  lib,
+  ...
+}: {
+  config = lib.mkIf config.fireproof.hardware.battery {
+    services.upower.enable = true;
+  };
+}

modules/system/default.nix

@@ -15,5 +15,6 @@ _: {
     ./user.nix
     ./yubikey.nix
     ./tailscale.nix
+    ./battery.nix
   ];
 }