From 1f18c3eff37d54d04634c25d647f3fb3b7f0096d Mon Sep 17 00:00:00 2001
From: Luca Bilke <luca@gmail.com>
Date: Mon, 6 Feb 2023 10:27:26 +0100
Subject: [PATCH] move to playerctl

---
 .config/nvim/lua/config/keymaplist.lua | 2 +-
 .config/x11/xinitrc                    | 1 -
 .config/x11/xprofile                   | 5 +++--
 .local/bin/statusbar/sb-music          | 1 +
 .local/bin/statusbar/sb-playerctl      | 8 ++++++++
 .local/bin/statusbar/sb-xkbmap         | 2 +-
 .local/bin/statusbar/sbd-playerctl     | 2 ++
 7 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100755 .local/bin/statusbar/sb-playerctl
 create mode 100755 .local/bin/statusbar/sbd-playerctl

diff --git a/.config/nvim/lua/config/keymaplist.lua b/.config/nvim/lua/config/keymaplist.lua
index f597ef0a..1dc86918 100644
--- a/.config/nvim/lua/config/keymaplist.lua
+++ b/.config/nvim/lua/config/keymaplist.lua
@@ -47,7 +47,7 @@ M.whichkey = {
     general = {
         n = {
             ["w"] = { "<cmd>w!<CR>", "Save" },
-            ["q"] = { function() require("funcs").buf_kill() end, "Close" },
+            ["'"] = { function() require("funcs").buf_kill() end, "Close" },
             ["f"] = { function() require("lf").start("~") end, "File Picker" },
             ["h"] = { "<cmd>nohlsearch<CR>", "Clear Highlights" },
             u = {
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index 90eed12d..8df0f9b1 100755
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -13,5 +13,4 @@ if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile" ]; then
 else
 	. "$HOME/.xprofile"
 fi
-
 dwm
diff --git a/.config/x11/xprofile b/.config/x11/xprofile
index 9001fbba..d609d634 100755
--- a/.config/x11/xprofile
+++ b/.config/x11/xprofile
@@ -6,10 +6,11 @@ setbg &
 xrdb "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources" & xrdbpid=$!
 remaps &
 
-autostart="picom checkup mpd dunst unclutter pipewire dwmblocks"
+autostart="picom checkup dunst unclutter pipewire dwmblocks"
 for program in $autostart; do
 	pidof -s "$program" || "$program" &
 done >/dev/null 2>&1
+playerctld daemon
 
 if ! pgrep -x -u "${USER}" gpg-agent 1> /dev/null 2>&1; then
      gpg-connect-agent /bye 1> /dev/null 2>&1
@@ -33,7 +34,7 @@ export XSECURELOCK_PASSWORD_PROMPT="time_hex"
 export XSECURELOCK_AUTH_TIMEOUT=10
 export XSECURELOCK_SHOW_DATETIME=1
 export XSECURELOCK_COMPOSITE_OBSCURER=0
-export XSECURELOCK_SAVER="/usr/libexec/xscreensaver/cubicgrid"
+export XSECURELOCK_SAVER="/usr/lib/xscreensaver/cubicgrid"
 export XSECURELOCK_SHOW_DATETIME=1
 export XSECURELOCK_SHOW_HOSTNAME=1
 xset s 300
diff --git a/.local/bin/statusbar/sb-music b/.local/bin/statusbar/sb-music
index a65fd9e0..78856683 100755
--- a/.local/bin/statusbar/sb-music
+++ b/.local/bin/statusbar/sb-music
@@ -12,3 +12,4 @@ filter() {
   fi
 }
 pidof -x sbd-music >/dev/null 2>&1 || sbd-music >/dev/null 2>&1 &
+filter
diff --git a/.local/bin/statusbar/sb-playerctl b/.local/bin/statusbar/sb-playerctl
new file mode 100755
index 00000000..0cf08529
--- /dev/null
+++ b/.local/bin/statusbar/sb-playerctl
@@ -0,0 +1,8 @@
+#!/bin/sh
+pidof -x sbd-playerctl >/dev/null 2>&1 || sbd-playerctl >/dev/null 2>&1 &
+[ "$(playerctl status 2>&1)" = "No players found" ] && echo ""ﱙ && exit 1
+# song="$(playerctl metadata xesam:artist) - $(playerctl metadata xesam:title)"
+song="$(playerctl metadata xesam:title)"
+[ ${#song} -gt 35 ] && song="$(printf %.35s "$song")…"
+icon=$(playerctl status | sed "s/Playing//;s/Paused//;")
+echo "$icon $song"
diff --git a/.local/bin/statusbar/sb-xkbmap b/.local/bin/statusbar/sb-xkbmap
index 808067b9..158d9b70 100755
--- a/.local/bin/statusbar/sb-xkbmap
+++ b/.local/bin/statusbar/sb-xkbmap
@@ -1,3 +1,3 @@
 #/bin/sh
-pidof -x sbd-xkbmap >/dev/null 2>&1 || sbd-xkbmap >/dev/null 2>&1 &
+# pidof -x sbd-xkbmap >/dev/null 2>&1 || sbd-xkbmap >/dev/null 2>&1 &
 printf "\033[11m\033[10m %s\n" "$(setxkbmap -query | grep -oP '(layout|variant):\s*\K\w+' | sed ':a;N;s/\n/ /')"
diff --git a/.local/bin/statusbar/sbd-playerctl b/.local/bin/statusbar/sbd-playerctl
new file mode 100755
index 00000000..697e5e3d
--- /dev/null
+++ b/.local/bin/statusbar/sbd-playerctl
@@ -0,0 +1,2 @@
+#!/bin/sh
+playerctl status -F | tee "/tmp/playerctl-status" | (while read -r _; do pkill -RTMIN+11 dwmblocks; done;)