Customized configs specifically for Ubuntu on PC

Removed device-specific lines in vz and deleted device-specific folders
in configs. Also added 5 more workspaces in i3 along with keybindings to
switch/move to them.

dotfiles/vimrc

@@ -98,8 +98,8 @@ Plug 'tpope/vim-surround'
 Plug 'easymotion/vim-easymotion'
 
 " status bar displaying various info about the current buffer
-" Plug 'vim-airline/vim-airline'
-" Plug 'vim-airline/vim-airline-themes'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
 
 " continue Markdown lists when started
 Plug 'dkarter/bullets.vim'
@@ -110,6 +110,9 @@ Plug 'dylanaraps/wal.vim'
 " repeat plugin commands
 Plug 'tpope/vim-repeat'
 
+" better Django support
+Plug 'tweekmonster/django-plus.vim'
+
 call plug#end()
 
 " colorscheme gotham256
@@ -160,6 +163,7 @@ nnoremap <leader>ff :set foldmethod=marker<CR> zM
 nnoremap <leader>h :set hlsearch! hlsearch?<CR>
 " help
 nnoremap <leader>he :help 
+nnoremap <leader>ht :set tabstop=2 shiftwidth=2 expandtab<CR>
 nnoremap <leader>vhe :vert help 
 " move cursor to middle of line
 nnoremap <leader>m :call cursor(0, len(getline('.'))/2)<CR>
@@ -172,7 +176,7 @@ nnoremap <leader>pli :PlugInstall<CR>
 nnoremap <leader>plc :PlugClean<CR>
 nnoremap <leader>plu :PlugUpdate<CR>
 " don't break lines
-nnoremap <leader>py :set tw=200<CR>
+nnoremap <leader>py :set tw=0<CR>
 " replace in next x lines
 nnoremap <leader>r q:i.,.+s///g<ESC>Fsi
 " replace in line
@@ -230,36 +234,3 @@ autocmd Filetype tex inoremap <localleader>tx $t(x)$
 " }}} tex "
 
 " }}} Local Mappings "
-
-" format XML {{{
-
-function! DoPrettyXML()
-  " save the filetype so we can restore it later
-  let l:origft = &ft
-  set ft=
-  " delete the xml header if it exists. This will
-  " permit us to surround the document with fake tags
-  " without creating invalid xml.
-  1s/<?xml .*?>//e
-  " insert fake tags around the entire document.
-  " This will permit us to pretty-format excerpts of
-  " XML that may contain multiple top-level elements.
-  0put ='<PrettyXML>'
-  $put ='</PrettyXML>'
-  silent %!xmllint --format -
-  " xmllint will insert an <?xml?> header. it's easy enough to delete
-  " if you don't want it.
-  " delete the fake tags
-  2d
-  $d
-  " restore the 'normal' indentation, which is one extra level
-  " too deep due to the extra tags we wrapped around the document.
-  silent %<
-  " back to home
-  1
-  " restore the filetype
-  exe "set ft=" . l:origft
-endfunction
-command! PrettyXML call DoPrettyXML()
-
-" format XML }}}