From 656573db82c9fa0c9c6a352356ebd35f1c855c60 Mon Sep 17 00:00:00 2001 From: Uyanide Date: Wed, 18 Jun 2025 14:21:27 +0200 Subject: [PATCH] eww: remove player window --- .memo/hyprland-ricing | 10 +- eww/Main/eww.scss | 41 ++++ eww/Main/eww.yuck | 21 +- eww/{Player => Main}/scripts/cava | 2 +- .../scripts/music-length-info | 0 eww/{Player => Main}/scripts/music-position | 0 eww/{Player => Main}/scripts/player | 12 +- eww/Player/eww.scss | 217 ------------------ eww/Player/eww.yuck | 67 ------ eww/Player/scripts/change-music | 4 - eww/Player/scripts/equalizer | 11 - eww/Player/scripts/music-album | 32 --- eww/Player/scripts/music-art | 22 -- eww/Player/scripts/music-artist | 32 --- eww/Player/scripts/music-length | 32 --- eww/Player/scripts/music-title | 43 ---- eww/Player/status/eq-status | 1 - eww/eww.scss | 1 - eww/eww.yuck | 1 - hypr/hyprland/execs.conf | 2 +- waybar/config.jsonc | 1 - 21 files changed, 75 insertions(+), 477 deletions(-) rename eww/{Player => Main}/scripts/cava (98%) rename eww/{Player => Main}/scripts/music-length-info (100%) rename eww/{Player => Main}/scripts/music-position (100%) rename eww/{Player => Main}/scripts/player (76%) delete mode 100644 eww/Player/eww.scss delete mode 100644 eww/Player/eww.yuck delete mode 100755 eww/Player/scripts/change-music delete mode 100755 eww/Player/scripts/equalizer delete mode 100755 eww/Player/scripts/music-album delete mode 100755 eww/Player/scripts/music-art delete mode 100755 eww/Player/scripts/music-artist delete mode 100755 eww/Player/scripts/music-length delete mode 100755 eww/Player/scripts/music-title delete mode 100644 eww/Player/status/eq-status diff --git a/.memo/hyprland-ricing b/.memo/hyprland-ricing index cb94e0c..8b3ff76 100644 --- a/.memo/hyprland-ricing +++ b/.memo/hyprland-ricing @@ -18,15 +18,18 @@ network-manager-applet # nm-applet slurp # region selector wf-recorder # screen recorder brightnessctl +qt5ct +qt6ct waybar +eww wlogout fuzzel hyprpicker cliphist blueman # bluetooth GUI & applet pavucontrol -easyeffects +pamixer nautilus # dolphin doesn't look nice in Hyprland gnome-text-editor # neither does kwrite, even with Kvantum btop # system monitor @@ -37,4 +40,7 @@ catppuccin-gtk-theme-mocha # theme of GTK apps polkit-gnome kitty # normal terminal -ghostty # floating terminal, for btop for example \ No newline at end of file +ghostty # floating terminal, for btop for example# + +bc +jq \ No newline at end of file diff --git a/eww/Main/eww.scss b/eww/Main/eww.scss index 0f8d301..858c23b 100644 --- a/eww/Main/eww.scss +++ b/eww/Main/eww.scss @@ -163,6 +163,47 @@ background: linear-gradient(to right, $bg-alt, transparent); } +.player-cover-box { + background-size: 140px; + min-height: 140px; + min-width: 140px; + border-radius: 20px; + background-repeat: no-repeat; + background-position: center; +} + +.player-box { + margin: 40px 30px 30px 50px; +} + +.player-info-box { + font-size: 14px; +} + +.player-info-title, +.player-info-artist { + color: $blue; + font-weight: bold; +} + +.player-info-album, +.player-info-length { + color: $fg-alt; +} + +.player-info-button { + background-color: $gray-alt; + padding: 15px; + border-radius: 20px; + font-weight: bold; + margin-top: 10px; +} + +.cavabar { + font-size: 14px; + color: $lavender; +} + .music-controls-box { margin: 20px 20px 0px 20px; background-color: $gray-alt; diff --git a/eww/Main/eww.yuck b/eww/Main/eww.yuck index 90d4bd1..4d084d4 100644 --- a/eww/Main/eww.yuck +++ b/eww/Main/eww.yuck @@ -26,6 +26,12 @@ (defpoll volume :interval "1s" "Main/scripts/system --vol") (defpoll brightness :interval "1s" "Main/scripts/system --bri") (defpoll fortune :interval "1h" "Main/scripts/fortune.py 32 9") +(deflisten cava "Main/scripts/cava") +(defpoll title :interval "1s" "Main/scripts/music-title --status") +(defpoll artist :interval "1s" "Main/scripts/player --artist") +(defpoll album :interval "1s" "Main/scripts/player --album") +(defpoll length-info :interval "1s" "Main/scripts/player --length-info") +(defpoll art :interval "1s" "Main/scripts/player --cover") ;; widgets @@ -60,9 +66,18 @@ (box :class "third-row" :orientation "h" :space-evenly "false" (box :class "music-art-box" :space-evenly "false" :orientation "v" :hexpand "false" :vexpand "false" :style "background-image: url(\"${music-art}\");" (box :class "music-stuff-box" :space-evenly "false" :hexpand "false" :vexpand "false" :orientation "v" - (label :class "music-title" :text music-title :halign "start" :limit-width 22 :tooltip music-title) - (label :class "music-artist" :text music-artist :halign "start" :limit-width 22 :tooltip music-artist) - (label :class "music-length" :text music-length :halign "start" :valign "end"))) + (box :class "player-box" :hexpand "false" :vexpand "false" :space-evenly "true" + (box :class "player-info-box" :hexpand "false" :vexpand "false" :space-evenly "false" :orientation "v" :spacing 15 + (label :class "player-info-title" :text "󰝚 Title: ${title}" :halign "start" :limit-width 30 :tooltip "${title}") + (label :class "player-info-artist" :text "󰠃 Artist: ${artist}" :halign "start" :limit-width 30 :tooltip "${artist}") + (label :class "player-info-album" :text "󰀥 Album: ${album}" :halign "start" :limit-width 30 :tooltip "${album}") + (label :class "player-info-length" :text "󰦚 Length: ${length-info}" :halign "start" :tooltip "${length-info}")) + (box :class "player-cover-box" :hexpand "false" :halign "end" :vexpand "false" :space-evenly "false" :style "background-image: url('${art}');")) + (box :class "cava-box" :hexpand "false" :vexpand "false" + (label :vexpand "false" :hexpand "false" :space-evenly "false" + :class "cavabar" + :text cava + )))) (box :class "music-controls-box" :space-evenly "true" :hexpand "true" :vexpand "false" :orientation "v" (button :class "music-previous" :halign "center" :onclick "playerctl previous" "󰒮") (button :class "music-pp" :halign "center" :onclick "playerctl play-pause" "${music-pp}") diff --git a/eww/Player/scripts/cava b/eww/Main/scripts/cava similarity index 98% rename from eww/Player/scripts/cava rename to eww/Main/scripts/cava index 63b1e7b..09fe389 100755 --- a/eww/Player/scripts/cava +++ b/eww/Main/scripts/cava @@ -23,7 +23,7 @@ mkfifo $pipe config_file="/tmp/waybar_cava_config" echo " [general] -bars = 49 +bars = 33 [output] method = raw raw_target = $pipe diff --git a/eww/Player/scripts/music-length-info b/eww/Main/scripts/music-length-info similarity index 100% rename from eww/Player/scripts/music-length-info rename to eww/Main/scripts/music-length-info diff --git a/eww/Player/scripts/music-position b/eww/Main/scripts/music-position similarity index 100% rename from eww/Player/scripts/music-position rename to eww/Main/scripts/music-position diff --git a/eww/Player/scripts/player b/eww/Main/scripts/player similarity index 76% rename from eww/Player/scripts/player rename to eww/Main/scripts/player index 97b583a..7683560 100755 --- a/eww/Player/scripts/player +++ b/eww/Main/scripts/player @@ -1,7 +1,7 @@ #!/bin/bash if [[ $1 == "--length" ]]; then - playerctl -p spotify metadata mpris:length + playerctl -p spotify metadata mpris:length fi if [[ $1 == "--open" ]]; then @@ -10,23 +10,23 @@ if [[ $1 == "--open" ]]; then fi if [[ $1 == "--artist" ]]; then - "$HOME/.config/eww/Player/scripts/music-artist" + "$HOME/.config/eww/Main/scripts/music-artist" fi if [[ $1 == "--length-time" ]]; then - "$HOME/.config/eww/Player/scripts/music-length" + "$HOME/.config/eww/Main/scripts/music-length" fi if [[ $1 == "--length-info" ]]; then - "$HOME/.config/eww/Player/scripts/music-length-info" + "$HOME/.config/eww/Main/scripts/music-length-info" fi if [[ $1 == "--cover" ]]; then - "$HOME/.config/eww/Player/scripts/music-art" + "$HOME/.config/eww/Main/scripts/music-art" fi if [[ $1 == "--album" ]]; then - "$HOME/.config/eww/Player/scripts/music-album" + "$HOME/.config/eww/Main/scripts/music-album" fi if [[ $1 == "--current-volume" ]]; then diff --git a/eww/Player/eww.scss b/eww/Player/eww.scss deleted file mode 100644 index f87f1b6..0000000 --- a/eww/Player/eww.scss +++ /dev/null @@ -1,217 +0,0 @@ -* { - all: unset; - transition: 200ms ease-out; -} - -.player-main-box { - background-color: $bg; - border-radius: 20px; - border: 3px solid $blue; -} - -.spotify-header-logo { - font-size: 24px; - color: $green; - margin: 30px 0px 0px 300px; -} - -.spotify-header-title { - font-size: 28px; - color: $green; - font-weight: bold; - margin-top: 30px; - margin-right: 10px; -} - -.spotify-header-player { - font-size: 28px; - color: $fg; - font-weight: 200; - margin-top: 30px; -} - -.player-cover-box { - background-size: 222px; - min-height: 222px; - min-width: 222px; - border-radius: 20px; - background-repeat: no-repeat; - background-position: center; - margin: 0px 40px 0px 0px; -} - -.player-box { - background-color: $bg; - margin: 40px 30px 30px 50px; -} - -.player-info-box { - margin: 20px 0px 0px 20px; - font-size: 20px; -} - -.player-info-title, -.player-info-artist { - color: $blue; - font-weight: bold; -} - -.player-info-album, -.player-info-length { - color: $gray; -} - -.player-info-button { - background-color: $gray-alt; - padding: 15px; - border-radius: 20px; - font-weight: bold; - margin-top: 10px; -} - -.player-music-slider trough { - background-color: $gray; -} - -.player-music-slider highlight { - background-color: $blue; - padding: 3px; -} - -.player-volume-slider trough { - background-color: $gray; - border-radius: 15px; -} - -.player-volume-slider highlight { - background: linear-gradient(to right, $cyan, $blue); - border-radius: 15px; - padding: 7px; -} - -.main-player-control-box { - background-color: $bg-alt; - border-radius: 0px 0px 25px 25px; - padding: 10px; -} - -.player-volume-icon { - color: $cyan; - font-size: 24px; - margin-left: 10px; -} - -.player-volume-box { - padding-top: 15px; - padding-bottom: 15px; - margin-left: 20px; - margin-right: 20px; -} - -.shuffle-btn-on { - color: $green; - font-size: 26px; - font-weight: lighter; -} - -.shuffle-btn-off { - color: $gray; - font-size: 26px; - font-weight: lighter; -} - -.previous-btn, -.next-btn { - font-size: 30px; - color: $fg; -} - -.player-pp-btn { - font-size: 50px; - color: $blue; -} - -.current-position { - color: $fg; - font-size: 20px; - margin-left: 20px; -} - -.length-of-song { - color: $gray; - font-size: 20px; - margin-right: 20px; -} - -.player-album-box { - background-size: 150px; - min-height: 150px; - min-width: 150px; - border-radius: 100px; - background-repeat: no-repeat; - background-position: center; - border: 5px solid $cyan; - margin: 47px 0px 0px 0px; -} - -.main-album-box { - background-color: $bg; -} - -.visualizer-btn-on { - background-color: $gray-alt; - padding: 5px 15px 5px 10px; - font-size: 24px; - border-radius: 10px; - color: $blue; - box-shadow: 0px 0px 20px 10px rgba(0, 0, 0, 0.3); -} - -.visualizer-btn-off { - background-color: $gray-alt; - padding: 5px 15px 5px 10px; - font-size: 24px; - border-radius: 10px; - box-shadow: 0px 0px 20px 10px rgba(0, 0, 0, 0.3); -} - -.equalizer-btn-on { - background-color: $gray-alt; - padding: 5px 14px 5px 11px; - font-size: 24px; - border-radius: 10px; - color: $blue; - box-shadow: 0px 0px 20px 10px rgba(0, 0, 0, 0.3); -} - -.equalizer-btn-off { - background-color: $gray-alt; - padding: 5px 14px 5px 11px; - font-size: 24px; - border-radius: 10px; - box-shadow: 0px 0px 20px 10px rgba(0, 0, 0, 0.3); -} - -.player-buttons { - padding-left: 45px; - text-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); -} - -.player-length-box { - padding-left: 50px; -} - -.player-control-box-right { - padding: 15px 0px 15px 40px; -} - -.vz-title { - padding: 0px 0px 0px 0px; - font-size: 22px; - color: $blue; -} - -.cavabar { - font-size: 24px; - color: $lavender; -} diff --git a/eww/Player/eww.yuck b/eww/Player/eww.yuck deleted file mode 100644 index 4cdc177..0000000 --- a/eww/Player/eww.yuck +++ /dev/null @@ -1,67 +0,0 @@ -;; variables -(defpoll art :interval "1s" "Player/scripts/player --cover") -(defpoll title :interval "1s" "Player/scripts/music-title --status") -(defpoll artist :interval "1s" "Player/scripts/player --artist") -(defpoll album :interval "1s" "Player/scripts/player --album") -(defpoll current-pos :interval "1s" "Player/scripts/player --current-pos") -(defpoll length-info :interval "1s" "Player/scripts/player --length-info") -(defpoll length :interval "0s" "dbus-send --dest=org.mpris.MediaPlayer2.spotify --print-reply /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get string:org.mpris.MediaPlayer2.Player string:Metadata | grep uint | awk '{print $3}'") -(defpoll position :interval "1s" "dbus-send --dest=org.mpris.MediaPlayer2.spotify --print-reply /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get string:org.mpris.MediaPlayer2.Player string:Position | awk 'FNR==2 {print $3}'") -(defpoll trackid :interval "1s" "playerctl -p spotify metadata mpris:trackid") -(defpoll current-volume :interval "1s" "Player/scripts/player --current-volume") -(defpoll pp-icon :interval "1s" "Player/scripts/music-title --icon") -(defpoll shuffle :interval "1s" "playerctl -p spotify shuffle") -(deflisten eq-status "tail -F Player/status/eq-status") -(deflisten vz-status "tail -F Player/status/vz-status") -(deflisten ly-status "tail -F Player/status/ly-status") -(defvar hover false) -(deflisten cava "Player/scripts/cava") - -;; widgets -(defwidget player[] - (box :class "player-main-box" :space-evenly "false" :orientation "v" :hexpand "false" :vexpand "false" - ; (box :class "header-box" :hexpand "false" :vexpand "false" :space-evenly "true" - ; (box :class "another-header-box" :space-evenly "false" - ; (label :class "spotify-header-logo" :text "󰓇 " :halign "center") - ; (label :class "spotify-header-title" :text "Spotify" :halign "center") - ; (label :class "spotify-header-player" :text "Player" :halign "center"))) - (box :class "player-box" :hexpand "false" :vexpand "false" :space-evenly "true" - (box :class "player-info-box" :hexpand "false" :vexpand "false" :space-evenly "false" :orientation "v" :spacing 15 - (label :class "player-info-title" :text "󰝚 Title: ${title}" :halign "start" :limit-width 30 :tooltip "${title}") - (label :class "player-info-artist" :text "󰠃 Artist: ${artist}" :halign "start" :limit-width 30 :tooltip "${artist}") - (label :class "player-info-album" :text "󰀥 Album: ${album}" :halign "start" :limit-width 30 :tooltip "${album}") - (label :class "player-info-length" :text "󰦚 Length: ${length-info}" :halign "start" :tooltip "${length-info}")) - (box :class "player-cover-box" :hexpand "false" :halign "end" :vexpand "false" :space-evenly "false" :style "background-image: url('${art}');")) - (box :class "cava-box" :hexpand "false" :vexpand "false" - (label :vexpand "false" :hexpand "false" :space-evenly "false" - :class "cavabar" - :text cava - )) - (eventbox :onhover "eww update hover=true" - :onhoverlost "eww update hover=false" - :cursor "pointer" - :space-evenly "false" - (scale :orientation "h" :class "player-music-slider" :min 0 :max length :value position :tooltip current-pos :onchange { hover ? "dbus-send --type=method_call --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.SetPosition objpath:${trackid} int64:{}" : "" })) - (box :class "main-player-control-box" :hexpand "false" :vexpand "false" :space-evenly "false" :orientation "h" :height 70 - (box :class "player-volume-box" :space-evenly "false" :hexpand "false" :vexpand "false" :spacing 10 - (label :class "player-volume-icon" :text "󰕾") - (scale :class "player-volume-slider" :width 140 :min 0 :max 100 :orientation "h" :value current-volume :halign "start" :onchange "Player/scripts/player --volume {}")) - (box :class "player-buttons" :space-evenly "false" :hexpand "false" :vexpand "false" :spacing 10 - (button :class "shuffle-btn ${shuffle == "On" ? "shuffle-btn-on" : "shuffle-btn-off"}" :onclick "Player/scripts/player --shuffle" "󰒟") - (button :class "previous-btn" :onclick "playerctl -p spotify previous" "󰒮") - (button :class "player-pp-btn" :onclick "playerctl -p spotify play-pause" "${pp-icon}") - (button :class "next-btn" :onclick "playerctl -p spotify next" "󰒭")) - (box :class "player-length-box" :space-evenly "false" :hexpand "false" :vexpand "false" :halign "end" :width 150 - (label :class "current-position" :text "${current-pos} ") - (label :class "length-of-song" :text "/ ${length-info}")) - (box :class "player-control-box-right" :space-evenly "false" :hexpand "false" :vexpand "false" :spacing 15 :halign "end" - (button :class "equalizer-btn ${eq-status == "On" ? "equalizer-btn-on" : "equalizer-btn-off"}" :onclick "Player/scripts/equalizer" "󰺢"))))) - - -;; windows -(defwindow player - :windowtype "normal" - :wm-ignore true - :monitor 0 - :geometry (geometry :anchor "top center" :y 100 :height 400 :width 680) - (player)) \ No newline at end of file diff --git a/eww/Player/scripts/change-music b/eww/Player/scripts/change-music deleted file mode 100755 index 7c4986c..0000000 --- a/eww/Player/scripts/change-music +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -TRACK_ID=$(playerctl -p spotify metadata mpris:trackid) -dbus-send --type=method_call --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.SetPosition objpath:/com/spotify/track/0LnS7aOdOdI1dNKZqdOLz4 int64:120000000 \ No newline at end of file diff --git a/eww/Player/scripts/equalizer b/eww/Player/scripts/equalizer deleted file mode 100755 index 320f399..0000000 --- a/eww/Player/scripts/equalizer +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if pgrep easyeffects; then - pkill easyeffects - echo "Off" > $HOME/.config/eww/Player/status/eq-status - exit 1 -else - exec easyeffects --gapplication-service & - echo "On" > $HOME/.config/eww/Player/status/eq-status -fi -exit diff --git a/eww/Player/scripts/music-album b/eww/Player/scripts/music-album deleted file mode 100755 index 25db975..0000000 --- a/eww/Player/scripts/music-album +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Set the source audio player here. -# Players supporting the MPRIS spec are supported. -# Examples: spotify, vlc, chrome, mpv and others. -# Use `playerctld` to always detect the latest player. -# See more here: https://github.com/altdesktop/playerctl/#selecting-players-to-control -PLAYER="playerctld" - -# Format of the information displayed -# Eg. {{ artist }} - {{ album }} - {{ title }} -# See more attributes here: https://github.com/altdesktop/playerctl/#printing-properties-and-metadata -FORMAT="{{ album }}" - -PLAYERCTL_STATUS=$(playerctl --player=$PLAYER status 2>/dev/null) -EXIT_CODE=$? - -if [ $EXIT_CODE -eq 0 ]; then - STATUS=$PLAYERCTL_STATUS -else - STATUS="No Album" -fi - -if [ "$STATUS" = "Stopped" ]; then - echo "No Album" - elif [ "$STATUS" = "Paused" ]; then - playerctl --player=$PLAYER metadata --format "$FORMAT" - elif [ "$STATUS" = "No Alnum" ]; then - echo "$STATUS" -else - playerctl --player=$PLAYER metadata --format "$FORMAT" -fi diff --git a/eww/Player/scripts/music-art b/eww/Player/scripts/music-art deleted file mode 100755 index 0f4e609..0000000 --- a/eww/Player/scripts/music-art +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -tmp_dir="$HOME/.config/eww/Main/images" -tmp_cover_path=$tmp_dir/cover.png -tmp_temp_path=$tmp_dir/temp.png - -if [ ! -d $tmp_dir ]; then - mkdir -p $tmp_dir -fi - -artlink="$(playerctl -p spotify,$any,mpd,firefox,chromium,brave metadata mpris:artUrl | sed -e 's/open.spotify.com/i.scdn.co/g')" -artFromBrowser=$(playerctl metadata mpris:artUrl | sed 's/file:\/\///g') - -if [ $(playerctl -p spotify,%any,firefox,chromium,brave,mpd metadata mpris:artUrl) ]; then - curl -s "$artlink" --output $tmp_temp_path - echo $tmp_temp_path -elif [[ -n $artFromBrowser ]]; then - cp $artFromBrowser $tmp_temp_path - echo $tmp_temp_path -else - echo Main/images/default-music.svg -fi \ No newline at end of file diff --git a/eww/Player/scripts/music-artist b/eww/Player/scripts/music-artist deleted file mode 100755 index 9b702ce..0000000 --- a/eww/Player/scripts/music-artist +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Set the source audio player here. -# Players supporting the MPRIS spec are supported. -# Examples: spotify, vlc, chrome, mpv and others. -# Use `playerctld` to always detect the latest player. -# See more here: https://github.com/altdesktop/playerctl/#selecting-players-to-control -PLAYER="playerctld" - -# Format of the information displayed -# Eg. {{ artist }} - {{ album }} - {{ title }} -# See more attributes here: https://github.com/altdesktop/playerctl/#printing-properties-and-metadata -FORMAT="{{ artist }}" - -PLAYERCTL_STATUS=$(playerctl --player=$PLAYER status 2>/dev/null) -EXIT_CODE=$? - -if [ $EXIT_CODE -eq 0 ]; then - STATUS=$PLAYERCTL_STATUS -else - STATUS="No Artist" -fi - -if [ "$STATUS" = "Stopped" ]; then - echo "No Artist" - elif [ "$STATUS" = "Paused" ]; then - playerctl --player=$PLAYER metadata --format "$FORMAT" - elif [ "$STATUS" = "No Artist" ]; then - echo "$STATUS" -else - playerctl --player=$PLAYER metadata --format "$FORMAT" -fi diff --git a/eww/Player/scripts/music-length b/eww/Player/scripts/music-length deleted file mode 100755 index a28db0f..0000000 --- a/eww/Player/scripts/music-length +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Set the source audio player here. -# Players supporting the MPRIS spec are supported. -# Examples: spotify, vlc, chrome, mpv and others. -# Use `playerctld` to always detect the latest player. -# See more here: https://github.com/altdesktop/playerctl/#selecting-players-to-control -PLAYER="playerctld" - -# Format of the information displayed -# Eg. {{ artist }} - {{ album }} - {{ title }} -# See more attributes here: https://github.com/altdesktop/playerctl/#printing-properties-and-metadata -FORMAT="{{ duration(position) }} / {{ duration(mpris:length) }}" - -PLAYERCTL_STATUS=$(playerctl --player=$PLAYER status 2>/dev/null) -EXIT_CODE=$? - -if [ $EXIT_CODE -eq 0 ]; then - STATUS=$PLAYERCTL_STATUS -else - STATUS="--:-- / --:--" -fi - -if [ "$STATUS" = "Stopped" ]; then - echo "--:-- / --:--" - elif [ "$STATUS" = "Paused" ]; then - playerctl --player=$PLAYER metadata --format "$FORMAT" - elif [ "$STATUS" = "--:-- / --:--" ]; then - echo "$STATUS" -else - playerctl --player=$PLAYER metadata --format "$FORMAT" -fi diff --git a/eww/Player/scripts/music-title b/eww/Player/scripts/music-title deleted file mode 100755 index c17655d..0000000 --- a/eww/Player/scripts/music-title +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# Set the source audio player here. -# Players supporting the MPRIS spec are supported. -# Examples: spotify, vlc, chrome, mpv and others. -# Use `playerctld` to always detect the latest player. -# See more here: https://github.com/altdesktop/playerctl/#selecting-players-to-control -PLAYER="playerctld" - -# Format of the information displayed -# Eg. {{ artist }} - {{ album }} - {{ title }} -# See more attributes here: https://github.com/altdesktop/playerctl/#printing-properties-and-metadata -FORMAT="{{ title }}" - - -PLAYERCTL_STATUS=$(playerctl --player=$PLAYER status 2>/dev/null) -EXIT_CODE=$? - -if [ $EXIT_CODE -eq 0 ]; then - STATUS=$PLAYERCTL_STATUS -else - STATUS="Nothing is playing" -fi - -if [ "$1" == "--status" ]; then - if [ "$STATUS" = "Stopped" ]; then - echo "Nothing is playing" - elif [ "$STATUS" = "Paused" ]; then - playerctl --player=$PLAYER metadata --format "$FORMAT" - elif [ "$STATUS" = "Nothing is playing" ]; then - echo "$STATUS" - else - playerctl --player=$PLAYER metadata --format "$FORMAT" - fi -fi - -if [ "$1" == "--icon" ]; then - if [[ $STATUS == "Playing" ]]; then - echo "󰏤" - else - echo "󰐊" - fi -fi \ No newline at end of file diff --git a/eww/Player/status/eq-status b/eww/Player/status/eq-status deleted file mode 100644 index 0f5ec10..0000000 --- a/eww/Player/status/eq-status +++ /dev/null @@ -1 +0,0 @@ -On diff --git a/eww/eww.scss b/eww/eww.scss index 862ea1b..f348ddd 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -14,5 +14,4 @@ $gray: #585b70; $gray-alt: #313244; $lavender: #b4befe; -@import './Player/eww.scss'; @import './Main/eww.scss'; diff --git a/eww/eww.yuck b/eww/eww.yuck index 296aaed..9a2ca21 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -1,2 +1 @@ -(include "./Player/eww.yuck") (include "./Main/eww.yuck") diff --git a/hypr/hyprland/execs.conf b/hypr/hyprland/execs.conf index e459962..39f09ab 100755 --- a/hypr/hyprland/execs.conf +++ b/hypr/hyprland/execs.conf @@ -18,7 +18,7 @@ exec-once = nm-applet exec-once = blueman-applet # Audio -exec-once = easyeffects --gapplication-service +# exec-once = easyeffects --gapplication-service # Clipboard: history # exec-once = wl-paste --watch cliphist store & diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 8a20dc6..b248a47 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -237,7 +237,6 @@ "escape": true, "exec": "$HOME/.config/waybar/modules/mediaplayer.py 2> /dev/null", "on-click": "playerctl play-pause", - "on-click-right": "eww open --toggle player", "on-scroll-up": "playerctl next", "on-scroll-down": "playerctl previous" },