miscellaneous updates

shaobodang · Feb 19, 2015 · 5c0d1fd · 5c0d1fd
1 parent 8766728
commit 5c0d1fd
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 12 deletions.
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -43,7 +43,8 @@ http {
 
         location / {
             root   /Users/nicknisi/code;
-            # index  index.html index.htm;
+            index  index.html index.php;
+            include /usr/local/etc/nginx/conf.d/php-fpm;
             autoindex on;
         }
 

diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim
@@ -9,6 +9,7 @@ Plugin 'gmarik/vundle'
 " utilities
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
+Plugin 'Xuyuanp/nerdtree-git-plugin'
 Plugin 'mileszs/ack.vim'
 Plugin 'Raimondi/delimitMate'
 Plugin 'tpope/vim-commentary'
@@ -46,27 +47,31 @@ Plugin 'sickill/vim-pasta'
 " colorschemes
 Plugin 'chriskempson/base16-vim'
 
-" languages
-" Plugin 'othree/html5.vim'
-" Plugin 'pangloss/vim-javascript'
-Plugin 'jason0x43/vim-js-syntax'
-Plugin 'jason0x43/vim-js-indent'
-" Plugin 'jelera/vim-javascript-syntax'
-Plugin 'tpope/vim-markdown'
+" JavaScript
+Plugin 'othree/html5.vim'
+Plugin 'pangloss/vim-javascript'
+Plugin 'jelera/vim-javascript-syntax'
+" Plugin 'jason0x43/vim-js-syntax'
+" Plugin 'jason0x43/vim-js-indent'
 Plugin 'wavded/vim-stylus'
 Plugin 'groenewege/vim-less'
 Plugin 'digitaltoad/vim-jade'
 Plugin 'juvenn/mustache.vim'
 Plugin 'moll/vim-node'
 Plugin 'elzr/vim-json'
 Plugin 'leafgarland/typescript-vim'
-" Plugin 'jnwhiteh/vim-golang'
-" Plugin 'dart-lang/dart-vim-plugin'
+Plugin 'mxw/vim-jsx'
 Plugin 'cakebaker/scss-syntax.vim'
+" Plugin 'dart-lang/dart-vim-plugin'
 " Plugin 'kchmck/vim-coffee-script'
+" Plugin 'Valloric/YouCompleteMe'
+" Plugin 'marijnh/tern_for_vim'
+
+" languages
+Plugin 'tpope/vim-markdown'
+Plugin 'fatih/vim-go'
 " Plugin 'tclem/vim-arduino'
 Plugin 'timcharper/textile.vim'
-Plugin 'mxw/vim-jsx'
 
 call vundle#end()
 filetype plugin indent on
diff --git a/vim/vim.symlink/snippets/html.snippets b/vim/vim.symlink/snippets/html.snippets
@@ -29,3 +29,17 @@ snippet dtestcase
 			</script>
 		</body>
 	</html>
+snippet dsupport
+	<!DOCTYPE html>
+	<html lang="en">
+		<head>
+			<meta charset="UTF-8">
+			<title></title>
+		</head>
+		<body>
+			<script data-dojo-config="async:1,isDebug:1" src="../../dojo/dojo.js"></script>
+			<script>
+				${1}
+			</script>
+		</body>
+	</html>
diff --git a/vim/vim.symlink/snippets/javascript.snippets b/vim/vim.symlink/snippets/javascript.snippets
@@ -49,6 +49,8 @@ snippet lblue
 	console.log('%c${1}', 'font-weight:bold;color:blue;');
 snippet lpurple
 	console.log('%c${1}', 'font-weight:bold;color:purple;');
+snippet lor
+	console.log('%c${1}', 'font-weight:bold;color:orange;');
 snippet ctab
 	console.table(${1});
 snippet debug

diff --git a/vim/vim.symlink/spell/en.utf-8.add b/vim/vim.symlink/spell/en.utf-8.add
@@ -48,3 +48,14 @@ CSS
 SVG
 Github
 selendroid
+apps
+repos
+intermediateChanges
+priorityChange
+undefiend
+querySelector
+templateString
+NodeList
+W3C
+CSS2
+CSS3
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
@@ -365,13 +365,21 @@ hi def InterestingWord4 guifg=#000000 ctermfg=16 guibg=#b88853 ctermbg=137
 hi def InterestingWord5 guifg=#000000 ctermfg=16 guibg=#ff9eb8 ctermbg=211
 hi def InterestingWord6 guifg=#000000 ctermfg=16 guibg=#ff2c4b ctermbg=195
 
+function! HtmlUnEscape()
+  silent s/&lt;/</eg
+  silent s/&gt;/>/eg
+  silent s/&amp;/\&/eg
+endfunction
+
+nnoremap <silent> <leader>u :call HtmlUnEscape()<cr>
+
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Plugins
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 " close NERDTree after a file is opened
-let g:NERDTreeQuitOnOpen=1
+let g:NERDTreeQuitOnOpen=0
 " show hidden files in NERDTree
 let NERDTreeShowHidden=1
 " Toggle NERDTree

diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
@@ -39,6 +39,8 @@ fi
 
 [ -z "$TMUX" ] && export TERM=xterm-256color
 
+# install rbenv
+if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
 
 if [[ -d ~/.rvm ]]; then
     PATH=$HOME/.rvm/bin:$PATH # Add RVM to PATH for scripting