Initial version of the shells' dotfiles

- add config files for both bash and zsh
- as some utilities regard git to be present, git's config files
  are included as well
This commit is contained in:
Alexander Hess 2022-07-11 04:05:56 +02:00
parent c90d4825a7
commit 9c4ea2ecfe
Signed by: alexander
GPG key ID: 344EA5AB10D868E0
17 changed files with 2855 additions and 0 deletions

4
.bash_login Normal file
View file

@ -0,0 +1,4 @@
# Executed by bash when a login shell starts
# Mimic bash's default behavior and source `~/.profile`
source "$HOME/.profile"

4
.bash_logout Normal file
View file

@ -0,0 +1,4 @@
# Executed by bash when a login shell exits
source "$HOME/.config/shell/logout.sh"

8
.bash_profile Normal file
View file

@ -0,0 +1,8 @@
# Executed by bash when a login shell starts
# Mimic bash's default behavior and source `~/.bash_login` next
if [ -f "$HOME/.bash_login" ]; then
source "$HOME/.bash_login"
else
source "$HOME/.profile"
fi

238
.bashrc Normal file
View file

@ -0,0 +1,238 @@
# Executed by bash when a non-login shell starts
# Ensure bash is running interactively
[[ $- != *i* ]] && return
# Check if a command can be found on the $PATH
command_exists() {
command -v "$1" 1>/dev/null 2>&1
}
# ==================
# Base Configuration
# ==================
# Disable Ctrl-S and Ctrl-Q
stty -ixon
# Report status of background jobs immediately
set -o notify
# Show # of running jobs when exiting a shell
shopt -s checkjobs
# Just type the directory to cd into it
shopt -s autocd
# Correct minor spelling mistakes with cd
shopt -s cdspell
# Include hidden files in * glob expansion
shopt -s dotglob
shopt -s extglob
# Expand ** into (recursive) directories
shopt -s globstar
# Ignore case when * expanding
shopt -s nocaseglob
# Update $ROWS and $COLUMNS after each command
shopt -s checkwinsize
# =======
# History
# =======
# Remember multi-line commands in history as one command
shopt -s cmdhist
# Do not overwrite .bash_history file
shopt -s histappend
# Allow re-editing a failed history substitution
shopt -s histreedit
# Store multi-line commands in history without semicolons
shopt -s lithist
# Cannot be set in `~/.profile` due to conflict with `zsh` (same env variable)
export HISTFILE="$HOME/.bash_history"
# Ignore commands prefixed with a space, and ones used identically just before
# (this mimics zsh's default behavior)
export HISTCONTROL=ignoreboth
# =========================
# Shell Utilities & Aliases
# =========================
source "$HOME/.config/shell/utils.sh"
source "$HOME/.config/shell/aliases.sh"
# Add tab completion for all aliases to commands with completion functions
# Source: https://superuser.com/a/437508
_alias_completion() {
local namespace="alias_completion"
# parse function based completion definitions, where capture group 2 => function and 3 => trigger
local compl_regex='complete( +[^ ]+)* -F ([^ ]+) ("[^"]+"|[^ ]+)'
# parse alias definitions, where capture group 1 => trigger, 2 => command, 3 => command arguments
local alias_regex="alias ([^=]+)='(\"[^\"]+\"|[^ ]+)(( +[^ ]+)*)'"
# create array of function completion triggers, keeping multi-word triggers together
eval "local completions=($(complete -p | sed -Ene "/$compl_regex/s//'\3'/p"))"
(( ${#completions[@]} == 0 )) && return 0
# create temporary file for wrapper functions and completions
rm -f "/tmp/${namespace}-*.tmp" # preliminary cleanup
local tmp_file; tmp_file="$(mktemp "/tmp/${namespace}-${RANDOM}XXX.tmp")" || return 1
local completion_loader; completion_loader="$(complete -p -D 2>/dev/null | sed -Ene 's/.* -F ([^ ]*).*/\1/p')"
# read in "<alias> '<aliased command>' '<command args>'" lines from defined aliases
local line; while read line; do
eval "local alias_tokens; alias_tokens=($line)" 2>/dev/null || continue # some alias arg patterns cause an eval parse error
local alias_name="${alias_tokens[0]}" alias_cmd="${alias_tokens[1]}" alias_args="${alias_tokens[2]# }"
# skip aliases to pipes, boolean control structures and other command lists
# (leveraging that eval errs out if $alias_args contains unquoted shell metacharacters)
eval "local alias_arg_words; alias_arg_words=($alias_args)" 2>/dev/null || continue
# avoid expanding wildcards
read -a alias_arg_words <<< "$alias_args"
# skip alias if there is no completion function triggered by the aliased command
if [[ ! " ${completions[*]} " =~ " $alias_cmd " ]]; then
if [[ -n "$completion_loader" ]]; then
# force loading of completions for the aliased command
eval "$completion_loader $alias_cmd"
# 124 means completion loader was successful
[[ $? -eq 124 ]] || continue
completions+=($alias_cmd)
else
continue
fi
fi
local new_completion="$(complete -p "$alias_cmd")"
# create a wrapper inserting the alias arguments if any
if [[ -n $alias_args ]]; then
local compl_func="${new_completion/#* -F /}"; compl_func="${compl_func%% *}"
# avoid recursive call loops by ignoring our own functions
if [[ "${compl_func#_$namespace::}" == $compl_func ]]; then
local compl_wrapper="_${namespace}::${alias_name}"
echo "function $compl_wrapper {
(( COMP_CWORD += ${#alias_arg_words[@]} ))
COMP_WORDS=($alias_cmd $alias_args \${COMP_WORDS[@]:1})
(( COMP_POINT -= \${#COMP_LINE} ))
COMP_LINE=\${COMP_LINE/$alias_name/$alias_cmd $alias_args}
(( COMP_POINT += \${#COMP_LINE} ))
$compl_func
}" >> "$tmp_file"
new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }"
fi
fi
# replace completion trigger by alias
new_completion="${new_completion% *} $alias_name"
echo "$new_completion" >> "$tmp_file"
done < <(alias -p | sed -Ene "s/$alias_regex/\1 '\2' '\3'/p")
source "$tmp_file" && \rm -f "$tmp_file"
}; _alias_completion
# Must come after `_alias_completion`
alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
# ================
# Bash Completions
# ================
# Enable programmable completion features
if ! shopt -oq posix; then
if [ -f /usr/share/bash-completion/bash_completion ]; then
source /usr/share/bash-completion/bash_completion
elif [ -f /etc/bash_completion ]; then
source /etc/bash_completion
fi
fi
# ============
# Key Bindings
# ============
# Allow easier clearing of the screen (like in zsh)
bind -x '"\C-l": clear;'
# ======
# Prompt
# ======
# Set a variable identifying the chroot you work in
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
_debian_chroot=$(cat /etc/debian_chroot)
fi
# Mimic PowerLevel10k's git prompt (only rough approximation)
_prompt_git() {
local out ref uncommited unstaged untracked ahead behind
# Check if the pwd contains a git repository and exit early if it does not
ref=$(git rev-parse --abbrev-ref --symbolic-full-name HEAD 2> /dev/null)
[ "$ref" == "" ] && return
# Check if the current HEAD is detached or reachable by a ref
echo -en "\033[0;37m "
if [ "$ref" == "HEAD" ]; then
ref=$(git rev-parse --short HEAD)
echo -en "@"
fi
echo -en "\033[0;32m$ref\033[0m"
# Indicate if local is ahead and/or behind upstream
ahead=0
behind=0
git status 2>/dev/null | (
while read -r line ; do
case "$line" in
*'diverged'*) # For simplicity, a diverged local branch is
ahead=1 ; behind=1 ; break ; ;; # indicated as being
*'ahead'*) # both ahead and behind its upstream
ahead=1 ; ;;
*'behind'*)
behind=1 ; ;;
esac
done
if [ $ahead -gt 0 ] && [ $behind -gt 0 ]; then
echo -en "\033[0;32m <>\033[0m"
elif [ $ahead -gt 0 ]; then
echo -en "\033[0;32m >\033[0m"
elif [ $behind -gt 0 ]; then
echo -en "\033[0;32m <\033[0m"
fi
)
# Indicate stashed files with a *
[ "$(git stash list 2> /dev/null)" != "" ] && echo -en "\033[0;32m *\033[0m"
# Indicate uncommited/staged with a +
git diff-index --cached --exit-code --quiet HEAD -- 2> /dev/null
[ $? -gt 0 ] && echo -en "\033[0;33m +\033[0m"
# Indicate unstaged with a !
git diff-files --exit-code --quiet 2> /dev/null
[ $? -gt 0 ] && echo -en "\033[0;33m !\033[0m"
# Indicate untracked files with a ?
if [ "$(git ls-files --exclude-standard --others 2> /dev/null)" != "" ]; then
echo -en "\033[0;34m ?\033[0m"
fi
}
# Mimic zsh's "%" symbol indicating background jobs
_prompt_jobs() {
local running
(( $(jobs -rp | wc -l) )) && echo -e "\033[0;32m %\033[0m"
}
PS1='${chroot:+($_debian_chroot)}\w$(_prompt_git)$(_prompt_jobs) > '
PS2='... '

View file

@ -0,0 +1,39 @@
#=================================================|
# SUBJECT ========================================|
#=================================================|
# - what does the commit do
# - capitalize the first word
# - use imperative mood (e.g., "Add" over "Adds")
# - do not end the line with a period
# - start with "Fix" for any fixes
#---------- 50 characters / 1 line ---------------|
#-------------------------------------------------|
#=======================================================================|
# BODY (optional) ======================================================|
#=======================================================================|
# - explain what the commit does, why it does it, and how
# - do not format the text (e.g., Markdown)
# - use multiple lines starting with "-" as bullet points
# + first sub-level
# * second sub-level
# - link to external resources for more context
#---------- 72 characters / multiple lines (and paragraphs) ------------|
#=======================================================================|
# ISSUE TRACKER (optional) =============================================|
#=======================================================================|
# - uncomment and adapt one of the lines below
# - use the "closes" keyword if applicable
# (see https://help.github.com/articles/closing-issues-using-keywords)
#-----------------------------------------------------------------------|
# Closes #41 on the issue tracker
# Fixes #42 on the issue tracker
# Resolves #43 on the issue tracker

4
.config/git/ignore Normal file
View file

@ -0,0 +1,4 @@
# Vim
*~
.*.swp
.env

3
.config/shell/README.md Normal file
View file

@ -0,0 +1,3 @@
# Shell-related Configs
This folder contains further files that are sourced by `bash` and `zsh`.

135
.config/shell/aliases.sh Normal file
View file

@ -0,0 +1,135 @@
# Shell aliases used for both bash and zsh
# Check if a command can be found on the $PATH.
command_exists() {
command -v "$1" 1>/dev/null 2>&1
}
# Check if we are running from within a zsh instance.
in_zsh() {
[ -n "$ZSH_VERSION" ]
}
# Re-run last command with sudo privileges
if in_zsh; then
alias ,,='sudo $(fc -ln -1)'
else
alias ,,='sudo $(history -p !!)'
fi
# Global aliases
if in_zsh; then
alias -g F='| fzf'
alias -g G='| grep'
alias -g H='| head'
alias -g L='| less'
alias -g T='| tail'
alias -g NE='2 > /dev/null'
alias -g NUL='> /dev/null 2>&1'
fi
alias cls='clear'
alias help='man'
# Avoid bad mistakes and show what happens
alias cp="cp --interactive --verbose"
alias ln='ln --interactive --verbose'
alias mv='mv --interactive --verbose'
alias rm='rm -I --preserve-root --verbose'
# Make working with files more convenient
alias cd..='cd ..'
alias ..='cd ..'
alias ...='cd ../..'
alias ....='cd ../../..'
alias .....='cd ../../../..'
alias mkdir='mkdir -p'
alias md='mkdir'
alias rmdir='rmdir --parents --verbose'
alias rd='rmdir'
alias grep='grep --color=auto --exclude-dir={.cache,\*.egg-info,.git,.nox,.tox,.venv}'
alias egrep='egrep --color=auto --exclude-dir={.cache,\*.egg-info,.git,.nox,.tox,.venv}'
alias fgrep='fgrep --color=auto --exclude-dir={.cache,*.egg-info,.git,.nox,.tox,.venv}'
alias fdir='find . -type d -name'
alias ffile='find . -type f -name'
alias ls='ls --classify --color=auto --group-directories-first --human-readable --no-group --time-style=long-iso'
alias la='ls --almost-all'
alias lal='la -l'
alias ll='ls -l'
alias l.='ls --directory .*'
alias ll.='l. -l'
alias df='df --human-readable'
alias du='du --human-readable'
alias diff='diff --color=auto --unified'
command_exists colordiff && alias diff='colordiff --unified'
alias free='free --human --total'
alias less='less --chop-long-lines --ignore-case --LONG-PROMPT --no-init --status-column --quit-if-one-screen'
alias more='less'
alias tree='tree -C --dirsfirst'
# Aliases for various utilities
alias datetime='date +"%Y-%m-%d %H:%M:%S %z (%Z)"'
alias datetime-iso='date --iso-8601=seconds'
alias external-ip="curl https://icanhazip.com"
alias external-ip-alt="curl https://ipinfo.io/ip\?token=cfd78a97e15ebf && echo"
alias external-ip-extended-infos="curl https://ipinfo.io/json\?token=cfd78a97e15ebf && echo"
alias speedtest="curl -s https://raw.githubusercontent.com/sivel/speedtest-cli/22210ca35228f0bbcef75a7c14587c4ecb875ab4/speedtest.py | python -"
# Fix common typos
command_exists ifconfig && alias ipconfig='ifconfig'
command_exists R && alias r='R'
# Use sane defaults
command_exists exa && alias exa='exa --group-directories-first --git --time-style=long-iso'
command_exists netstat && alias ports='netstat -tulanp'
command_exists screenfetch && alias screenfetch='screenfetch -n'
alias uptime='uptime --pretty'
alias wget='wget --continue'
# Create short aliases
command_exists batcat && alias bat='batcat'
command_exists fdfind && alias fd='fdfind'
command_exists ranger && alias rn='ranger'
command_exists screenfetch && alias sf='screenfetch'
# Integrate git
if command_exists git; then
alias g='git'
# All git aliases are shell aliases with a 'g' prefix.
for al in $(git internal-aliases); do
# Only "real" (i.e., short) aliases are created.
[ ${#al} -lt 7 ] && eval "alias g$al='git $al'"
done
# Check if a 'main' branch exists in place of a 'master' branch.
git_main_branch() {
if [[ -n "$(git branch --list main)" ]]; then
echo 'main'
else
echo 'master'
fi
}
fi
# (Un-)Encrypt vaults
alias open-documents-vault='gocryptfs -q -extpass "pass getraenkemarkt/vaults/documents" $HOME/nextcloud/vault/ $HOME/.vault/documents'
alias close-documents-vault='fusermount -q -u $HOME/.vault/documents'

7
.config/shell/logout.sh Normal file
View file

@ -0,0 +1,7 @@
# This file is sourced by a login shell upon logout
# Clear the screen to increase privacy
if [ "$SHLVL" = 1 ]; then
[ -x /usr/bin/clear ] && /usr/bin/clear || [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
fi

335
.config/shell/utils.sh Normal file
View file

@ -0,0 +1,335 @@
# This file is executed either by bash or zsh and holds all
# initializations and utility definitions used in both shells.
# Check if a command can be found on the $PATH.
command_exists() {
command -v "$1" 1>/dev/null 2>&1
}
# Check if we are running from within a zsh instance.
in_zsh() {
[ -n "$ZSH_VERSION" ]
}
# =========================
# Initialize some CLI tools
# =========================
# Load custom $LS_COLORS if available
if command_exists dircolors; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
fi
# Make less understand some binary types (e.g., PDFs)
# Source: https://github.com/wofr06/lesspipe
command_exists lesspipe && eval "$(SHELL=/bin/sh lesspipe)"
# Configure the keyboard:
# - make right alt and menu keys the compose key, e.g., for umlauts
# - make caps lock a ctrl modifier and Esc key
setxkbmap us -option 'compose:menu,compose:ralt,caps:ctrl_modifier'
command_exists xcape && xcape -e "Caps_Lock=Escape"
# ==============================
# Working with files and folders
# ==============================
# List the $PATH variable, one element per line
# If an argument is passed, grep for it
path() {
if [ -n "$1" ]; then
echo "$PATH" | perl -p -e 's/:/\n/g;' | grep -i "$1"
else
echo "$PATH" | perl -p -e 's/:/\n/g;'
fi
}
# Show folders by size.
disk_usage() {
local dest
if [ -n "$1" ]; then
dest="$1"
else
dest=.
fi
\du --human-readable --max-depth=1 $dest 2>/dev/null | sort --human-numeric-sort --reverse
}
# Search all files in a directory and its children.
lsgrep() {
ls --almost-all --directory . ./**/* | uniq | grep --color=auto -i "$*"
}
# Make a directory and cd there.
mcd() {
test -n "$1" || return
mkdir -p "$1" && cd "$1" || return
}
# Extract a compressed archive or file.
extract() {
if [ -f "$1" ] ; then
case "$1" in
*.tar.bz2) tar xjvf "$1" ;;
*.tar.gz) tar xzvf "$1" ;;
*.tar.xz) tar xvf "$1" ;;
*.bz2) bzip2 -d "$1" ;;
*.rar) unrar2dir "$1" ;;
*.gz) gunzip "$1" ;;
*.tar) tar xf "$1" ;;
*.tbz2) tar xjf "$1" ;;
*.tgz) tar xzf "$1" ;;
*.zip) unzip2dir "$1" ;;
*.Z) uncompress "$1" ;;
*.7z) 7z x "$1" ;;
*.ace) unace x "$1" ;;
*) echo "'$1' cannot be extracted automatically" ;;
esac
else
echo "'$1' is not a file"
fi
}
# Create a tar.gz archive from a given directory.
mktar() {
tar cvzf "${1%%/}.tar.gz" "${1%%/}/"
}
# Create a zip archive from a given file or directory.
mkzip() {
zip -r "${1%%/}.zip" "$1"
}
# =================================
# Creating random login credentials
# =================================
# Create random passwords for logins
genpw() {
PARSED=$(getopt --quiet --options=acn: --longoptions=alphanum,clip,chars: -- "$@")
eval set -- "$PARSED"
SYMBOLS='--symbols'
CHARS=30
XCLIP=false
while true; do
case "$1" in
-a|--alphanum)
SYMBOLS=''
shift
;;
-c|--clip)
XCLIP=true
shift
;;
-n|--chars)
CHARS=$2
shift 2
;;
--)
shift
break
;;
*)
echo 'Programming error'
break
;;
esac
done
PW=$(pwgen --ambiguous --capitalize --numerals --secure $SYMBOLS --remove-chars="|/\\\"\`\'()[]{}<>^~@§$\#" $CHARS 1)
if [[ $XCLIP == true ]]; then
echo $PW | xclip -selection c
else
echo $PW
fi
}
# Short password that is accepted by most services
alias genpw-alphanum='pwgen --ambiguous --capitalize --numerals --secure 30 1'
# Email addresses created with this utility look kind of "normal" but are totally random
genemail() {
PARSED=$(getopt --quiet --options=c --longoptions=clip -- "$@")
eval set -- "$PARSED"
XCLIP=false
while true; do
case "$1" in
-c|--clip)
XCLIP=true
shift
;;
--)
shift
break
;;
*)
echo 'Programming error'
break
;;
esac
done
FIRST=$(shuf -i 4-5 -n 1)
LAST=$(shuf -i 8-10 -n 1)
USER="$(gpw 1 $FIRST).$(gpw 1 $LAST)@webartifex.biz"
if [[ $XCLIP == true ]]; then
echo $USER | xclip -selection c
else
echo $USER
fi
}
# =============================
# Automate the update machinery
# =============================
# Pull down latest version of dot files
update-dotfiles() {
echo -e '\nUpdating dotfiles\n'
# The `dotfiles` alias is defined in ~/.bashrc at the end of the "Shell Utilities & Aliases" section
git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME stash
git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME fetch --all --prune
git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME pull --rebase
git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME stash pop
}
# Run entire aptitude upgrade cycle (incl. removal of old packages).
update-apt() {
echo -e '\nUpdating apt packages\n'
sudo apt update
echo
sudo apt upgrade
echo
sudo apt autoremove
echo
sudo apt autoclean
}
remove-old-snaps() {
sudo snap list --all | awk "/disabled/{print $1, $3}" |
while read snapname revision; do
sudo snap remove "$snapname" --revision="$revision"
done
}
# Update all repositories in ~/repos without the ones related to zsh/zplug
update-repositories() {
echo -e '\nUpdating repositories unrelated to zsh/zplug\n'
local cwd
cwd=$(pwd)
cd "$REPOS"
for dir in */; do
[ "$dir" = "zsh/" ] && continue
echo "$REPOS/$dir"
cd "$REPOS/$dir"
git stash
git fetch --all --prune
git pull --rebase
git stash pop
echo
done
cd "$cwd"
}
# Update everything related to zsh
update-zsh() {
echo -e '\nUpdating zsh/zplug related repositories\n'
if in_zsh; then
omz update
zplug update
zplug install
zplug load
else
local cwd
cwd=$(pwd)
# Pull down latest versions manually.
for dir in $HOME/.zplug/repos/*/*/; do
echo "$dir" && cd "$dir"
git fetch --all --prune
git pull --rebase
done
echo "$HOME/.oh-my-zsh" && cd "$HOME/.oh-my-zsh"
git fetch --all --prune
git pull --rebase
cd "$cwd"
fi
}
# Wrapper to run several update functions at once
update-machine() {
sudo --validate || return
update-apt
if command_exists flatpak; then
echo -e '\nUpdating flatpaks\n'
sudo flatpak update -y
fi
if command_exists snap; then
echo -e '\nUpdating snaps\n'
sudo snap refresh
remove-old-snaps
fi
update-dotfiles
update-zsh
echo -e '\nUpdating password store\n'
pass git pull
echo
sudo updatedb -U /
echo
sudo --reset-timestamp
}
# =======================
# Various other Utilities
# =======================
# List all internal IPs.
internal-ips() {
if command_exists ifconfig; then
ifconfig | awk '/inet /{ gsub(/addr:/, ""); print $2 }'
else
echo 'ifconfig not installed'
fi
}
# Obtain a weather report
weather() {
if [ -n "$1" ]; then
curl "v1.wttr.in/$1"
else
curl 'v1.wttr.in'
fi
}

