From 6a3b65e69f5ec5b9a146567df22e97d61f0013d9 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Mon, 2 Nov 2020 23:31:29 +0100 Subject: [PATCH] add prettierrc --- .prettierrc | 3 +++ .travis.yml | 2 +- editorconfig | 16 ---------------- exports | 14 +++++++------- 4 files changed, 11 insertions(+), 24 deletions(-) create mode 100644 .prettierrc delete mode 100644 editorconfig diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..75fa134 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,3 @@ +{ + "tabWidth": 2 +} diff --git a/.travis.yml b/.travis.yml index aca1f62..70c7c1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,4 @@ matrix: fast_finish: true notifications: - email: false \ No newline at end of file + email: false diff --git a/editorconfig b/editorconfig deleted file mode 100644 index 95c54f3..0000000 --- a/editorconfig +++ /dev/null @@ -1,16 +0,0 @@ -# -# Global EditorConfig file -# http://EditorConfig.org -# - -[*] -charset = utf-8 -indent_style = space -indent_size = 4 - -[.{json,yml,yaml}] -indent_style = space -indent_size = 2 - -[{Makefile,Make,make}] -indent_style = tab \ No newline at end of file diff --git a/exports b/exports index 7cb62e6..d562dfb 100644 --- a/exports +++ b/exports @@ -12,14 +12,14 @@ export LANG="en_US" # --------------------------------------------------- PATH_OPENSSL=$(brew --prefix openssl)/bin -PATH_RUBY=$(brew --prefix ruby)/bin -PATH_GEMS=/usr/local/lib/ruby/gems/2.6.0/bin +# PATH_RUBY=$(brew --prefix ruby)/bin +# PATH_GEMS=/usr/local/lib/ruby/gems/2.6.0/bin PATH_PYTHON=$(brew --prefix python)/libexec/bin PATH_GO=$(brew --prefix go)/libexec/bin -PATH_RUST=$HOME/.cargo/bin +#PATH_RUST=$HOME/.cargo/bin export GOPATH=$HOME/.go/ -export PATH=$HOME/.bin:/usr/local/bin:$PATH_OPENSSL:$PATH_RUBY:$PATH_GEMS:$PATH_PYTHON:$GOPATH/bin:$PATH_GO:$PATH_RUST:$PATH +export PATH=$HOME/.bin:/usr/local/bin:$PATH_OPENSSL:$PATH_PYTHON:$GOPATH/bin:$PATH_GO:$PATH # define CDPATHs which are autocompleted from when doing cd export CDPATH=$CDPATH:~/Code @@ -31,12 +31,12 @@ NODE_GLOBALS+=("node") NODE_GLOBALS+=("nvm") load_nvm () { - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" } for cmd in "${NODE_GLOBALS[@]}"; do - eval "${cmd}(){ unset -f ${NODE_GLOBALS}; load_nvm; ${cmd} \$@ }" + eval "${cmd}(){ unset -f ${NODE_GLOBALS}; load_nvm; ${cmd} \$@ }" done # pip should only run if there is a virtualenv currently activated