M .vimrc → .vimrc

@@ -5,8 +5,9 @@ 
 set tabstop=2 " number of visual spaces per tab
 set softtabstop=2 " number of spaces in the tab when editing
 set expandtab " tabs are shortcut for spaces
+set shiftwidth=2
 syntax enable " enalbe syntax processing
-
+set smartindent
 " when opening a new line, keep the same indentation if no
 " file-specific indenting is enabled
 set autoindent
@@ -14,6 +15,8 @@ 
 " load filetype-specific indent files
 filetype indent on
 
+set backspace=indent,eol,start
+
 " visual autocomplete for command menu
 set wildmenu
 
@@ -22,6 +25,8 @@ set lazyredraw
 
 " highligt matching [{()}]
 set showmatch
+
+hi MatchParen cterm=none ctermbg=none ctermfg=white
 
 set incsearch "search as characters are entered
 set hlsearch " highlight search matches
@@ -65,3 +70,13 @@ 
 " jk is escape
 inoremap jk <esc>
 
+" Use a blinking upright bar cursor in Insert mode, a blinking block in normal
+if &term == 'xterm-256color' || &term == 'screen-256color'
+    let &t_SI = "\<Esc>[5 q"
+    let &t_EI = "\<Esc>[1 q"
+endif
+
+if exists('$TMUX')
+    let &t_EI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=0\x7\<Esc>\\"
+    let &t_SI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=1\x7\<Esc>\\"
+endif

M .zshrc → .zshrc

@@ -2,7 +2,7 @@ # If you come from bash you might have to change your $PATH.
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
-  export ZSH=$HOME/.oh-my-zsh
+export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load. Optionally, if you set this to "random"
 # it'll load a random theme each time that oh-my-zsh is loaded.
@@ -90,7 +90,7 @@ alias cfz="vim ~/.zshrc"
 alias cfv="vim ~/.vimrc"
 alias sn="shutdown now"
 alias rn="shutdown -r now"
-
+alias :wq="exit"
 
 # change into the directory right after making it
 mkdir(){