From 71c6c34fdaae22af11fb01eed6aa2cbc4cdbcc0e Mon Sep 17 00:00:00 2001
From: muon <admin@muon.host>
Date: Sat, 2 Aug 2025 23:53:34 +0000
Subject: [PATCH] Add laptop related config

---
 hosts/murk/configuration.nix |  5 +++
 hosts/murk/home.nix          |  3 +-
 modules/home/desktop/i3.nix  | 71 ++++++++++++++++++++++++------------
 3 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix
index db9a10f..84c0a2f 100644
--- a/hosts/murk/configuration.nix
+++ b/hosts/murk/configuration.nix
@@ -49,6 +49,11 @@ in {
     WINIT_X11_SCALE_FACTOR = "1";
   };
 
+  ## Laptop
+  powerManagement.enable = true;
+  services.thermald.enable = true;
+  services.tlp.enable = true;
+
   ## Mouse
   services.libinput.mouse.accelProfile = "flat";
 
diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix
index 3a815e6..16cbb9c 100644
--- a/hosts/murk/home.nix
+++ b/hosts/murk/home.nix
@@ -6,6 +6,7 @@ in {
   # Modules
   mods.xdg.enable = true;
   mods.i3.enable = true;
+  mods.battery.enable = true;
   mods.terminal.zsh.enable = true;
   mods.terminal.emulator.enable = true;
   mods.terminal.development.enable = true;
@@ -18,6 +19,7 @@ in {
       thunderbird
       pulseaudio
       pavucontrol
+      alsa-utils
     ]
 
     # Non-free </3
@@ -25,7 +27,6 @@ in {
     ++ [ google-cloud-sdk ];
 
   # Hardware preferences
-
   ## Monitors
   services.autorandr.enable = true;
   programs.autorandr = {
diff --git a/modules/home/desktop/i3.nix b/modules/home/desktop/i3.nix
index 21fc88b..924eddf 100644
--- a/modules/home/desktop/i3.nix
+++ b/modules/home/desktop/i3.nix
@@ -14,6 +14,7 @@ let
     };
 in with lib; {
   options.mods.i3.enable = mkEnableOption "enables i3";
+  options.mods.battery.enable = mkEnableOption "enables battery";
 
   config = mkIf config.mods.i3.enable {
     services.unclutter.enable = true;
@@ -21,29 +22,53 @@ in with lib; {
 
     programs.i3status-rust = {
       enable = true;
-      bars.default = {
-        settings.theme.overrides = with config.lib.stylix.colors.withHashtag; {
-          idle_bg = base00;
-          idle_fg = base05;
-          separator = "";
-        };
-        icons = "awesome5";
-        blocks = [
-          {
-            block = "sound";
-            format = " $icon $volume ";
-            click = [{
-              button = "left";
-              cmd = "${lib.getExe pkgs.pavucontrol}";
-            }];
-          }
-          {
-            block = "time";
-            format = "$icon $timestamp.datetime(f:'%Y-%m-%d %a %H:%M:%S') ";
-            interval = 1;
-          }
-        ];
-      };
+      bars.default = lib.mkMerge [
+        {
+          blocks = lib.mkBefore [
+            {
+              block = "privacy";
+              driver = [ { name = "v4l"; } { name = "pipewire"; } ];
+            }
+            {
+              block = "net";
+              format = " $icon  ";
+              inactive_format = " $icon ";
+            }
+          ];
+        }
+        (lib.mkIf config.mods.battery.enable {
+          blocks = [{
+            block = "battery";
+            format = " $icon $percentage ";
+            # format_alt =
+            #   " $icon $percentage {$time_remaining.dur(hms:true, min_unit:m) |}";
+          }];
+        })
+        {
+          settings.theme.overrides = lib.mkMerge [
+            { separator = ""; }
+            config.lib.stylix.i3status-rust.bar
+          ];
+          icons = "awesome5";
+          blocks = lib.mkAfter [
+            {
+              block = "sound";
+              format = " $icon {$volume |} ";
+              driver = "alsa";
+              click = [{
+                button = "left";
+                cmd = "${lib.getExe pkgs.pavucontrol}";
+              }];
+            }
+            {
+              block = "time";
+              format = "$icon $timestamp.datetime(f:'%Y-%m-%d %a %H:%M:%S') ";
+              # format_alt = "$icon $timestamp.datetime(f:'%Y-%m-%d %H:%M') ";
+              interval = 1;
+            }
+          ];
+        }
+      ];
     };
 
     xsession.windowManager.i3 = let