aboutsummaryrefslogtreecommitdiff
path: root/i3
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fl.fischer@fau.de>2015-11-25 20:17:15 +0100
committerFlorian Fischer <florian.fl.fischer@fau.de>2015-11-27 02:44:53 +0100
commite02542fca8dfe25bc22346b55b35d2a6cbc0c35c (patch)
tree82b66ccf80fa72371df9fc36ed4fa94bb2fddf63 /i3
parent2a9bfb8a3c90031cea661b1de69caca885b21530 (diff)
downloaddotfiles-e02542fca8dfe25bc22346b55b35d2a6cbc0c35c.tar.gz
dotfiles-e02542fca8dfe25bc22346b55b35d2a6cbc0c35c.zip
rework media buttons control to function with spotify
also remove bash wrapper for fish scripts and just use bash scripts
Diffstat (limited to 'i3')
-rw-r--r--i3/config8
-rw-r--r--i3/conkyrc.json9
2 files changed, 9 insertions, 8 deletions
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}},