diff --git a/hypr-configs/hyprland/eww/assets/themes/feverblush.scss b/hypr-configs/hyprland/eww/assets/themes/feverblush.scss new file mode 100644 index 0000000..9578553 --- /dev/null +++ b/hypr-configs/hyprland/eww/assets/themes/feverblush.scss @@ -0,0 +1,42 @@ +// Everblush palette + +$black: #171717; +$gray100: #282828; +$gray90: #2d3437; +$gray80: #373d3f; +$gray70: #43494b; +$gray60: #5d6567; +$gray50: #767b7c; +$gray40: #8f9293; +$gray30: #a8a9aa; +$gray20: #c1c2c3; +$gray10: #dadada; +$white: #dadada; + +$red: #CF223E; + +$red_dark: #b35d5d; + +$green: #8ccf7e; +$green_dark: #70a665; + +$yellow: #e5c76b; +$yellow_dark: #b89f56; + +$blue: #67b0e8; +$blue_dark: #528dba; + +$magenta: #c47fd5; +$magenta_dark: #9d66aa; + +$cyan: #6cbfbf; +$cyan_dark: #569999; + +$base: $black; +$surface0: $gray100; +$surface1: $gray90; +$surface2: $gray80; +$white0: $gray10; +$white1: $white; +$white2: $white; +$accent: $blue; diff --git a/hypr-configs/hyprland/eww/eww.scss b/hypr-configs/hyprland/eww/eww.scss index d044764..7570c8c 100644 --- a/hypr-configs/hyprland/eww/eww.scss +++ b/hypr-configs/hyprland/eww/eww.scss @@ -1,4 +1,4 @@ -@import "./assets/themes/everblush.scss"; +@import "./assets/themes/feverblush.scss"; @import "./src/sidebar/styles.scss"; @import "./src/control-panel/styles.scss"; @import "./src/dashboard/styles.scss"; diff --git a/hypr-configs/hyprland/eww/src/_definitions.yuck b/hypr-configs/hyprland/eww/src/_definitions.yuck index a549e15..939dacc 100644 --- a/hypr-configs/hyprland/eww/src/_definitions.yuck +++ b/hypr-configs/hyprland/eww/src/_definitions.yuck @@ -1,15 +1,36 @@ +; Global +(defpoll thour :initial "0" :interval "60s" "date +'%I'") +(defpoll tmin :initial "0" :interval "60s" "date +'%M'") +(defpoll tpm :initial "0" :interval "60s" "date +'%p'") +(defpoll volumemute :initial "false" :interval "1s" "pamixer --get-mute") +(defpoll volume :initial "0" :interval "1s" "pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | tr -d '%'") +(defpoll mic_volume :initial "0" :interval "1s" "pactl get-source-volume @DEFAULT_SOURCE@ | awk '{print $5}' | tr -d '%'") +(defpoll brightness :initial "0" :interval "2s" "brightnessctl -m | awk -F, '{print substr($4, 0, length($4)-1)}' | tr -d '%'") +(defpoll wifi_icon :initial "" :interval "30s" "./scripts/wifi --ICON") +(defpoll wifi_essid :initial "" :interval "30s" "./scripts/wifi --ESSID") +(defpoll wifi_radio :initial "off" :interval "2s" "nmcli radio wifi") +(defpoll calendar_day :initial "1" :interval "20h" "date '+%d'") +(defpoll calendar_year :initial "2000" :interval "20h" "date '+%Y'") +(defpoll bat0 :initial "0" :interval "30s" "bash ./scripts/sys_info --bat") +(defpoll baticon :initial "" :interval "30s" "bash ./scripts/sys_info --baticon") +(defpoll batstat :interval "30s" "cat /sys/class/power_supply/BAT0/status") +(defpoll homedir :initial "" :interval "24h" "echo ~") + +; Sidebar (defvar revealVolume false) (defvar revealMicrophone false) (defvar revealBrightness false) (defvar revealControlpanel false) +(defvar revealSystray false) + +; Bottombar (defvar reveal1 false) (defvar reveal2 false) (defvar reveal3 false) (defvar reveal4 false) (defvar reveal5 false) (defvar reveal6 false) -(defvar revealweather false) -(defvar revealsystray false) + ; Workspaces (defvar show_no_of_windows false) @@ -40,28 +61,11 @@ "playerctl -F metadata -f '{ \"position\": {{position/1000000}}, \"duration\": {{mpris:length/1000000}}, \"readable\": \"{{duration(position)}}/{{duration(mpris:length)}}\" }'") ;; (deflisten pside "playerctl -F metadata -f '{ \"volume\": {{volume*100}}, \"shuffle\": \"{{shuffle}}\", \"loop\": \"{{loop}}\" }'") - -(defpoll thour :initial "0" :interval "60s" "date +'%I'") -(defpoll tmin :initial "0" :interval "60s" "date +'%M'") -(defpoll tpm :initial "0" :interval "60s" "date +'%p'") -(defpoll volumemute :initial "false" :interval "1s" "pamixer --get-mute") -(defpoll volume :initial "0" :interval "1s" "pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | tr -d '%'") -(defpoll mic_volume :initial "0" :interval "1s" "pactl get-source-volume @DEFAULT_SOURCE@ | awk '{print $5}' | tr -d '%'") -(defpoll brightness :initial "0" :interval "2s" "brightnessctl -m | awk -F, '{print substr($4, 0, length($4)-1)}' | tr -d '%'") -(defpoll wifi_icon :initial "" :interval "30s" "./scripts/wifi --ICON") -(defpoll wifi_essid :initial "" :interval "30s" "./scripts/wifi --ESSID") -(defpoll wifi_radio :initial "off" :interval "2s" "nmcli radio wifi") -(defpoll calendar_day :initial "1" :interval "20h" "date '+%d'") -(defpoll calendar_year :initial "2000" :interval "20h" "date '+%Y'") -(defpoll bat0 :initial "0" :interval "30s" "bash ./scripts/sys_info --bat") -(defpoll baticon :initial "" :interval "30s" "bash ./scripts/sys_info --baticon") -(defpoll batstat :interval "30s" "cat /sys/class/power_supply/BAT0/status") -(defpoll homedir :initial "" :interval "24h" "echo ~") - ; Controlpanel +(defvar revealWeather false) +(deflisten timerdis "./scripts/timer.py subscribe") (defpoll hostname :initial "idk" :interval "24h" 'echo "$(whoami)"') (defpoll uptime :initial "idk" :interval "1m" "uptime -p") -(deflisten timerdis "./scripts/timer.py subscribe") (defpoll weatherjson :initial '{ "FeelsLikeC": "0", diff --git a/hypr-configs/hyprland/eww/src/control-panel/main.yuck b/hypr-configs/hyprland/eww/src/control-panel/main.yuck index 98d5cfe..47b3d20 100644 --- a/hypr-configs/hyprland/eww/src/control-panel/main.yuck +++ b/hypr-configs/hyprland/eww/src/control-panel/main.yuck @@ -71,7 +71,7 @@ (label :class {reveal5 ? "titlesel" : "title"} :text "System")) (button :onclick "${EWW_CMD} update reveal6=${!reveal6} reveal5=false reveal4=false" - (label :class {reveal6 ? "titlesel" : "title"} :text "Sway"))) + (label :class {reveal6 ? "titlesel" : "title"} :text "Hyprland"))) (notes) (sysinfo) @@ -244,11 +244,11 @@ (box :orientation "h" (button - :onclick "${EWW_CMD} update revealweather=false" - (label :class {!revealweather ? "titlesel" : "title"} :text "Notifications")) + :onclick "${EWW_CMD} update revealWeather=false" + (label :class {!revealWeather ? "titlesel" : "title"} :text "Notifications")) (button - :onclick "${EWW_CMD} update revealweather=true" - (label :class {revealweather ? "titlesel" : "title"} :text "Weather"))) + :onclick "${EWW_CMD} update revealWeather=true" + (label :class {revealWeather ? "titlesel" : "title"} :text "Weather"))) (box :orientation "h" @@ -256,11 +256,11 @@ :hexpand true :space-evenly false (revealer - :reveal {!revealweather} + :reveal {!revealWeather} :transition "slideright" (notificationlog)) (revealer - :reveal revealweather + :reveal revealWeather :transition "slideleft" (weather))))) diff --git a/hypr-configs/hyprland/eww/src/sidebar/main.yuck b/hypr-configs/hyprland/eww/src/sidebar/main.yuck index d1abddb..983b568 100644 --- a/hypr-configs/hyprland/eww/src/sidebar/main.yuck +++ b/hypr-configs/hyprland/eww/src/sidebar/main.yuck @@ -31,16 +31,15 @@ (bottom) ))) -(defwidget top [] - (box - :orientation "v" - :space-evenly false - :valign "start" - :class "top_modules" - :height "450" +(defwidget top [] (box + :orientation "v" + :space-evenly false + :valign "start" + :class "top_modules" + :height "450" :vexpand false (home) - (workspaces) + (workspaces) (hiddenctl) )) @@ -52,7 +51,7 @@ :vexpand false :class "center_modules" :height "180" - (playerctl) + ; (playerctl) )) (defwidget bottom [] @@ -84,7 +83,6 @@ :onclick "hyprctl dispatch workspace ${workspace.id}" (box :hexpand false - :width 10 :height { workspace.id == current_workspace ? 50 : 30 } :class "workspace ${workspace.id == current_workspace ? "workspacethingactive" : "workspacething"}" ) @@ -115,10 +113,10 @@ :valign "end" :orientation "v" (eventbox - :onclick "${EWW_CMD} update revealsystray=${!revealsystray}" - (label :angle {!revealsystray ? 90 : 270} :class "revealtouch" :tooltip "reveal systray" :text "")) + :onclick "${EWW_CMD} update revealSystray=${!revealSystray}" + (label :angle {!revealSystray ? 90 : 270} :class "revealtouch" :tooltip "reveal systray" :text "")) (revealer - :reveal revealsystray + :reveal revealSystray :transition "slideup" (systray :icon_size 20