205
.gitconfig Normal file
View file

@ -0,0 +1,205 @@
[alias]
# Important: The accompanying ~/.bashrc file loads all git aliases with
# less than 7 characters into the global bash "namespace" with a "g" prefix
# Example: git add <=> git a <=> ga
a = add
ap = add --patch
bi = bisect
br = branch
bra = branch --all
brd = branch --delete
brdd = branch --delete --force
brm = branch --move
cf = cat-file
ci = commit
cim = commit --message
cl = clone
co = checkout
cob = checkout -b
cod = checkout develop
com = checkout master
cp = cherry-pick
de = describe --tags
df = diff
fe = fetch
lg = log
lga = log --all
mb = merge-base
me = merge
mea = merge --abort
mec = merge --continue
mefeat = "!f() { if [ $# -eq 0 ]; then echo "Must specify a branch to merge in"; exit 1; fi; git check-pull; if [ $? -gt 0 ]; then echo "$1 must be rebased first"; exit 1; fi; cb=$(git current-branch) && printf '# SUBJECT\n# =======\n# - what does the commit do\n# - capitalize the first word and use the\n# imperative mood (e.g. "Add" vs "Adds")\n# - do not end the line with a period\n# - start with "Fix" for any hotfixes\n# ========= 50 characters / 1 line ============= |\nMerge in \"%s\"\n# ============================================== |\n\n\n# BODY (optional)\n# ===============\n# - explain what the commit does, why it does it, and how\n# - do not format the text (e.g., Markdown or reStructuredText)\n# - use multiple lines starting with "-" as bullet points\n# - link to external resources for even more context where appropriate\n# ========= 72 characters / multiple lines (and paragraphs) ========== |\nMerge branch \"%s\" into \"%s\"\n\nSummary of the merged in commits:\n' $1 $1 $cb > .merge_msg.txt.tmp && git log --format=format:' * %h: %s' $cb..$1 >> .merge_msg.txt.tmp && printf '\n\n\n# ==================================================================== |\n\n\n# GITHUB ISSUE (optional)\n# =======================\n# - uncomment and adapt one of the lines below\n# - use the "closes" keyword if applicable\n# (see https://help.github.com/en/articles/closing-issues-using-keywords)\n#\n# Related GitHub issue: #21\n# This commit closes #42 on the GitHub issue tracker\n\n\n#\n# END\n#\n' >> .merge_msg.txt.tmp && git merge --no-ff --no-commit $1 && SKIP=no-commit-to-branch git commit --edit --file=.merge_msg.txt.tmp; rm -f .merge_msg.txt.tmp; }; f"
meff = merge --ff-only
menoff = merge --no-ff
pl = pull
plrb = pull --rebase
ps = push
psf = push --force
rb = rebase --committer-date-is-author-date
rba = rebase --abort
rbc = rebase --continue
rbi = rebase --interactive
rbq = rebase --quit
rbs = rebase --skip
rl = reflog
rm = rm # To make it available as the grm alias
rp = rev-parse
rs = reset
rv = revert
s = status
ss = status --short
sh = show
st = stash
sta = stash push --include-untracked # push does not go into the shortcut!
stam = stash push --include-untracked --message
stapp = stash apply
stl = stash list
stp = stash pop
stsh = stash show
# Provide an overview of all aliases. Second one is for use in ~/.bashrc
aliases = config --get-regexp 'alias.*'
internal-aliases = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1/' | sort
# Provide synonyms as "specified" in the git status header
discard = checkout --
unstage = reset HEAD --
# Common tasks with tedious or non-intuitive flags
amend-commit = !git log -n 1 --pretty=tformat:%B | git commit -F - --amend # Keep the commit message
check-pull = "!f() { git fetch; upstream=${1:-'@{u}'}; local=$(git rev-parse @); remote=$(git rev-parse "$upstream"); base=$(git merge-base @ "$upstream"); if [ $local = $remote ]; then echo "Up-to-date"; exit 0; elif [ $local = $base ]; then echo "Local branch is behind upstream"; elif [ $remote = $base ]; then echo "Local branch is ahead of upstream"; else echo "Local and remote branches diverged"; fi; exit 1; }; f"
current-branch = !git rev-parse --abbrev-ref HEAD
project-root = rev-parse --show-toplevel
uncommit = reset --soft HEAD~1
# Sync the working directory into the index
rm-deleted = !git ls-files -z --deleted | xargs -r -0 git rm
sync-pwd-to-index = !git rm-deleted && git add . --all
sy = !git sync-pwd-to-index
# Make minimal diff the default
diff-minimal = diff --color-words=. --ws-error-highlight=all
d = diff --color-words=. --ws-error-highlight=all
dlc = diff --color-words=. --ws-error-highlight=all HEAD
ds = diff --color-words=. --ws-error-highlight=all --staged
# Clean the project folder with intuitive commands
# Always keep the .python-version file, which is also often in ~.gitignore
clean-all = !git reset --hard && git clean-ignored && git clean-untracked
clean-ignored = "!f() { if [ -f .python-version ]; then mv .python-version .python-version.tmp; fi; if [ -f .env ]; then mv .env .env.tmp; fi; git clean -X -d -f "$@"; if [ -f .python-version.tmp ]; then mv .python-version.tmp .python-version; fi; if [ -f .env.tmp ]; then mv .env.tmp .env; fi }; f"
clean-untracked = !git clean -x -d -e ".python-version" -e ".env" -f # The -e flag does not work with -X
# Delete everything not reachable from a branch from the repository
gc-everything = "!f() { git -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now gc "$@"; }; f"
# Make the logs look nice by default
last-commit = log --pretty='%C(auto)%h: %s%d%Creset%n%C(dim)%aN @ %ad => %ar%n%+b' --date=format:'%a %Y-%m-%d %H:%M:%S %z' -1 -p --stat
lc = log --pretty='%C(auto)%h: %s%d%Creset%n%C(dim)%aN @ %ad => %ar%n%+b' --date=format:'%a %Y-%m-%d %H:%M:%S %z' -1 -p --stat
history = log --pretty='%C(auto)%h: %s%d%Creset%n%C(dim)%aN @ %ad => %ar%n%+b' --date=format:'%a %Y-%m-%d %H:%M:%S %z' --graph
hi = log --pretty='%C(auto)%h: %s%d%Creset%n%C(dim)%aN @ %ad => %ar%n%+b' --date=format:'%a %Y-%m-%d %H:%M:%S %z' --graph
hia = log --pretty='%C(auto)%h: %s%d%Creset%n%C(dim)%aN @ %ad => %ar%n%+b' --date=format:'%a %Y-%m-%d %H:%M:%S %z' --graph --all
summary = log --pretty='%C(auto)%h: %s%d%Creset%n%C(dim)%an @ %ad => %ar%n' --date=format:'%a %Y-%m-%d %H:%M:%S %z' --graph
su = log --pretty='%C(auto)%h: %s%d%Creset%n%C(dim)%an @ %ad => %ar%n' --date=format:'%a %Y-%m-%d %H:%M:%S %z' --graph
sua = log --pretty='%C(auto)%h: %s%d%Creset%n%C(dim)%an @ %ad => %ar%n' --date=format:'%a %Y-%m-%d %H:%M:%S %z' --graph --all
oneline = log --pretty='%C(auto)%h: %s%d' --graph
ol = log --pretty='%C(auto)%h: %s%d' --graph
ola = log --pretty='%C(auto)%h: %s%d' --graph --all
# Search the repository
grep-code = grep --break --context 1 --full-name --heading --line-number --show-function
grepc = grep --break --context 1 --full-name --heading --line-number --show-function
grep-log = log --all --regexp-ignore-case --pretty='%C(auto)%h: %s%+D%Creset%n%C(reverse)%C(dim)%aN @ %ad = %ar%Creset%n%+b' --date=format:'%a %Y-%m-%d %H:%M:%S' --grep
grepl = log --all --regexp-ignore-case --pretty='%C(auto)%h: %s%+D%Creset%n%C(reverse)%C(dim)%aN @ %ad = %ar%Creset%n%+b' --date=format:'%a %Y-%m-%d %H:%M:%S' --grep
grep-text = grep --break --context 1 --full-name --heading --ignore-case --line-number
grept = grep --break --context 1 --full-name --heading --ignore-case --line-number
# Push current branch to origin
push-to-origin = "!f(){ git push --set-upstream origin $(git current-branch) "$@"; }; f"
pso = "!f(){ git push --set-upstream origin $(git current-branch) "$@"; }; f"
[clean]
requireforce = true
[color "branch"]
current = cyan dim bold reverse
local = green bold
remote = red bold
[color "decorate"]
HEAD = cyan dim bold reverse
branch = green bold
remoteBranch = red bold
stash = magenta dim bold reverse
tag = magenta bold
[color "diff"]
context = white
frag = blue dim bold reverse
meta = yellow dim bold reverse
new = green bold
old = red bold
whitespace = red dim bold reverse
[color "grep"]
context = white
filename = yellow dim bold reverse
function = white bold
linenumber = blue dim bold reverse
match = red bold
selected = white
separator = blue dim bold reverse
[color "interactive"]
error = red dim bold reverse
header = white
help = yellow bold
prompt = white dim bold reverse
[color "status"]
added = green bold
branch = cyan dim bold reverse
changed = yellow bold
header = white
localBranch = green bold
nobranch = red dim bold reverse
remoteBranch = red bold
unmerged = yellow dim bold reverse
untracked = red bold
[commit]
cleanup = strip
gpgSign = true
template = ~/.config/git/commit_msg_template.txt
verbose = true
[core]
editor = vim
excludesfile = ~/.config/git/ignore
pager = less --chop-long-lines --ignore-case --LONG-PROMPT --status-column --quit-if-one-screen
whitespace = -space-before-tab,tab-in-indent
[diff]
renames = true
submodule = log
[help]
autocorrect = 50
[merge]
conflictstyle = diff3
ff = only
[pull]
ff = only
rebase = true
[push]
default = upstream
recursesubmodules = check
[rerere]
enabled = true
[url "https://bitbucket.org/"]
insteadOf = bb:
[url "https://github.com/"]
insteadOf = gh:
[url "https://gitlab.com/"]
insteadOf = gl:
[user]
name = Alexander Hess
email = alexander@webartifex.biz
signingKey = AB5C0E319D77350FBA6CF143344EA5AB10D868E0

