From 795beba6cec40a60a845c6228ff5675a0415e0e3 Mon Sep 17 00:00:00 2001
From: yage <wagner.wryn@gmail.com>
Date: Sun, 6 Feb 2022 01:08:03 -0700
Subject: [PATCH] Setup Cleanup on machine transfer

---
 bin/pulseaudio         | 5 ++---
 bin/youtube-music      | 6 +++---
 config/i3.conf         | 2 +-
 setup/config.setup.zsh | 1 -
 setup/env/env.zsh      | 4 +---
 setup/vim.setup.zsh    | 4 ----
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/bin/pulseaudio b/bin/pulseaudio
index 7404b8f..681c69c 100755
--- a/bin/pulseaudio
+++ b/bin/pulseaudio
@@ -23,15 +23,14 @@ case $DEVICE in
 	* ) ERROR 1 "Unsupported device '$DEVICE'" ;;
 esac
 
-VOLUME_INCREMENT=10%
 DEFAULT_DEVICE="@DEFAULT_$(echo $DEVICE | tr '[:lower:]' '[:upper:]')@"
 case $COMMAND in
 	up )
-		pactl set-$DEVICE-volume $DEFAULT_DEVICE +$VOlUME_INCREMENT
+		pactl set-$DEVICE-volume $DEFAULT_DEVICE +10%
 		PLAY_SFX volume
 		;;
 	down )
-		pactl set-$DEVICE-volume $DEFAULT_DEVICE -$VOlUME_INCREMENT
+		pactl set-$DEVICE-volume $DEFAULT_DEVICE -10%
 		PLAY_SFX volume
 		;;
 	mute )
diff --git a/bin/youtube-music b/bin/youtube-music
index 4a01769..521a7ac 100755
--- a/bin/youtube-music
+++ b/bin/youtube-music
@@ -17,9 +17,9 @@ function ERROR() {
 
 COMMAND="$1"
 case $COMMAND in
-	next      ) COMMAND_KEY='j';;
-	prev      ) COMMAND_KEY='k';;
-	playpause ) COMMAND_KEY='space';;
+	next ) COMMAND_KEY='j';;
+	prev ) COMMAND_KEY='k';;
+	play ) COMMAND_KEY='space';;
 	* ) ERROR 1 "unsupported command '$COMMAND'" ;;
 esac
 
diff --git a/config/i3.conf b/config/i3.conf
index c228edc..587aaeb 100644
--- a/config/i3.conf
+++ b/config/i3.conf
@@ -19,7 +19,7 @@ bindsym XF86AudioNext        exec --no-startup-id $UTILS next
 bindsym XF86AudioPlay        exec --no-startup-id $UTILS play
 bindsym XF86AudioRaiseVolume exec --no-startup-id $UTILS volumeup
 bindsym XF86AudioLowerVolume exec --no-startup-id $UTILS volumedown
-bindsym XF86AudioMute        exec --no-startup-id $UTILS mute
+bindsym XF86AudioMute        exec --no-startup-id $UTILS volumemute
 bindsym XF86AudioMicMute     exec --no-startup-id $UTILS micmute
 bindsym $mod+backslash       exec --no-startup-id $UTILS micmute
 
diff --git a/setup/config.setup.zsh b/setup/config.setup.zsh
index 47d77ce..a4a97db 100644
--- a/setup/config.setup.zsh
+++ b/setup/config.setup.zsh
@@ -15,7 +15,6 @@ function SETUP__CONFIG() {
 	CONFIG__SYMLINK 'pgcli/config'                    'pgcli.conf'
 	CONFIG__SYMLINK 'pylintrc'                        'pylintrc'
 	CONFIG__SYMLINK 'ripgrep/config'                  'ripgrep.conf'
-	CONFIG__SYMLINK 'wryn/sfx'                        '../bin/sfx/play.sh'
 	############################################################################################
 
 	CONFIG__TERMINFO
diff --git a/setup/env/env.zsh b/setup/env/env.zsh
index 5448a39..b4a9ea2 100644
--- a/setup/env/env.zsh
+++ b/setup/env/env.zsh
@@ -14,9 +14,7 @@ PREFERRED_EDITOR=(vim vi)
 
 # should play an audio file argument
 MEDIA_ENGINE='canberra-gtk-play -f'
-PLAY_SFX () {
-	$HOME/.config/wryn/sfx $@ >/dev/null 2>&1
-}
+PLAY_SFX () { $DOTWRYN/bin/play-sound $@ >/dev/null 2>&1; }
 
 RIPGREP_CONFIG_PATH="$HOME/.config/ripgrep/config"
 TMUX_DEFAULT_SESSION_NAME='wryn'
diff --git a/setup/vim.setup.zsh b/setup/vim.setup.zsh
index 11d593c..809c2bf 100644
--- a/setup/vim.setup.zsh
+++ b/setup/vim.setup.zsh
@@ -1,7 +1,3 @@
-source "$DOTWRYN_PATH/setup/vim.compile.zsh"
-
-#####################################################################
-
 function SETUP__VIM() {
 	STATUS 'starting vim setup'
 	"$DOTWRYN_PATH/bin/vim/compile"