Commits

Steve Losh  committed d7112a0 Merge

Merge.

  • Participants
  • Parent commits c0d4f70, 7824a3c

Comments (0)

Files changed (4)

 syntax:literal
 .DS_Store
+tags
+tags.bak
+cookbook
+banner.txt
 
 syntax:regex
 ^./target$

File tmux/tmux.conf

 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"
 
 
 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
 
 " }}}
     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
 

File weechat/weechat.conf

 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