diff --git a/.bashrc b/.bashrc index 2ab7256..dffd309 100644 --- a/.bashrc +++ b/.bashrc @@ -2,123 +2,45 @@ # ~/.bashrc # -#export vblank_mode=0 -set -o vi +#if not running interactively, don't do anything [[ $- != *i* ]] && return -colors() { - local fgc bgc vals seq0 +set -o vi +PS1='\[\e[31m\]\W\[\e[m\] \[\e[32m\]>\[\e[m\] ' +#export vblank_mode=0 - 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" +# I don't know what these do for now, might or might not break something if disabled +#unset use_color safe_term match_lhs sh +#use_color=true +#xhost +local:root > /dev/null 2>&1 +#complete -cf sudo - # foreground colors - for fgc in {30..37}; do - # background colors - for bgc in {40..47}; do - fgc=${fgc#37} # white - bgc=${bgc#40} # black +alias cp='cp -i' # confirm before overwriting something +alias df='df -h' # human-readable sizes +alias du='du -h' +alias free='free -h' - vals="${fgc:+$fgc;}${bgc}" - vals=${vals%%;} +alias ls='ls --color=auto' +alias grep='grep --colour=auto' +alias egrep='egrep --colour=auto' +alias fgrep='fgrep --colour=auto' - 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*) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"' - ;; - screen*) - 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='\[\e[31m\]\W\[\e[m\] \[\e[32m\]>\[\e[m\] ' - 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 +# [[ Not sure about these, guess I'll just keep them... # 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 +# ]] -# -# # ex - archive extractor -# # usage: ex -ex () +# # ext - archive extractor +# # usage: ext +ext () { if [ -f $1 ] ; then case $1 in @@ -133,29 +55,19 @@ ex () *.zip) unzip $1 ;; *.Z) uncompress $1;; *.7z) 7z x $1 ;; - *) echo "'$1' cannot be extracted via ex()" ;; + *) echo "'$1' cannot be extracted via ext()" ;; esac else echo "'$1' is not a valid file" fi } -# better yaourt colors -export YAOURT_COLORS="nb=1:pkg=1:ver=1;32:lver=1;45:installed=1;42:grp=1;34:od=1;41;5:votes=1;44:dsc=0:other=1;35" - # User added aliases -alias yeet='yay' alias vim='nvim' -alias gcloud-ssh-bot='gcloud beta compute --project "vibot-discord" ssh --zone "europe-west3-c" "redbot"' -alias gcloud-ssh-multipurpose='gcloud beta compute --project "multipurpose-vps-264707" ssh --zone "us-west2-c" "vibikim@halo" --ssh-flag="-p 22"' -alias gcloud-ssh-mc='gcloud beta compute --project "multipurpose-vps-264707" ssh --zone "europe-west3-c" "vibikim@minecraft" --ssh-flag="-p 22"' - #rclone syncs +#rclone syncs alias rclone-up-projecte_drawings="rclone sync ~/Documents/Projecte\ drawings/ 'Main gDrive':/'Projecte drawings' -P" alias rclone-up-music="rclone sync /run/media/vibikim/WAD/Music/ gdrive_music:/Music -P" alias rclone-down-projecte_drawings="rclone sync 'Main gDrive':/'Projecte drawings' ~/Documents/Projecte\ drawings/ -P" alias rclone-down-music="rclone sync gdrive_music:/Music /run/media/vibikim/WAD/Music/ -P" - -#osu on wine -alias osu="WINEPREFIX="$HOME/osu/" WINEARCH=win32 PATH=/opt/wine-osu/bin:$PATH"