From e1538bff90d130212cc2e502862988ec0c96fb46 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 11 Jul 2024 12:01:02 -0700 Subject: [PATCH] feat: basic waybar rice --- home.nix | 100 ++++++++++++++++++++++++++++++++++++++++------ waybar/waybar.css | 15 ++++--- 2 files changed, 95 insertions(+), 20 deletions(-) diff --git a/home.nix b/home.nix index 06863aa..0dc6642 100755 --- a/home.nix +++ b/home.nix @@ -250,8 +250,6 @@ "blur,swaync-control-center" "ignorezero,swaync-control-center" "blur,logout_dialog" - - "blur,waybar" ]; monitor = [ "DP-1,2560x1440@165,1920x0,auto" @@ -338,17 +336,95 @@ mainBar = { layer = "top"; position = "top"; - height = 30; - output = [ - "DP-1" - "HDMI-A-1" - ]; - modules-left = [ "hyprland/workspaces" "sway/submap" "wlr/taskbar" ]; - modules-right = [ "mpd" "temperature" ]; - + height = 24; + width = 1600; + reload-style-on-change = true; + margin = "10px 0px 0px 0px"; + modules-left = [ "hyprland/window" "hyprland/workspaces" ]; + modules-right = [ "backlight" "group/adjustable" "custom/weather" ]; + modules-center = [ "network" "group/hardware" "clock" ]; "hyprland/workspaces" = { - disable-scroll = true; - all-outputs = true; + active-only = false; + all-outputs = false; + format = "{icon}"; + format-icons = { + default = ""; + active = ""; + }; + persistent-workspaces = { + eDP-1 = [ 1 ]; + DP-1 = [ 2 3 4 5 ]; + }; + }; + "group/hardware" = { + orientation = "inherit"; + modules = [ "cpu" "memory" "battery" ]; + }; + "group/adjustable" = { + orientation = "inherit"; + drawer = { + transition-duration = 500; + transition-left-to-right = true; + }; + modules = [ "pulseaudio" "mpris" ]; + }; + "custom/weather" = { + orientation = "horizontal"; + exec = "curl wttr.in/?format=\"%l:%20%t\""; + interval = 10; + }; + cpu = { + interval = 10; + format = "{usage}%  "; + }; + memory = { + interval = 10; + format = "{percentage}%  "; + }; + # mpris = { + # format-playing = "  {title} "; + # format-paused = " 󰏤 {title} "; + # format-stopped = "Nothing Playing"; + # }; + tray = { + spacing = 10; + }; + clock = { + format = "{:%a %b %d, %I:%M %p} "; + }; + backlight = { + device = "intel_backlight"; + format = "{percent}% {icon}"; + format-icons = [ "󰃞" "󰃠" ]; + }; + battery = { + states = { + good = 95; + warning = 20; + critical = 10; + }; + format = "{capacity}% {icon}"; + format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ]; + }; + "hyprland/window" = { + format = "{class}"; + }; + network = { + format-wifi = "{essid} "; + format-linked = "{ifname} (No IP) "; + format-disconnected = "Disconnected ⚠"; + format-alt = "{ifname}: {ipaddr}/{cidr}"; + }; + pulseaudio = { + format = "{volume}% {icon} {format_source}"; + format-bluetooth = "{volume}% {icon}  {format_source}"; + format-bluetooth-muted = " {icon} {format_source}"; + format-muted = " {format_source}"; + format-source = "{volume}% "; + format-source-muted = ""; + format-icons = { + default = [ "" "" "" ]; + }; }; }; }; diff --git a/waybar/waybar.css b/waybar/waybar.css index 3c7f895..0d7dbfc 100644 --- a/waybar/waybar.css +++ b/waybar/waybar.css @@ -10,14 +10,14 @@ window#waybar { } #workspaces { - background: @bg; + background: #24273a; padding: 0px 2px 0px 2px; margin: 0px 0px 0px 5px; border-radius: 5px; } #workspaces { - background: @bg; + background: #24273a; padding: 0px 5px 0px 5px; margin: 0px 0px 0px 5px; border-radius: 5px; @@ -26,7 +26,7 @@ window#waybar { #workspaces button, #workspaces button:hover { padding: 0; - background-color: @bg; + background-color: #24273a; /* color: @color4; */ } #workspaces button.active, @@ -46,7 +46,7 @@ window#waybar { #custom-weather, #window, #backlight { - background-color: @bg; + background-color: #24273a; /* color: @color4; */ opacity: 1; border-radius: 5px; @@ -75,11 +75,10 @@ window#waybar { } #memory, #cpu { - margin-right: 0px; padding-right: 2px; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; - border-right-width: 0px; + /* border-top-right-radius: 0px; */ + /* border-bottom-right-radius: 0px; */ + /* border-right-width: 0px; */ } #memory, #battery {