2 files changed, 30 insertions, 5 deletions

diff --git a/modules/home-manager/personal/gui/x/i3/bar.nix b/modules/home-manager/personal/gui/x/i3/bar.nix
index 554b38a..3d88692 100644
--- a/modules/home-manager/personal/gui/x/i3/bar.nix
+++ b/modules/home-manager/personal/gui/x/i3/bar.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.personal.x.i3;
-  cfgStylix = config.stylix.targets.i3;
+  cfgStylix = config.stylix.targets.i3.exportedBarConfig;
   mkDeviceOption = lib.mkOption {
     type = with lib.types; nullOr str;
     default = null;
@@ -71,16 +71,35 @@ in
 
   config = lib.mkIf cfg.enable {
     xsession.windowManager.i3.config.bars = [
-      {
-        statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml";
-        fonts = { inherit (cfgStylix.exportedBarConfig.fonts) size; };
-      }
+      (
+        cfgStylix
+        // {
+          command = "i3bar";
+          statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml";
+          mode = "hide";
+          trayPadding = 6;
+        }
+      )
     ];
 
     programs.i3status-rust = {
       enable = true;
       bars = {
         default = {
+          settings.theme.overrides =
+            let
+              bgColor = cfgStylix.colors.background;
+            in
+            {
+              idle_bg = bgColor;
+              good_bg = bgColor;
+              info_bg = bgColor;
+              warning_bg = bgColor;
+              critical_bg = bgColor;
+
+              separator = " · ";
+              separator_bg = bgColor;
+            };
           icons = "material-nf";
           blocks =
             (serviceStatusBlock {
@@ -159,6 +178,11 @@ in
                 interval = 1;
                 format = " $timestamp.datetime(f:'%a. %b. %d, %H:%M:%S') ";
               }
+              {
+                block = "custom";
+                command = "true";
+                interval = "once";
+              }
             ];
         };
       };
diff --git a/modules/home-manager/personal/gui/x/i3/keybindings.nix b/modules/home-manager/personal/gui/x/i3/keybindings.nix
index d28e9fb..e4b0589 100644
--- a/modules/home-manager/personal/gui/x/i3/keybindings.nix
+++ b/modules/home-manager/personal/gui/x/i3/keybindings.nix
@@ -55,6 +55,7 @@ in
         "${modifier}+Print" = exec rofiBluetooth;
         "${modifier}+Delete" = exec "${rofiShow} menu -modi menu:${rofiPowerMenu}";
         "${modifier}+p" = "move workspace to output right";
+        "${modifier}+b" = "bar mode toggle";
       }
       // {
         # exiting