diff --git a/configs/niri/waybar/bottom-bar.css b/configs/niri/waybar/bottom-bar.css index 83d20b2..29ccc37 100644 --- a/configs/niri/waybar/bottom-bar.css +++ b/configs/niri/waybar/bottom-bar.css @@ -47,7 +47,6 @@ button:hover { background-color: #eb4d4b; } -#window, #workspaces { margin: 0 4px; } diff --git a/configs/niri/waybar/bottom-bar.jsonc b/configs/niri/waybar/bottom-bar.jsonc index 6065550..e60971c 100644 --- a/configs/niri/waybar/bottom-bar.jsonc +++ b/configs/niri/waybar/bottom-bar.jsonc @@ -4,11 +4,12 @@ "position": "bottom", // Waybar at bottom layer "height": 42, "margin-top": 4, + "margin-bottom": 4, "margin-left": 4, "margin-right": 4, "spacing": 0, "modules-left": [ - "niri/workspaces", + "niri/workspaces" ], "modules-center": [ "wlr/taskbar" diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index 2cde221..f0ff7bc 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -14,13 +14,16 @@ let path ]; after = [ "niri.service" "xdg-desktop-portal.service" ]; - partOf = [ "niri.service" ]; + partOf = [ "niri.service" "tray.target" ]; bindsTo = [ "niri.service" ]; wants = [ "niri.service" "xdg-desktop-portal.service" ]; - wantedBy = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" "tray.target" ]; serviceConfig = { Type = "simple"; Restart = "on-failure"; + ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID"; + KillMode = "mixed"; + ConditionEnvironment = "WAYLAND_DISPLAY"; }; }; in