From e02542fca8dfe25bc22346b55b35d2a6cbc0c35c Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Wed, 25 Nov 2015 20:17:15 +0100
Subject: rework media buttons control to function with spotify

also remove bash wrapper for fish scripts and just use bash scripts
---
 i3/config       | 8 +++-----
 i3/conkyrc.json | 9 ++++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'i3')

diff --git a/i3/config b/i3/config
index 416d2ae..a6ca140 100644
--- a/i3/config
+++ b/i3/config
@@ -178,10 +178,9 @@ bindsym XF86AudioLowerVolume exec amixer -q set Master 10%-
 bindsym XF86AudioRaiseVolume exec amixer -q set Master 10%+
 bindsym XF86AudioMute exec amixer -q set Master toggle
 # # Music
-bindsym XF86AudioPrev exec bash -c "~/.dotfiles/scripts/i3_use_fish.sh ~/.dotfiles/scripts/media_prev.fish"
-bindsym XF86AudioPlay exec bash -c "~/.dotfiles/scripts/i3_use_fish.sh ~/.dotfiles/scripts/media_toggle.fish"
-bindsym XF86AudioNext exec bash -c "~/.dotfiles/scripts/i3_use_fish.sh ~/.dotfiles/scripts/media_next.fish"
-
+bindsym XF86AudioPrev exec bash ~/.dotfiles/scripts/media_control.sh prev
+bindsym XF86AudioPlay exec bash ~/.dotfiles/scripts/media_control.sh toggle
+bindsym XF86AudioNext exec bash ~/.dotfiles/scripts/media_control.sh next
 
 ## brightnescontroll
 bindsym XF86MonBrightnessUp exec /usr/bin/xbacklight +10
@@ -220,4 +219,3 @@ exec --no-startup-id mpd
 # Please remove the following exec line:
 #######################################################################
 exec i3-config-wizard
-
diff --git a/i3/conkyrc.json b/i3/conkyrc.json
index b192bb8..196f2c3 100644
--- a/i3/conkyrc.json
+++ b/i3/conkyrc.json
@@ -41,12 +41,15 @@ TEXT
     #{"name": "disk", "color": "\#ffffff", "full_text": " ${fs_used_perc /}%"},  
 
 
-    ############### music / mpd ###################
+    ############### music/ spotify/ mpd ###################
 
     ${if_match "${nodename_short}"!="fishbowl"}
-        ${if_mpd_playing}
-            # {"name": "test status", "full_text":"${mpd_status}", "separator":false},
+        ${if_match "${exec lsof | grep /dev/snd | grep spotify}"!=""} # spotify using sound devices -> is playing
+            {"name": "indicator", "separator": false ,"color": "\#ffffff", "full_text": "Spotify:"},
+            {"name": "artist_title", "color": "\#ffffff", "full_text": "${exec bash ~/.dotfiles/scripts/spotify-artist-title.sh}"},
 
+        ${else} ${if_mpd_playing}
+            {"name": "indicator", "separator": false, "color": "\#ffffff", "full_text": "MPD:"},
             {"name": "statusSymbol", "color": "\#ffffff", "separator": false,
             "full_text": ${if_match "${mpd_status}"=="Playing"}"▶"${else}"▐▐"${endif}},
         
-- 
cgit v1.2.3