More bash bits

bash/.bash_aliases

@@ -5,4 +5,5 @@ else
 	alias ls="ls -F --color=auto"
 fi
 
-alias tma="tmux attach"
+alias t='(tmux has-session 2>/dev/null && tmux attach) || (tmux new-session)'
+alias tma="tmux attach"

bash/.bash_functions

@@ -25,4 +25,16 @@ function add-sshkey() {
             echo "No key named ${NAME} found..."
         fi
     fi
+}
+
+# Switch to a simple prompt for demos (thanks Mark H for the idea)
+function demoprompt() {
+    if [ ! -z ${OLDPS1+x} ]; then
+        PS1=$OLDPS1
+        unset OLDPS1
+    else
+        OLDPS1=$PS1
+        PS1="\$ "
+        clear
+    fi
 }