From 75580df3bc58c64457406942e7f47bfc7dff27e3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 20 Apr 2023 20:12:50 +0200 Subject: [PATCH] waybar for hyprland --- hmModules/sway/style.css | 18 +++++++++++------- hmModules/sway/waybar.nix | 20 +++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/hmModules/sway/style.css b/hmModules/sway/style.css index ccaf823..ab25e21 100644 --- a/hmModules/sway/style.css +++ b/hmModules/sway/style.css @@ -2,22 +2,26 @@ border: none; border-radius: 0; min-height: 0; + font-family: Fira Code; + } window#waybar { - background: @theme_bg_color; - color: @theme_fg_color; + background: rgba(255, 255, 255, 0.05); + color: white; + font-size: 1.2rem; } #workspaces button { padding: 0 10px; - /* background: transparent; */ - /* color: @theme_fg_color; */ + background: transparent; + color: white; + font-size: 2rem; } -#workspaces button.focused { - /* background: @theme_bg_color; */ - border-bottom: 3px solid @theme_fg_color; +#workspaces button.focused, #workspaces button.focused, #workspaces button:hover { + background: transparent; + box-shadow: inset 0 -5px white; /* color: @theme_fg_color; */ } diff --git a/hmModules/sway/waybar.nix b/hmModules/sway/waybar.nix index f20e499..2385f2d 100644 --- a/hmModules/sway/waybar.nix +++ b/hmModules/sway/waybar.nix @@ -1,5 +1,11 @@ {pkgs, ...}: { programs.waybar = { + package = pkgs.waybar.overrideAttrs (old: { + mesonFlags = old.mesonFlags ++ ["-Dexperimental=true"]; + patchPhase = '' + sed -i -e 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());/g' src/modules/wlr/workspace_manager.cpp + ''; + }); enable = true; style = builtins.readFile ./style.css; settings = { @@ -10,10 +16,10 @@ height = 30; modules-left = [ - "sway/mode" - "sway/workspaces" + "wlr/mode" + "wlr/workspaces" ]; - modules-center = ["sway/window"]; + modules-center = ["wlr/window"]; modules-right = [ "tray" "pulseaudio" @@ -25,7 +31,7 @@ "clock" ]; - "sway/workspaces" = { + "wlr/workspaces" = { all-outputs = true; disable-scroll-wraparound = true; active-only = true; @@ -41,9 +47,9 @@ sort-by-number = true; }; - "sway/mode" = {tooltip = false;}; + "wlr/mode" = {tooltip = false;}; - "sway/window" = {max_length = 50;}; + "wlr/window" = {max_length = 50;}; tray = { spacing = 10; }; @@ -93,7 +99,7 @@ format-source-muted = ""; on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; }; - "sway/mode" = {format = ''{}'';}; + "wlr/mode" = {format = ''{}'';}; temperature = { critical-threshold = 80; format = "{temperatureC}°C {icon}";