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

.bash_aliases

@@ -16,7 +16,7 @@ alias screenoff="sleep 2; xset dpms force off"
 # sleep
 alias suspend="slock & sleep 5 ; systemctl suspend"
 # screen brightness script
-alias brightness="$HOME/.config/wm_scripts/brightness.sh"
+alias brightness="$HOME/.config/scripts/wm/brightness.sh"
 
 #
 # TUI

.config/scripts/wm/toggle-mic-notify

@@ -1,6 +1,7 @@
 #!/bin/sh
-amixer set Capture toggle @> /dev/null
 
-str=$(grep '\[on\]\|\[off\]' <<< $(amixer get Capture) | awk '{print $5}')
-echo $str
-notify-send "Microphone: $str"
+pactl set-source-mute @DEFAULT_SOURCE@ toggle
+str=$(pactl get-source-mute @DEFAULT_SOURCE@| awk '{print $2}')
+
+[[ "$str" == "yes" ]] && notify-send "Microphone: off"
+[[ "$str" == "no" ]] && notify-send "Microphone: on"

.config/sway/config

@@ -1,4 +1,4 @@
-# Default config for sway
+# Default config for sway.conf
 #
 # Copy this to ~/.config/sway/config and edit it to your liking.
 #
@@ -41,15 +41,10 @@ set $screenshot "~/.config/scripts/wm/screenshot.sh"
 ### Monitor config
 # 
 # Monitor layout
-set $mon1 DP-2
-set $mon2 HDMI-A-3
-
-output $mon2 pos 0 0
-output $mon1 pos 1080 0
-
-# Xwayland related
 xwayland force
-exec xrandr --output XWAYLAND0 --primary
+
+include monitor
+
 #output $mon1 adaptive_sync on
 
 ### Output configuration
@@ -104,6 +99,10 @@ exec swayidle -w \
 		xkb_variant "colemak"
 		xkb_options "caps:ctrl_modifier,altwin:swap_alt_win"
 	}
+    input 2:10:TPPS/2_Elan_TrackPoint {
+		accel_profile "flat"
+		pointer_accel 1
+	}
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 
@@ -340,6 +339,7 @@ exec signal-desktop
 #
 # Xwayland applications tend to use 'class=<class>', whereas wayland applications use 'appid=<appid>'
 assign [app_id="firefox"] workspace 2:r
+assign [class="firefox"] workspace 2:r
 assign [app_id="Discord Firefox"] workspace 3:s
 for_window [title="^Discord — Mozilla Firefox$"] fullscreen disable
 assign [class="WebCord"] workspace 3:s

.gtkrc-2.0

@@ -1,4 +1,3 @@
-gtk-icon-theme-name=kora
-gtk-theme-name=Materia-dark-compact
-gtk-cursor-theme-name=default
-
+gtk-theme-name="Materia-dark-compact"
+gtk-icon-theme-name="kora"
+gtk-cursor-theme-name=" default "