Permalink
Browse files

new stuff

  • Loading branch information...
1 parent 71bdfc2 commit 1ab777249563a2f606567554b40d8f677d8224cc @phunehehe committed Mar 25, 2012
Showing with 22 additions and 14 deletions.
  1. +4 −6 _gitconfig
  2. +6 −0 _tmux.conf
  3. +10 −8 vim/_vimrc
  4. +2 −0 vim/install.sh
View
@@ -1,13 +1,11 @@
[color]
ui = auto
[merge]
- tool = vimdiff
-[mergetool]
- prompt = false
+ tool = vimdiff
[diff]
- tool = vimdiff
+ tool = vimdiff
[difftool]
prompt = false
[core]
- filemode = false
- autocrlf = false
+ filemode = false
+ autocrlf = false
View
@@ -4,3 +4,9 @@ new-session
unbind %
bind | split-window -h
bind - split-window -v
+
+setw -g mode-keys vi
+bind h select-pane -t L
+bind j select-pane -t D
+bind k select-pane -t U
+bind l select-pane -t R
View
@@ -63,6 +63,15 @@ set preserveindent
" g as default flag for :substitute, make sense!
set gdefault
+" Show funny characters!
+set list
+set listchars=tab\ ,trail:⋅,extends:❯,precedes:
+set showbreak=
+
+" Fold by indentation, fine for most programming languages
+set foldmethod=indent
+set foldnestmax=1
+
"" Display options
@@ -104,10 +113,6 @@ nnoremap <c-h> <c-w>h
nnoremap <c-n> :cnext<CR>
nnoremap <c-p> :cprevious<CR>
-" Reselect visual block after indent/outdent
-vnoremap < <gv
-vnoremap > >gv
-
" Improve up/down movement on wrapped lines
nnoremap j gj
nnoremap k gk
@@ -117,7 +122,4 @@ let g:ctrlp_map = '<leader>f'
nnoremap <leader>h :set hlsearch!<CR>
nnoremap <leader>n :NERDTreeFind<CR>
nnoremap <leader>p :set paste!<CR>
-
-set list
-set listchars=tab\ ,trail:⋅,extends:❯,precedes:
-set showbreak=
+nnoremap <space> za
View
@@ -50,6 +50,8 @@ plugins="
https://github.com/scrooloose/nerdtree/tarball/master
https://github.com/kien/ctrlp.vim/tarball/master
https://github.com/Lokaltog/vim-easymotion/tarball/master
+https://github.com/pangloss/vim-javascript/tarball/master
+https://github.com/kchmck/vim-coffee-script/tarball/master
"
for url in $(echo "$plugins")
do

0 comments on commit 1ab7772

Please sign in to comment.