diff --git a/.tmux.conf b/.tmux.conf
index 0987995..109ba8b 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -9,6 +9,9 @@ set -s escape-time 50
 # Make mouse useful in copy mode
 setw -g mouse on
 
+# copy selection to X windows clipboard
+set -g set-clipboard on
+bind-key -T copy-mode-vi y send copy-selection-and-cancel\; run "tmux save -|xsel -b > /dev/null 2>&1"
 
 ##########################################
 # TERMINAL EMULATOR TITLES
diff --git a/.vimrc b/.vimrc
index db0b0de..a2da96a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,8 +9,9 @@ set nowritebackup
 set tabstop=4
 set shiftwidth=4	" set to same as tabstop for auto-indent
 set foldmethod=syntax
-set foldnestmax=1
-set foldcolumn=2
+set foldnestmax=2
+set foldlevelstart=99
+set foldcolumn=3
 set autoindent
 
 " filename auto-completion