diff --git a/modules/home/hypr/hyprland.nix b/modules/home/hypr/hyprland.nix index f482427..b9b6e79 100644 --- a/modules/home/hypr/hyprland.nix +++ b/modules/home/hypr/hyprland.nix @@ -7,6 +7,7 @@ { home.packages = with pkgs; [ hyprpolkitagent + hyprpicker ]; # xdg.configFile."uwsm/env".source = diff --git a/modules/home/packages.nix b/modules/home/packages.nix index c01ae6b..80d33b4 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -10,6 +10,7 @@ sqlitebrowser drawio check-capslock + wl-clipboard-rs # Libre Office libreoffice-qt diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix index c202fb5..e70a44c 100644 --- a/modules/home/waybar/default.nix +++ b/modules/home/waybar/default.nix @@ -1,13 +1,6 @@ { ... }: -let - separator_blank = { - format = ""; - interval = "once"; - tooltip = false; - }; -in { programs.waybar = { enable = true; @@ -20,7 +13,7 @@ in margin-right = 10; margin-top = 5; fixed-center = true; - reload_style_on_change = true; + reload_style_on_change = false; "hyprland/workspaces" = import ./modules/hyprland-workspaces.nix { }; "custom/menu" = import ./modules/menu.nix { }; @@ -38,12 +31,19 @@ in "battery" = import ./modules/battery.nix { full-at = 80; }; # Change this to come from the TLP setting "clock" = import ./modules/clock.nix { }; "custom/power" = import ./modules/power.nix { }; - "custom/separator#blank" = separator_blank; + "custom/hyprpicker" = import ./modules/hyprpicker.nix { }; + "custom/separator#blank" = { + format = ""; + interval = "once"; + tooltip = false; + }; modules-left = [ "custom/menu" "custom/separator#blank" "clock" + "custom/separator#blank" + "custom/hyprpicker" ]; modules-center = [ @@ -57,6 +57,8 @@ in "custom/separator#blank" "wireplumber" "custom/separator#blank" + "battery" + "custom/separator#blank" "custom/power" ]; @@ -71,7 +73,6 @@ in }; } ]; - # style = ./style.css; style = '' @define-color base00 #192435; /* Darkest background (night sky / deep shadows) */ @define-color base01 #243449; /* Slightly lighter background */ @@ -131,7 +132,9 @@ in } #wireplumber, + #battery, #custom-power, + #custom-hyprpicker, #clock { color: @base05; } diff --git a/modules/home/waybar/modules/battery.nix b/modules/home/waybar/modules/battery.nix index 7cf8ef1..868729d 100644 --- a/modules/home/waybar/modules/battery.nix +++ b/modules/home/waybar/modules/battery.nix @@ -13,7 +13,7 @@ format = "{icon} {capacity}%"; format-charging = " {capacity}%"; format-plugged = "󱘖 {capacity}%"; - format-full = "{icon} Full"; + format-full = "{icon} {capacity}%"; format-icons = [ "󰂎" "󰁺" diff --git a/modules/home/waybar/modules/hyprpicker.nix b/modules/home/waybar/modules/hyprpicker.nix new file mode 100644 index 0000000..27fcade --- /dev/null +++ b/modules/home/waybar/modules/hyprpicker.nix @@ -0,0 +1,7 @@ +{ + ... +}: +{ + format = "󰏘"; + on-click = "hyprpicker | tr -d '\\n' | wl-copy"; +}