diff --git a/hm_modules/bspwm.nix b/hm_modules/bspwm.nix index bd7799f..977247c 100644 --- a/hm_modules/bspwm.nix +++ b/hm_modules/bspwm.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: let - monitorPages = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X" ]; + monitorPages = [ "Ⅰ" "Ⅱ" "Ⅲ" "Ⅳ" "Ⅴ" "Ⅵ" "Ⅶ" "Ⅷ" "Ⅸ" "Ⅹ" ]; monitorPagesString = lib.strings.concatStringsSep " " monitorPages; strPalette = pkgs.lib.rice.palette.toRGBHex pkgs.rice.colorPalette; xrandr = "${pkgs.xorg.xrandr}/bin/xrandr"; diff --git a/hm_modules/polybar.nix b/hm_modules/polybar.nix index 82031d9..a2a0432 100644 --- a/hm_modules/polybar.nix +++ b/hm_modules/polybar.nix @@ -20,7 +20,8 @@ let ''; colors = with pkgs.lib.rice; let alpha = 255 * opacity; - in palette.toARGBHex rec { + in + palette.toARGBHex rec { normal = { foreground = colorPalette.normal.white; @@ -62,10 +63,7 @@ let foreground = colors.normal.foreground; line-size = 2; line-color = colors.normal.underline; - padding = { - left = 0; - right = 0; - }; + padding = 0; module.margin = { left = 0; right = 0; @@ -125,12 +123,11 @@ in "bar/primary" = recursiveUpdate commonBar { modules-left = "bspwm"; # modules-center = - modules-right = - "player pulseaudio temperature cpu memory battery date powermenu"; + modules-right = "player pulseaudio temperature cpu memory battery date powermenu"; enable-ipc = true; tray = { position = "right"; - padding = 0; + padding = 1; }; }; @@ -185,8 +182,8 @@ in label = let common = { - padding = 1; - separator = " "; + padding = 0; + separator = "&nsbp;&nsbp;"; text = "%name%"; }; in @@ -197,7 +194,7 @@ in background = colors.alert; }; empty = recursiveUpdate (recursiveUpdate colors.normal common) { - text = "󰧟"; + text = "·"; padding = 0; }; };