merge conflicts

diff --cc dotvimrc
index 8e3b5c34f1e2dad0017f7e0638794b0142718415,f856a01c136d3389f653dc2d30c826ec6084e55d..3128c5701c97cf7648a06472e19395ba30682c02
--- 1/dotvimrc
--- 2/dotvimrc
+++ b/dotvimrc
@@@ -74,9 -76,10 +74,9 @@@ 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
 +au BufNewFile,BufRead *.js,*.json set filetype=javascript
  au BufNewFile,BufRead *.ts set filetype=typescript
  au BufNewFile,BufRead Podfile,*.podspec set filetype=ruby
  au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx

diff --cc i3/i3.conf
index e939f1f539061887acece045b2ba2dd5122e6b38,f65b1902c3be3f0c9f125dfe5ac6ee070069c0ee..841013777c004eec2206a8a9b363ceeae4a8fc58
--- 1/i3/i3.conf
--- 2/i3/i3.conf
+++ b/i3/i3.conf
@@@ -177,9 -177,7 +177,7 @@@ mode "resize" 
  }
  
  bindsym $mod+r mode "resize"
- 
- # Move current workspace to next output
 -bindsym $mod+x move workspace to output primary
 +bindsym $mod+x move workspace to output next
  
  # Screenshot, bound to PRINT SCREEN
  bindsym 0xff61 exec screenshot.sh
@@@ -194,10 -193,9 +193,10 @@@ for_window [class="KeePassXC"] floatin
  for_window [class="Rhythmbox"] floating enable, border normal
  
  bindsym --release $mod+Pause exec --no-startup-id slock
 +bindsym --release $mod+Escape 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

diff --cc i3/i3status.conf
Simple merge