diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix index 8d9a643..f334fa9 100644 --- a/modules/home/desktop/niri/default.nix +++ b/modules/home/desktop/niri/default.nix @@ -68,7 +68,7 @@ in { programs = { walker = import ./programs/walker {inherit config inputs pkgs;}; - waybar = import ./programs/waybar {inherit config colors getExe ifLaptop pkgs;}; + waybar = import ./programs/waybar {inherit config colors getExe ifLaptop launcher pkgs;}; }; services = import ./services {inherit pkgs lockscreen getExe perSystem;}; diff --git a/modules/home/desktop/niri/niri.nix b/modules/home/desktop/niri/niri.nix index a3ab5db..09dbbcb 100644 --- a/modules/home/desktop/niri/niri.nix +++ b/modules/home/desktop/niri/niri.nix @@ -215,6 +215,12 @@ in { off } } + layer-rule { + match namespace="waybar" + match at-startup=true + + opacity 0.99 // fixes the black fill + } window-rule { match title="Картинка в картинці" @@ -250,6 +256,7 @@ in { block-out-from "screencast" } + binds { Mod+Shift+Slash { show-hotkey-overlay; } diff --git a/modules/home/desktop/niri/programs/waybar/default.nix b/modules/home/desktop/niri/programs/waybar/default.nix index f7bf74b..2dee77e 100644 --- a/modules/home/desktop/niri/programs/waybar/default.nix +++ b/modules/home/desktop/niri/programs/waybar/default.nix @@ -3,6 +3,7 @@ config, getExe, ifLaptop, + launcher, pkgs, ... }: { @@ -21,6 +22,7 @@ margin-bottom = 3; reload_style_on_change = true; modules-left = [ + "custom/launcher" "niri/language" "niri/workspaces" "wlr/taskbar" @@ -101,7 +103,7 @@ }; "clock" = { interval = 1; - format = "{:%B %d - %H:%M - %A}"; + format = "{:%B %d - %R - %A}"; tooltip = false; # tooltip-format = "{%y.%m.%d - %B %d, %A}"; }; @@ -155,6 +157,11 @@ on-click = getExe pkgs.pwvucontrol; on-click-right = "wpctl set-mute @DEFAULT_SINK@ toggle"; }; + "custom/launcher" = { + format = ""; + on-click = launcher; + tooltip = false; + }; "custom/notification" = { tooltip = false; format = "{icon}"; @@ -217,11 +224,14 @@ font-weight: 500; font-size: 18px; } - window#waybar, .modules-center, .mpris.stopped { background-color: transparent; } + window#waybar { + background: @base00; + border-radius: 24px; + } .modules-left, .modules-center, .modules-right { @@ -231,12 +241,13 @@ border-top-right-radius: 0px; */ background-color: @base00; border-radius: 24px; - border: 1px solid @base0D; color: @base05; + /* margin: 1px; for the window#waybar border */ } tooltip { background: @base01; border: 1px solid @base0D; + border-radius: 24px; } tooltip label { color: @base05; @@ -256,6 +267,7 @@ #backlight, #battery, #clock, + #custom-launcher, #custom-notification, #custom-separator, #idle_inhibitor, @@ -274,17 +286,18 @@ padding: 0 6px; } /* left modules */ - #language, + #custom-launcher, + /* #language, */ #clock, #wireplumber { margin: 3px; } #taskbar button { - padding: 0 2px; + padding: 0 3px; margin: 3px; } #workspaces button { - padding: 0 4px; + padding: 0 5px; margin: 3px; } #tray button { @@ -301,8 +314,9 @@ #wireplumber { padding: 0 14px 0 10px; } + #custom-launcher, #power-profiles-daemon { - padding: 0 16px 0 8px; + padding: 0 17px 0 8px; } #privacy, #taskbar,