Env

diff --git a/.bashrc b/.bashrc
index 4877bf51840bc57ac335667d7a7fccaa5b6efac2..73d46f40c544c5443af709c6085116492f47af14 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,10 +1,15 @@
 # BASHRC
 
-# Environment variables
+# Environment variables strictly related to the machine
 if [ -f ~/.bash_env ]; then
     . ~/.bash_env
 fi
 
+# Environment variables
+if [ -f ~/.config/some.files/bash/env.sh ]; then
+    . ~/.config/some.files/bash/env.sh
+fi
+
 # To avoid duplicate lines in bash History
 HISTCONTROL=ignoreboth
 
@@ -95,8 +100,8 @@ for fname in ~/.config/some.files/bash/procedures/*.sh; do
 done
 # End Load Procedures
 
-if [ -z "$TMUX" ]; then
-       tmux
+if [ -n "$PS1" -a -z "$TMUX" ]; then
+       tmux && exit
 fi
 
 if [ -n "$PS1"  -a -n "$TMUX" ]; then