From 480dbc953f29daca121fe9b3c2fed86133621b9a Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 3 Mar 2025 11:12:41 -0500 Subject: [PATCH] [home.wayland] Update configuration --- modules/home/wayland/keybindings.nix | 1 - modules/home/wayland/sway.nix | 8 ++-- modules/home/wayland/waybar-style.css | 24 +++++----- modules/home/wayland/waybar.nix | 69 ++++++++++++++++----------- 4 files changed, 58 insertions(+), 44 deletions(-) diff --git a/modules/home/wayland/keybindings.nix b/modules/home/wayland/keybindings.nix index 8f446238..4e285ebc 100644 --- a/modules/home/wayland/keybindings.nix +++ b/modules/home/wayland/keybindings.nix @@ -15,7 +15,6 @@ in "${mod}+d" = "${menu}"; "${mod}+Shift+F" = "exec MOZ_DISABLE_RDD_SANDBOX=1 firefox"; "${mod}+Return" = "exec ${term}"; - # "${mod}+Shift+Return" = "exec ${pkgs.wezterm}/bin/wezterm"; "${mod}+x" = "exec wlogout"; "${mod}+s" = null; "${mod}+w" = null; diff --git a/modules/home/wayland/sway.nix b/modules/home/wayland/sway.nix index e02eb556..8853075a 100644 --- a/modules/home/wayland/sway.nix +++ b/modules/home/wayland/sway.nix @@ -37,7 +37,7 @@ in }; config = { terminal = lib.getExe pkgs.ghostty; - menu = "exec ${term} --class=py.floating --window-height=15 --window-width=10 --font-size=16 -e ${pkgs.sway-launcher-desktop}/bin/sway-launcher-desktop"; + menu = "exec ${term} --class=py.floating --window-height=20 --window-width=12 --font-size=14 -e ${pkgs.sway-launcher-desktop}/bin/sway-launcher-desktop"; modifier = "Mod4"; bars = [ { command = "true"; } ]; focus = { @@ -51,9 +51,9 @@ in size = 12.0; }; gaps = { - inner = 4; - outer = 4; - smartBorders = "off"; + inner = 1; + outer = 1; + smartBorders = "on"; smartGaps = false; }; input = { diff --git a/modules/home/wayland/waybar-style.css b/modules/home/wayland/waybar-style.css index 3a52dd14..3a564702 100644 --- a/modules/home/wayland/waybar-style.css +++ b/modules/home/wayland/waybar-style.css @@ -7,7 +7,11 @@ } #window { - padding: 0 10px; + padding: 0 4px; +} + +.modules-center { + padding-right: 20px; } window#waybar { @@ -27,8 +31,8 @@ window#waybar { #workspaces button { padding: 0 8px; color: @text; - border: 2px solid @subtext0; - border-radius: 10px; + border-bottom: 2px solid @subtext0; + border-radius: 0px; min-width: 25px; margin-right: 8px; } @@ -38,15 +42,15 @@ window#waybar { } #workspaces button.focused { - border: 3px solid @mauve; + border-bottom: 3px solid @mauve; + font-weight: bold; } #workspaces button.urgent { - background-color: @red; + border: 2px solid @red; } #workspaces button:hover { - box-shadow: inherit; border-color: @blue; color: @blue; } @@ -77,7 +81,6 @@ window#waybar { color: @text; } -#tray:hover, #mode:hover, #battery:hover, #temperature:hover, @@ -89,10 +92,8 @@ window#waybar { #idle_inhibitor:hover, #sway-language:hover, #backlight:hover { - padding: 2px 8px; - margin: 2px 5px; - color: @base; background-color: @subtext1; + color: @base; } #clock { @@ -107,7 +108,8 @@ window#waybar { color: @red; } -#battery.charging { +#battery.charging, +#battery.full { color: @green; } diff --git a/modules/home/wayland/waybar.nix b/modules/home/wayland/waybar.nix index aaebdfb6..a9234282 100644 --- a/modules/home/wayland/waybar.nix +++ b/modules/home/wayland/waybar.nix @@ -2,8 +2,6 @@ pkgs, lib, config, - inputs, - system, ... }: let @@ -30,7 +28,7 @@ in "sway/workspaces" "sway/mode" ]; - modules-center = [ "custom/media" ]; + modules-center = [ "mpris" ]; modules-right = [ "idle_inhibitor" "wireplumber" @@ -49,7 +47,7 @@ in format = "{icon}"; }; "idle_inhibitor" = { - format = "{icon}"; + format = "{icon} "; format-icons = { "activated" = ""; "deactivated" = ""; @@ -61,21 +59,26 @@ in }; "clock" = { tooltip-format = "{calendar}"; - format = "{:%H:%M:%S}  "; + format = " {:%H:%M:%S}"; format-alt = "{%d %b %Y}"; interval = 1; + calendar = { + format = { + today = "{}"; + }; + }; }; "cpu" = { - format = "{usage}% "; + format = " {usage}%"; interval = 5; tooltip = false; }; "memory" = { - format = "{}% "; + format = " {}%"; }; "temperature" = { critical-threshold = 80; - format = "{temperatureC}°C {icon}"; + format = "{icon} {temperatureC}°C"; format-icons = [ "" "" @@ -85,7 +88,7 @@ in ]; }; "backlight" = { - format = "{percent}% {icon}"; + format = "{icon} {percent}%"; format-icons = [ "󰃚" "󰃛" @@ -98,14 +101,15 @@ in }; "battery" = { states = { - good = 80; + good = 65; warning = 30; critical = 15; }; - format = "{capacity}% {icon}"; - format-charging = "{capacity}% 󰂄"; - format-plugged = "{capacity}% "; - format-alt = "{time} {icon}"; + full-at = 80; + format = "{icon} {capacity}%"; + format-charging = "󰂄 {capacity}%"; + format-plugged = " {capacity}%"; + format-alt = "{icon} {time}"; format-icons = [ "󰂎" "󰁺" @@ -121,33 +125,42 @@ in ]; }; "network" = { - format-wifi = "{essid} "; - format-ethernet = "{ifname}: {ipaddr}/{cidr} 󰈀"; - format-linked = "{ifname} (No IP) 󰄡"; - format-disconnected = "Disconnected! ⚠"; + format-wifi = " {essid}"; + format-ethernet = "󰈀 {ifname}: {ipaddr}/{cidr}"; + format-linked = "󰄡 {ifname} (No IP)"; + format-disconnected = "⚠ Disconnected!"; format-alt = "{ifname}: {ipaddr}/{cidr}"; on-click = lib.getExe pkgs.networkmanagerapplet; }; "wireplumber" = { - format = "{volume}% {icon}"; + format = "{icon} {volume}%"; format-muted = "󰝟"; format-icons = [ "" "" "" ]; + states = { + low = 15; + med = 40; + high = 60; + }; + scroll-step = 5; on-click = lib.getExe pkgs.pwvucontrol; }; - "custom/media" = { - format = "{icon}{}"; - return-type = "json"; - format-icons = { - Paused = " "; - Playing = " "; + mpris = { + format = "{status_icon} {dynamic}"; + format-paused = "{status_icon} {dynamic}"; + dynamic-order = [ + "artist" "title" + ]; + status-icons = { + playing = ""; + paused = ""; + }; + player-icons = { + firefox = "󰈹"; }; - max-length = 70; - exec = ''${lib.getExe pkgs.playerctl} -a metadata --format '{"text": "{{playerName}}: {{artist}} - {{markup_escape(title)}}", "tooltip": "{{playerName}} : {{markup_escape(title)}}", "alt": "{{status}}", "class": "{{status}}"}' -F''; - on-click = "${lib.getExe pkgs.playerctl} play-pause"; }; }; }; -- 2.51.2