1622
.p10k.zsh Normal file

File diff suppressed because it is too large Load diff

46
.profile Normal file
View file

@ -0,0 +1,46 @@
# Executed by a login shell (e.g., bash or sh) during start
# Prepend a folder to $PATH if it is not already there
_prepend_to_path () {
if [ -d "$1" ] ; then
case :$PATH: in
*:$1:*) ;;
*) PATH=$1:$PATH ;;
esac
fi
}
# Put some private bin directories on the $PATH
_prepend_to_path "$HOME/bin"
_prepend_to_path "$HOME/.local/bin"
# Generic environment variables
export EDITOR=vim
export HISTFILESIZE=999999
export PAGER='less --chop-long-lines --ignore-case --LONG-PROMPT --no-init --status-column --quit-if-one-screen'
export TERM=xterm-256color
export TZ='Europe/Berlin'
export VISUAL=$EDITOR
# Machine-specific directories
export REPOS="$HOME/repos"
# Configurations for various utilities
export LESSHISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/.lesshst"
# Shell-specific stuff
# zsh-specific stuff is automatically sourced from `~/.zshenv`, `~/.zprofile`, `~/.zlogin`, and `~/.zshrc`
# Source `~/.bashrc` if we are running inside a BASH shell
if [ -n "$BASH_VERSION" ]; then
if [ -f "$HOME/.bashrc" ]; then
# `~/.bashrc` is NOT automatically sourced by bash
source "$HOME/.bashrc"
fi
fi

