Add oh-my-bash

.config/aliasrc

@@ -7,7 +7,7 @@ alias aliases='vim ~/.config/aliasrc && source ~/.config/aliasrc'
 
 alias bfg='java -jar ~/tools/bfg-1.13.0.jar'
 
-alias cp='cp -i'
+alias cp='cp -iv'
 
 alias df='df -h'
 alias doas='doas -- '
@@ -23,11 +23,14 @@ alias hist-grep='history 0 | grep '
 
 alias j='jump'
 
-alias ls='ls -Flh --color=auto'
+alias less='less -FS'
+alias ls='ls -lFh --color=auto'
 
 alias lsblk='lsblk -o +PARTLABEL -o +FSTYPE'
 
 alias make='make -j5'
+alias mkdir='mkdir -pv'
+alias mv='mv -iv'
 
 alias pacman-autoremove='pacman -Rns $(pacman -Qtdq)'
 
@@ -35,8 +38,11 @@ alias qutebrowser-kiosk='qutebrowser -B $XDG_DATA_DIR/qutebrowser-kiosk -C $XDG_
 
 alias rm='rm -I --one-file-system -v'
 
+alias s3cmd="s3cmd --config=$XDG_CONFIG_DIR/s3cmd/config"
 alias sudo='sudo '
 
+alias wget='wget -c'
+
 ### conditionals
 
 [ -x "$(command -v bat)" ] && alias cat='bat -pp'

.config/bash/colours

@@ -1,33 +0,0 @@
-black='\[\e[0;30m\]'
-BLACK='\[\e[1;30m\]'
-blackbg='\[\e[40m\]'
-
-red='\[\e[0;31m\]'
-RED='\[\e[1;31m\]'
-redbg='\[\e[41m\]'
-
-green='\[\e[0;32m\]'
-GREEN='\[\e[1;32m\]'
-greenbg='\[\e[42m\]'
-
-yellow='\[\e[0;33m\]'
-YELLOW='\[\e[1;33m\]'
-yellowbg='\[\e[43m\]'
-
-blue='\[\e[0;34m\]'
-BLUE='\[\e[1;34m\]'
-bluebg='\[\e[44m\]'
-
-purple='\[\e[0;35m\]'
-PURPLE='\[\e[1;35m\]'
-purplebg='\[\e[45m\]'
-
-cyan='\[\e[0;36m\]'
-CYAN='\[\e[1;36m\]'
-cyanbg='\[\e[46m\]'
-
-white='\[\e[0;37m\]'
-WHITE='\[\e[1;37m\]'
-whitebg='\[\e[47m\]'
-
-nc='\[\e[0m\]'

.config/environment

@@ -13,10 +13,12 @@ export MARKPATH="$HOME/.config/zsh/jump_marks"
 
 export NOTMUCH_CONFIG="$HOME/.config/notmuch/config"
 
-export PASSWORD_STORE_GENERATED_LENGTH='64'
+export OSH="$HOME/.config/bash/oh-my-bash"
 
+export PASSWORD_STORE_GENERATED_LENGTH='64'
 export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:$HOME/.local/bin:$GOPATH/bin
 
 export VIMINIT="source $HOME/.config/vim/vimrc"
 
 export ZDOTDIR="$HOME/.config/zsh"
+export ZSH="$ZDOTDIR/oh-my-zsh"

.config/zsh/.zshrc

@@ -1,5 +1,4 @@
-# Path to your oh-my-zsh installation.
-export ZSH="$ZDOTDIR/oh-my-zsh"
+source "$HOME/.config/environment"
 
 if [ ! -f "$ZSH/oh-my-zsh.sh" ]
 then