From a273c90c07233c01301c526104ef71ee124bf9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 20 Jan 2019 13:09:46 +0000
Subject: [PATCH] cleanup zsh env

---
 .gitlab-ci.yml                   | 10 ++--------
 .setenv.sh                       | 18 +++++++++---------
 .zprofile                        |  5 -----
 .zshrc                           |  2 +-
 common/configure_fresh_system.sh |  2 ++
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e42c1c72..6216e5ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/.setenv.sh b/.setenv.sh
index bd206ad5..47f99422 100644
--- a/.setenv.sh
+++ b/.setenv.sh
@@ -1,18 +1,18 @@
 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"
 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"
+export NVM_DIR="$HOME/.nvm"
\ No newline at end of file
diff --git a/.zprofile b/.zprofile
index 57a228ce..11155fe3 100644
--- a/.zprofile
+++ b/.zprofile
@@ -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() {
diff --git a/.zshrc b/.zshrc
index 3edca006..c8231494 100644
--- a/.zshrc
+++ b/.zshrc
@@ -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"
diff --git a/common/configure_fresh_system.sh b/common/configure_fresh_system.sh
index d6b051c7..ecdbef31 100755
--- a/common/configure_fresh_system.sh
+++ b/common/configure_fresh_system.sh
@@ -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