personal laptop changes

diff --cc dotbash_profile
index 2ee27ccd484cb3f8464e959de08f421999473230,e2623f09f8f4d0e3cb99a7d07ae934e7d3b06ccd..4daa08cf3fdcbfe84b90678bf4dcb8728439459e
--- 1/dotbash_profile
--- 2/dotbash_profile
+++ b/dotbash_profile
@@@ -118,11 -113,7 +113,7 @@@ export PATH=$PATH:$(go env GOPATH)/bi
  #
  ##################################################
  
- <<<<<<< HEAD
 -export PATH=/opt/node/bin:$PATH
 +export PATH=/opt/node/bin/:$PATH
- =======
- export PATH=/opt/node/bin:$PATH
- >>>>>>> 9f6202f8a285245e27f1372605e2c435839312d3
  
  ##################################################
  #
@@@ -167,8 -158,7 +158,8 @@@ complete -F _ssh_hosts ss
  alias ls="ls --color=auto"
  alias grep="grep --color=auto"
  export EDITOR=/usr/bin/vi
- export PATH=~/.local/bin:~/bin:/opt/bin:$PATH
 +export PATH=~/bin/android_sdk/cmdline-tools/latest/bin:$PATH
+ export PATH=~/bin:~/.local/bin:/opt/bin:/opt/VSCode-linux-x64/bin:$PATH
  . "$HOME/.cargo/env"
  
--eval "$(direnv hook bash)"
++# eval "$(direnv hook bash)"

diff --cc dotvimrc
index 2fca675c21fa1fd6f880d29d20ca4a49d54259e1,636728c91caba3dd205f4d4ccadb81829b8e0b80..f856a01c136d3389f653dc2d30c826ec6084e55d
--- 1/dotvimrc
--- 2/dotvimrc
+++ b/dotvimrc
@@@ -74,7 -76,7 +76,7 @@@ function! s:Repl(
  endfunction
  
  autocmd FileType make setlocal noexpandtab
--autocmd Filetype python setlocal tabstop=4 softtabstop=4 shiftwidth=4
++autocmd FileType python setlocal tabstop=4 softtabstop=4 shiftwidth=4
  
  au BufNewFile,BufRead *.js set filetype=javascript
  au BufNewFile,BufRead *.json set filetype=javascript

diff --cc i3/i3.conf
index 8199e7ed1d9cc50987ebb3b199ab9abf47165146,4deb853ecee05f69e457ad748b9b5d0a64269cba..f65b1902c3be3f0c9f125dfe5ac6ee070069c0ee
--- 1/i3/i3.conf
--- 2/i3/i3.conf
+++ b/i3/i3.conf
@@@ -177,6 -177,6 +177,7 @@@ mode "resize" 
  }
  
  bindsym $mod+r mode "resize"
++bindsym $mod+x move workspace to output primary
  
  # Screenshot, bound to PRINT SCREEN
  bindsym 0xff61 exec screenshot.sh
@@@ -194,7 -193,7 +195,7 @@@ for_window [class="Rhythmbox"] floatin
  bindsym --release $mod+Pause exec --no-startup-id slock
  
  # Theming, ala Gruvbox
--font pango:Exo 2.0 10 
++font pango:Exo 2 8 
  
  set $gruv_bg    #282828
  set $gruv_bg1   #3c3836
@@@ -224,7 -226,7 +228,7 @@@ bar 
      active_workspace $gruv_fg4 $gruv_bg1 $gruv_fg4
      urgent_workspace $gruv_fg $gruv_red $gruv_fg
    }
--  font pango:Exo 2.0 14
++  font pango:Exo 2 10
  }
  
  # Apply xmodmap

diff --cc i3/i3status.conf
index 40887fee05b26824e35a7849cc1f2680016a5b73,6fe96b84a5e2d29bbd090b0217a8c47aea1f6d6c..865b7714496ffa3a81d64bc3e405a356169b2e6d
--- 1/i3/i3status.conf
--- 2/i3/i3status.conf
+++ b/i3/i3status.conf
@@@ -14,7 -17,7 +17,7 @@@ general 
  order += "ipv6"
  order += "wireless _first_"
  order += "ethernet _first_"
--order += "ethernet vpn0"
++order += "ethernet mullvad-us10"
  order += "battery 0"
  order += "load"
  order += "memory"
@@@ -31,9 -34,9 +34,9 @@@ ethernet _first_ 
          format_down = "E: down"
  }
  
--ethernet vpn0 {
--        format_up = "VPN (wifi): %ip"
--        format_down = "VPN (wifi): down"
++ethernet mullvad-us10 {
++        format_up = "VPN: %ip"
++        format_down = "VPN: down"
  }
  
  battery 0 {
@@@ -45,7 -48,7 +48,7 @@@ load 
  }
  
  memory {
-         format = "%used | %available"
 -        format = "%used / %available"
++        format = "%used / %available (%total)"
          threshold_degraded = "1G"
          format_degraded = "MEMORY < %available"
  }
@@@ -57,7 -60,7 +60,7 @@@ tztime local 
  volume master {
          format = "♪: %volume"
          format_muted = "♪: muted (%volume)"
--        device = "pulse:alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y75Z9UA21E5007-00.analog-stereo"
++        device = "pulse:alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y75Z9UA21E5007-00.iec958-stereo"
          mixer = "Master"
          mixer_idx = 0
  }