refactored bash settings

6 files changed, 43 insertions, 59 deletions

diff --git a/.bashrc.files/bash_prompt b/.bashrc.files/bash_prompt
deleted file mode 100644
index 9c53c48..0000000
--- a/.bashrc.files/bash_prompt
+++ /dev/null
@@ -1,12 +0,0 @@
-# dotfiles -- .bashrc/bash_prompt
-# author: johannst
-
-# colors not annotadted in the comments!!!
-
-# ::user::host - time - path
-# [return_code] $>
-#export PS1="\[\033[38;5;88m\]::\[$(tty -s && tput sgr0)\]\[\033[38;5;202m\]\u\[$(tty -s && tput sgr0)\]\[\033[38;5;88m\]::\[$(tty -s && tput sgr0)\]\[\033[38;5;208m\]\H\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;7m\]-\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;226m\]\t\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;7m\]-\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;89m\]\w\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\]\n\[$(tty -s && tput sgr0)\]\[\033[38;5;7m\][\[$(tty -s && tput sgr0)\]\[\033[38;5;214m\]\$?\[$(tty -s && tput sgr0)\]\[\033[38;5;7m\]]\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;67m\]\\$>\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]"
-
-# ::user::host - time - path
-# [return_code] >>
-export PS1="\[\033[38;5;88m\]::\[$(tty -s && tput sgr0)\]\[\033[38;5;202m\]\u\[$(tty -s && tput sgr0)\]\[\033[38;5;88m\]::\[$(tty -s && tput sgr0)\]\[\033[38;5;208m\]\H\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;7m\]-\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;226m\]\t\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;7m\]-\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;74m\]\w\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\]\n\[$(tty -s && tput sgr0)\]\[\033[38;5;7m\][\[$(tty -s && tput sgr0)\]\[\033[38;5;214m\]\$?\[$(tty -s && tput sgr0)\]\[\033[38;5;7m\]]\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]\[\033[38;5;67m\]>>\[$(tty -s && tput sgr0)\]\[\033[38;5;15m\] \[$(tty -s && tput sgr0)\]"
diff --git a/.bashrc.files/colors b/.bashrc.files/colors
deleted file mode 100644
index 1b5b1e7..0000000
--- a/.bashrc.files/colors
+++ /dev/null
@@ -1,34 +0,0 @@
-# dotfiles -- .bashrc/colors
-# author: johannst
-
-# explanations
-  #no  NORMAL                 Global default, although everything should be something
-  #fi  FILE                   Normal file
-  #di  DIR                    Directory
-  #ln  SYMLINK                Symbolic link. If you set this to ‘target’ instead of a numerical value, the color is as for the file pointed to.
-  #pi  FIFO, PIPE             Named pipe
-  #do  DOOR                   Door
-  #bd  BLOCK                  Block device
-  #cd  CHAR                   Character device
-  #or  ORPHAN                 Symbolic link pointing to a non-existent file
-  #so  SOCK                   Socket
-  #su  SETUID                 File that is setuid (u+s)
-  #sg  SETGID                 File that is setgid (g+s)
-  #tw  STICKY_OTHER_WRITABLE  Directory that is sticky and other-writable (+t,o+w)
-  #ow  OTHER_WRITABLE         Directory that is other-writable (o+w) and not sticky
-  #st  STICKY                 Directory with the sticky bit set (+t) and not other-writable
-  #ex  EXEC                   Executable file (i.e. has ‘x’ set in permissions)
-  #mi  MISSING                Non-existent file pointed to by a symbolic link (visible when you type ls -l)
-  #lc  LEFTCODE               Opening terminal code
-  #rc  RIGHTCODE              Closing terminal code
-  #ec  ENDCODE                Non-filename text
-  #*.extension                Every file using this extension e.g. *.jpg
-# mostly unix file types
-#export LS_COLORS="rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32"
-export LS_COLORS="di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43::tw=30;42:ow=34;42:st=37;44:ex=01;32"
-# archives
-export LS_COLORS="*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:$LS_COLORS"
-# image and video
-export LS_COLORS="*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:$LS_COLORS"
-# audio
-export LS_COLORS="*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:$LS_COLORS"
diff --git a/.bashrc.files/functions b/.bashrc.files/functions
deleted file mode 100644
index fbab13d..0000000
--- a/.bashrc.files/functions
+++ /dev/null
@@ -1,6 +0,0 @@
-function vimgrep()
-{
-    if [ -z $1 ]; then echo -e "vimgrep PATTERN PATH"; return 1; fi 
-    if [ -z $2 ]; then echo -e "vimgrep PATTERN PATH"; return 1; fi 
-    \grep -IRn $1 $2 | vim -
-}
diff --git a/.bashrc.files/settings b/.bashrc.files/settings
deleted file mode 100644
index ad9c4ad..0000000
--- a/.bashrc.files/settings
+++ /dev/null
@@ -1,5 +0,0 @@
-# dotfiles -- .bashrc/settings
-# author: johannst
-
-# disable sticky mode
-stty -ixon
diff --git a/bashrc b/bashrc
new file mode 100644
index 0000000..3886ab7
--- /dev/null
+++ b/bashrc
@@ -0,0 +1,43 @@
+# dotfiles -- bashrc
+# author: johannst
+
+
+#{{{ general bash settings
+
+export TERM=xterm-256color
+
+# disable sticky mode
+stty -ixon
+
+#}}}
+#{{{ alias
+
+alias ls='ls --color=auto -h'
+alias ll='ls -alF'
+alias la='ls -AF'
+alias grep='grep --color=auto'
+
+#}}}
+#{{{ color definition
+
+BCol_NoColor='\e[m'
+BCol_DarkRed='\e[38;5;88m'
+BCol_DarkOrange='\e[38;5;202m'
+BCol_LightOrange='\e[38;5;208m'
+BCol_LightGray='\e[38;5;7m'
+BCol_Yellow='\e[38;5;226m'
+BCol_LightBlue='\e[38;5;74m'
+BCol_BlueGray='\e[38;5;67m'
+BCol_YellowOrange='\e[38;5;214m'
+
+#}}}
+#{{{ bash prompt 
+
+export PS1="${BCol_DarkRed}::${BCol_DarkOrange}\u${BCol_DarkRed}::${BCol_LightOrange}\H${BCol_LightGray} - ${BCol_Yellow}\t${BCol_LightGray} - ${BCol_LightBlue}\w\n${BCol_NoColor}[${BCol_YellowOrange}$?${BCol_NoColor}] ${BCol_BlueGray}>>${BCol_NoColor} "
+
+#}}}
+#{{{ ls colors
+
+export LS_COLORS='di=34:ln=96:or=4;96;41:so=0:pi=0:ex=01;92:bd=0;42:cd=0;42:su=0:sg=0:tw=30;44:ow=30;44'
+
+#}}}
diff --git a/print_bash_color b/print_bash_color
index fe3309b..43f6fcc 100755
--- a/print_bash_color
+++ b/print_bash_color
@@ -29,11 +29,9 @@ done
 #{{{ print colors 0-255 fg
 
 for i in $(seq 0 255); do
-   color_line="color${i}"
    color_line="\\e[38;5;${i}"
    printf "\e[38;5;${i}m%11s " $color_line;
    if [ $((((i+1)) % 16)) == 0 ]; then printf '\n'; fi
-   #printf "\x1b[38;5;${i}mcolour${i}\n"; 
 done
 
 #}}}