diff --git a/xmobar/icons/bat-ac/0.xpm b/config/xmobar/icons/bat-ac/0.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/0.xpm
rename to config/xmobar/icons/bat-ac/0.xpm
diff --git a/xmobar/icons/bat-ac/1.xpm b/config/xmobar/icons/bat-ac/1.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/1.xpm
rename to config/xmobar/icons/bat-ac/1.xpm
diff --git a/xmobar/icons/bat-ac/2.xpm b/config/xmobar/icons/bat-ac/2.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/2.xpm
rename to config/xmobar/icons/bat-ac/2.xpm
diff --git a/xmobar/icons/bat-ac/3.xpm b/config/xmobar/icons/bat-ac/3.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/3.xpm
rename to config/xmobar/icons/bat-ac/3.xpm
diff --git a/xmobar/icons/bat-ac/4.xpm b/config/xmobar/icons/bat-ac/4.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/4.xpm
rename to config/xmobar/icons/bat-ac/4.xpm
diff --git a/xmobar/icons/bat-ac/5.xpm b/config/xmobar/icons/bat-ac/5.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/5.xpm
rename to config/xmobar/icons/bat-ac/5.xpm
diff --git a/xmobar/icons/bat-ac/6.xpm b/config/xmobar/icons/bat-ac/6.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/6.xpm
rename to config/xmobar/icons/bat-ac/6.xpm
diff --git a/xmobar/icons/bat-ac/7.xpm b/config/xmobar/icons/bat-ac/7.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/7.xpm
rename to config/xmobar/icons/bat-ac/7.xpm
diff --git a/xmobar/icons/bat-ac/8.xpm b/config/xmobar/icons/bat-ac/8.xpm
similarity index 100%
rename from xmobar/icons/bat-ac/8.xpm
rename to config/xmobar/icons/bat-ac/8.xpm
diff --git a/xmobar/icons/bat/0.xpm b/config/xmobar/icons/bat/0.xpm
similarity index 100%
rename from xmobar/icons/bat/0.xpm
rename to config/xmobar/icons/bat/0.xpm
diff --git a/xmobar/icons/bat/1.xpm b/config/xmobar/icons/bat/1.xpm
similarity index 100%
rename from xmobar/icons/bat/1.xpm
rename to config/xmobar/icons/bat/1.xpm
diff --git a/xmobar/icons/bat/2.xpm b/config/xmobar/icons/bat/2.xpm
similarity index 100%
rename from xmobar/icons/bat/2.xpm
rename to config/xmobar/icons/bat/2.xpm
diff --git a/xmobar/icons/bat/3.xpm b/config/xmobar/icons/bat/3.xpm
similarity index 100%
rename from xmobar/icons/bat/3.xpm
rename to config/xmobar/icons/bat/3.xpm
diff --git a/xmobar/icons/bat/4.xpm b/config/xmobar/icons/bat/4.xpm
similarity index 100%
rename from xmobar/icons/bat/4.xpm
rename to config/xmobar/icons/bat/4.xpm
diff --git a/xmobar/icons/bat/5.xpm b/config/xmobar/icons/bat/5.xpm
similarity index 100%
rename from xmobar/icons/bat/5.xpm
rename to config/xmobar/icons/bat/5.xpm
diff --git a/xmobar/icons/bat/6.xpm b/config/xmobar/icons/bat/6.xpm
similarity index 100%
rename from xmobar/icons/bat/6.xpm
rename to config/xmobar/icons/bat/6.xpm
diff --git a/xmobar/icons/bat/7.xpm b/config/xmobar/icons/bat/7.xpm
similarity index 100%
rename from xmobar/icons/bat/7.xpm
rename to config/xmobar/icons/bat/7.xpm
diff --git a/xmobar/icons/bat/8.xpm b/config/xmobar/icons/bat/8.xpm
similarity index 100%
rename from xmobar/icons/bat/8.xpm
rename to config/xmobar/icons/bat/8.xpm
diff --git a/xmobar/icons/battery-all.png b/config/xmobar/icons/battery-all.png
similarity index 100%
rename from xmobar/icons/battery-all.png
rename to config/xmobar/icons/battery-all.png
diff --git a/xmobar/icons/battery.xcf b/config/xmobar/icons/battery.xcf
similarity index 100%
rename from xmobar/icons/battery.xcf
rename to config/xmobar/icons/battery.xcf
diff --git a/xmobar/icons/brightness.xcf b/config/xmobar/icons/brightness.xcf
similarity index 100%
rename from xmobar/icons/brightness.xcf
rename to config/xmobar/icons/brightness.xcf
diff --git a/xmobar/icons/brightness/0.xpm b/config/xmobar/icons/brightness/0.xpm
similarity index 100%
rename from xmobar/icons/brightness/0.xpm
rename to config/xmobar/icons/brightness/0.xpm
diff --git a/xmobar/icons/brightness/1.xpm b/config/xmobar/icons/brightness/1.xpm
similarity index 100%
rename from xmobar/icons/brightness/1.xpm
rename to config/xmobar/icons/brightness/1.xpm
diff --git a/xmobar/icons/brightness/2.xpm b/config/xmobar/icons/brightness/2.xpm
similarity index 100%
rename from xmobar/icons/brightness/2.xpm
rename to config/xmobar/icons/brightness/2.xpm
diff --git a/xmobar/icons/brightness/3.xpm b/config/xmobar/icons/brightness/3.xpm
similarity index 100%
rename from xmobar/icons/brightness/3.xpm
rename to config/xmobar/icons/brightness/3.xpm
diff --git a/xmobar/icons/brightness/4.xpm b/config/xmobar/icons/brightness/4.xpm
similarity index 100%
rename from xmobar/icons/brightness/4.xpm
rename to config/xmobar/icons/brightness/4.xpm
diff --git a/xmobar/icons/brightness/5.xpm b/config/xmobar/icons/brightness/5.xpm
similarity index 100%
rename from xmobar/icons/brightness/5.xpm
rename to config/xmobar/icons/brightness/5.xpm
diff --git a/xmobar/icons/brightness/6.xpm b/config/xmobar/icons/brightness/6.xpm
similarity index 100%
rename from xmobar/icons/brightness/6.xpm
rename to config/xmobar/icons/brightness/6.xpm
diff --git a/xmobar/icons/brightness/7.xpm b/config/xmobar/icons/brightness/7.xpm
similarity index 100%
rename from xmobar/icons/brightness/7.xpm
rename to config/xmobar/icons/brightness/7.xpm
diff --git a/xmobar/icons/brightness/8.xpm b/config/xmobar/icons/brightness/8.xpm
similarity index 100%
rename from xmobar/icons/brightness/8.xpm
rename to config/xmobar/icons/brightness/8.xpm
diff --git a/xmobar/icons/cpu.xcf b/config/xmobar/icons/cpu.xcf
similarity index 100%
rename from xmobar/icons/cpu.xcf
rename to config/xmobar/icons/cpu.xcf
diff --git a/xmobar/icons/cpu/0.xpm b/config/xmobar/icons/cpu/0.xpm
similarity index 100%
rename from xmobar/icons/cpu/0.xpm
rename to config/xmobar/icons/cpu/0.xpm
diff --git a/xmobar/icons/cpu/1.xpm b/config/xmobar/icons/cpu/1.xpm
similarity index 100%
rename from xmobar/icons/cpu/1.xpm
rename to config/xmobar/icons/cpu/1.xpm
diff --git a/xmobar/icons/cpu/2.xpm b/config/xmobar/icons/cpu/2.xpm
similarity index 100%
rename from xmobar/icons/cpu/2.xpm
rename to config/xmobar/icons/cpu/2.xpm
diff --git a/xmobar/icons/cpu/3.xpm b/config/xmobar/icons/cpu/3.xpm
similarity index 100%
rename from xmobar/icons/cpu/3.xpm
rename to config/xmobar/icons/cpu/3.xpm
diff --git a/xmobar/icons/cpu/4.xpm b/config/xmobar/icons/cpu/4.xpm
similarity index 100%
rename from xmobar/icons/cpu/4.xpm
rename to config/xmobar/icons/cpu/4.xpm
diff --git a/xmobar/icons/cpu/5.xpm b/config/xmobar/icons/cpu/5.xpm
similarity index 100%
rename from xmobar/icons/cpu/5.xpm
rename to config/xmobar/icons/cpu/5.xpm
diff --git a/xmobar/icons/cpu/6.xpm b/config/xmobar/icons/cpu/6.xpm
similarity index 100%
rename from xmobar/icons/cpu/6.xpm
rename to config/xmobar/icons/cpu/6.xpm
diff --git a/xmobar/icons/cpu/7.xpm b/config/xmobar/icons/cpu/7.xpm
similarity index 100%
rename from xmobar/icons/cpu/7.xpm
rename to config/xmobar/icons/cpu/7.xpm
diff --git a/xmobar/icons/cpu/8.xpm b/config/xmobar/icons/cpu/8.xpm
similarity index 100%
rename from xmobar/icons/cpu/8.xpm
rename to config/xmobar/icons/cpu/8.xpm
diff --git a/xmobar/icons/cpu1/0.xpm b/config/xmobar/icons/cpu1/0.xpm
similarity index 100%
rename from xmobar/icons/cpu1/0.xpm
rename to config/xmobar/icons/cpu1/0.xpm
diff --git a/xmobar/icons/cpu1/1.xpm b/config/xmobar/icons/cpu1/1.xpm
similarity index 100%
rename from xmobar/icons/cpu1/1.xpm
rename to config/xmobar/icons/cpu1/1.xpm
diff --git a/xmobar/icons/cpu1/2.xpm b/config/xmobar/icons/cpu1/2.xpm
similarity index 100%
rename from xmobar/icons/cpu1/2.xpm
rename to config/xmobar/icons/cpu1/2.xpm
diff --git a/xmobar/icons/cpu1/3.xpm b/config/xmobar/icons/cpu1/3.xpm
similarity index 100%
rename from xmobar/icons/cpu1/3.xpm
rename to config/xmobar/icons/cpu1/3.xpm
diff --git a/xmobar/icons/cpu1/4.xpm b/config/xmobar/icons/cpu1/4.xpm
similarity index 100%
rename from xmobar/icons/cpu1/4.xpm
rename to config/xmobar/icons/cpu1/4.xpm
diff --git a/xmobar/icons/cpu1/5.xpm b/config/xmobar/icons/cpu1/5.xpm
similarity index 100%
rename from xmobar/icons/cpu1/5.xpm
rename to config/xmobar/icons/cpu1/5.xpm
diff --git a/xmobar/icons/cpu1/6.xpm b/config/xmobar/icons/cpu1/6.xpm
similarity index 100%
rename from xmobar/icons/cpu1/6.xpm
rename to config/xmobar/icons/cpu1/6.xpm
diff --git a/xmobar/icons/cpu1/7.xpm b/config/xmobar/icons/cpu1/7.xpm
similarity index 100%
rename from xmobar/icons/cpu1/7.xpm
rename to config/xmobar/icons/cpu1/7.xpm
diff --git a/xmobar/icons/cpu1/8.xpm b/config/xmobar/icons/cpu1/8.xpm
similarity index 100%
rename from xmobar/icons/cpu1/8.xpm
rename to config/xmobar/icons/cpu1/8.xpm
diff --git a/xmobar/icons/cpu4/0.xpm b/config/xmobar/icons/cpu4/0.xpm
similarity index 100%
rename from xmobar/icons/cpu4/0.xpm
rename to config/xmobar/icons/cpu4/0.xpm
diff --git a/xmobar/icons/cpu4/1.xpm b/config/xmobar/icons/cpu4/1.xpm
similarity index 100%
rename from xmobar/icons/cpu4/1.xpm
rename to config/xmobar/icons/cpu4/1.xpm
diff --git a/xmobar/icons/cpu4/2.xpm b/config/xmobar/icons/cpu4/2.xpm
similarity index 100%
rename from xmobar/icons/cpu4/2.xpm
rename to config/xmobar/icons/cpu4/2.xpm
diff --git a/xmobar/icons/cpu4/3.xpm b/config/xmobar/icons/cpu4/3.xpm
similarity index 100%
rename from xmobar/icons/cpu4/3.xpm
rename to config/xmobar/icons/cpu4/3.xpm
diff --git a/xmobar/icons/cpu4/4.xpm b/config/xmobar/icons/cpu4/4.xpm
similarity index 100%
rename from xmobar/icons/cpu4/4.xpm
rename to config/xmobar/icons/cpu4/4.xpm
diff --git a/xmobar/icons/cpu4/5.xpm b/config/xmobar/icons/cpu4/5.xpm
similarity index 100%
rename from xmobar/icons/cpu4/5.xpm
rename to config/xmobar/icons/cpu4/5.xpm
diff --git a/xmobar/icons/cpu4/6.xpm b/config/xmobar/icons/cpu4/6.xpm
similarity index 100%
rename from xmobar/icons/cpu4/6.xpm
rename to config/xmobar/icons/cpu4/6.xpm
diff --git a/xmobar/icons/cpu4/7.xpm b/config/xmobar/icons/cpu4/7.xpm
similarity index 100%
rename from xmobar/icons/cpu4/7.xpm
rename to config/xmobar/icons/cpu4/7.xpm
diff --git a/xmobar/icons/cpu4/8.xpm b/config/xmobar/icons/cpu4/8.xpm
similarity index 100%
rename from xmobar/icons/cpu4/8.xpm
rename to config/xmobar/icons/cpu4/8.xpm
diff --git a/config/xmobar/icons/music.xcf b/config/xmobar/icons/music.xcf
new file mode 100644
index 0000000..3f99991
Binary files /dev/null and b/config/xmobar/icons/music.xcf differ
diff --git a/config/xmobar/icons/music/pause.xpm b/config/xmobar/icons/music/pause.xpm
new file mode 100644
index 0000000..a82db14
--- /dev/null
+++ b/config/xmobar/icons/music/pause.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * pause_xpm[] = {
+"16 16 2 1",
+" c None",
+". c #FFFFFF",
+" ",
+" ... ",
+" . . ",
+" ... ",
+" . ",
+" . ",
+" . . ",
+" .. .. . . ",
+" .. .. . . ",
+" .. .. . . ",
+" .. .. . .. ",
+" .. .. ... ",
+" .. .. .. ",
+" . ",
+" . ",
+" "};
diff --git a/config/xmobar/icons/music/play.xpm b/config/xmobar/icons/music/play.xpm
new file mode 100644
index 0000000..c66767d
--- /dev/null
+++ b/config/xmobar/icons/music/play.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * play_xpm[] = {
+"16 16 2 1",
+" c None",
+". c #FFFFFF",
+" ",
+" ... ",
+" . . ",
+" ... ",
+" . ",
+" . ",
+" . . . ",
+" .. . . ",
+" ... . . ",
+" .... . . ",
+" ... . .. ",
+" .. ... ",
+" . .. ",
+" . ",
+" . ",
+" "};
diff --git a/xmobar/icons/sound.xcf b/config/xmobar/icons/sound.xcf
similarity index 100%
rename from xmobar/icons/sound.xcf
rename to config/xmobar/icons/sound.xcf
diff --git a/xmobar/icons/sound/high.xpm b/config/xmobar/icons/sound/high.xpm
similarity index 100%
rename from xmobar/icons/sound/high.xpm
rename to config/xmobar/icons/sound/high.xpm
diff --git a/xmobar/icons/sound/low.xpm b/config/xmobar/icons/sound/low.xpm
similarity index 100%
rename from xmobar/icons/sound/low.xpm
rename to config/xmobar/icons/sound/low.xpm
diff --git a/xmobar/icons/sound/medium.xpm b/config/xmobar/icons/sound/medium.xpm
similarity index 100%
rename from xmobar/icons/sound/medium.xpm
rename to config/xmobar/icons/sound/medium.xpm
diff --git a/xmobar/icons/sound/mute.xpm b/config/xmobar/icons/sound/mute.xpm
similarity index 100%
rename from xmobar/icons/sound/mute.xpm
rename to config/xmobar/icons/sound/mute.xpm
diff --git a/xmobar/icons/sound/none.xpm b/config/xmobar/icons/sound/none.xpm
similarity index 100%
rename from xmobar/icons/sound/none.xpm
rename to config/xmobar/icons/sound/none.xpm
diff --git a/xmobar/icons/wired.xcf b/config/xmobar/icons/wired.xcf
similarity index 100%
rename from xmobar/icons/wired.xcf
rename to config/xmobar/icons/wired.xcf
diff --git a/xmobar/icons/wired/0.xpm b/config/xmobar/icons/wired/0.xpm
similarity index 100%
rename from xmobar/icons/wired/0.xpm
rename to config/xmobar/icons/wired/0.xpm
diff --git a/xmobar/icons/wired/1.xpm b/config/xmobar/icons/wired/1.xpm
similarity index 100%
rename from xmobar/icons/wired/1.xpm
rename to config/xmobar/icons/wired/1.xpm
diff --git a/xmobar/icons/wired/2.xpm b/config/xmobar/icons/wired/2.xpm
similarity index 100%
rename from xmobar/icons/wired/2.xpm
rename to config/xmobar/icons/wired/2.xpm
diff --git a/xmobar/icons/wired/3.xpm b/config/xmobar/icons/wired/3.xpm
similarity index 100%
rename from xmobar/icons/wired/3.xpm
rename to config/xmobar/icons/wired/3.xpm
diff --git a/xmobar/icons/wired/4.xpm b/config/xmobar/icons/wired/4.xpm
similarity index 100%
rename from xmobar/icons/wired/4.xpm
rename to config/xmobar/icons/wired/4.xpm
diff --git a/xmobar/icons/wired/5.xpm b/config/xmobar/icons/wired/5.xpm
similarity index 100%
rename from xmobar/icons/wired/5.xpm
rename to config/xmobar/icons/wired/5.xpm
diff --git a/xmobar/icons/wired/6.xpm b/config/xmobar/icons/wired/6.xpm
similarity index 100%
rename from xmobar/icons/wired/6.xpm
rename to config/xmobar/icons/wired/6.xpm
diff --git a/xmobar/icons/wired/7.xpm b/config/xmobar/icons/wired/7.xpm
similarity index 100%
rename from xmobar/icons/wired/7.xpm
rename to config/xmobar/icons/wired/7.xpm
diff --git a/xmobar/icons/wired/8.xpm b/config/xmobar/icons/wired/8.xpm
similarity index 100%
rename from xmobar/icons/wired/8.xpm
rename to config/xmobar/icons/wired/8.xpm
diff --git a/xmobar/icons/wireless.xcf b/config/xmobar/icons/wireless.xcf
similarity index 100%
rename from xmobar/icons/wireless.xcf
rename to config/xmobar/icons/wireless.xcf
diff --git a/xmobar/icons/wireless/0.xpm b/config/xmobar/icons/wireless/0.xpm
similarity index 100%
rename from xmobar/icons/wireless/0.xpm
rename to config/xmobar/icons/wireless/0.xpm
diff --git a/xmobar/icons/wireless/1.xpm b/config/xmobar/icons/wireless/1.xpm
similarity index 100%
rename from xmobar/icons/wireless/1.xpm
rename to config/xmobar/icons/wireless/1.xpm
diff --git a/xmobar/icons/wireless/2.xpm b/config/xmobar/icons/wireless/2.xpm
similarity index 100%
rename from xmobar/icons/wireless/2.xpm
rename to config/xmobar/icons/wireless/2.xpm
diff --git a/xmobar/icons/wireless/3.xpm b/config/xmobar/icons/wireless/3.xpm
similarity index 100%
rename from xmobar/icons/wireless/3.xpm
rename to config/xmobar/icons/wireless/3.xpm
diff --git a/xmobar/icons/wireless/4.xpm b/config/xmobar/icons/wireless/4.xpm
similarity index 100%
rename from xmobar/icons/wireless/4.xpm
rename to config/xmobar/icons/wireless/4.xpm
diff --git a/xmobar/icons/wireless/5.xpm b/config/xmobar/icons/wireless/5.xpm
similarity index 100%
rename from xmobar/icons/wireless/5.xpm
rename to config/xmobar/icons/wireless/5.xpm
diff --git a/xmobar/icons/wireless/6.xpm b/config/xmobar/icons/wireless/6.xpm
similarity index 100%
rename from xmobar/icons/wireless/6.xpm
rename to config/xmobar/icons/wireless/6.xpm
diff --git a/xmobar/icons/wireless/7.xpm b/config/xmobar/icons/wireless/7.xpm
similarity index 100%
rename from xmobar/icons/wireless/7.xpm
rename to config/xmobar/icons/wireless/7.xpm
diff --git a/xmobar/icons/wireless/8.xpm b/config/xmobar/icons/wireless/8.xpm
similarity index 100%
rename from xmobar/icons/wireless/8.xpm
rename to config/xmobar/icons/wireless/8.xpm
diff --git a/config/xmobar/scripts/quodlibet b/config/xmobar/scripts/quodlibet
new file mode 100755
index 0000000..1f6edfa
--- /dev/null
+++ b/config/xmobar/scripts/quodlibet
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+status=$(quodlibet --status | cut -d' ' -f1)
+case "$status" in
+ "playing") icon="" ;;
+ "paused") icon="" ;;
+ *) ;;
+esac
+
+echo ''"$icon"''
+
diff --git a/local/bin/soundinfo b/config/xmobar/scripts/sound
similarity index 66%
rename from local/bin/soundinfo
rename to config/xmobar/scripts/sound
index 4b1511e..3a6ae46 100755
--- a/local/bin/soundinfo
+++ b/config/xmobar/scripts/sound
@@ -1,17 +1,19 @@
#!/bin/bash
+sound="mute"
+
if grep -q "\[on\]" <(amixer get Master); then
current="$(amixer get Master | sed -n '/%/s/.*\[\(.*\)%\].*/\1/p' | head -1)"
if (( current <= 25 )); then
- echo "none"
+ sound="none"
elif (( current <= 50 )); then
- echo "low"
+ sound="low"
elif (( current <= 75 )); then
- echo "medium"
+ sound="medium"
else
- echo "high"
+ sound="high"
fi
-else
- echo "mute"
fi
+echo ""
+
diff --git a/local/bin/quodinfo b/local/bin/quodinfo
deleted file mode 100755
index beb56bd..0000000
--- a/local/bin/quodinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-status=$(quodlibet --status | cut -d' ' -f1)
-case "$status" in
- "playing") quodlibet --print-playing "" ;;
- *) ;;
-esac
-
diff --git a/xmobarrc b/xmobarrc
index 34cbbf5..4a88e9f 100644
--- a/xmobarrc
+++ b/xmobarrc
@@ -50,9 +50,9 @@ Config { font = "xft:Source Code Pro:size=9"
, "--load-icon-patterns", ""
, "--load-icon-patterns", ""
] 50
- , Run Com "quodinfo" [] "quodlibet" 10
- , Run Com "soundinfo" [] "sound" 10
+ , Run Com ".config/xmobar/scripts/quodlibet" [] "quodlibet" 10
+ , Run Com ".config/xmobar/scripts/sound" [] "sound" 10
, Run StdinReader
]
- , template = " %StdinReader%} %date% {%quodlibet% %multicpu%%wlp7s0wi%%enp9s0%%bright%%battery% "
+ , template = " %StdinReader%} %date% {%multicpu%%quodlibet%%sound%%wlp7s0wi%%enp9s0%%bright%%battery% "
}