aniva
/
config
1
1
Fork 0
Code Issues 3 Pull Requests 2 Packages Projects Releases Wiki Activity

fix: Hyprland config update, eww bar integration #15

Merged
aniva merged 15 commits from wayland/hypr into main 2024-09-03 13:15:08 -07:00
Conversation 0 Commits 15 Files Changed 9 +22 -20
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b48bfabe9a - Show all commits

22
eww/bar/eww.scss
View File

@ -12,7 +12,6 @@ $workspace_hover: #2E5DFF;
$widget_bg: rgba(40, 40, 40, 0.5); $widget_bg: rgba(40, 40, 40, 0.5);
$weather: rgba(180, 220, 235, 0.8); $weather: rgba(180, 220, 235, 0.8);
$weather_end: rgba(171, 233, 179, 0.8); $weather_end: rgba(171, 233, 179, 0.8);
$clock: rgba(171, 233, 179, 1.0);
$media-progress-bg: #333333; $media-progress-bg: #333333;
$media: rgba(224, 232, 224, 0.7); $media: rgba(224, 232, 224, 0.7);
@ -20,7 +19,7 @@ $media-paused: rgba(224, 200, 200, 0.7);
// Dims the desktop background so status icons can be seen against darker wallpapers // Dims the desktop background so status icons can be seen against darker wallpapers
$status_bg: rgba(0, 0, 0, 0.3); $status_bg: rgba(0, 0, 0, 0.3);
$tray_bg: rgba(204, 204, 204, 0.1); $tray-bg: rgba(204, 204, 204, 0.3);
$tray: #c9cbff; $tray: #c9cbff;
$keyboard: #f2cdcd; $keyboard: #f2cdcd;
$idle_inhibitor: #f28fad; $idle_inhibitor: #f28fad;
@ -28,9 +27,9 @@ $volume: #fae3b0;
$microphone: #e8a2af; $microphone: #e8a2af;
$network: #f8bd96; $network: #f8bd96;
$backlight: #bd93f9; $backlight: #bd93f9;
$cpu_bg: #333333; $cpu-bg: #333333;
$cpu: #96cdfb; $cpu: #96cdfb;
$memory_bg: #333333; $memory-bg: #333333;
// previously bluetooth colour // previously bluetooth colour
$memory: #caa9c7; $memory: #caa9c7;
//$memory: #88bbeb; //$memory: #88bbeb;
@ -38,6 +37,7 @@ $temperature-bg: rgba(180, 180, 180, 0.5);
$temperature: #b6b2b3; $temperature: #b6b2b3;
$temperature-critical: #ff6666; $temperature-critical: #ff6666;
$battery: #ddb6f2; $battery: #ddb6f2;
$clock: rgba(171, 233, 179, 1.0);
// Styles all scales // Styles all scales
@ -76,7 +76,7 @@ trough slider {
.vbar { .vbar {
background-color: transparent; background-color: transparent;
font-size: 15px; font-size: 20px;
font-family: monospace; font-family: monospace;
} }
@ -176,6 +176,7 @@ box .weather {
font-family: "Noto Serif"; font-family: "Noto Serif";
min-height: 15px; min-height: 15px;
min-width: 15px; min-width: 15px;
font-size: 15px;
color: $media; color: $media;
border: none; border: none;
@ -202,19 +203,19 @@ box .temperature {
margin-bottom: 1px; margin-bottom: 1px;
margin-top: 1px; margin-top: 1px;
} }
.temperature-progress trough progress {
background-color: $temperature;
}
.temperature-progress-cpu trough progress { .temperature-progress-cpu trough progress {
background-color: mix($cpu, $temperature, 50%); background-color: mix($cpu, $temperature, 50%);
} }
.temperature-progress-gpu trough progress {
background-color: $temperature;
}
.temperature-progress-critical trough progress { .temperature-progress-critical trough progress {
background-color: $temperature-critical; background-color: $temperature-critical;
} }
box .cpu { box .cpu {
.progress { .progress {
background-color: $cpu_bg; background-color: $cpu-bg;
} }
color: $cpu; color: $cpu;
border-left: 2px solid $cpu; border-left: 2px solid $cpu;
@ -223,7 +224,7 @@ box .cpu {
} }
box .memory { box .memory {
.progress { .progress {
background-color: $memory_bg; background-color: $memory-bg;
} }
color: $memory; color: $memory;
border-left: 2px solid $memory; border-left: 2px solid $memory;
@ -240,4 +241,5 @@ box .clock {
//background-color: $tray_bg; //background-color: $tray_bg;
color: $tray; color: $tray;
border-left: 2px dotted $tray; border-left: 2px dotted $tray;
border-bottom: 2px dotted $tray-bg;
} }

20
eww/bar/eww.yuck
View File

@ -8,7 +8,7 @@
:geometry (geometry :geometry (geometry
:x "0%" :x "0%"
:y "0%" :y "0%"
:width "20px" :width "25px"
:height "99%" :height "99%"
:anchor "center left" :anchor "center left"
) )
@ -122,7 +122,7 @@
:onchange "${amixer} sset Master {}%" )) :onchange "${amixer} sset Master {}%" ))
(label (label
:class "icon" :class "icon"
:width 20 :height 20 :width 25 :height 20
:xalign 0.5 :yalign 0.5 :xalign 0.5 :yalign 0.5
:noindent true :noindent true
:text { current-volume-state == "off" ? "" : (current-volume > 50 ? "" : "") })))) :text { current-volume-state == "off" ? "" : (current-volume > 50 ? "" : "") }))))
@ -149,7 +149,7 @@
:onchange "${amixer} sset Capture {}%" )) :onchange "${amixer} sset Capture {}%" ))
(label (label
:class "icon" :class "icon"
:width 20 :height 20 :width 25 :height 20
:xalign 0.5 :yalign 0.5 :xalign 0.5 :yalign 0.5
:noindent true :noindent true
:text { current-microphone-state == "off" ? "" : "" })))) :text { current-microphone-state == "off" ? "" : "" }))))
@ -173,7 +173,7 @@
:orientation "h" :orientation "h"
:tooltip "CPU ${EWW_TEMPS[cpu-temp-key]}C; GPU ${EWW_TEMPS[gpu-temp-key]}C" :tooltip "CPU ${EWW_TEMPS[cpu-temp-key]}C; GPU ${EWW_TEMPS[gpu-temp-key]}C"
:space-evenly true :space-evenly true
:width 20 :width 25
:halign "" :valign "center" :halign "" :valign "center"
(progress (progress
:class { EWW_TEMPS[cpu-temp-key] > temperature-threshold ? "temperature-progress-critical" : "temperature-progress-cpu" } :class { EWW_TEMPS[cpu-temp-key] > temperature-threshold ? "temperature-progress-critical" : "temperature-progress-cpu" }
@ -184,7 +184,7 @@
:value {EWW_TEMPS[cpu-temp-key]} :value {EWW_TEMPS[cpu-temp-key]}
) )
(progress (progress
:class { EWW_TEMPS[gpu-temp-key] > temperature-threshold ? "temperature-progress-critical" : "temperature-progress" } :class { EWW_TEMPS[gpu-temp-key] > temperature-threshold ? "temperature-progress-critical" : "temperature-progress-gpu" }
:halign "center" :valign "center" :halign "center" :valign "center"
:flipped "true" :flipped "true"
:width 3 :width 3
@ -198,8 +198,8 @@
:orientation "v" :orientation "v"
(circular-progress (circular-progress
:class "progress" :class "progress"
:width 20 :width 25
:height 20 :height 25
:thickness 4 :thickness 4
:tooltip " ${round(EWW_CPU.avg, 2)}%" :tooltip " ${round(EWW_CPU.avg, 2)}%"
:value {EWW_CPU.avg} :value {EWW_CPU.avg}
@ -210,8 +210,8 @@
:orientation "v" :orientation "v"
(circular-progress (circular-progress
:class "progress" :class "progress"
:width 20 :width 25
:height 20 :height 25
:thickness 4 :thickness 4
:tooltip " ${round(100 * EWW_RAM.used_mem / EWW_RAM.total_mem, 2)}%" :tooltip " ${round(100 * EWW_RAM.used_mem / EWW_RAM.total_mem, 2)}%"
:value {EWW_RAM.used_mem_perc} :value {EWW_RAM.used_mem_perc}
@ -221,7 +221,7 @@
:class "systray" :class "systray"
:orientation "v" :orientation "v"
:space-evenly true :space-evenly true
:icon-size 20 :icon-size 25
:prepend-new true :prepend-new true
)) ))