Merge branch 'master' of ssh://dundun.ddns.net:222/sheldonmlee/dotfiles

.bash_profile

@@ -17,7 +17,8 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 
 if [[ -z "$DISPLAY" ]] && [[ $(tty) = /dev/tty1 ]]; then
 	if [[ ! -z "$IS_LAPTOP" ]]; then
-		exec dbus-run-session sway
+		WLR_DRM_DEVICES=/dev/dri/card1:/dev/dri/card0 dbus-run-session sway
+		#dbus-run-session sway
 	else
 		exec start-sway.sh
 	fi

.config/sway/config

@@ -243,9 +243,12 @@ exec swayidle -w \
     # If there are multiple scratchpad windows, this command cycles through them.
     bindsym $mod+minus scratchpad show
 #
-# Microphone:
+# Audio:
 #
 	bindsym $mod+Tab exec toggle-mic-notify
+	bindsym --locked XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
+	bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+	bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 #
 # Resizing containers:
 #