diff --git a/.bash_aliases b/.bash_aliases deleted file mode 120000 index 8b9b8ec..0000000 --- a/.bash_aliases +++ /dev/null @@ -1 +0,0 @@ -.bash_aliases \ No newline at end of file diff --git a/.bash_aliases b/.bash_aliases new file mode 100644 index 0000000..b5bddc1 --- /dev/null +++ b/.bash_aliases @@ -0,0 +1,20 @@ +alias cp="cp -iv" # 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 + +alias p="sudo pacman" +alias y="yay" +alias upgrade="sudo pacman -Syyu && yay -Syyu" +alias ls="exa --group-directories-first -lh" +alias l="exa --group-directories-first -lh" +alias la="exa --group-directories-first -alh" +alias e="nvim" +alias print="printf" + +alias cfi3="nvim ~/.config/i3/config" +alias cfi3s="nvim ~/.config/i3status/config" + +alias yt="youtube-viewer" + diff --git a/.bash_profile b/.bash_profile deleted file mode 120000 index 6cc8412..0000000 --- a/.bash_profile +++ /dev/null @@ -1 +0,0 @@ -.bash_profile \ No newline at end of file diff --git a/.bash_profile b/.bash_profile new file mode 100644 index 0000000..214e62e --- /dev/null +++ b/.bash_profile @@ -0,0 +1,9 @@ +# +# ~/.bash_profile +# +[[ -f ~/.bashrc ]] && . ~/.bashrc +. "$HOME/.cargo/env" + + +export VISUAL=/usr/bin/nvim +export EDITOR=/usr/bin/nvim diff --git a/.bashrc b/.bashrc deleted file mode 120000 index 5157537..0000000 --- a/.bashrc +++ /dev/null @@ -1 +0,0 @@ -.bashrc \ No newline at end of file diff --git a/.bashrc b/.bashrc new file mode 100644 index 0000000..e76d254 --- /dev/null +++ b/.bashrc @@ -0,0 +1,167 @@ +# +# ~/.bashrc +# +export VISUAL=/usr/bin/nvim +export EDITOR=/usr/bin/nvim +export SPOTIPY_CLIENT_ID='aafa7f3fb81f46f681415f2cedfda2c8' +export SPOTIPY_CLIENT_SECRET='6ebee1d932c34fcdb711d4bf14dac0de' +export BROWSER=brave +#export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store" +#export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg" +# - Ui4axsk9mwfw? - + +ufetch +#(cat $HOME/.config/wpg/sequences &) + + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + + +[[ $- != *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*) + 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='\[\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 +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 + +# +# # ex - archive extractor +# # usage: ex +ex () +{ + if [ -f $1 ] ; then + case $1 in + *.tar.bz2) tar xjf $1 ;; + *.tar.gz) tar xzf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) unrar x $1 ;; + *.gz) gunzip $1 ;; + *.tar) tar xf $1 ;; + *.tbz2) tar xjf $1 ;; + *.tgz) tar xzf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1;; + *.7z) 7z x $1 ;; + *) echo "'$1' cannot be extracted via ex()" ;; + esac + else + echo "'$1' is not a valid file" + fi +} +export PATH=$PATH:/home/simon/.scripts +. "$HOME/.cargo/env" + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/home/simon/anaconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/home/simon/anaconda3/etc/profile.d/conda.sh" ]; then + . "/home/simon/anaconda3/etc/profile.d/conda.sh" + else + export PATH="/home/simon/anaconda3/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< +