cleanup zsh env

This commit is contained in:
Cyryl Płotnicki 2019-01-20 13:09:46 +00:00
parent 5002e6407e
commit a273c90c07
5 changed files with 14 additions and 23 deletions

View file

@ -1,10 +1,7 @@
fedora:
before_script:
- apk add bash
script:
- pwd
- ls
- bash -c $CI_PROJECT_DIR/test.sh
script: ./test.sh
image: docker:stable
services:
- docker:dind
@ -17,10 +14,7 @@ fedora:
ubuntu:
before_script:
- apk add bash
script:
- pwd
- ls
- bash -c $CI_PROJECT_DIR/test.sh
script: ./test.sh
image: docker:stable
services:
- docker:dind

View file

@ -1,12 +1,14 @@
export TERM="xterm-256color"
export GOPATH=`realpath "$HOME/go"`
export PATH=$PATH:$HOME/.rvm/bin
export PATH=$HOME/tools:$PATH
export PATH=$HOME/bin:$PATH
export PATH=$GOPATH/bin:$PATH
export PATH=$HOME/.local/bin:$PATH
export PATH=$HOME/.cargo/bin:$PATH
export PATH="$GOPATH/bin:$PATH"
export PATH="$PATH:$HOME/.rvm/bin"
export PATH="$HOME/programs:$PATH"
export PATH="$HOME/tools:$PATH"
export PATH="$HOME/bin:$PATH"
export PATH="$HOME/.local/bin:$PATH"
export PATH="$HOME/.cargo/bin:$PATH"
export RUST_SRC_PATH=$HOME/dev/rust/src
export EDITOR="vim"
@ -14,5 +16,3 @@ export KEYTIMEOUT=1
export VAGRANT_DEFAULT_PROVIDER=virtualbox
export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
export NVM_DIR="$HOME/.nvm"
source "$NVM_DIR/nvm.sh"

View file

@ -30,11 +30,6 @@ fi
TMPPREFIX="${TMPDIR%/}/zsh"
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
export PATH="$HOME/.cargo/bin:$PATH"
export PATH="$HOME/programs:$PATH"
# other common env vars
source ~/.setenv
vacuum-repo() {

2
.zshrc
View file

@ -36,5 +36,5 @@ if [[ `uname` =~ 'CYGWIN.*' ]]; then
fi
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
[ -f /home/cyryl/.travis/travis.sh ] && source /home/cyryl/.travis/travis.sh
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

View file

@ -72,6 +72,8 @@ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | b
echo "sourcing env"
source ~/.setenv
\. "$NVM_DIR/nvm.sh"
nvm use node
# tools