diff --git a/modules/shell/files/applications.sh b/modules/shell/files/applications.sh
index 3d569a7..c6dab2e 100644
--- a/modules/shell/files/applications.sh
+++ b/modules/shell/files/applications.sh
@@ -52,4 +52,3 @@ recreatedb() {
 }
 
 # colored GCC warnings and errors
-export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
diff --git a/modules/shell/files/base.sh b/modules/shell/files/base.sh
index b93b43c..eafb4a4 100644
--- a/modules/shell/files/base.sh
+++ b/modules/shell/files/base.sh
@@ -4,12 +4,6 @@ case $- in
   *) return;;
 esac
 
-# Export some variables
-export ANDROID_HOME=/opt/android-sdk
-export EDITOR=/bin/nano
-export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S'
-export DOTFILES=~/.dotfiles
-export QT_QPA_PLATFORMTHEME=gtk2
 
 # Extend path
 export PATH=${PATH}:${ANDROID_HOME}/tools
@@ -17,6 +11,9 @@ export PATH=${PATH}:${ANDROID_HOME}/platform-tools
 export PATH=${PATH}:/opt/genymobile/genymotion
 export PATH=${PATH}:${HOME}/.bin
 
+export DOTFILES=~/.dotfiles
+
+
 # bash aliases
 alias refresh="cd $PWD > /dev/null"
 alias c="clear"
diff --git a/modules/shell/files/environment.sh b/modules/shell/files/environment.sh
new file mode 100644
index 0000000..2d4568b
--- /dev/null
+++ b/modules/shell/files/environment.sh
@@ -0,0 +1,6 @@
+# Export some variables
+ANDROID_HOME=/opt/android-sdk
+EDITOR=/bin/nano
+TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S'
+QT_QPA_PLATFORMTHEME=gtk2
+GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
diff --git a/modules/shell/files/javascript.sh b/modules/shell/files/javascript.sh
index 53c9597..bfc3691 100644
--- a/modules/shell/files/javascript.sh
+++ b/modules/shell/files/javascript.sh
@@ -37,6 +37,5 @@ alias nrm="npm run mocha"
 alias nvmu="nvm use"
 
 # React-native extras
-export REACT_EDITOR=atom
 alias rnl="adb logcat | grep ReactNative"
 alias rn="react-native"
diff --git a/modules/shell/manifests/init.pp b/modules/shell/manifests/init.pp
index eb11adb..e713ec6 100644
--- a/modules/shell/manifests/init.pp
+++ b/modules/shell/manifests/init.pp
@@ -46,4 +46,13 @@ class shell {
     mode => '0755',
     recurse => remote
   }
+
+  file { 'Global Environment':
+    ensure => file,
+    mode => '0644',
+    owner => 'root',
+    group => 'root',
+    source => 'puppet:///modules/shell/environment.sh',
+    path => '/etc/environment'
+  }
 }