From 2ef21ebe4b9938f769471e555bcb7fc8e112af66 Mon Sep 17 00:00:00 2001
From: Harri Lahtinen <lahtinen.harri@gmail.com>
Date: Wed, 26 Dec 2018 16:38:18 +0200
Subject: [PATCH] gpmdp and other stuff

---
 .config/Scripts/gpmdp-remote |  6 +++++-
 .config/i3/config            |  2 ++
 .config/mopidy/mopidy.conf   |  2 +-
 .config/mpd/mpd.conf         | 12 +++++++++---
 .config/polybar/config       | 28 ++++++++++++++++++++++++++--
 5 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/.config/Scripts/gpmdp-remote b/.config/Scripts/gpmdp-remote
index a9350bc..2a7d6f0 100755
--- a/.config/Scripts/gpmdp-remote
+++ b/.config/Scripts/gpmdp-remote
@@ -53,7 +53,7 @@ gpmdp_status () {
 
 gpmdp_info () {
     if [ "$(gpmdp_status)" == "Playing" ]; then
-        printf "%s\n" "Now Playing: $(title) by $(artist)"
+        printf "%s\n" "$(title) by $(artist)"
     elif [ "$(gpmdp_status)" == "Paused" ]; then
         printf "%s\n" "Paused: $(title) by $(artist)"
     fi
@@ -64,7 +64,9 @@ current () {
 }
 
 usage () { cat << EOF
+
     usage: gpmdp-remote <option>
+
     info            Print info about now playing song
     title           Print current song title
     artist          Print current song artist
@@ -75,6 +77,7 @@ usage () { cat << EOF
     status          Print whether GPMDP is paused or playing
     current         Print now playing song in "artist - album - song" format
     help            Print this help message
+
 EOF
 exit 1
 }
@@ -92,3 +95,4 @@ case $1 in
     current) current ;;
     *) usage ;;
 esac
+
diff --git a/.config/i3/config b/.config/i3/config
index 2958536..8e9e6ad 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -66,6 +66,8 @@ client.urgent		    $darkred	    $darkred	$black		$darkred		$darkred
 client.background $black
 ###---Starting External Scripts---###
 
+#Start bluealsa
+exec --no-startup-id sudo bluealsa &
 #Twmn
 exec --no-startup-id twmnd &
 #Album art for mpd/mopidy
diff --git a/.config/mopidy/mopidy.conf b/.config/mopidy/mopidy.conf
index 11385cc..2b46c74 100644
--- a/.config/mopidy/mopidy.conf
+++ b/.config/mopidy/mopidy.conf
@@ -30,7 +30,7 @@ debug_file = mopidy.log
 #config_file =
 
 [audio]
-output = tee name=t t. ! queue ! autoaudiosink t. ! queue ! audioresample ! audioconvert ! audio/x-raw,rate=44100,channels=2,format=S16LE ! wavenc ! filesink location=/tmp/mpd.fifo
+output = tee name=t t. ! queue ! pulsesink t. ! queue ! audioresample ! audioconvert ! audio/x-raw,rate=44100,channels=2,format=S16LE ! wavenc ! filesink location=/tmp/mpd.fifo
 #mixer = software
 #mixer_volume =
 #output = autoaudiosink
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index 1f4faac..d30d1f4 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -13,10 +13,16 @@ sticker_file       "~/.config/mpd/sticker.sql"
 
 max_output_buffer_size "16384"
 
+#audio_output {
+#      type  "alsa"
+#      name  "mpd alsamixer-output"
+#      mixer_type "software"
+#}
+
 audio_output {
-      type  "alsa"
-      name  "mpd alsamixer-output"
-      mixer_type "software"
+       type     "pulse"
+       name     "My PULSE Device"
+       server   "localhost"
 }
 
 audio_output {
diff --git a/.config/polybar/config b/.config/polybar/config
index bb4fd13..07a3937 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -23,9 +23,9 @@ alert = #bd2c40
 [bar/top]
 monitor = ${env:MONITOR:eDP-1}
 include-file = ~/.config/polybar/top-bar
-modules-left = i3
+modules-left = i3 gpmdp
 modules-center = term chrome editor fm music vpn
-modules-right = pkg alsa battery backlight wlan networkmanager date clock powermenu
+modules-right = pkg pulseaudio battery backlight wlan networkmanager date clock powermenu
 
 ;tray-position = right
 ;tray-padding = 2
@@ -39,6 +39,30 @@ modules-left = hostname vpncheck
 modules-center = cpu memory temperature
 modules-right = openweather
 
+[module/pulseaudio]
+type = internal/pulseaudio
+; Sink to be used, if it exists (find using `pacmd list-sinks`, name field)
+; If not, uses default sink
+;sink = alsa_output.pci-0000_00_0e.0.analog-stereo
+sink = bluez_sink.E8_07_BF_33_4D_F2.headset_head_unit
+; Use PA_VOLUME_UI_MAX (~153%) if true, or PA_VOLUME_NORM (100%) if false
+; Default: true
+use-ui-max = true
+; Interval for volume increase/decrease (in percent points)
+; Default: 5
+interval = 5
+format-volume = <ramp-volume> <label-volume>
+label-volume = %percentage%%
+label-volume-foreground = ${root.foreground}
+format-muted = <label-muted>
+format-muted-foreground = ${colors.foreground-alt}
+label-muted =  muted
+ramp-volume-0 = 
+ramp-volume-1 = 
+ramp-volume-foreground = ${colors.foreground-alt}
+ramp-headphones-0 = 
+ramp-headphones-1 = 
+
 [module/nm-launcher]
 type = custom/script
 exec = ~/.config/Scripts/nm-applet/applet.sh