3
.zlogout Normal file
View file

@ -0,0 +1,3 @@
# Executed by zsh when a login shell exits
source "$HOME/.config/shell/logout.sh"

5
.zprofile Normal file
View file

@ -0,0 +1,5 @@
# Executed by zsh when a login shell starts
# Mimic bash's default behavior (as an analogy) and source `~/.profile`
# (`~/.zlogin` is skipped as it comes after `~/.zshrc`)
source "$HOME/.profile"

20
.zshenv Normal file
View file

@ -0,0 +1,20 @@
# This file is sourced by zsh before `~/.zprofile` and `~/.zshrc`
# (it's kind of a zsh-only `~/.profile` file)
# TODO: As of now, this coloring does not work when zsh-syntax-highlighting is loaded simultaniously
# Source: https://github.com/zsh-users/zsh-history-substring-search/issues/131
export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="fg=#ffffff,bg=#38761d,bold"
export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND="fg=#ffffff,bg=#990000,bold"
export YSU_MESSAGE_POSITION="after"
export YSU_MODE="BESTMATCH"
export ZSH="$HOME/.oh-my-zsh"
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#666666,bg=bold"
export ZSH_AUTOSUGGEST_STRATEGY=(history completion)
export ZSH_COMPDUMP="${XDG_CACHE_HOME:-$HOME/.cache}/.zcompdump-$HOST-$ZSH_VERSION"
export ZPLUG_HOME="$HOME/.zplug"

