# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1374949348 14400
# Node ID d7112a09d1dd0282e0e0623b685b1c020105f2f4
# Parent  c0d4f70f7b262fc6b0eb48c42b6817145dc70309# Parent  7824a3c6c12f47c4cb44d985369236e189e4bc7a
Merge.

diff -r c0d4f70f7b26 -r d7112a09d1dd ffignore
--- a/ffignore	Sat Jul 27 14:22:15 2013 -0400
+++ b/ffignore	Sat Jul 27 14:22:28 2013 -0400
@@ -1,5 +1,9 @@
 syntax:literal
 .DS_Store
+tags
+tags.bak
+cookbook
+banner.txt
 
 syntax:regex
 ^./target$
diff -r c0d4f70f7b26 -r d7112a09d1dd tmux/tmux.conf
--- a/tmux/tmux.conf	Sat Jul 27 14:22:15 2013 -0400
+++ b/tmux/tmux.conf	Sat Jul 27 14:22:28 2013 -0400
@@ -113,7 +113,7 @@
 bind -t vi-copy H start-of-line
 bind -t vi-copy L end-of-line
 bind -t vi-copy v begin-selection
-bind -t vi-copy y copy-selection
+bind -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
 bind -t vi-copy Escape cancel
 bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
 
diff -r c0d4f70f7b26 -r d7112a09d1dd vim/vimrc
--- a/vim/vimrc	Sat Jul 27 14:22:15 2013 -0400
+++ b/vim/vimrc	Sat Jul 27 14:22:28 2013 -0400
@@ -1054,12 +1054,16 @@
 
 augroup ft_scala
     au!
-    au Filetype scala setlocal foldmethod=indent
+    " au Filetype scala setlocal foldmethod=indent
+    au Filetype scala setlocal foldmethod=marker foldmarker={,}
     au Filetype scala compiler maven
     au Filetype scala let b:dispatch = 'mvn -B package install'
     au Filetype scala nnoremap <buffer> <localleader>s :SortScalaImports<cr>
     au Filetype scala nnoremap <buffer> M :call scaladoc#Search(expand("<cword>"))<cr>
     au Filetype scala vnoremap <buffer> M "ry:call scaladoc#Search(@r)<cr>
+    au Filetype scala nmap <buffer> <localleader>( ysiwbi
+    au Filetype scala nmap <buffer> <localleader>[ ysiwri
+    ")]
 augroup END
 
 " }}}
@@ -1253,6 +1257,8 @@
     au!
 
     au Filetype nerdtree setlocal nolist
+    au Filetype nerdtree nnoremap <buffer> H :vertical resize -10<cr>
+    au Filetype nerdtree nnoremap <buffer> L :vertical resize +10<cr>
     " au Filetype nerdtree nnoremap <buffer> K :q<cr>
 augroup END
 
diff -r c0d4f70f7b26 -r d7112a09d1dd weechat/weechat.conf
--- a/weechat/weechat.conf	Sat Jul 27 14:22:15 2013 -0400
+++ b/weechat/weechat.conf	Sat Jul 27 14:22:28 2013 -0400
@@ -227,7 +227,7 @@
 nicklist.conditions = "nicklist"
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = on
+nicklist.hidden = off
 nicklist.items = "buffer_nicklist"
 nicklist.position = right
 nicklist.priority = 200