improved eslintrc and alias for grep.

izdesenko · May 18, 2016 · eabf279 · eabf279
1 parent 08d36dd
commit eabf279
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/bash_include b/bash_include
@@ -2,6 +2,7 @@
 export EDITOR=vim
 export VISUAL=vim
 export XDEBUG_CONFIG="ide-key=vim"
+export GREP_OPTIONS='--color=auto --exclude=*.swp --exclude-dir=.git'
 if [ "$(whoami)" == "ilya" ]
 then
 	export GIT_EDITOR=vim
@@ -308,7 +309,7 @@ fi
 
 
 alias mtail="less +F "
-alias grep="grep --color"
+# alias grep="grep --color"
 alias ll="ls -lAF"
 alias gis="git -c color.ui=always -c color.status=always status"
 alias giss="git -c color.ui=always -c color.status=always status | grep -v .min.js | grep -v .min.css "

diff --git a/bundle/fugitive b/bundle/fugitive
diff --git a/bundle/syntastic b/bundle/syntastic
diff --git a/eslintrc b/eslintrc
@@ -94,7 +94,7 @@
 		"no-dupe-keys": "error",
 		"no-duplicate-case": "error",
 		"no-dupe-args": "error",
-		"no-empty": "error",
+		"no-empty": ["error",{"allowEmptyCatch":true}],
 		"no-empty-function": "off",
 		"no-func-assign": "error",
 		"no-extra-parens": "error",
@@ -115,7 +115,7 @@
 		"no-extra-label": "error",
 		"no-fallthrough": "error",
 		"no-lone-blocks": "error",
-		"no-invalid-this": "error",
+		"no-invalid-this": "off",
 		"no-lonely-if": "error",
 		"no-extra-boolean-cast": "error",
 		"no-floating-decimal": "error",