177
.zshrc Normal file
View file

@ -0,0 +1,177 @@
# Executed by zsg when a non-login shell starts
# Ensure zsh is running interactively
[[ $- != *i* ]] && return
# Check if a command can be found on the $PATH
command_exists() {
command -v "$1" 1>/dev/null 2>&1
}
# ==================
# Base Configuration
# ==================
# Enable Powerlevel10k instant prompt
if [ -r "${XDG_CACHE_HOME:-$HOME/.cache}/zsh/p10k-instant-prompt-${(%):-%n}.zsh" ]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/zsh/p10k-instant-prompt-${(%):-%n}.zsh"
fi
# Enable colors and change prompt
autoload -Uz colors
colors
# Enable VI mode
bindkey -v
# If an entered command does not exist per se
# but is the name of a folder instead, go there.
setopt AUTO_CD
# Treat "#", "~", and "^" as part of patterns for filename generation
setopt EXTENDEDGLOB
# Warn if there are no matches
setopt NOMATCH
# Silence the shell
setopt NO_BEEP
# Report status of background jobs immediately
setopt NOTIFY
# Remove all "built-in" aliases
unalias -a
# =======
# History
# =======
# Cannot be set in `~/.profile` due to conflict with `bash` (same env variable)
export HISTFILE="$HOME/.zsh_history"
# =========================
# Shell Utilities & Aliases
# =========================
source "$HOME/.config/shell/utils.sh"
source "$HOME/.config/shell/aliases.sh"
# Defined here as it cannot be in `aliases.sh` due to a dependency with `~/.bashrc`
alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
# ===============
# zplug & Plugins
# ===============
source "$ZSH/oh-my-zsh.sh"
source "$HOME/.zplug/init.zsh" # config in `~/.zshenv`
# Load all zsh plugins with `zplug`
# Must use double quotes in this section
# Source: https://github.com/zplug/zplug#example
# Make zplug manage itself like a plugin
# Source: https://github.com/zplug/zplug#let-zplug-manage-zplug
zplug "zplug/zplug", hook-build:"zplug --self-manage"
zplug "MichaelAquilina/zsh-you-should-use" # config in `~/.zshenv`
zplug "zsh-users/zsh-autosuggestions" # config in `~/.zshenv`
zplug "zsh-users/zsh-history-substring-search" # config in `~/.zshenv`; there are key bindings below
zplug "zsh-users/zsh-syntax-highlighting"
zplug "plugins/command-not-found", from:oh-my-zsh
zplug "plugins/dotenv", from:oh-my-zsh
zplug "plugins/dirhistory", from:oh-my-zsh
zplug "plugins/git-escape-magic", from:oh-my-zsh
zplug "plugins/jsontools", from:oh-my-zsh
zplug "plugins/z", from:oh-my-zsh
zplug "romkatv/powerlevel10k", as:theme, depth:1
zplug load
# ===============
# Zsh Completions
# ===============
# Initialize zsh's completions
# NOTE: This is already done with `~/.oh-my-zsh.sh` above
# autoload -Uz compinit
# compinit -u -d "$ZSH_COMPDUMP"
# Enable match highlighting and scrolling through long lists,
# and provide a different style of menu completion
zmodload zsh/complist
# Include hidden files in tab completion
_comp_options+=(GLOB_DOTS)
# Enable arrow-key driven interface
zstyle ':completion:*' menu select
# Make compinit find new executables right away
zstyle ':completion:*' rehash true
# Enable grouping and group headers
zstyle ':completion:*:descriptions' format '%B%d%b'
zstyle ':completion:*:messages' format '%d'
zstyle ':completion:*:warnings' format 'No matches for: %d'
zstyle ':completion:*' group-name ''
# ============
# Key Bindings
# ============
# zsh-autosuggestions plugin
bindkey "^ " autosuggest-accept
# Enable Ctrl-R
bindkey "^R" history-incremental-search-backward
# Use VI keys to navigate the completions in the menu
bindkey -M menuselect 'h' vi-backward-char
bindkey -M menuselect 'k' vi-up-line-or-history
bindkey -M menuselect 'l' vi-forward-char
bindkey -M menuselect 'j' vi-down-line-or-history
# history-substring-search plugin
# Source: https://github.com/zsh-users/zsh-history-substring-search#usage
# Normal mode
bindkey "$terminfo[kcuu1]" history-substring-search-up
bindkey "$terminfo[kcud1]" history-substring-search-down
# VI mode
bindkey -M vicmd 'k' history-substring-search-up
bindkey -M vicmd 'j' history-substring-search-down
# =====
# Other
# =====
# Enable Powerlevel10k "full" prompt
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh