6 files changed, 54 insertions(+), 18 deletions(-)

M .config/cmus/autosave
M .config/sway/config
M .config/waybar/config
M .gitconfig
M .zprofile
M .zshrc
M .config/cmus/autosave +1 -1
@@ 1,4 1,4 @@ 
-set aaa_mode=all
+set aaa_mode=artist
 set altformat_current= %F 
 set altformat_playlist= %f%= %d 
 set altformat_title=%f

          
M .config/sway/config +36 -6
@@ 40,6 40,8 @@ input 1:1:AT_Translated_Set_1_keyboard {
 
 input "1267:47:Elan_TrackPoint" {
     pointer_accel -0.5
+    middle_emulation disabled
+    events enabled
 }
 
 

          
@@ 69,6 71,22 @@ input 65261:4871:ErgoDox_EZ_ErgoDox_EZ {
     repeat_rate 30
 }
 
+input 12951:18804:ZSA_Technology_Labs_Inc_ErgoDox_EZ {
+    xkb_layout us
+    xkb_variant dvorak
+    xkb_options caps:escape
+    repeat_delay 300
+    repeat_rate 30
+}
+
+input 12951:6505:ZSA_Moonlander_Mark_I {
+    xkb_layout us
+    xkb_variant dvorak
+    xkb_options caps:escape
+    repeat_delay 300
+    repeat_rate 30
+}
+
 #####
 # Output
 ##

          
@@ 80,13 98,25 @@ set $laptop eDP-1
 
 output * bg ~/.config/sway/bliss.jpg center
 
-output $laptop resolution 1920x1080 position 0,0 scale 1 
+output $laptop resolution 1920x1080 position 3640,1440 scale 1
+
+# output DP-1 resolution 3440x1440 position 1920,0
+# output DP-2 resolution 3440x1440 position 1920,0
+# output DP-3 resolution 3440x1440 position 1920,0
+# output DP-4 resolution 3440x1440 position 1920,0
+# output DP-4 resolution 2560x1440 position 1920,0
+# output DP-5 resolution 3440x1440 position 1920,0
 
-output DP-1 resolution 3440x1440 position 1920,0
-output DP-2 resolution 3440x1440 position 1920,0
-output DP-3 resolution 3440x1440 position 1920,0
-output DP-4 resolution 3440x1440 position 1920,0
-output DP-5 resolution 3440x1440 position 1920,0
+#output DP-1 resolution 2560x1440 position 1920,0
+#output DP-2 resolution 2560x1440 position 1920,0
+#output DP-3 resolution 2560x1440 position 1920,0
+
+#output DP-3 resolution 2560x1440 position 1080,200
+output 'BenQ Corporation BenQ GW2765 V3G02015019' resolution 2560x1440 position 1920,0
+#output DP-6 resolution 1920x1080@60Hz transform 90 position 0,0
+output 'Unknown VG259 KALMQS073168' resolution 1920x1080@60Hz position 0,280
+#output DP-6 resolution 2560x1440 position 1920,
+output 'Dell Inc. DELL U3415W PXF79921088L' resolution 3440x1440 position 0,0
 
 
 bindswitch --locked lid:on output $laptop disable

          
M .config/waybar/config +1 -10
@@ 7,15 7,6 @@ 
 	"modules-left": [
 		"sway/workspaces",
 		"sway/mode",
-		"custom/right-arrow-dark",
-		"custom/right-arrow-light",
-		"custom/user",
-		"custom/right-arrow-dark",
-		"custom/right-arrow-light",
-		"custom/machine",
-		"custom/right-arrow-dark",
-		"custom/right-arrow-light",
-		"network#2",
 		"custom/right-arrow-dark"
 	],
 	"modules-center": [

          
@@ 114,7 105,7 @@ 
 	},
 	"network#1": {
 		// "interface": "wlp0s20f3",
-		"format-wifi": "  {essid} ({signalStrength}%)",
+		"format-wifi": " ({signalStrength}%)",
 		"format-ethernet": " {ifname}",
 		"format-disconnected": " No Network",
 		"max-length": 50,

          
M .gitconfig +1 -0
@@ 3,3 3,4 @@ 
 	name = Evan Giesel
 [core]
 	editor = vim
+	ignorecase = false

          
M .zprofile +2 -0
@@ 1,3 1,5 @@ 
 
 # Created by `userpath` on 2019-12-16 05:04:43
 export PATH="/home/vin/bin:$PATH:/home/vin/.local/bin"
+
+export PATH="$HOME/.cargo/bin:$PATH"

          
M .zshrc +13 -1
@@ 68,7 68,7 @@ ZSH_THEME="robbyrussell"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git dotenv)
+plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
 

          
@@ 124,9 124,21 @@ export PATH=$PATH:$JAVA_HOME/bin
 # custom bin folder
 export PATH="$HOME/bin:$PATH"
 
+export PATH="$(yarn global bin):$PATH"
+
+
+# adb
+if [ -d "$HOME/extract/adb-fastboot/platform-tools" ] ; then
+ export PATH="$HOME/extract/adb-fastboot/platform-tools:$PATH"
+fi
+
+
 # probably best to keep that out of commit history
 source ~/.bw_session
 
 source ~/.aliases
+
+# rust
+source $HOME/.cargo/env