From 5c0d1fdf4fc6dc93011ad44b580fd48ce70f3c64 Mon Sep 17 00:00:00 2001 From: Nick Nisi Date: Thu, 19 Feb 2015 08:37:22 -0600 Subject: [PATCH] miscellaneous updates --- nginx/nginx.conf | 3 ++- vim/vim.symlink/plugins.vim | 25 ++++++++++++-------- vim/vim.symlink/snippets/html.snippets | 14 +++++++++++ vim/vim.symlink/snippets/javascript.snippets | 2 ++ vim/vim.symlink/spell/en.utf-8.add | 11 +++++++++ vim/vimrc.symlink | 10 +++++++- zsh/zshrc.symlink | 2 ++ 7 files changed, 55 insertions(+), 12 deletions(-) diff --git a/nginx/nginx.conf b/nginx/nginx.conf index f715635..3406047 100644 --- 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 index b0c4056..56f6e88 100644 --- 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,13 +47,12 @@ 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' @@ -60,13 +60,18 @@ 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 index 0eac990..65f6353 100644 --- a/vim/vim.symlink/snippets/html.snippets +++ b/vim/vim.symlink/snippets/html.snippets @@ -29,3 +29,17 @@ snippet dtestcase +snippet dsupport + + + + + + + + + + + diff --git a/vim/vim.symlink/snippets/javascript.snippets b/vim/vim.symlink/snippets/javascript.snippets index 2f8aeb9..24c03d7 100644 --- 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 index e4951f4..0b893cc 100644 --- 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 index fec5c69..ee74ba7 100644 --- 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/<//eg + silent s/&/\&/eg +endfunction + +nnoremap u :call HtmlUnEscape() + """"""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => 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 index 7b13d52..005583a 100644 --- 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