diff --git a/hypr-configs/hyprland/eww/bar/bar.yuck b/hypr-configs/hyprland/eww/bar/bar.yuck index 99c70bf..4f7cc6a 100644 --- a/hypr-configs/hyprland/eww/bar/bar.yuck +++ b/hypr-configs/hyprland/eww/bar/bar.yuck @@ -93,7 +93,7 @@ (box :hexpand false :width 10 - :height { workspace.id == current_workspace ? 60 : 35 } + :height { workspace.id == current_workspace ? 50 : 30 } :class "workspace ${workspace.id == current_workspace ? "workspacethingactive" : "workspacething"}" ) ) @@ -102,23 +102,6 @@ ) ) -; (defwidget workspaces [] -; (eventbox -; :cursor "pointer" -; (box -; :class "workspaces widget" -; :orientation "v" -; :space-evenly false -; (for workspace in {workspacejson} -; (button -; :onclick "swaymsg -t command workspace number ${workspace.name}" -; (box -; :hexpand false -; :width 10 -; :height { workspace.focused ? 60 : !workspace.empty ? 40 : 30} -; :class { workspace.focused ? "workspacethingactive" : "workspacething"})))))) - - (defwidget home [] (box :class "widget" @@ -242,6 +225,7 @@ :valign "end" (button :onclick "alacritty -e nmtui" :tooltip wifi_essid (label :class "icon" :style "font-size: 18px;" :text wifi_icon)) + (reveal_on_hover :revealval reveal1 :revealvalstr "reveal1" @@ -255,15 +239,36 @@ (scale :class "volslide" :value volume - :onchange "pamixer --set-volume {}" + :onchange "pactl set-sink-volume @DEFAULT_SINK@ {}%" :orientation "v" :tooltip "${volume}%" - :max 100 + :max 101 :min 0 :flipped true)) + (reveal_on_hover - :revealval reveal2 - :revealvalstr "reveal2" + :revealval reveal2 + :revealvalstr "reveal2" + (box + :orientation "v" + :space-evenly false + :class "sound" + (label :class "icon" :text {volumemute == 'false' ? "" : "󰖁"}) + ;; {volumemute == 'no' ? volume : " Muted"}) + ) + (scale + :class "volslide" + :value volume + :onchange "pactl set-source-volume @DEFAULT_SOURCE@ {}%" + :orientation "v" + :tooltip "${volume}%" + :max 100 + :min 0 + :flipped true)) + + (reveal_on_hover + :revealval reveal5 + :revealvalstr "reveal5" (box :orientation "v" :space-evenly false @@ -271,8 +276,8 @@ (label :class "icon" :text "󰃞")) (scale :class "brislide" - :value brightness :onchange "brightnessctl set {}%" + :value brightness :orientation "v" :tooltip "${brightness}%" :max 100 @@ -287,8 +292,8 @@ :space-evenly false :valign "end" (eventbox - :onhover "${EWW_CMD} update ${revealvalstr}=true" - :onhoverlost "${EWW_CMD} update ${revealvalstr}=false" + :onhover `${EWW_CMD} update ${revealvalstr}=true` + :onhoverlost `${EWW_CMD} update ${revealvalstr}=false` (box :space-evenly false :orientation "v" diff --git a/hypr-configs/hyprland/eww/colors.scss b/hypr-configs/hyprland/eww/colors.scss index 1fa078a..154ffec 100644 --- a/hypr-configs/hyprland/eww/colors.scss +++ b/hypr-configs/hyprland/eww/colors.scss @@ -1 +1 @@ -@import "./themes/oxocarbon.scss"; +@import "./themes/everblush.scss"; diff --git a/hypr-configs/hyprland/eww/themes/everblush.scss b/hypr-configs/hyprland/eww/themes/everblush.scss new file mode 100644 index 0000000..6e1c157 --- /dev/null +++ b/hypr-configs/hyprland/eww/themes/everblush.scss @@ -0,0 +1,41 @@ +// Everblush palette + +$black: #141b1e; +$gray100: #232a2d; +$gray90: #2d3437; +$gray80: #373d3f; +$gray70: #43494b; +$gray60: #5d6567; +$gray50: #767b7c; +$gray40: #8f9293; +$gray30: #a8a9aa; +$gray20: #c1c2c3; +$gray10: #dadada; +$white: #dadada; + +$red: #e57474; +$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: $red; diff --git a/hypr-configs/hyprland/eww/themes/fullerene.scss b/hypr-configs/hyprland/eww/themes/fullerene.scss index 596f2eb..4487057 100644 --- a/hypr-configs/hyprland/eww/themes/fullerene.scss +++ b/hypr-configs/hyprland/eww/themes/fullerene.scss @@ -1,30 +1,30 @@ // by Gwynsav -$black :#0c0c0c; -$gray100 :#161616; -$gray90 :#1f1f1f; -$gray80 :#262626; -$gray70 :#393939; -$gray60 :#525252; -$gray50 :#6f6f6f; -$gray40 :#8d8d8d; -$gray30 :#a8a8a8; -$gray20 :#c6c6c6; -$gray10 :#e0e0e0; -$white :#f4f4f4; +$black: #0c0c0c; +$gray100: #161616; +$gray90: #1f1f1f; +$gray80: #262626; +$gray70: #393939; +$gray60: #525252; +$gray50: #6f6f6f; +$gray40: #8d8d8d; +$gray30: #a8a8a8; +$gray20: #c6c6c6; +$gray10: #e0e0e0; +$white: #f4f4f4; -$red :#c1374b; -$red_dark :#902c3b; -$green :#32ae80; -$green_dark :#2a8664; -$yellow :#e1a36b; -$yellow_dark :#d78438; -$blue :#738be7; -$blue_dark :#546ad8; -$magenta :#9e7ad5; -$magenta_dark :#875fd4; -$cyan :#2b9eb0; -$cyan_dark :#1f7a89; +$red: #c1374b; +$red_dark: #902c3b; +$green: #32ae80; +$green_dark: #2a8664; +$yellow: #e1a36b; +$yellow_dark: #d78438; +$blue: #738be7; +$blue_dark: #546ad8; +$magenta: #9e7ad5; +$magenta_dark: #875fd4; +$cyan: #2b9eb0; +$cyan_dark: #1f7a89; $base: $black; $surface0: $gray80;