X-Git-Url: https://git.danix.xyz/?p=my-dotfiles.git;a=blobdiff_plain;f=bashrc;h=64257a2c460d618f9a224465f348ef594d548cf7;hp=0599652d5f1eb759790e4d78e7a2cb1aedb4a047;hb=HEAD;hpb=6a1cebe53b6d80c79a7292997b0aaf6974572147 diff --git a/bashrc b/bashrc index 0599652..6eade8a 100644 --- a/bashrc +++ b/bashrc @@ -11,7 +11,7 @@ fi bash_prompt() { local NONE="\[\033[0m\]" # unsets color to term's fg color - + # regular colors local K="\[\033[0;30m\]" # black local R="\[\033[0;31m\]" # red @@ -21,7 +21,7 @@ bash_prompt() { local M="\[\033[0;35m\]" # magenta local C="\[\033[0;36m\]" # cyan local W="\[\033[0;37m\]" # white - + # emphasized (bolded) colors local EMK="\[\033[1;30m\]" local EMR="\[\033[1;31m\]" @@ -31,7 +31,7 @@ bash_prompt() { local EMM="\[\033[1;35m\]" local EMC="\[\033[1;36m\]" local EMW="\[\033[1;37m\]" - + # background colors local BGK="\[\033[40m\]" local BGR="\[\033[41m\]" @@ -41,13 +41,14 @@ bash_prompt() { local BGM="\[\033[45m\]" local BGC="\[\033[46m\]" local BGW="\[\033[47m\]" - + local UC=$EMG [ $UID -eq "0" ] && UC=$EMR - - PS1="${UC}\u ${NONE}@ ${EMB}\h ${NONE}{ ${M}\d ${NONE}} ${W}${BGG}[ \w ]${NONE}\n\#$(__git_ps1) ${UC}\\$> ${NONE}" + + PS1="${UC}\u ${NONE}@ ${EMB}\h ${NONE}{ ${M}\d ${NONE}} ${W}${BGY}${EMK}[ \w ]${NONE}\n\#$(__git_ps1) ${UC}\\$> ${NONE}" } export PROMPT_COMMAND=bash_prompt +printf "\033]0;%s@%s\007" "${LOGNAME}" "${HOSTNAME%%.*}" # turns on git prompt if [ -f /home/danix/.git-prompt.sh ]; then @@ -74,12 +75,11 @@ alias du="du -sh" alias diff='diff --color=auto' alias grep='grep --color=auto' alias path='(IFS=:;ls -1d $PATH | nl)' -alias hf='history|grep' # history as big as possible!! HISTSIZE=1000000 HISTFILESIZE=2000000 -HISTIGNORE='hf *' +# HISTIGNORE='hf *' # unix.stackexchange.com/a/18443 # history: erase duplicates... HISTCONTROL=ignoreboth:erasedups @@ -87,19 +87,28 @@ shopt -s histappend -export PATH=~/.config/composer/vendor/bin:~/.local/bin:~/bin:$PATH +#export PATH=~/.platformio/penv/bin:~/.config/composer/vendor/bin:~/.local/bin:~/bin:$PATH +#export PATH=~/.config/composer/vendor/bin:~/.local/bin:~/bin:$PATH export INTEL_BATCH=1 export QT_QPA_PLATFORMTHEME="lxqt" export QT_STYLE_OVERRIDE="kvantum-dark" export XDG_DATA_DIRS="/usr/local/share/:/usr/share/" +export CM_LAUNCHER=rofi # Tailoring LESS +# If any syntax highlighters are available, use them. +# # pygmentize does more, but source-highlight is still good. +if command -v pygmentize > /dev/null 2>&1; then + export LESSCOLOURIZER="pygmentize -f terminal" +elif command -v source-highlight > /dev/null 2>&1; then + export LESSCOLOURIZER="source-highlight --failsafe --infer-lang -f esc --style-file=esc.style -i" +fi alias more='less' -export LESS='-R' +export LESS=' -R' export LESSOPEN='|~/.lessfilter %s' export PAGER=less export SVN_EDITOR=vim -export LESSCHARSET='latin1' +export LESSCHARSET='utf-8' man() { LESS_TERMCAP_md=$'\e[01;31m' \ @@ -114,13 +123,17 @@ man() { # sudo password helper export SUDO_ASKPASS=/usr/bin/lxsudo +# password store directory +export PASSWORD_STORE_DIR=/home/danix/Programming/GIT/password_store/ + # logdate appends a date to a script output logdate() { - while IFS= read -r line; do - echo "$(date +"%F_%R.%S") $line" - done + while IFS= read -r line; do + echo "$(date +"%F_%R.%S") $line" + done } +# start gpg-agent for ssh authentication as well as key management unset GPG_AGENT_INFO unset SSH_AGENT_PID if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then @@ -128,7 +141,7 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then fi export GPG_TTY=$(tty) if [ -x "$(which gpg-connect-agent)" ]; then - gpg-connect-agent updatestartuptty /bye > /dev/null + gpg-connect-agent updatestartuptty /bye > /dev/null fi mount-fs () { @@ -136,4 +149,3 @@ mount-fs () { mount | \grep -E '^[^[:lower:]_-]+' | awk '{print $1,$3,$5}' ) | column -t } -