Removed extra bashrc lines and updated tmprc

bashrc

@@ -100,7 +100,6 @@ alias g="git $@"
 function mcl(){ mkdir "$@"&&cl "$@"; }
 function cl(){ cd "$@" && ls; }
 function k(){
-  echo "$@"
   if [ -d "$@" ] ; then
     cd "$@" && ls
   elif [ "$@" == "-" ] ; then
@@ -182,13 +181,6 @@ function initify(){
 }
 export -f initify
 
-
-
-
-
-
-
-
 #Color definitions
 txtblk='\[\e[0;30m\]' # Black - Regular
 txtred='\[\e[0;31m\]' # Red
@@ -262,4 +254,4 @@ if [ "$BASH" ]; then
   #readonly HISTSIZE
   #readonly HISTFILE
   #readonly HISTCONTROL
-fi
+fi

tmprc

@@ -4,8 +4,6 @@ case $- in
 esac
 HISTCONTROL=ignoreboth
 shopt -s histappend
-HISTSIZE=1000
-HISTFILESIZE=2000
 shopt -s checkwinsize
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
@@ -79,7 +77,7 @@ alias mv="mv -v"
 alias la='ls -lah $LS_COLOR'
 alias dt='date "+%F %T"'
 alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done'
-alias adk='/home/stonewareslord/applications/adk/bin/studio.sh>/dev/null&'
+alias adk='/home/stonewareslord/applications/adk/bin/studio.sh&>/dev/null'
 alias resource='. ~/.bashrc'
 alias install='sudo apt-get install'
 alias search='sudo apt-cache search'
@@ -98,43 +96,42 @@ alias .........='k ../../../../../../../..'
 alias ytdl="youtube-dl $@ -x --audio-format mp3 --audio-quality 0 -c -o '%(title)s.%(ext)s'"
 alias tux="tmux a||tmux"
 alias rmgit="git remote rm origin;git remote rm https;git remote rm oOrigin;git remote rm oHttps"
+alias g="git $@"
 function mcl(){ mkdir "$@"&&cl "$@"; }
 function cl(){ cd "$@" && ls; }
 function k(){
   if [ -d "$@" ] ; then
     cd "$@" && ls
-  else
+  elif [ "$@" == "-" ] ; then
+    cd - && ls
+  elif [ -f "$@" ] ; then
     vim "$@"
+  else
+    echo -n "Create? "
+    read a
+    if [ ! -z $a ] ; then
+      vim "$@"
+    fi
   fi
-  #elif [ -f "$@" ] ; then
-  #  vim "$@"
-  #fi
 }
 complete -f k
 function ovim(){ vim +"SessionOpen $@"; }
 function ogvim(){ gvim +"SessionOpen $@"; }
 function tsh(){
   ssh $* -X
-  echo -e "\n\n\n\n\n\n\nSESSION CLOSED\n\n\n\n\n\n\n"
+  if which ponysay >/dev/null; then
+    ponysay "Connection closed!"
+  else
+    echo "\n\n\n\n\n\n\n\n\n\nSESSION CLOSED\n\n\n\n\n\n\n\n\n\n"
+  fi
 }
 
-#History control
-if [ "$BASH" ]; then
-  export HISTTIMEFORMAT="%Y-%m-%d_%H:%M:%S "
-  export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND ; }"'echo "`date +'%y.%m.%d-%H:%M:%S:'`" $USER "$(pwd)" "$(history 1 | cut -c8-)" >> ~/.bash_eternal_history'
-  alias ehistory='cat ~/.bash_eternal_history|grep $@'
-  #readonly PROMPT_COMMAND
-  #readonly HISTSIZE
-  readonly HISTFILE
-  readonly HOME
-  readonly HISTIGNORE
-  #readonly HISTCONTROL
-fi
 
 #Functions
 extract () {
   if [ -f $1 ] ; then
     case $1 in
+      *.tar.xz)    tar xvf $1     ;;
       *.tar.bz2)   tar xvjf $1    ;;
       *.tar.gz)    tar xvzf $1    ;;
       *.bz2)       bunzip2 $1     ;;
