diff --git a/configs/niri/waybar/bottom-bar.css b/configs/niri/waybar/bottom-bar.css index ea5065d..83d20b2 100644 --- a/configs/niri/waybar/bottom-bar.css +++ b/configs/niri/waybar/bottom-bar.css @@ -4,7 +4,7 @@ } window#waybar { - background-color: rgba(30, 30, 46, 0.5); + background-color: rgba(0, 0, 0, 0); color: #ffffff; } @@ -12,15 +12,6 @@ window#waybar.hidden { opacity: 0.2; } -window#waybar.termite { - background-color: #3F3F3F; -} - -window#waybar.chromium { - background-color: #000000; - border: none; -} - button { box-shadow: none; border: none; @@ -56,35 +47,6 @@ button:hover { background-color: #eb4d4b; } -#mode { - background-color: #64727D; - border-bottom: 3px solid #ffffff; -} - -#clock, -#battery, -#cpu, -#memory, -#disk, -#temperature, -#backlight, -#network, -#pulseaudio, -#wireplumber, -#custom-media, -#tray, -#mode, -#idle_inhibitor, -#keyboard-state, -#scratchpad, -#custom-logout, -#mpd { - padding: 0px 10px; - margin-right: 1px; - color: #f0f0ff; - border-radius: 5px; -} - #window, #workspaces { margin: 0 4px; @@ -98,65 +60,16 @@ button:hover { margin-right: 0; } -#clock { - font-weight: bold; -} - -#battery { - margin-left: 4px; -} - -#battery.charging, -#battery.plugged { - color: #ffffff; - background-color: rgba(38, 166, 91, 0.9); -} - -@keyframes blink { - to { - background-color: rgba(255, 255, 255, 0.9); - color: #000000; - } -} - -#battery.critical:not(.charging) { - background-color: rgba(245, 60, 60, 0.9); - color: #fff; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - -label:focus { - background-color: rgba(0, 0, 0, 0.9); -} - -#network.disconnected { - background-color: rgba(245, 60, 60, 0.9); -} - #taskbar { - margin-left: 4px; + background-color: rgba(30, 30, 46, 0.6); + border-radius: 20px; + padding: 5px; } #taskbar button { color: #f0f0ff; - background-color: rgba(30, 30, 46, 0.6); -} - -#taskbar button:first-child { - border-radius: 99px 0 0 99px; -} - -#taskbar button:last-child { - border-radius: 0 99px 99px 0; -} - -#taskbar button:first-child:last-child { - border-radius: 99px; + border-radius: 5px; } #taskbar button:hover { @@ -169,97 +82,4 @@ label:focus { #taskbar button.active:hover { background-color: rgba(108, 112, 134, 0.6); -} - - -#pulseaudio.muted { - background-color: rgba(46, 32, 30, 0.9); -} - -slider { - min-height: 0px; - min-width: 0px; - opacity: 0; - background-image: none; - border: none; - box-shadow: none; -} - -trough { - min-height: 10px; - min-width: 80px; - border-radius: 5px; - background-color: black; -} - -highlight { - min-width: 10px; - border-radius: 5px; - background-color: green; -} - -#wireplumber { - background-color: rgba(255, 240, 245, 0.8); - color: #000000; -} - -#wireplumber.muted { - background-color: rgba(245, 60, 60, 0.9); -} - - -#temperature.critical { - background-color: rgba(235, 77, 75, 0.8); -} - -#tray { - background-color: rgba(41, 128, 185, 0.8); -} - -#tray>.passive { - -gtk-icon-effect: dim; -} - -#tray>.needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; -} - -#idle_inhibitor { - background-color: #2d3436; -} - -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - -#language { - background: #00b093; - color: #740864; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state { - background: rgba(151, 225, 173, 0.8); - color: #000000; -} - -#keyboard-state>label { - margin-left: 2.5px; - margin-right: 2.5px; - padding: 0 5px; -} - -#keyboard-state>label.locked { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad.empty { - background-color: transparent; } \ No newline at end of file diff --git a/configs/niri/waybar/bottom-bar.jsonc b/configs/niri/waybar/bottom-bar.jsonc index eaec4aa..6065550 100644 --- a/configs/niri/waybar/bottom-bar.jsonc +++ b/configs/niri/waybar/bottom-bar.jsonc @@ -2,7 +2,7 @@ "reload_style_on_change": true, "layer": "top", "position": "bottom", // Waybar at bottom layer - "height": 32, + "height": 42, "margin-top": 4, "margin-left": 4, "margin-right": 4, @@ -21,5 +21,10 @@ "nix-setup": "🧠", "homelab": "🏠" } + }, + "wlr/taskbar": { + "tooltip": true, + "tooltip-format": "{title}", + "on-click": "activate" } } \ No newline at end of file diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index 6aee706..2cde221 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -13,10 +13,10 @@ let script path ]; - after = [ "niri.service" ]; + after = [ "niri.service" "xdg-desktop-portal.service" ]; partOf = [ "niri.service" ]; bindsTo = [ "niri.service" ]; - wants = [ "niri.service" ]; + wants = [ "niri.service" "xdg-desktop-portal.service" ]; wantedBy = [ "graphical-session.target" ]; serviceConfig = { Type = "simple"; @@ -40,6 +40,8 @@ in hypridle swayosd xwayland-satellite + adwaita-icon-theme + papirus-icon-theme ]; system.userActivationScripts.niriConfig.text = skygUtils.makeHyperlinkScriptToConfigs { filePath = "niri";