2 files changed, 5 insertions, 136 deletions

diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index bb61b5a..82573d1 100755
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -1,5 +1,6 @@
 [settings]
 screenchange-reload = true
+# wm-restack = bspwm
 
 [colors]
 #background = ${xrdb:color0:#222}
@@ -31,10 +32,10 @@ padding-left = 2
 padding-right = 2
 module-margin-left = 1.5
 module-margin-right = 1.5
-font-0 = Hermit:style=medium:size=9;1
-modules-left = pulseaudio battery date time bspwm
+font-0 = JetBrains Mono Nerd Font Mono:style=medium:pixelsize=10:antialias=true:autohint=true:lcdfilter=lcddefault:rgba=rgb
+modules-left = pulseaudio battery date time cmus
 modules-center = 
-modules-right = cmus
+modules-right = bspwm
 tray-position = right
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -43,7 +44,6 @@ cursor-scroll = ns-resize
 type = internal/xwindow
 label = %title:0:20:...%
 
-
 [module/bspwm]
 type = internal/bspwm
 format = <label-state> <label-mode>
@@ -122,7 +122,7 @@ battery = BAT0
 adapter = ADP1
 poll-interval = 1
 ;full-at = 98
-label-discharging = -bat %percentage%%
+label-discharging = bat %percentage%%
 label-charging = +bat %percentage%%
 label-full = ^bat %percentage%%
 format-discharging = <label-discharging>
@@ -135,14 +135,6 @@ format-volume = vol <label-volume>
 label-volume = %percentage%%
 label-muted = muted
 
-[module/spotify]
-type = custom/script
-interval = 1
-format-prefix = " "
-format = <label>
-format-foreground = #7b8c58
-exec = python ~/.config/polybar/spotify.py -f '{artist}: {song}'
-
 [module/cmus]
 type = custom/script
 exec = ~/.config/polybar/cmus.sh
diff --git a/polybar/.config/polybar/spotify.py b/polybar/.config/polybar/spotify.py
deleted file mode 100755
index aae6d81..0000000
--- a/polybar/.config/polybar/spotify.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/python
-
-import sys
-import dbus
-import argparse
-
-
-parser = argparse.ArgumentParser()
-parser.add_argument(
-    '-t',
-    '--trunclen',
-    type=int,
-    metavar='trunclen'
-)
-parser.add_argument(
-    '-f',
-    '--format',
-    type=str,
-    metavar='custom format',
-    dest='custom_format'
-)
-parser.add_argument(
-    '-p',
-    '--playpause',
-    type=str,
-    metavar='play-pause indicator',
-    dest='play_pause'
-)
-parser.add_argument(
-    '--font',
-    type=str,
-    metavar='the index of the font to use for the main label',
-    dest='font'
-)
-parser.add_argument(
-    '--playpause-font',
-    type=str,
-    metavar='the index of the font to use to display the playpause indicator',
-    dest='play_pause_font'
-)
-
-
-args = parser.parse_args()
-
-def fix_string(string):
-    # corrects encoding for the python version used
-    if sys.version_info.major == 3:
-        return string
-    else:
-        return string.encode('utf-8')
-
-# Default parameters
-output = fix_string(u'{play_pause} {artist}: {song}')
-trunclen = 25
-play_pause = fix_string(u'\u25B6,\u23F8') # first character is play, second is paused
-
-label_with_font = '%{{T{font}}}{label}%{{T-}}'
-font = args.font
-play_pause_font = args.play_pause_font
-
-# parameters can be overwritten by args
-if args.trunclen is not None:
-    trunclen = args.trunclen
-if args.custom_format is not None:
-    output = args.custom_format
-if args.play_pause is not None:
-    play_pause = args.play_pause
-
-try:
-    session_bus = dbus.SessionBus()
-    spotify_bus = session_bus.get_object(
-        'org.mpris.MediaPlayer2.spotify',
-        '/org/mpris/MediaPlayer2'
-    )
-
-    spotify_properties = dbus.Interface(
-        spotify_bus,
-        'org.freedesktop.DBus.Properties'
-    )
-
-    metadata = spotify_properties.Get('org.mpris.MediaPlayer2.Player', 'Metadata')
-    status = spotify_properties.Get('org.mpris.MediaPlayer2.Player', 'PlaybackStatus')
-
-    # Handle play/pause label
-
-    play_pause = play_pause.split(',')
-
-    if status == 'Playing':
-        play_pause = play_pause[0]
-    elif status == 'Paused':
-        play_pause = play_pause[1]
-    else:
-        play_pause = str()
-
-    if play_pause_font:
-        play_pause = label_with_font.format(font=play_pause_font, label=play_pause)
-
-    # Handle main label
-
-    artist = fix_string(metadata['xesam:artist'][0]) if metadata['xesam:artist'] else ''
-    song = fix_string(metadata['xesam:title']) if metadata['xesam:title'] else ''
-
-    if not artist and not song:
-        print('')
-    else:
-        if len(song) > trunclen:
-            song = song[0:trunclen]
-            song += '...'
-            if ('(' in song) and (')' not in song):
-                song += ')'
-
-        if font:
-            artist = label_with_font.format(font=font, label=artist)
-            song = label_with_font.format(font=font, label=song)
-
-        print(output.format(artist=artist, song=song, play_pause=play_pause))
-
-except Exception as e:
-    if isinstance(e, dbus.exceptions.DBusException):
-        print('')
-    else:
-        print(e)
-