@@ -157,8 +154,8 @@ function cinitify(){
   mkdir $2
   cd $2
   git init
-  git remote add origin git@98.26.78.121:$1/$2.git
+  git remote add origin git@austenwares.com:$1/$2.git
-  git remote add https https://98.26.78.121/gitlab/$1/$2.git
+  git remote add https https://austenwares.com/gitlab/$1/$2.git
   #Offline mode
   git remote add oOrigin git@10.0.1.200:$1/$2.git
   git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git
@@ -171,8 +168,8 @@ function cinitify(){
 export -f cinitify
 function initify(){
   git init
-  git remote add origin git@98.26.78.121:$1/$2.git
+  git remote add origin git@austenwares.com:$1/$2.git
-  git remote add https https://98.26.78.121/gitlab/$1/$2.git
+  git remote add https https://austenwares.com/gitlab/$1/$2.git
   #Offline mode
   git remote add oOrigin git@10.0.1.200:$1/$2.git
   git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git
@@ -183,3 +180,78 @@ function initify(){
   git co master
 }
 export -f initify
+
+#Color definitions
+txtblk='\[\e[0;30m\]' # Black - Regular
+txtred='\[\e[0;31m\]' # Red
+txtgrn='\[\e[0;32m\]' # Green
+txtylw='\[\e[0;33m\]' # Yellow
+txtblu='\[\e[0;34m\]' # Blue
+txtpur='\[\e[0;35m\]' # Purple
+txtcyn='\[\e[0;36m\]' # Cyan
+txtwht='\[\e[0;37m\]' # White
+ 
+bldblk='\[\e[1;30m\]' # Black - Bold
+bldred='\[\e[1;31m\]' # Red
+bldgrn='\[\e[1;32m\]' # Green
+bldylw='\[\e[1;33m\]' # Yellow
+bldblu='\[\e[1;34m\]' # Blue
+bldpur='\[\e[1;35m\]' # Purple
+bldcyn='\[\e[1;36m\]' # Cyan
+bldwht='\[\e[1;37m\]' # White
+ 
+unkblk='\[\e[4;30m\]' # Black - Underline
+undred='\[\e[4;31m\]' # Red
+undgrn='\[\e[4;32m\]' # Green
+undylw='\[\e[4;33m\]' # Yellow
+undblu='\[\e[4;34m\]' # Blue
+undpur='\[\e[4;35m\]' # Purple
+undcyn='\[\e[4;36m\]' # Cyan
+undwht='\[\e[4;37m\]' # White
+ 
+bakblk='\[\e[40m\]'   # Black - Background
+bakred='\[\e[41m\]'   # Red
+badgrn='\[\e[42m\]'   # Green
+bakylw='\[\e[43m\]'   # Yellow
+bakblu='\[\e[44m\]'   # Blue
+bakpur='\[\e[45m\]'   # Purple
+bakcyn='\[\e[46m\]'   # Cyan
+bakwht='\[\e[47m\]'   # White
+ 
+txtrst='\[\e[0m\]'    # Text Reset
+
+#History control
+if [ "$BASH" ]; then
+  parse_git_branch() {
+    git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \1/' | grep -oE '[^ ]+$'
+  }
+  prompt(){
+    a=`parse_git_branch`
+    hn=`hostname`
+    hn=${hn:0:3}
+    who=`whoami`
+    who=${who:0:3}
+    if [ -z $a ] ; then
+      printf "{$txtgrn%s@%s$txtrst}{$txtred%s$txtrst}>" $who $hn "$PWD"
+    else
+      printf "{$txtgrn%s@%s$txtrst}{$txtred%s$txtrst}{$txtblu%s$txtrst}>" $who $hn "$PWD" $(parse_git_branch)
+    fi
+  }
+  PS1=""
+  PROMPT_COMMAND='PS1=`prompt`'
+  export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND ; }"'echo "`date +'%y.%m.%d-%H:%M:%S:'`" $USER "$(pwd)" "$(history 1 | cut -c8-)" >> ~/.bash_eternal_history'
+  #PROMPT_COMMAND='PS1="\(\033[0;33m\][\!]\`if [[ \$? = "0" ]]; then echo "\\[\\033[32m\\]"; else echo "\\[\\033[31m\\]"; fi\`[\u.\h: \`if [[ `pwd|wc -c|tr -d " "` > 18 ]]; then echo "\\W"; else echo "\\w"; fi\`]\$\[\033[0m\] "; echo -ne "\033]0;`hostname -s`:`pwd`\007"'
+
+  export HISTFILESIZE=
+  export HISTSIZE=
+  export HISTTIMEFORMAT="%Y-%m-%d_%H:%M:%S "
+  export HISTFILE=~/.bash_eternal_history
+
+  alias ehistory='cat ~/.bash_eternal_history|grep $@'
+  readonly HOME
+  readonly HISTIGNORE
+  #readonly PROMPT_COMMAND
+  #readonly HISTSIZE
+  #readonly HISTFILE
+  #readonly HISTCONTROL
+fi