diff --git a/git/hooks/banned.pre-commit b/git/hooks/banned.pre-commit deleted file mode 100755 index e91ed7f..0000000 --- a/git/hooks/banned.pre-commit +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/zsh -# Banned Words -# If the file(s) being commited contain any of the below banned words -# then fail the commit - -COLOR_RED="\x1B[31m" -COLOR_GREEN="\x1B[32m" -COLOR_NONE="\x1B[0m" - -LIST="debugger\|console\|TODO\|FIXME\|BANNED" - -if `git rev-parse --verify HEAD >/dev/null 2>&1`; then - against=HEAD -else - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -for FILE in `git diff-index --name-status --cached $against -- | cut -c3-` ; do - # check if the fil contains one fo the words in the list - if grep -w $LIST $FILE; then - echo "" - echo "${COLOR_RED}✘ ${FILE} contains a banned word.${COLOR_NONE}" - exit 1 - fi -done -echo "${COLOR_GREEN}✔ No banned words detected${COLOR_NONE}" diff --git a/vim/vim.symlink/snippets/javascript.snippets b/vim/vim.symlink/snippets/javascript.snippets index 835c254..ef87ba6 100644 --- a/vim/vim.symlink/snippets/javascript.snippets +++ b/vim/vim.symlink/snippets/javascript.snippets @@ -25,6 +25,7 @@ snippet fun } snippet iife (function () { + ${1} })(); # log snippets snippet log diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index 0e31d93..991ba57 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -135,7 +135,7 @@ call matchadd('ColorColumn', '\%81v', 100) set encoding=utf8 set t_Co=256 " Explicitly tell vim that the terminal supports 256 colors" set background=dark -colorscheme smyck +colorscheme jellybeans " set number " show line numbers set relativenumber " show relative line numbers @@ -194,6 +194,9 @@ nmap :%s/\s\+$ " shortcut to save nmap , :w +" disable Visual mode +noremap Q + " set paste toggle set pastetoggle= @@ -292,6 +295,7 @@ let g:ctrlp_working_path_mode = 'ra' " Fugitive Shortcuts nmap gs :Gstatus nmap ge :Gedit +nmap gr :Gread " toggle syntastic nmap s :SyntasticToggleMode