diff --git a/eww/eww.scss b/eww/eww.scss index 669c8d2..1b2fe23 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -57,7 +57,7 @@ tooltip label { .membar { color: #e0b089; - background-color: #38384d; + background-color: #38384d; border-radius: 10px; } .batbar { @@ -101,10 +101,13 @@ tooltip label { } .iconmem { - font-size: 15; - margin: 11px; + font-size: 23; + margin: 4px -3px 4px 0px; color: #e0b089; } +.mem_padding { + margin: 10px; +} .iconbat { font-size: 23; color: #afbea2; @@ -119,9 +122,9 @@ tooltip label { } .mem_module { - background-color: #0f0f17; + background-color: #0f0f17; border-radius: 16px; - margin: 0px 10px 0px 3px; + margin: 0px 10px 0px 0px; } .bat_module { background-color: #0f0f17; @@ -392,6 +395,17 @@ color: #bfc9db; margin: 20px 0px 0px 0px; } +.change_audio_box { + margin: 0px 0px 0px 100px; +} + +.change_audio { + color: #a1bdce; + margin: 0px 30px 5px 0px; + font-size: 30px; + font-weight: bold; +} + .speaker_bar scale trough highlight { all: unset; background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); diff --git a/eww/eww.yuck b/eww/eww.yuck index b9dc624..7d76f9e 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -5,7 +5,7 @@ ;; volume definitions ;; (defpoll volume_percent :interval "3s" "pactl get-sink-volume @DEFAULT_SINK@ | awk -F '/' ' { print $2 } ' | tr -d ' %'") -(defpoll mic_percent :interval "3s" "amixer -D pulse sget Capture | grep 'Left:' | awk -F'[][]' '{ print $2 }' | tr -d '%'") +(defpoll mic_percent :interval "3s" "pactl get-source-volume @DEFAULT_SOURCE@ | awk -F'/' '{ print $2 }' | tr -d ' %'") (defpoll brightness_percent :interval "5s" "brightnessctl -m -d intel_backlight | awk -F, '{print substr($4, 0, length($4)-1)}' | tr -d '%'") ;; battery definitions ;; @@ -88,15 +88,16 @@ ;; memory ;; (defwidget mem [] (box :class "mem_module" :vexpand "false" :hexpand "false" + (button :class "iconmem" + :onclick "$HOME/.config/eww/scripts/pop system" (circular-progress :value memory :class "membar" :thickness 4 :tooltip "using ${memory}% ram" - :onclick "$HOME/.config/eww/scripts/pop system" :show_truncated false :wrap false - (button :class "iconmem" "") - ))) + (label :class "mem_padding" :text "") + )))) ;; seperator ;; @@ -180,9 +181,16 @@ :space-evenly "false" :orientation "h" :tooltip "mic on ${mic_percent}%" - :onchange "amixer -D pulse sset Capture {}%" + :onchange "pactl set-source-volume @DEFAULT_SOURCE@ {}%" :max 100 - :min 0))))))) + :min 0)))) + (label :text "" :class "audio_sep" :halign "center") + (box :class "change_audio_box" :halign "v" :space-evenly "false" :hexpand "false" :vexpand "false" + (box :class "change_audio" :orientation "v" + (button :onclick "scripts/change-audio internal" "")) + (box :class "change_audio" :orientation "v" + (button :onclick "scripts/change-audio bluetooth" "")) + )))) ;; Music ;; ;;(defwidget music [] diff --git a/eww/scripts/change-audio b/eww/scripts/change-audio new file mode 100755 index 0000000..9028dff --- /dev/null +++ b/eww/scripts/change-audio @@ -0,0 +1,37 @@ +#! /bin/sh + +internal() { + SPEAKER=$(pactl list sinks | grep "Name" | grep "alsa" | awk -F ': ' '{ print $2 }') + if [ "$SPEAKER" != "" ]; then + pactl set-default-sink "$SPEAKER" + pactl set-sink-mute "$SPEAKER" false + DEVICE=$( echo "$SPEAKER" | awk -F '.' ' { print $4 } ') + notify-send "changed audio to "$DEVICE" " + else + notify-send "failed, not available!" + fi +} + +bluetooth() { + SPEAKER=$(pactl list sinks | grep "Name" | grep "blue" | awk -F ': ' '{ print $2 }') + if [ "$SPEAKER" != "" ]; then + pactl set-default-sink "$SPEAKER" + pactl set-sink-mute "$SPEAKER" false + DEVICE=$(echo "$SPEAKER" | awk -F '.' ' { print $4 } ') + notify-send "changed audio to "$DEVICE" " + else + notify-send "failed, not available!" + fi +} + + +if [ "$1" == "internal" ]; then + internal +elif [ "$1" == "bluetooth" ]; then + bluetooth +else + SPEAKER=$(pactl info | grep "Default Sink" | awk -F ': ' ' { print $2 } ') + pactl set-sink-mute "$SPEAKER" false +fi + + diff --git a/eww/scripts/pop b/eww/scripts/pop index 415a6d7..f36fe70 100755 --- a/eww/scripts/pop +++ b/eww/scripts/pop @@ -84,7 +84,6 @@ fi hoverGet() { NAME="$1" EWW_BIN="$HOME/.local/bin/eww" -STORE="$HOME/.cache/cache.txt" if [[ -f "$STORE" ]]; then rm "$STORE" ${EWW_BIN} -c $HOME/.config/eww close "$NAME" @@ -92,14 +91,13 @@ fi } hoverCreate() { -STORE="$HOME/.cache/cache.txt" if [[ ! -f "$STORE" ]]; then touch "$STORE" else echo "failure!" fi } - +STORE=true if [ "$1" = "calendar" ]; then calendar elif [ "$1" = "system" ]; then