From e1aa18dbed2a47f80542e3f45c7b89d14ff0e2fa Mon Sep 17 00:00:00 2001 From: Hydroxycarbamide Date: Sat, 1 Oct 2022 19:38:53 +0200 Subject: [PATCH] Update mprix and colors --- bin/dominant-color.py | 30 ++++++++ bin/get_mpris_art.sh | 20 +++++- bin/get_mpris_status_desc_only.sh | 98 ++++++++++++++++++++++++++ bin/get_mpris_status_title_only.sh | 89 +++++++++++++++++++++++ bin/scroll_mpris_status_title_only.sh | 22 ++++++ crylia_bar/bottom_right_bar.lua | 6 +- crylia_bar/dock.lua | 4 +- src/assets/icons/mpris/cd-hi-res.svg | 7 ++ src/assets/icons/mpris/disc.png | Bin 0 -> 11551 bytes src/assets/rules.txt | 2 +- src/core/notifications.lua | 18 ++--- src/modules/brightness_osd.lua | 2 +- src/modules/volume_controller.lua | 54 +++++++------- src/modules/volume_osd.lua | 4 +- src/theme/user_variables.lua | 3 +- src/widgets/kblayout.lua | 6 +- src/widgets/mpris.lua | 71 +++++++++++++++---- src/widgets/power.lua | 2 +- src/widgets/taglist.lua | 6 +- src/widgets/tasklist.lua | 30 ++++---- 20 files changed, 389 insertions(+), 85 deletions(-) create mode 100755 bin/dominant-color.py create mode 100755 bin/get_mpris_status_desc_only.sh create mode 100755 bin/get_mpris_status_title_only.sh create mode 100755 bin/scroll_mpris_status_title_only.sh create mode 100644 src/assets/icons/mpris/cd-hi-res.svg create mode 100644 src/assets/icons/mpris/disc.png diff --git a/bin/dominant-color.py b/bin/dominant-color.py new file mode 100755 index 0000000..84cc746 --- /dev/null +++ b/bin/dominant-color.py @@ -0,0 +1,30 @@ +from __future__ import print_function +import binascii +from PIL import Image +import numpy as np +import scipy +import scipy.misc +import scipy.cluster +import sys + +NUM_CLUSTERS = 5 + +# print('reading image') +im = Image.open(sys.argv[1]) +im = im.resize((150, 150)) # optional, to reduce time +ar = np.asarray(im) +shape = ar.shape +ar = ar.reshape(np.product(shape[:2]), shape[2]).astype(float) + +# print('finding clusters') +codes, dist = scipy.cluster.vq.kmeans(ar, NUM_CLUSTERS) +# print('cluster centres:\n', codes) + +vecs, dist = scipy.cluster.vq.vq(ar, codes) # assign codes +counts, bins = np.histogram(vecs, len(codes)) # count occurrences + +index_max = np.argmax(counts) # find most frequent +peak = codes[index_max] +colour = binascii.hexlify(bytearray(int(c) for c in peak)).decode('ascii') +# print('most frequent is %s (#%s)' % (peak, colour)) +print(colour) diff --git a/bin/get_mpris_art.sh b/bin/get_mpris_art.sh index ad0dbf8..07a1f3d 100755 --- a/bin/get_mpris_art.sh +++ b/bin/get_mpris_art.sh @@ -1,3 +1,18 @@ +get_artUrl() { + artUrl=$(playerctl -p $1 metadata | grep artUrl | awk '{$1=$2=""; print $0}') + regex='(https?|ftp)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]' + if [[ $artUrl =~ $regex ]] + then + filename=/tmp/spotify-mpris/$(basename $artUrl) + if [ ! -f $filename ] + then + curl -sSL $artUrl --create-dirs -o $filename + fi + echo $filename + else + echo $artUrl + fi +} read -d'\n' -ra PLAYERS <<<"$(playerctl -l 2>/dev/null)" declare -a PAUSED @@ -8,7 +23,7 @@ for player in "${PLAYERS[@]}"; do # if we have one playing, we'll use it and EXIT if [ "$p_status" = "Playing" ]; then - echo $(playerctl -p $player metadata | grep artUrl | awk '{$1=$2=""; print $0}') + get_artUrl $player exit 0; fi @@ -17,6 +32,7 @@ done # if we have a paused, show it otherwise assume there are no players or have all stopped if [ -n "${PAUSED[0]}" ]; then - echo $(playerctl -p ${PAUSED[0]} metadata | grep artUrl | awk '{$1=$2=""; print $0}') + get_artUrl ${PAUSED[0]} + echo $(playerctl -p metadata | grep artUrl | awk '{$1=$2=""; print $0}') fi diff --git a/bin/get_mpris_status_desc_only.sh b/bin/get_mpris_status_desc_only.sh new file mode 100755 index 0000000..105bf73 --- /dev/null +++ b/bin/get_mpris_status_desc_only.sh @@ -0,0 +1,98 @@ +#!/bin/bash + +# The name of polybar bar which houses the main spotify module and the control modules. +PARENT_BAR="${1:-music}" +PARENT_BAR_PID=$(pgrep -a "polybar" | grep "$PARENT_BAR" | cut -d" " -f1) + +urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } + +send_hook() { + [ -z "$1" ] && echo "send_hook: missing arg" && exit 1 + polybar-msg hook mpris-play-pause "$1" 1>/dev/null 2>&1 +} + + +extract_meta() { + grep "$1\W" <<< "$meta" | awk '{$1=$2=""; print $0}' | sed 's/^ *//; s/; */;/g' | paste -s -d/ - +} + +# if "icon" given, determine icon. otherwise, print metadata +get_info() { + if [ -z "$1" ]; then + echo "Usage: get_info PLAYER [icon]" + exit 1 + fi + + meta=$(playerctl -p "$1" metadata) + + # get title + title=$(extract_meta title) + # if no title, try url e.g. vlc + if [ -z "$title" ]; then + title=$(extract_meta url) + title=$(urldecode "${title##*/}") + fi + + # if not "icon", display information and return + if [ "$2" != "icon" ]; then + artist=$(extract_meta artist) + [ -z "$artist" ] && artist=$(extract_meta albumArtist) + + if [ -n "$artist" ]; then + album=$(extract_meta album) + [ -n "$album" ] && printf "from $album\n" + + printf "by $artist" + fi + + return 0 + fi + + # determine icon: + # if player name is recognised, use it + case "$1" in + spotify* | vlc | mpv) echo "$1";; + kdeconnect*) echo "kdeconnect";; + chromium*) + # if a browser, search window titles: + + # this tries to avoid title messing up the regex + regex_title=$(echo "$title" | tr "[:punct:]" ".") + windowname=$(xdotool search --name --class --classname "$regex_title" getwindowname 2>/dev/null) + case $windowname in + "") ;; # ignore if empty + *Netflix*) echo "netflix";; + *YouTube*) echo "youtube";; + *"Prime Video"*) echo "prime";; + *"Corridor Digital"*) echo "corridor";; + *) echo "browser";; + esac;; + *) echo "none";; + esac +} + +# manually go through players +read -d'\n' -ra PLAYERS <<<"$(playerctl -l 2>/dev/null)" +declare -a PAUSED +for player in "${PLAYERS[@]}"; do + [ "$player" = "playerctld" ] && continue; + + p_status=$(playerctl -p "$player" status 2>/dev/null) + + # if we have one playing, we'll use it and EXIT + if [ "$p_status" = "Playing" ]; then + send_hook 1 + get_info "$player" "$2" + exit 0; + fi + + [ "$p_status" = "Paused" ] && PAUSED+=("$player") +done + +# if we have a paused, show it otherwise assume there are no players or have all stopped +if [ -n "${PAUSED[0]}" ]; then + send_hook 2 + get_info "${PAUSED[0]}" "$2" +else + [ "$2" = icon ] && echo "none" || echo " 鈴 no players " +fi diff --git a/bin/get_mpris_status_title_only.sh b/bin/get_mpris_status_title_only.sh new file mode 100755 index 0000000..e20ddc0 --- /dev/null +++ b/bin/get_mpris_status_title_only.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +# The name of polybar bar which houses the main spotify module and the control modules. +PARENT_BAR="${1:-music}" +PARENT_BAR_PID=$(pgrep -a "polybar" | grep "$PARENT_BAR" | cut -d" " -f1) + +urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } + +send_hook() { + [ -z "$1" ] && echo "send_hook: missing arg" && exit 1 + polybar-msg hook mpris-play-pause "$1" 1>/dev/null 2>&1 +} + + +extract_meta() { + grep "$1\W" <<< "$meta" | awk '{$1=$2=""; print $0}' | sed 's/^ *//; s/; */;/g' | paste -s -d/ - +} + +# if "icon" given, determine icon. otherwise, print metadata +get_info() { + if [ -z "$1" ]; then + echo "Usage: get_info PLAYER [icon]" + exit 1 + fi + + meta=$(playerctl -p "$1" metadata) + + # get title + title=$(extract_meta title) + # if no title, try url e.g. vlc + if [ -z "$title" ]; then + title=$(extract_meta url) + title=$(urldecode "${title##*/}") + fi + + # if not "icon", display information and return + if [ "$2" != "icon" ]; then + printf "$title" + return 0 + fi + + # determine icon: + # if player name is recognised, use it + case "$1" in + spotify* | vlc | mpv) echo "$1";; + kdeconnect*) echo "kdeconnect";; + chromium*) + # if a browser, search window titles: + + # this tries to avoid title messing up the regex + regex_title=$(echo "$title" | tr "[:punct:]" ".") + windowname=$(xdotool search --name --class --classname "$regex_title" getwindowname 2>/dev/null) + case $windowname in + "") ;; # ignore if empty + *Netflix*) echo "netflix";; + *YouTube*) echo "youtube";; + *"Prime Video"*) echo "prime";; + *"Corridor Digital"*) echo "corridor";; + *) echo "browser";; + esac;; + *) echo "none";; + esac +} + +# manually go through players +read -d'\n' -ra PLAYERS <<<"$(playerctl -l 2>/dev/null)" +declare -a PAUSED +for player in "${PLAYERS[@]}"; do + [ "$player" = "playerctld" ] && continue; + + p_status=$(playerctl -p "$player" status 2>/dev/null) + + # if we have one playing, we'll use it and EXIT + if [ "$p_status" = "Playing" ]; then + send_hook 1 + get_info "$player" "$2" + exit 0; + fi + + [ "$p_status" = "Paused" ] && PAUSED+=("$player") +done + +# if we have a paused, show it otherwise assume there are no players or have all stopped +if [ -n "${PAUSED[0]}" ]; then + send_hook 2 + get_info "${PAUSED[0]}" "$2" +else + [ "$2" = icon ] && echo "none" || echo " 鈴 no players " +fi diff --git a/bin/scroll_mpris_status_title_only.sh b/bin/scroll_mpris_status_title_only.sh new file mode 100755 index 0000000..6fd4d8a --- /dev/null +++ b/bin/scroll_mpris_status_title_only.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +cmd="${0%/*}/get_mpris_status_title_only.sh $1" + +zscroll -l 50 \ + --scroll-padding "$(printf ' %.0s' {1..8})" \ + -d 0.5 \ + -M "$cmd icon" \ + -m "none" "-b ''" \ + -m "browser" "-b ' '" \ + -m "netflix" "-b 'ﱄ '" \ + -m "youtube" "-b ' '" \ + -m "prime" "-b ' '" \ + -m "spotify" "-b ' '" \ + -m "spotifyd" "-b ' '" \ + -m "vlc" "-b '嗢 '" \ + -m "mpv" "-b ' '" \ + -m "kdeconnect" "-b ' '" \ + -m "corridor" "-b ' '" \ + -U 1 -u t "$cmd" & + +wait diff --git a/crylia_bar/bottom_right_bar.lua b/crylia_bar/bottom_right_bar.lua index 3758d7d..1aa6aec 100644 --- a/crylia_bar/bottom_right_bar.lua +++ b/crylia_bar/bottom_right_bar.lua @@ -14,10 +14,10 @@ return function(s, widgets) local bottom_right = awful.popup { widget = wibox.container.background, ontop = false, - bg = cat["Crust"], + bg = color["Grey900"], visible = true, screen = s, - maximum_height = dpi(80), + maximum_height = dpi(60), placement = function(c) awful.placement.bottom_left(c, { margins = dpi(5) }) end, shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) @@ -25,7 +25,7 @@ return function(s, widgets) } bottom_right:struts { - bottom = 85 + bottom = 65 } local function prepare_widgets(widgets) diff --git a/crylia_bar/dock.lua b/crylia_bar/dock.lua index 504c89f..c93be7e 100644 --- a/crylia_bar/dock.lua +++ b/crylia_bar/dock.lua @@ -47,11 +47,11 @@ return function(screen, programs) for _, c in ipairs(client.get()) do if string.lower(c.class):match(program) and c == client.focus then - dock_element.background.bg = color["Grey800"] + dock_element.background.bg = cat["Surface0"] end end - Hover_signal(dock_element.background, color["Grey800"], cat["Text"]) + Hover_signal(dock_element.background, cat["Surface0"], cat["Text"]) dock_element:connect_signal( "button::press", diff --git a/src/assets/icons/mpris/cd-hi-res.svg b/src/assets/icons/mpris/cd-hi-res.svg new file mode 100644 index 0000000..89b200e --- /dev/null +++ b/src/assets/icons/mpris/cd-hi-res.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/src/assets/icons/mpris/disc.png b/src/assets/icons/mpris/disc.png new file mode 100644 index 0000000000000000000000000000000000000000..caa7bfad6279e426d7b3538a9d78086182c5a127 GIT binary patch literal 11551 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 JY#aUb{{Xmvm=gd1 literal 0 HcmV?d00001 diff --git a/src/assets/rules.txt b/src/assets/rules.txt index 49e195a..cfe5840 100644 --- a/src/assets/rules.txt +++ b/src/assets/rules.txt @@ -1 +1 @@ -Steam; \ No newline at end of file +Steam;watchdogs2.exe; \ No newline at end of file diff --git a/src/core/notifications.lua b/src/core/notifications.lua index 9dd4ec4..af35076 100644 --- a/src/core/notifications.lua +++ b/src/core/notifications.lua @@ -19,12 +19,12 @@ naughty.config.defaults.icon_size = dpi(32) naughty.config.defaults.timeout = 3 naughty.config.defaults.title = "System Notification" naughty.config.defaults.margin = dpi(10) -naughty.config.defaults.position = "bottom_right" +naughty.config.defaults.position = "top_right" naughty.config.defaults.shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, dpi(10)) end naughty.config.defaults.border_width = dpi(4) -naughty.config.defaults.border_color = color["Grey800"] +naughty.config.defaults.border_color = cat["Surface0"] naughty.config.defaults.spacing = dpi(10) naughty.connect_signal( @@ -51,7 +51,7 @@ naughty.connect_signal( n.bg = cat["Surface0"] else n.title = string.format("%s", - cat["Text"], n.title) or "" + color["White"], n.title) or "" n.message = string.format("%s", cat['Text'], n.message) or "" n.bg = cat["Surface0"] n.timeout = n.timeout or 5 @@ -63,15 +63,15 @@ naughty.connect_signal( n.actions = { naughty.action { program = "Spotify", id = "skip-prev", - icon = gears.color.recolor_image(icondir .. "skip-prev.svg", cat["Lavender"]) + icon = gears.color.recolor_image(icondir .. "skip-prev.svg", color["Cyan200"]) }, naughty.action { program = "Spotify", id = "play-pause", - icon = gears.color.recolor_image(icondir .. "play-pause.svg", cat["Lavender"]) + icon = gears.color.recolor_image(icondir .. "play-pause.svg", color["Cyan200"]) }, naughty.action { program = "Spotify", id = "skip-next", - icon = gears.color.recolor_image(icondir .. "skip-next.svg", cat["Lavender"]) + icon = gears.color.recolor_image(icondir .. "skip-next.svg", color["Cyan200"]) } } use_image = true end @@ -97,7 +97,7 @@ naughty.connect_signal( }, forced_height = dpi(35), forced_width = dpi(35), - fg = cat["Lavender"], + fg = color["Cyan200"], bg = cat["Surface0"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, dpi(6)) @@ -300,7 +300,7 @@ naughty.connect_signal( border_color = cat["Surface1"], border_width = dpi(0), shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 12) + gears.shape.rounded_rect(cr, width, height, 20) end, widget = wibox.container.background } @@ -374,7 +374,7 @@ naughty.connect_signal( type = "notification", screen = awful.screen.focused(), shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 10) + gears.shape.rounded_rect(cr, width, height, 20) end, widget_template = w_template } diff --git a/src/modules/brightness_osd.lua b/src/modules/brightness_osd.lua index e50e790..177b3af 100644 --- a/src/modules/brightness_osd.lua +++ b/src/modules/brightness_osd.lua @@ -75,7 +75,7 @@ return function(s) id = "brightness_slider", bar_shape = gears.shape.rounded_rect, bar_height = dpi(10), - bar_color = color["Grey800"] .. "88", + bar_color = cat["Surface0"] .. "88", bar_active_color = "#ffffff", handle_color = "#ffffff", handle_shape = gears.shape.circle, diff --git a/src/modules/volume_controller.lua b/src/modules/volume_controller.lua index e362796..e9f6bf2 100644 --- a/src/modules/volume_controller.lua +++ b/src/modules/volume_controller.lua @@ -39,12 +39,12 @@ return function(s) layout = wibox.layout.align.horizontal }, id = "device_margin", - margins = dpi(5), + margins = dpi(10), widget = wibox.container.margin }, id = "background", shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 4) + gears.shape.rounded_rect(cr, width, height, 20) end, widget = wibox.container.background }, @@ -158,9 +158,9 @@ return function(s) device.background:set_fg(cat["Crust"]) else fg = color["Purple200"] - bg = color["Grey700"] + bg = cat["Surface1"] device.background:set_fg(color["Purple200"]) - device.background:set_bg(color["Grey700"]) + device.background:set_bg(cat["Surface1"]) end end ) @@ -175,9 +175,9 @@ return function(s) device.background:set_fg(cat["Crust"]) else fg = color["Purple200"] - bg = color["Grey700"] + bg = cat["Surface1"] device.background:set_fg(color["Purple200"]) - device.background:set_bg(color["Grey700"]) + device.background:set_bg(cat["Surface1"]) end end ) @@ -288,9 +288,9 @@ return function(s) device.background:set_fg(cat["Crust"]) else fg = color["Blue200"] - bg = color["Grey700"] + bg = cat["Surface1"] device.background:set_fg(color["Blue200"]) - device.background:set_bg(color["Grey700"]) + device.background:set_bg(cat["Surface1"]) end end ) @@ -305,9 +305,9 @@ return function(s) device.background:set_fg(cat["Crust"]) else fg = color["Blue200"] - bg = color["Grey700"] + bg = cat["Surface1"] device.background:set_fg(color["Blue200"]) - device.background:set_bg(color["Grey700"]) + device.background:set_bg(cat["Surface1"]) end end ) @@ -323,9 +323,9 @@ return function(s) id = "volume_device_list" }, id = "volume_device_background", - bg = color["Grey800"], + bg = cat["Surface0"], shape = function(cr, width, height) - gears.shape.partially_rounded_rect(cr, width, height, false, false, true, true, 4) + gears.shape.partially_rounded_rect(cr, width, height, false, false, true, true, 20) end, widget = wibox.container.background }, @@ -342,9 +342,9 @@ return function(s) id = "volume_device_list" }, id = "volume_device_background", - bg = color["Grey800"], + bg = cat["Surface0"], shape = function(cr, width, height) - gears.shape.partially_rounded_rect(cr, width, height, false, false, true, true, 4) + gears.shape.partially_rounded_rect(cr, width, height, false, false, true, true, 20) end, widget = wibox.container.background }, @@ -385,10 +385,10 @@ return function(s) layout = wibox.layout.fixed.horizontal }, id = "audio_bg", - bg = color["Grey800"], + bg = cat["Surface0"], fg = color["Purple200"], shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 4) + gears.shape.rounded_rect(cr, width, height, 20) end, widget = wibox.container.background }, @@ -432,10 +432,10 @@ return function(s) layout = wibox.layout.fixed.horizontal }, id = "mic_bg", - bg = color["Grey800"], + bg = cat["Surface0"], fg = color["LightBlueA200"], shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 4) + gears.shape.rounded_rect(cr, width, height, 20) end, widget = wibox.container.background }, @@ -465,7 +465,7 @@ return function(s) gears.shape.rounded_rect(cr, width, height, 5) end, bar_height = dpi(5), - bar_color = color["Grey800"], + bar_color = cat["Surface0"], bar_active_color = color["Purple200"], handle_color = color["Purple200"], handle_shape = gears.shape.circle, @@ -505,7 +505,7 @@ return function(s) gears.shape.rounded_rect(cr, width, height, 5) end, bar_height = dpi(5), - bar_color = color["Grey800"], + bar_color = cat["Surface0"], bar_active_color = color["Blue200"], handle_color = color["Blue200"], handle_shape = gears.shape.circle, @@ -536,10 +536,10 @@ return function(s) widget = wibox.container.margin }, bg = cat["Crust"], - border_color = color["Grey800"], + border_color = cat["Surface0"], border_width = dpi(4), shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 12) + gears.shape.rounded_rect(cr, width, height, 20) end, forced_width = dpi(400), widget = wibox.container.background @@ -558,12 +558,12 @@ return function(s) volume_list.visible = not volume_list.visible if volume_list.visible then audio_bg.shape = function(cr, width, height) - gears.shape.partially_rounded_rect(cr, width, height, true, true, false, false, 4) + gears.shape.partially_rounded_rect(cr, width, height, true, true, false, false, 20) end audio_volume.icon:set_image(gears.color.recolor_image(icondir .. "menu-up.svg", color["Teal200"])) else audio_bg.shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 4) + gears.shape.rounded_rect(cr, width, height, 20) end audio_volume.icon:set_image(gears.color.recolor_image(icondir .. "menu-down.svg", color["Teal200"])) end @@ -583,12 +583,12 @@ return function(s) mic_list.visible = not mic_list.visible if mic_list.visible then mic_selector_margin.mic_bg.shape = function(cr, width, height) - gears.shape.partially_rounded_rect(cr, width, height, true, true, false, false, 4) + gears.shape.partially_rounded_rect(cr, width, height, true, true, false, false, 20) end mic_volume.icon:set_image(gears.color.recolor_image(icondir .. "menu-up.svg", color["Teal200"])) else mic_bg.shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 4) + gears.shape.rounded_rect(cr, width, height, 20) end mic_volume.icon:set_image(gears.color.recolor_image(icondir .. "menu-down.svg", color["Teal200"])) end @@ -628,7 +628,7 @@ return function(s) screen = s, placement = function(c) awful.placement.align(c, { position = "top_right", margins = { right = dpi(305), top = dpi(60) } }) end, shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 12) + gears.shape.rounded_rect(cr, width, height, 25) end } diff --git a/src/modules/volume_osd.lua b/src/modules/volume_osd.lua index 3240df8..bf7c17a 100644 --- a/src/modules/volume_osd.lua +++ b/src/modules/volume_osd.lua @@ -66,7 +66,7 @@ return function(s) id = "volume_slider", bar_shape = gears.shape.rounded_rect, bar_height = dpi(10), - bar_color = color["Grey800"] .. "88", + bar_color = cat["Surface0"] .. "88", bar_active_color = "#ffffff", handle_color = "#ffffff", handle_shape = gears.shape.circle, @@ -200,7 +200,7 @@ return function(s) screen = s, placement = function(c) awful.placement.centered(c, { margins = { top = dpi(700) } }) end, shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 15) + gears.shape.rounded_rect(cr, width, height, 20) end } diff --git a/src/theme/user_variables.lua b/src/theme/user_variables.lua index 8086578..506aa63 100644 --- a/src/theme/user_variables.lua +++ b/src/theme/user_variables.lua @@ -34,10 +34,11 @@ user_vars = { autostart = { "killall -9 gwe", "gwe --hide-window &", - "nautilus --gapplication-service &", +-- "nautilus --gapplication-service &", "setxkbmap -option compose:ralt", "setxkbmap -option caps:escape", "emacs --daemon=instance1", + "nvidia-settings", "bash -c \"[[ ! $(pgrep picom) ]] && picom &\"", "bash -c \"[[ ! -s ~/.config/mpd/pid ]] && mpd &\"", "bash -c \"[[ ! $(pgrep ulauncher) ]] && ulauncher --hide-window &\"", diff --git a/src/widgets/kblayout.lua b/src/widgets/kblayout.lua index 4024643..34a5f27 100644 --- a/src/widgets/kblayout.lua +++ b/src/widgets/kblayout.lua @@ -209,7 +209,7 @@ return function(s) shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 8) end, - bg = color["Grey800"], + bg = cat["Surface0"], fg = cat["Text"], widget = wibox.container.background, id = "background", @@ -229,7 +229,7 @@ return function(s) kb_layout_item:get_children_by_id("background2")[1].fg = cat["Crust"] kb_layout_item:get_children_by_id("background1")[1].fg = cat["Crust"] else - kb_layout_item.bg = color["Grey800"] + kb_layout_item.bg = cat["Surface0"] kb_layout_item:get_children_by_id("background2")[1].fg = cat["Maroon"] kb_layout_item:get_children_by_id("background1")[1].fg = color["Purple200"] end @@ -284,7 +284,7 @@ return function(s) bg = cat["Crust"], fg = cat["Text"], border_width = dpi(4), - border_color = color["Grey800"], + border_color = cat["Surface0"], width = dpi(100), max_height = dpi(600), visible = false, diff --git a/src/widgets/mpris.lua b/src/widgets/mpris.lua index 6fd725e..9c552ae 100644 --- a/src/widgets/mpris.lua +++ b/src/widgets/mpris.lua @@ -4,6 +4,7 @@ -- Awesome Libs local awful = require("awful") +local naughty = require("naughty") local color = require("src.theme.colors") local cat = require("src.theme.catppuccin") local dpi = require("beautiful").xresources.apply_dpi @@ -25,13 +26,11 @@ return function() { { id = "icon", + image = gears.color.recolor_image(icon_dir .. "disc" .. ".png", cat["Crust"]), widget = wibox.widget.imagebox, resize = true }, id = "icon_layout", - clip_shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 2) - end, widget = wibox.container.place }, widget = wibox.container.margin, @@ -39,17 +38,31 @@ return function() }, spacing = dpi(10), { - id = "label", - font = "UbuntuMono Nerd Font, Bold 8", - align = "left", - valign = "center", - widget = wibox.widget.textbox + { + { + id = "title", + font = "UbuntuMono Nerd Font, Bold 11", + align = "left", + widget = wibox.widget.textbox + }, + { + id = "desc", + font = "UbuntuMono Nerd Font, Bold 8", + align = "left", + widget = wibox.widget.textbox + }, + id = "label", + layout = wibox.layout.fixed.vertical + }, + id = "label_margin", + top = dpi(2), + widget = wibox.container.margin }, id = "mpris_layout", layout = wibox.layout.fixed.horizontal }, id = "container", - right = dpi(8), + right = dpi(10), widget = wibox.container.margin }, bg = cat["Lavender"], @@ -57,25 +70,53 @@ return function() shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, + forced_height = 65, widget = wibox.container.background } - Hover_signal(mpris_widget, cat["Lavender"], cat["Crust"]) + --Hover_signal(mpris_widget, cat["Lavender"], cat["Crust"]) watch( - [[ bash -c "$HOME/.config/awesome/bin/get_mpris_status.sh" ]], - 5, + [[ bash -c "$HOME/.config/awesome/bin/get_mpris_status_desc_only.sh" ]], + 10, function(_, stdout) - mpris_widget.container.mpris_layout.label.text = stdout + mpris_widget.container.mpris_layout.label_margin.label.desc.text = stdout awesome.emit_signal("update::mpris_widget", tostring(stdout)) end ) + awful.spawn.with_line_callback( + [[ bash -c "$HOME/.config/awesome/bin/scroll_mpris_status_title_only.sh" ]], { + stdout = function(line) + mpris_widget.container.mpris_layout.label_margin.label.title.text = line + end, + } + ) + watch( [[ bash -c "$HOME/.config/awesome/bin/get_mpris_art.sh" ]], - 5, + 10, function(_, stdout) - mpris_widget.container.mpris_layout.icon_margin.icon_layout.icon:set_image(gears.surface.load_uncached(stdout:gsub("\n", ""):gsub("file://", ""))) + local file = stdout:gsub("\n", ""):gsub("file://", "") + if #file <= 0 then + return + end + local command = string.format([[ bash -c "python3 $HOME/.config/awesome/bin/dominant-color.py %s" ]], file) + awful.spawn.easy_async( + command, + function(stdout, stderr, reason, exit_code) + local hex = stdout:gsub("\n", "") + local r, g, b = tonumber("0x"..hex:sub(1,2)), tonumber("0x"..hex:sub(3,4)), tonumber("0x"..hex:sub(5,6)) + local brightness = (r * 0.299) + (g * 0.587) + (b * 0.114); + mpris_widget.bg = "#" .. hex + if brightness > 186 then + mpris_widget.fg = cat["Crust"] + else + mpris_widget.fg = cat["Text"] + end + end + ) + mpris_widget.container.mpris_layout.icon_margin.icon_layout.icon:set_image(gears.surface.load_uncached(file)) awesome.emit_signal("update::mpris_widget", tostring(stdout)) end ) diff --git a/src/widgets/power.lua b/src/widgets/power.lua index 0bf2ff0..fc32225 100644 --- a/src/widgets/power.lua +++ b/src/widgets/power.lua @@ -43,7 +43,7 @@ return function() widget = wibox.container.margin }, bg = cat["Maroon"], - fg = color["Grey800"], + fg = cat["Surface0"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, diff --git a/src/widgets/taglist.lua b/src/widgets/taglist.lua index 57d7df3..14e97c9 100644 --- a/src/widgets/taglist.lua +++ b/src/widgets/taglist.lua @@ -109,7 +109,7 @@ local list_update = function(widget, buttons, label, data, objects) function() old_bg = tag_widget.bg if object == awful.screen.focused().selected_tag then - tag_widget.bg = '#dddddd' .. 'dd' + tag_widget.bg = cat["Subtext0"] else tag_widget.bg = '#3A475C' .. 'dd' end @@ -125,7 +125,7 @@ local list_update = function(widget, buttons, label, data, objects) "button::press", function() if object == awful.screen.focused().selected_tag then - tag_widget.bg = '#bbbbbb' .. 'dd' + tag_widget.bg = cat["Subtext0"] else tag_widget.bg = '#3A475C' .. 'dd' end @@ -136,7 +136,7 @@ local list_update = function(widget, buttons, label, data, objects) "button::release", function() if object == awful.screen.focused().selected_tag then - tag_widget.bg = '#dddddd' .. 'dd' + tag_widget.bg = cat["Text"] else tag_widget.bg = '#3A475C' .. 'dd' end diff --git a/src/widgets/tasklist.lua b/src/widgets/tasklist.lua index 9726290..fea0739 100644 --- a/src/widgets/tasklist.lua +++ b/src/widgets/tasklist.lua @@ -57,15 +57,15 @@ local list_update = function(widget, buttons, label, data, objects) widget = wibox.container.background } - local task_tool_tip = awful.tooltip { - objects = { task_widget }, - mode = "inside", - preferred_alignments = "middle", - preferred_positions = "bottom", - margins = dpi(10), - gaps = 0, - delay_show = 1 - } + --local task_tool_tip = awful.tooltip { + -- objects = { task_widget }, + -- mode = "inside", + -- preferred_alignments = "middle", + -- preferred_positions = "bottom", + -- margins = dpi(10), + -- gaps = 0, + -- delay_show = 1 + --} local function create_buttons(buttons, object) if buttons then @@ -101,10 +101,10 @@ local list_update = function(widget, buttons, label, data, objects) else text = object.class:sub(1, 20) end - task_tool_tip:set_text(text_full) - task_tool_tip:add_to_object(task_widget) + --task_tool_tip:set_text(text_full) + --task_tool_tip:add_to_object(task_widget) else - task_tool_tip:remove_from_object(task_widget) + --task_tool_tip:remove_from_object(task_widget) end end task_widget:set_bg(cat["Text"]) @@ -125,7 +125,7 @@ local list_update = function(widget, buttons, label, data, objects) function() old_bg = task_widget.bg if object == client.focus then - task_widget.bg = '#dddddddd' + task_widget.bg = cat["Subtext1"] else task_widget.bg = '#3A475Cdd' end @@ -141,7 +141,7 @@ local list_update = function(widget, buttons, label, data, objects) "button::press", function() if object == client.focus then - task_widget.bg = "#ffffffaa" + task_widget.bg = cat["Subtext1"] else task_widget.bg = '#3A475Caa' end @@ -152,7 +152,7 @@ local list_update = function(widget, buttons, label, data, objects) "button::release", function() if object == client.focus then - task_widget.bg = "#ffffffdd" + task_widget.bg = cat["Text"] else task_widget.bg = '#3A475Cdd' end