From 5e49d325e88737bf20370d5edb4a70f21de6d110 Mon Sep 17 00:00:00 2001
From: Harri Lahtinen <lahtinen.harri@gmail.com>
Date: Wed, 3 Jul 2019 00:27:54 +0300
Subject: [PATCH] polybar/pulseaudio & .zshrc changes

---
 .config/polybar/config | 17 ++++++++++++++++-
 .zshrc                 | 13 ++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index c0b5ea0..8da4131 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -26,7 +26,7 @@ monitor = ${env:MONITOR:eDP-1}
 include-file = ~/.config/polybar/top-bar
 modules-left = i3
 modules-center = term chrome editor fm music vpn
-modules-right = wlan pkg pulseaudio-rofi-output battery backlight networkmanager popup-calendar
+modules-right = wlan pkg pulseaudio battery backlight networkmanager popup-calendar
 
 ;tray-position = right
 ;tray-padding = 2
@@ -40,6 +40,21 @@ modules-left = hostname vpncheck
 modules-center = cpu memory temperature
 modules-right = openweather
 
+[module/pulseaudio-control]
+type = custom/script
+tail = true
+label=%output%
+format-underline = ${colors.blue}
+
+exec = ~/.config/Scripts/pulseaudio-control.sh --listen
+click-right = exec pavucontrol
+click-left = ~/.config/Scripts/pulseaudio-control.sh --togmute
+click-middle = ~/.config/Scripts/pulseaudio-control.sh --change
+scroll-up = ~/.config/Scripts/pulseaudio-control.sh --up
+scroll-down = ~/.config/Scripts/pulseaudio-control.sh --down
+label-padding = 2
+label-foreground = ${colors.foreground}
+
 [module/pulseaudio-rofi-output]
 type = custom/script
 exec = ~/.config/Scripts/pulseaudio-rofi.sh --output_volume_listener
diff --git a/.zshrc b/.zshrc
index 400ca60..1ea53e9 100644
--- a/.zshrc
+++ b/.zshrc
@@ -10,14 +10,13 @@
 #------------------------------
 # Source config files
 #------------------------------
-for file in ${ZDOTDIR}/{.zaliases,.zshenv}; do
-    . $file || { print "$file: cannot source file" && setopt warncreateglobal }
-done
+if [ -r $HOME/.zaliases ] ; then
+    source $HOME/.zaliases
+fi
 
-# Host specific config
-for file in ${ZDOTDIR}/hosts/${HOST}/{.zshenv,.zshrc,.zaliases}; do
-    [[ -r $file ]] && . $file
-done
+if [ -r $HOME/.zshenv ] ; then
+    source $HOME/.zshenv
+fi
 
 ZSH_THEME="spaceship"