diff --git a/dots/bash/.bashrc b/dots/bash/.bashrc index 3096eb4..c26c57e 100644 --- a/dots/bash/.bashrc +++ b/dots/bash/.bashrc @@ -38,48 +38,6 @@ ex () fi } - - - - - - - -# -------------- -# OLD ENTRIES -# -------------- - -# [[ $- != *i* ]] && return -# -# colors() { -# local fgc bgc vals seq0 -# -# printf "Color escapes are %s\n" '\e[${value};...;${value}m' -# printf "Values 30..37 are \e[33mforeground colors\e[m\n" -# printf "Values 40..47 are \e[43mbackground colors\e[m\n" -# printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n" -# -# # foreground colors -# for fgc in {30..37}; do -# # background colors -# for bgc in {40..47}; do -# fgc=${fgc#37} # white -# bgc=${bgc#40} # black -# -# vals="${fgc:+$fgc;}${bgc}" -# vals=${vals%%;} -# -# seq0="${vals:+\e[${vals}m}" -# printf " %-9s" "${seq0:-(default)}" -# printf " ${seq0}TEXT\e[m" -# printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m" -# done -# echo; echo -# done -# } -# -# [ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion -# # # Change the window title of X terminals # case ${TERM} in # xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) @@ -89,92 +47,17 @@ ex () # PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"' # ;; # esac -# -# use_color=true -# -# # Set colorful PS1 only on colorful terminals. -# # dircolors --print-database uses its own built-in database -# # instead of using /etc/DIR_COLORS. Try to use the external file -# # first to take advantage of user additions. Use internal bash -# # globbing instead of external grep binary. -# safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM -# match_lhs="" -# [[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" -# [[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(/dev/null \ -# && match_lhs=$(dircolors --print-database) -# [[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true -# -# if ${use_color} ; then -# # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 -# if type -P dircolors >/dev/null ; then -# if [[ -f ~/.dir_colors ]] ; then -# eval $(dircolors -b ~/.dir_colors) -# elif [[ -f /etc/DIR_COLORS ]] ; then -# eval $(dircolors -b /etc/DIR_COLORS) -# fi -# fi -# -# if [[ ${EUID} == 0 ]] ; then -# PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] ' -# else -# PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] ' -# fi -# -# alias ls='ls --color=auto' -# alias grep='grep --colour=auto' -# alias egrep='egrep --colour=auto' -# alias fgrep='fgrep --colour=auto' -# else -# if [[ ${EUID} == 0 ]] ; then -# # show root@ when we don't have colors -# PS1='\u@\h \W \$ ' -# else -# PS1='\u@\h \w \$ ' -# fi -# fi -# -# unset use_color safe_term match_lhs sh -# + # alias cp="cp -i" # confirm before overwriting something # alias df='df -h' # human-readable sizes # alias free='free -m' # show sizes in MB # alias np='nano -w PKGBUILD' # #alias more=less -# -# xhost +local:root > /dev/null 2>&1 -# -# complete -cf sudo -# -# # Bash won't get SIGWINCH if another process is in the foreground. -# # Enable checkwinsize so that bash will check the terminal size when -# # it regains control. #65623 -# # http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) -# shopt -s checkwinsize -# -# shopt -s expand_aliases -# -# # export QT_SELECT=4 -# -# # Enable history appending instead of overwriting. #139609 -# shopt -s histappend -# -# # -# -# # ----------------------- -# # own additions below -# # -# # note: only use lowercase letters for aliases! -# # ----------------------- -# + + # # --- # # sys stuff # # --- -# eval "$(jump shell)" -# alias genesis='~/Scripts/genesis.sh' -# alias curae='~/Scripts/tmp/curae.sh' -# # alias nas-mount="sudo systemctl start media-nas.mount" # alias nas-unmount="sudo systemctl stop media-nas.mount" # @@ -189,8 +72,7 @@ ex () # alias res-high="xrandr -s 3840x2160" # # alias keymap="setxkbmap -model pc105 -layout us,no -option grp:caps_toggle,grp_led:scroll" -# -# + # # --- # # misc # # --- @@ -219,19 +101,19 @@ ex () # alias notesArchiver='/home/poq/syncDir/gitRepos/git.mz.fo/miniProjects/2306_notesArchiver/notesArchiver.sh' # alias toJpg='/home/poq/syncDir/gitRepos/git.mz.fo/miniProjects/2306_toJpg/toJpg.sh' # alias gpxImporter='python /home/poq/syncDir/gitRepos/git.mz.fo/miniProjects/2308_gpxImporter/importer.py' -# -# # --- -# # ajp related -# # --- + +# --- +# ajp related +# --- # ajp-cp2dropbox() { # "/home/poq/syncDir/gitRepos/git.mz.fo/miniProjects/2106_ajpDropboxDeployer/archi.sh" "$1" "$2" # } -# podigy() { -# cd /home/poq/syncDir/gitRepos/git.mz.fo/podigy/src -# source venv/bin/activate -# python archi.py -s /home/poq/syncDir/gitRepos/git.mz.fo/fiodb/db/podigy/sites -# deactivate -# } +podigy() { + cd /home/poq/syncDir/gitRepos/git.mz.fo/podigy/src + source venv/bin/activate + python archi.py -s /home/poq/syncDir/gitRepos/git.mz.fo/fiodb/db/podigy/sites + deactivate +} # podigy-pywsdb() { # podigy # /home/poq/syncDir/gitRepos/git.mz.fo/pyws/deploy/deployToBuildServer.sh db