Added sox and mp3 sox support to desktop/server.txt. Removed extra

bashrc lines. Updated tmprc. Added twig formatting in vimrc.

bashrc

@@ -1,68 +1,32 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
 case $- in
     *i*) ;;
       *) return;;
 esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
 HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
 shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
 HISTSIZE=1000
 HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
 shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
 if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
     debian_chroot=$(cat /etc/debian_chroot)
 fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
 case "$TERM" in
     xterm-color) color_prompt=yes;;
 esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
 if [ -n "$force_color_prompt" ]; then
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
 	color_prompt=yes
     else
 	color_prompt=
     fi
 fi
-
 if [ "$color_prompt" = yes ]; then
     PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 else
     PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 fi
 unset color_prompt force_color_prompt
-
 # If this is an xterm set the title to user@host:dir
 case "$TERM" in
 xterm*|rxvt*)
@@ -71,8 +35,6 @@ xterm*|rxvt*)
 *)
     ;;
 esac
-
-
 if ! shopt -oq posix; then
   if [ -f /usr/share/bash-completion/bash_completion ]; then
     . /usr/share/bash-completion/bash_completion
@@ -125,20 +87,20 @@ alias remove='sudo apt-get remove'
 alias update='sudo apt-get update'
 alias upgrade='sudo apt-get upgrade'
 alias autoremove='sudo apt-get autoremove'
-alias ..='f ..'
+alias ..='k ..'
-alias ...='f ../..'
+alias ...='k ../..'
-alias ....='f ../../..'
+alias ....='k ../../..'
-alias .....='f ../../../..'
+alias .....='k ../../../..'
-alias ......='f ../../../../..'
+alias ......='k ../../../../..'
-alias .......='f ../../../../../..'
+alias .......='k ../../../../../..'
-alias ........='f ../../../../../../..'
+alias ........='k ../../../../../../..'
-alias .........='f ../../../../../../../..'
+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"
 function mcl(){ mkdir "$@"&&cl "$@"; }
 function cl(){ cd "$@" && ls; }
-function f(){
+function k(){
   if [ -d "$@" ] ; then
     cd "$@" && ls
   else
@@ -148,7 +110,7 @@ function f(){
   #  vim "$@"
   #fi
 }
-complete -f f
+complete -f k
 function ovim(){ vim +"SessionOpen $@"; }
 function ogvim(){ gvim +"SessionOpen $@"; }
 function tsh(){
@@ -162,11 +124,11 @@ if [ "$BASH" ]; then
   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 HISTSIZE
   readonly HISTFILE
   readonly HOME
   readonly HISTIGNORE
-  readonly HISTCONTROL
+  #readonly HISTCONTROL
 fi
 
 #Functions

desktop.txt

@@ -66,6 +66,8 @@ exiv2
 xdotool
 htop
 nload
+sox
+libsox-fmt-mp3
 #IN STARTUP ITEMS: gtk-redshift -l 36.3:-80.3 -t 6500:4000
 #FOR CAFFEINE sudo add-apt-repository ppa:caffeine-developers/ppa
 #caffeine

server.txt

@@ -32,3 +32,5 @@ lm-sensors
 openvpn
 autojump
 nload
+sox
+libsox-fmt-mp3

tmprc

@@ -42,12 +42,15 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
-function tsh(){
+[ -f /usr/share/autojump/autojump.sh ] && . /usr/share/autojump/autojump.sh
-  ssh $* -X
+
-  echo -e "\n\n\n\n\n\n\nSESSION CLOSED\n\n\n\n\n\n\n"
+[[ -s /home/stonewareslord/.autojump/etc/profile.d/autojump.sh ]] && source /home/stonewareslord/.autojump/etc/profile.d/autojump.sh
-}
+export PATH=/home/stonewareslord/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp
+alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"'
+
 complete -cf sudo man
-#Alias definitions
+
+#Alias definitions.
 if [ "$(uname)" != "Darwin" ] ; then
   alias ls='ls --color=always -F'
 fi
@@ -59,6 +62,7 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"'
 alias disphost='export DISPLAY=:0.0'
 alias ll='ls -alF'
 alias la='ls -A'
@@ -73,9 +77,9 @@ alias skim="(head -5; tail -5) <"
 alias cp="cp -v"
 alias mv="mv -v"
 alias la='ls -lah $LS_COLOR'
-function cl(){ cd "$@" && ls; }
 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 resource='. ~/.bashrc'
 alias install='sudo apt-get install'
 alias search='sudo apt-cache search'
@@ -83,17 +87,50 @@ alias remove='sudo apt-get remove'
 alias update='sudo apt-get update'
 alias upgrade='sudo apt-get upgrade'
 alias autoremove='sudo apt-get autoremove'
-alias ..='cl ..'
+alias ..='k ..'
-alias ...='cl ../..'
+alias ...='k ../..'
-alias ....='cl ../../..'
+alias ....='k ../../..'
-alias .....='cl ../../../..'
+alias .....='k ../../../..'
-alias ......='cl ../../../../..'
+alias ......='k ../../../../..'
-alias .......='cl ../../../../../..'
+alias .......='k ../../../../../..'
-alias ........='cl ../../../../../../..'
+alias ........='k ../../../../../../..'
-alias .........='cl ../../../../../../../..'
+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"
+function mcl(){ mkdir "$@"&&cl "$@"; }
+function cl(){ cd "$@" && ls; }
+function k(){
+  if [ -d "$@" ] ; then
+    cd "$@" && ls
+  else
+    vim "$@"
+  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"
+}
+
+#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
@@ -116,12 +153,33 @@ extract () {
   fi
 }
 export -f extract
+function cinitify(){
+  mkdir $2
+  cd $2
+  git init
+  git remote add origin git@98.26.78.121:$1/$2.git
+  git remote add https https://98.26.78.121/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
+  git remote -v
+  echo -n "Pull from: "
+  read from
+  git pull $FROM
+  git co master
+}
+export -f cinitify
 function initify(){
   git init
   git remote add origin git@98.26.78.121:$1/$2.git
   git remote add https https://98.26.78.121/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
   git remote -v
+  echo -n "Pull from: "
+  read from
+  git pull $FROM
+  git co master
 }
 export -f initify

vimrc

@@ -6,6 +6,7 @@ nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>
 command! W %!sudo tee > /dev/null %
 autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
 au VimResized * exe "normal! \<c-w>="
+au BufRead,BufNewFile *.twig set filetype=htmljinja
 "match Error /\s\+$/
 "nnoremap s xa
 "nnoremap <F5> :UndotreeToggle<CR>