7 files changed, 19 insertions, 147 deletions

diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 6a4dc7d..d88582c 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -10,7 +10,7 @@ bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 
 # rules
-bspc rule -a Chromium desktop='^2'
+bspc rule -a Brave-browser desktop='^2'
 bspc rule -a Steam desktop='^6'
 bspc rule -a "VirtualBox Manager" desktop='^6'
 
@@ -18,7 +18,7 @@ bspc rule -a "VirtualBox Manager" desktop='^6'
 xrdb -merge ~/.Xresources &
 xsetroot -cursor_name left_ptr &
 sxhkd &
-#xss-lock -- slock &
+xss-lock -- slock &
 xset b off &
 xset s 300 &
 ~/.fehbg &
@@ -26,3 +26,4 @@ urxvtd &
 ~/.local/bin/bat_check.sh &
 picom &
 dunst &
+~/.config/polybar/launch.sh
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)
-
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index 1b03a08..11088b8 100755
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -5,11 +5,11 @@ super + shift + Return
 super + @space
         dmenu_run -i -fn "JetBrains Mono Nerd Font Mono:style=medium:pixelsize=12.5" -nb "#f3f4f5" -nf "#2f2f2f" -sb "#626868" -sf "#ffffff"
 super + shift + w 
-    brave
+    /opt/brave/brave
 control + alt + l
     xset s activate
 super + shift + f
-        urxvtc -e ranger
+        urxvtc -e lf
 super + n
     urxvtc -e nvim ~/.cache/bujo/todo.md
 Print
diff --git a/x/.Xresources b/x/.Xresources
index 644860b..96e845e 100755
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -58,8 +58,9 @@ URxvt.font-size.step: 1
 URxvt.url-launcher    : chromium
 URxvt.matcher.button  : 1
 
-Xft.autohint: true
-Xft.antialias: true
-Xft.lcdfilter: lcddefault
-Xft.rgba: rgb
-Xft.dpi: 96
+Xft.antialias:  1
+Xft.hinting:    1
+Xft.autohint:   0
+Xft.hintstyle:  hintslight
+Xft.rgba:       rgb
+Xft.lcdfilter:  lcddefault
diff --git a/x/.xinitrc b/x/.xinitrc
index bf7bf3c..7d24b5e 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -5,4 +5,5 @@ setxkbmap -layout us -option caps:ctrl_modifier &
 xcape -e 'Caps_Lock=Escape' &
 # xrandr --setprovideroutputsource modesetting NVIDIA-0
 # xrandr --auto
-exec bspwm
+# exec dbus-launch --exit-with-session bspwm
+exec dbus-run-session bspwm
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 39fd7bf..0765b0d 100755
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -8,7 +8,7 @@ setopt appendhistory hist_ignore_all_dups hist_ignore_space
 export VISUAL=nvim
 export EDITOR="$VISUAL"
 export BROWSER=brave
-export PATH=$PATH:$HOME/.local/bin:$HOME/bin:/opt/brave
+export PATH=$PATH:$HOME/.local/bin:$HOME/bin
 export TERM=rxvt-unicode-256color
 export XDG_CURRENT_DESKTOP=bspwm