From a7f9f05ccfd8985398c70fc0568208c0698838ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Thu, 6 Oct 2022 20:19:28 +0200
Subject: [PATCH] :bug: fix polybar battery module

---
 modules/config/theming/catppuccin.nix | 135 ++++++++++++++------------
 modules/config/theming/default.nix    |   3 +
 2 files changed, 74 insertions(+), 64 deletions(-)

diff --git a/modules/config/theming/catppuccin.nix b/modules/config/theming/catppuccin.nix
index 33acbac..99ecea9 100644
--- a/modules/config/theming/catppuccin.nix
+++ b/modules/config/theming/catppuccin.nix
@@ -36,89 +36,88 @@ in
 {
   home-manager.users.moritz = {
     programs = {
-      kitty.extraConfig =
-        ''
-          # vim:ft=kitty
+      kitty.extraConfig = ''
+        # vim:ft=kitty
 
-          ## name:     Catppuccin-Frappe
-          ## author:   Pocco81 (https://github.com/Pocco81)
-          ## license:  MIT
-          ## upstream: https://github.com/catppuccin/kitty/blob/main/frappe.conf
-          ## blurb:    Soothing pastel theme for the high-spirited!
+        ## name:     Catppuccin-Frappe
+        ## author:   Pocco81 (https://github.com/Pocco81)
+        ## license:  MIT
+        ## upstream: https://github.com/catppuccin/kitty/blob/main/frappe.conf
+        ## blurb:    Soothing pastel theme for the high-spirited!
 
 
 
-          # The basic colors
-          foreground              #${text}
-          background              #${base}
-          selection_foreground    #${base}
-          selection_background    #${rosewater}
+        # The basic colors
+        foreground              #${text}
+        background              #${base}
+        selection_foreground    #${base}
+        selection_background    #${rosewater}
 
-          # Cursor colors
-          cursor                  #${rosewater}
-          cursor_text_color       #${base}
+        # Cursor colors
+        cursor                  #${rosewater}
+        cursor_text_color       #${base}
 
-          # URL underline color when hovering with mouse
-          url_color               #${rosewater}
+        # URL underline color when hovering with mouse
+        url_color               #${rosewater}
 
-          # Kitty window border colors
-          active_border_color     #${lavender}
-          inactive_border_color   #${overlay0}
-          bell_border_color       #${yellow}
+        # Kitty window border colors
+        active_border_color     #${lavender}
+        inactive_border_color   #${overlay0}
+        bell_border_color       #${yellow}
 
-          # OS Window titlebar colors
-          wayland_titlebar_color system
-          macos_titlebar_color system
+        # OS Window titlebar colors
+        wayland_titlebar_color system
+        macos_titlebar_color system
 
-          # Tab bar colors
-          active_tab_foreground   #${crust}
-          active_tab_background   #${mauve}
-          inactive_tab_foreground #${text}
-          inactive_tab_background #${mantle}
-          tab_bar_background      #${crust}
+        # Tab bar colors
+        active_tab_foreground   #${crust}
+        active_tab_background   #${mauve}
+        inactive_tab_foreground #${text}
+        inactive_tab_background #${mantle}
+        tab_bar_background      #${crust}
 
-          # Colors for marks (marked text in the terminal)
-          mark1_foreground #${base}
-          mark1_background #${lavender}
-          mark2_foreground #${base}
-          mark2_background #${mauve}
-          mark3_foreground #${base}
-          mark3_background #${sapphire}
+        # Colors for marks (marked text in the terminal)
+        mark1_foreground #${base}
+        mark1_background #${lavender}
+        mark2_foreground #${base}
+        mark2_background #${mauve}
+        mark3_foreground #${base}
+        mark3_background #${sapphire}
 
-          # The 16 terminal colors
+        # The 16 terminal colors
 
-          # black
-          color0 #${surface1}
-          color8 #${surface2}
+        # black
+        color0 #${surface1}
+        color8 #${surface2}
 
-          # red
-          color1 #${red}
-          color9 #${red}
+        # red
+        color1 #${red}
+        color9 #${red}
 
-          # green
-          color2  #${green}
-          color10 #${green}
+        # green
+        color2  #${green}
+        color10 #${green}
 
-          # yellow
-          color3  #${yellow}
-          color11 #${yellow}
+        # yellow
+        color3  #${yellow}
+        color11 #${yellow}
 
-          # blue
-          color4  #${blue}
-          color12 #${blue}
+        # blue
+        color4  #${blue}
+        color12 #${blue}
 
-          # magenta
-          color5  #${pink}
-          color13 #${pink}
+        # magenta
+        color5  #${pink}
+        color13 #${pink}
 
-          # cyan
-          color6  #${teal}
-          color14 #${teal}
+        # cyan
+        color6  #${teal}
+        color14 #${teal}
 
-          # white
-          color7  #${subtext1}
-          color15 #${subtext0}
-        '';
+        # white
+        color7  #${subtext1}
+        color15 #${subtext0}
+      '';
       zathura.extraConfig = ''
         set window-title-basename "true"
         set selection-clipboard "clipboard"
@@ -253,6 +252,14 @@ in
             format-connected-foreground = base;
             format-connected-background = mauve;
           };
+          "module/battery" = {
+            format-charging-foreground = base;
+            format-charging-background = green;
+            format-full-foreground = base;
+            format-full-background = green;
+            format-discharging-foreground = base;
+            format-discharging-background = red;
+          };
         };
       };
     };
diff --git a/modules/config/theming/default.nix b/modules/config/theming/default.nix
index ba2f6cf..882b3cc 100644
--- a/modules/config/theming/default.nix
+++ b/modules/config/theming/default.nix
@@ -74,8 +74,11 @@ in
             time-format = "%H:%M";
 
             format-charging = "<animation-charging> <label-charging>";
+            format-charging-padding = 1;
             format-discharging = "<animation-discharging> <label-discharging>";
+            format-discharging-padding = 1;
             format-full = " <label-full>";
+            format-full-padding = 1;
 
             label-charging = "%percentage%% %time% remaining";
             label-discharging = "%percentage%% %time% remaining";