From 5976121dad62745989cc4c1c4702cb04d24a2ddf Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 8 May 2025 14:27:39 -0500 Subject: [PATCH] fixing up eww for better things --- .config/eww/eww.scss | 12 ++++++----- .config/eww/eww.yuck | 45 +++++++++++---------------------------- home/home.nix | 32 +++++++++++++++++++++------- home/modules/hyprland.nix | 17 +++++++++------ 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index 33b14e8..d99c5a7 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -201,7 +201,9 @@ tooltip label { // Icon Size .iconbat, .iconmem, .iconcpu .iconvol .iconbright { - font-size: 12; + // font-size: 12; + // padding-top: 2px; + // padding-left: 8px; } // Memory @@ -215,8 +217,8 @@ tooltip label { .iconmem { color: $base0A; padding-top: 2px; - padding-left: 10px; - padding-right: 8px; + padding-left: 8px; + // padding-right: 8px; } .mem_label { color: $base0A; @@ -313,12 +315,12 @@ tooltip label { } .icondisk { - font-size: 18; + // font-size: 18; color: $base09; // margin: 3px 5px 0px 3px; padding-top: 3px; padding-left: 5px; - padding-right: 8px; + padding-right: 3px; } .separ { diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck index 6fcbfca..2182361 100644 --- a/.config/eww/eww.yuck +++ b/.config/eww/eww.yuck @@ -17,7 +17,7 @@ (defpoll WLAN_ICON :interval "1m" "scripts/wifi --ICON") (defpoll HOST :interval "1h" "hostname") (defpoll DISK :interval "1m" "disk") -(defpoll gpu :interval "1s" "gpu") +(defpoll gpu_percent :interval "1s" "gpu") ;; (defpoll nextcloud :interval "2s" "scripts/nextcloud.sh") (deflisten volume_percent :interval "0.2s" "tail -F /tmp/vol") (deflisten appname "scripts/appname") @@ -139,13 +139,10 @@ :space-evenly false :spacing 0 (button - :onclick "scripts/pop system" + :onclick "alacritty --class btop -e btop -p 2 &" :class "icondisk" :tooltip "${DISK}" - "󰋊") - (label - :text "${DISK}" - :class "disk_label"))) + "󰋊 ${DISK}"))) (defwidget bright [] (box @@ -158,11 +155,7 @@ :class "iconbright" ;; :onclick "scripts/pop audio" :tooltip "${brightness_percent}%" - "") - (label - :text brightness_percent - :class "bright_label")) - ) + " ${brightness_percent}"))) (defwidget volume [] (box @@ -172,12 +165,9 @@ :space-evenly false (button :class "iconvol" - :onclick "scripts/pop audio" + :onclick "alacritty --class pulsemixer -e pulsemixer &" :tooltip "${volume_percent}%" - "󰕾") - (label - :text volume_percent - :class "vol_label"))) + "󰕾 ${volume_percent}"))) (defwidget cpu [] (box @@ -186,13 +176,10 @@ :hexpand "false" :space-evenly false (button - :onclick "scripts/pop system" + :onclick "alacritty --class btop -e btop &" :class "iconcpu" :tooltip "using ${EWW_CPU.avg}% of cpu" - "") - (label - :text "${round(EWW_CPU.avg, 0)}%" - :class "cpu_label"))) + " ${round(EWW_CPU.avg, 0)}%"))) (defwidget gpu [] (box @@ -201,13 +188,10 @@ :hexpand "false" :space-evenly false (button - :onclick "scripts/pop system" + :onclick "alacritty --class btop -e nvtop &" :class "icongpu" - :tooltip gpu - "󱤓") - (label - :text gpu - :class "gpu_label"))) + :tooltip gpu_percent + "󱤓 ${gpu_percent}"))) (defwidget mem [] (box @@ -216,13 +200,10 @@ :vexpand "true" :hexpand "false" (button - :onclick "scripts/pop system" + :onclick "alacritty --class btop -e btop &" :class "iconmem" :tooltip "using ${EWW_RAM.used_mem_perc}% ram" - "") - (label - :text "${round(EWW_RAM.used_mem_perc, 0)}%" - :class "mem_label"))) + " ${round(EWW_RAM.used_mem_perc, 0)}%"))) (defwidget kdeconnect [] (box diff --git a/home/home.nix b/home/home.nix index 04eec0c..8be8c9a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -664,12 +664,12 @@ in { output = [ "DP-1" "eDP-1" ]; position = if laptop then "bottom" else "top"; height = 35; - width = if laptop then 1400 else 2100; + width = if laptop then 1400 else 3000; # Choose the order of the modules "custom/wintitle", modules-left = [ "hyprland/workspaces" "hyprland/window" ]; modules-center = [ ]; modules-right = - [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "tray" "clock" ]; + [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "custom/gpu" "tray" "clock" ]; margin-top = if laptop then -5 else 5; margin-bottom = if laptop then 4 else 0; margin-left = 6; @@ -694,7 +694,7 @@ in { # on-scroll-down = "hyprctl dispatch workspace e-1"; }; tray = { - icon-size = 21; + icon-size = 20; spacing = 10; }; clock = { @@ -704,8 +704,15 @@ in { format-alt = "{:%Y-%m-%d}"; format = "{:%a %b %e, %I:%M %p}"; }; - cpu = { format = " {usage}%"; }; - memory = { format = " {}%"; }; + cpu = { format = " {usage}%"; on-click = "alacritty --class btop -e btop"; }; + memory = { format = " {}%"; on-click = "alacritty --class btop -e btop"; }; + "custom/gpu" = { + exec = "cat /sys/class/hwmon/hwmon0/device/gpu_busy_percent"; + format = "󱤓 {}%"; + return-type = ""; + interval = 1; + on-click = "alacritty --class btop -e nvtop"; + }; temperature = { # "thermal-zone": 2, # "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", @@ -748,7 +755,7 @@ in { }; pulseaudio = { scroll-step = 1; - format = "{icon} {volume}%"; + format = "{icon} {volume}%"; format-muted = "󰝟 muted"; format-source = ""; format-source-muted = ""; @@ -936,7 +943,7 @@ in { padding-right: 5px; border-radius: 20px; transition: none; - color: @base09; + color: @base0A; background: transparent; } @@ -958,6 +965,15 @@ in { background: transparent; } + #custom-gpu { + padding-left: 5px; + padding-right: 5px; + border-radius: 20px; + transition: none; + color: @base08; + background: transparent; + } + #battery { padding-left: 5px; padding-right: 5px; @@ -1434,7 +1450,7 @@ in { padding.y = 10; dynamic_padding = true; }; - terminal.shell.program = "zellij"; + terminal.shell.program = "nu"; font = { normal = { family = "VictorMono Nerd Font"; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 96cb273..3cd70af 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -355,23 +355,26 @@ in # Blur waybar # blurls = "gtk-layer-shell"; + layerrule = [ + # "blur, gtk-layer-shell" + "ignorezero, gtk-layer-shell" + "animation snapslide, gtk-layer-shell" + ]; # blurls=notifications exec-once = [ "kwalletd6" - # "eww daemon" + "eww daemon" "hyprpaper" - # "eww open ${if laptop then "bar0" else "bar1"}" + "eww open ${if laptop then "bar0" else "bar1"}" # "dunst" - "waybar" + # "waybar" "rbw-agent" "hyprctl dispatch --batch 'splitratio 1; splitration -0.35'" "dbus-update-activation-environment --systemd --all" "/usr/lib/kdeconnectd" - # "systemctl --user stop jellyfin-mpv-shim" - # "systemctl --user stop emacs" - "systemctl --user stop nextcloud-client" - # "jellyfin-mpv-shim" + "systemctl --user restart jellyfin-mpv-shim" + "systemctl --user restart nextcloud-client" # "nextcloud" "kdeconnect-indicator" "wl-paste --watch cliphist store"