alexander/dotfiles
1
1
Fork 0
Code Issues Pull requests Activity

Compare commits

merge into: alexander:main
Branches Tags
alexander:main
alexander:desktop
alexander:main-old
alexander:old-main
...
pull from: alexander:old-main
Branches Tags
alexander:desktop
alexander:main
alexander:main-old
alexander:old-main

No commits in common. "main" and "old-main" have entirely different histories.
main ... old-main

59 changed files with 3241 additions and 857 deletions
Show stats Expand all files Collapse all files

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"

5
.bash_logout
View file

@ -1,3 +1,4 @@
#!/bin/bash
# Executed by bash when a login shell exits
. "$XDG_CONFIG_HOME/shell/logout"
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

246
.bashrc
View file

@ -1,82 +1,81 @@
#!/bin/bash
# `bash`-specific configurations
# Executed by bash when a non-login shell starts
# Load configuration files common to all kinds of shells,
# if not already done by a `bash` login shell
[ -z "$PROFILE_LOADED" ] && [ -f "$HOME/.profile" ] && . "$HOME/.profile"
# Ensure bash is running interactively
[[ $- != *i* ]] && return
# Ensure `bash` is running interactively
case $- in
*i*) ;;
*) return;;
esac
# Check if a command can be found on the $PATH
command_exists() {
command -v "$1" 1>/dev/null 2>&1
}
# Configure the `history`
# Set these environment variables here
# to avoid conflict/overlap with `zsh`
# ==================
# Base Configuration
# ==================
export HISTFILE="$XDG_STATE_HOME/bash/history"
export HISTSIZE=999999 # Number of lines kept in memory
export HISTFILESIZE=999999 # Number of lines kept in the `$HISTFILE`
# Disable Ctrl-S and Ctrl-Q
stty -ixon
# Ignore commands prefixed with a space
# and ones entered identically just before
# 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
shopt -s cmdhist # Remember multi-line commands as just one line
shopt -s histappend # Do not overwrite the `$HISTFILE`
shopt -s histreedit # Allow editing failed history substitutions
shopt -s lithist # Store multi-line commands in history without `;`
# Make `bash` feel a bit more like `zsh`
shopt -s autocd # Just type the directory to `cd` into it
shopt -s cdspell # Correct minor spelling mistakes with `cd`
shopt -s checkjobs # Show number of running jobs when exiting `bash`
shopt -s checkwinsize # Update `$ROWS` and `$COLUMNS` after commands
shopt -s globstar # Expand ** into recursive directories
# =========================
# Shell Utilities & Aliases
# =========================
stty -ixon # Prevent Ctrl+S from freezing `bash`
source "$HOME/.config/shell/utils.sh"
source "$HOME/.config/shell/aliases.sh"
# Make `bash` show `chroot`s
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
# Make `bash` more colorful
case "$TERM" in
xterm-color|*-256color) color_prompt=yes;;
esac
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --color=auto'
fi
# Enable tab completion
if ! shopt -oq posix; then
if [ -f /usr/share/bash-completion/bash_completion ]; then
. /usr/share/bash-completion/bash_completion
elif [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
fi
# Add tab completion for all aliases to commands with completion functions
# (must come after bash completions have been set up)
# Source: https://superuser.com/a/437508
_alias_completion() {
local namespace="alias_completion"
@ -134,5 +133,130 @@ _alias_completion() {
new_completion="${new_completion% *} $alias_name"
echo "$new_completion" >> "$tmp_file"
done < <(alias -p | sed -Ene "s/$alias_regex/\1 '\2' '\3'/p")
. "$tmp_file" && \rm -f "$tmp_file"
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
# Enable completions for various tools
command_exists invoke && eval "$(invoke --print-completion-script=bash)"
command_exists nox && eval "$(register-python-argcomplete nox)"
command_exists pip && eval "$(pip completion --bash)"
command_exists pipx && eval "$(register-python-argcomplete pipx)"
command_exists poetry && eval "$(poetry completions bash)"
# ============
# 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"
}
# Mimic zsh's pyenv/venv integration
_prompt_pyenv() {
if [ -n "$VIRTUAL_ENV" ]; then
echo -e "\033[0;36m py $(python -c "import os, sys; (hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix)) and print(os.path.basename(sys.prefix))")\033[0m"
elif [ -n "$PYENV_VERSION" ]; then
if [ "$PYENV_VERSION" != "system" ]; then
echo -e "\033[0;36m py $PYENV_VERSION\033[0m"
fi
elif [ -f "$(pwd)/.python-version" ]; then
echo -e "\033[0;36m py $(cat .python-version | sed ':a;N;$!ba;s/\n/:/g')\033[0m"
fi
}
# Disable the default prompts set by pyenv and venv
export PYENV_VIRTUALENV_DISABLE_PROMPT=1
export VIRTUAL_ENV_DISABLE_PROMPT=1
PS1='${chroot:+($_debian_chroot)}\w$(_prompt_git)$(_prompt_jobs)$(_prompt_pyenv) > '
PS2='... '

22
.config/Nextcloud/nextcloud.cfg Normal file
View file

@ -0,0 +1,22 @@
[General]
confirmExternalStorage=false
crashReporter=false
monoIcons=true
newBigFolderSizeLimit=99999
optionalServerNotifications=false
useNewBigFolderSizeLimit=false
[Accounts]
0\Folders\1\ignoreHiddenFiles=false
0\Folders\1\localPath=/home/alexander/nextcloud/
0\Folders\1\paused=false
0\Folders\1\targetPath=/
0\Folders\1\version=2
0\Folders\1\virtualFilesMode=off
0\authType=webflow
0\dav_user=alexander
0\url=https://nextcloud.webartifex.biz
0\user=@Invalid()
0\version=1
0\webflow_user=alexander
version=2

37
.config/Nextcloud/sync-exclude.lst Normal file
View file

@ -0,0 +1,37 @@
]*~
]~$*
].~lock.*
]~*.tmp
]*.~*
]Icon\r*
].DS_Store
].ds_store
]*.textClipping
]._*
]Thumbs.db
]photothumb.db
]System Volume Information
].*.sw?
].*.*sw?
].TemporaryItems
].Trashes
].DocumentRevisions-V100
].Trash-*
].fseventd
].apdisk
].Spotlight-V100
].directory
]*.part
]*.filepart
]*.crdownload
]*.kate-swp
]*.gnucash.tmp-*
].synkron.*
].sync.ffs_db
].symform
].symform-store
].fuse_hidden*
]*.unison
].nfs*
]My Saved Places.
]\#*#

11
.config/autostart/com.nextcloud.desktopclient.nextcloud.desktop Normal file
View file

@ -0,0 +1,11 @@
[Desktop Entry]
Name=Nextcloud
GenericName=File Synchronizer
Exec="/usr/bin/nextcloud" --background
Terminal=false
Icon=Nextcloud
Categories=Network
Type=Application
StartupNotify=false
X-GNOME-Autostart-enabled=true
X-GNOME-Autostart-Delay=10

5
.config/bat/config
View file

@ -2,6 +2,5 @@
--style="numbers,changes,header"
--map-syntax ".bash_history:Bourne Again Shell (bash)"
--map-syntax ".flake8:INI"
--map-syntax "poetry.lock:TOML"
--map-syntax ".flake8:ini"
--map-syntax "poetry.lock:toml"

11
.config/flameshot/flameshot.ini Normal file
View file

@ -0,0 +1,11 @@
[General]
contrastOpacity=188
disabledTrayIcon=true
drawColor=#ff0000
drawThickness=3
filenamePattern=%F_%H-%M-%S
saveAsFileExtension=png
savePath=/home/alexander/nextcloud/uploads/screenshots
showHelp=false
startupLaunch=false
uiColor=#ff3a00

47
.config/git/commit_msg_template.txt
View file

@ -1,18 +1,39 @@
# SUBJECT -> What does the commit do?
# - Imperative mood, no "." at the end
# - Start with "Add", "Fix", "Make", "Remove", ...
#=================================================|
# 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 -> The why and how
# - Use plain text without formatting
# + Use "-" and "+" as bullets
# - "See: URL" to link to external resources
#---------- 72 characters / multiple lines -----------------------------|
#-------------------------------------------------|
# ISSUE TRACKER -> Uncomment one of the lines below
# Closes #41
# Fixes #42
# Resolves #43
#=======================================================================|
# 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

273
.config/git/config
View file

@ -1,273 +0,0 @@
[alias]
# Note that ~/.config/shell/aliases loads all `git` aliases with
# less than 7 characters into the shell's "namespace" with a "g" prefix
# Example: `git add` <=> `git a` <=> `ga`
a = add
ap = add --patch
br = branch
bra = branch --all
brd = branch --delete
brdd = branch --delete --force
brm = branch --move
ci = commit
cim = commit --message
cl = clone
co = checkout
cob = checkout -b
cod = checkout develop
com = checkout main
cp = cherry-pick
df = diff
fe = fetch
lg = log
lga = log --all
me = merge
mea = merge --abort
mec = merge --continue
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 in the shell
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
# Synonyms as "specified" in the `git status` header
discard = checkout --
unstage = reset HEAD --
amend-commit = !git log -n 1 --pretty=tformat:%B | git commit -F - --amend # Keep the commit message
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
sync-deleted = !git ls-files -z --deleted | xargs -r -0 git rm
sync = !git sync-deleted && git add . --all
# Make minimal diff the default
diff-minimal = diff --color-words=. --ws-error-highlight=all
d = !git diff-minimal
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
clean-all = !git reset --hard && git clean-ignored && git clean-untracked
clean-ignored = "!f() { if [ -f .python-version ]; then mv .python-version .python-version.XYZ; fi; if [ -f .env ]; then mv .env .env.XYZ; fi; git clean -X -d -f "$@"; if [ -f .python-version.XYZ ]; then mv .python-version.XYZ .python-version; fi; if [ -f .env.XYZ ]; then mv .env.XYZ .env; fi }; f"
clean-untracked = !git clean -x -d -e ".python-version" -e ".env" -f # because 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
log-format1 = 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'
log-format2 = 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'
last-commit = !git log-format2 -1 -p --stat
lc = !git last-commit
history = !git log-format2 --graph
hi = !git history
hia = !git history --all
summary = !git log-format1 --graph
su = !git summary
sua = !git summary --all
oneline = log --pretty='%C(auto)%h: %s%d' --graph
ol = !git oneline
ola = !git oneline --all
# Search the repository
grep-code = grep --break --context 1 --full-name --heading --line-number --show-function
grepc = !git grep-code
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 = !git grep-log
grep-text = grep --break --context 1 --full-name --heading --ignore-case --line-number
grept = !git grep-text
# Prune local branches that were deleted remotely
prune-delete = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -d"
prune-show = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}'"
aliases = config --get-regexp 'alias.*'
aliases-internal = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1/' | sort # used in ~/.config/shell/aliases
[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
[init]
defaultBranch = main
[merge]
conflictstyle = diff3
ff = only
[pull]
ff = only
rebase = true
[push]
autoSetupRemote = true
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 = alexander@webartifex.biz

27
.config/git/ignore
View file

@ -1,27 +1,4 @@
# Generic temporary files
*.backup
*.bak
*.orig
*.temp
*.tmp
# Vim
# Source: https://github.com/github/gitignore/blob/main/Global/Vim.gitignore
#
# Swap
[._]*.s[a-v][a-z]
!*.svg
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]
# Session
Session.vim
Sessionx.vim
# Temporary
.netrwhist
*~
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~
.*.swp
.env

1
.config/pop-system-updater/config.ron Normal file
View file

@ -0,0 +1 @@
(enabled:false,notification_frequency:Weekly)

48
.config/psql/psqlrc
View file

@ -1,48 +0,0 @@
-- `psql` executes the commands in this file creating output
-- => This flag hides that and is unset again at the bottom
\set QUIET 1
-- Show verbose error messages
\set VERBOSITY verbose
-- Use normal "table" format by default
-- and "expanded table" with lots of columns
\x auto
-- By default, `NULL`s show up as empty spaces,
-- which may be confused with empty strings
-- => Show "NULL" instead for clarity
\pset null 'NULL'
-- Ignore errors in interactive sessions
-- but not when executing scripts
\set ON_ERROR_ROLLBACK interactive
-- Upper case SQL keywords
\set COMP_KEYWORD_CASE upper
-- Make VI the default editor
\set EDITOR vi
-- Use separate history files per database
-- and keep them in one folder
\set HISTFILE ~/.local/state/psql/history- :DBNAME
-- Don't store the same SQL statement repeatedly
\set HISTCONTROL ignoredups
-- Make all queries display query times
\timing
-- Unset the flag set at the top of this file
\unset QUIET

3
.config/pypoetry/config.toml Normal file
View file

@ -0,0 +1,3 @@
[virtualenvs]
create = true
in-project = true

53
.config/python/startup.py
View file

@ -1,53 +0,0 @@
"""Move Python's history file to "$XDG_STATE_HOME/python/history"."""
import atexit
import os
import readline
import sys
# For Python 3.13+ let `$PYTHON_HISTORY` handle it
if sys.version_info >= (3, 13):
sys.exit(0)
# For Python 2, do nothing
try:
import pathlib
except ImportError:
sys.exit(0)
if readline.get_current_history_length() == 0:
state_home = os.environ.get("XDG_STATE_HOME")
if state_home is None:
state_home = pathlib.Path.home() / ".local" / "state"
else:
state_home = pathlib.Path(state_home)
history_path = state_home / "python" / "history"
history_path.parent.mkdir(parents=True, exist_ok=True)
history_location = str(history_path)
if history_path.is_dir():
msg = history_location + " must not be a directory"
raise OSError(msg)
try:
readline.read_history_file(history_location)
except OSError: # Non existent
pass
readline.set_auto_history()
readline.set_history_length(99999)
def write_history():
try:
readline.write_history_file(history_location)
except OSError:
pass
atexit.register(write_history)

4
.config/shell/README.md
View file

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

28
.config/shell/aliases
View file

@ -1,28 +0,0 @@
#!/bin/sh
# Aliases used in all kinds of shells
# Manage the bare `git` repository in ~/ holding the dotfiles
alias dotfiles='git --git-dir=$XDG_DATA_HOME/dotfiles --work-tree=$HOME'
# Integrate `git`
if _command_exists git; then
alias g='git'
# Make all `git` aliases become shell aliases with a "g" prefix
for al in $(git aliases-internal); 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

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

@ -0,0 +1,152 @@
# 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'
# Make working with Python more convenient
alias py='python'
alias ipy='ipython'
if command_exists poetry; then
alias pr='poetry run'
fi
if command_exists pyenv; then
alias pyvenvs='pyenv virtualenvs --bare --skip-aliases'
alias pyver='pyenv version'
alias pyvers='pyenv versions --skip-aliases'
alias pywhich='pyenv which'
fi
# 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'

35
.config/shell/env
View file

@ -1,35 +0,0 @@
#!/bin/sh
# Environment variables for all kinds of shells
# Standard XDG base directories
# See: https://wiki.archlinux.org/title/XDG_Base_Directory
export XDG_CACHE_HOME="$HOME/.cache"
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share" # also set in ~/.local/bin/install-dotfiles
export XDG_STATE_HOME="$HOME/.local/state"
# Make up a XDG directory for binaries (that does not exist in the standard)
export XDG_BIN_HOME="$HOME/.local/bin"
# Convenient names for various places in the system
export DOTFILES_DIR="$XDG_DATA_HOME/dotfiles" # also set in ~/.local/bin/install-dotfiles
# Generic shell configs
export EDITOR=vim
export GPG_TTY=$(tty)
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
# Move common tools' config and cache files into XDG directories
export BAT_CONFIG_PATH="$XDG_CONFIG_HOME/bat/config"
export LESSHISTFILE="$XDG_STATE_HOME/less/history"
export PSQLRC="$XDG_CONFIG_HOME/psql/psqlrc"
export PYTHON_HISTORY="$XDG_STATE_HOME/python/history"
export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py"
export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"

60
.config/shell/init_dotfiles.sh Executable file
View file

@ -0,0 +1,60 @@
# This file initializes the `~/.dotfiles` bare repo
# Source it from either zsh or bash
# Check if a command can be found on the $PATH.
command_exists() {
command -v "$1" 1>/dev/null 2>&1
}
cd $HOME
# This is only here for documentation purposes
alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
# Remove a previous version of a `~/.dotfiles` bare repository
rm -rf "$HOME/.dotfiles" >/dev/null
git clone --bare git@git.webartifex.biz:alexander/dotfiles.git "$HOME/.dotfiles"
# Backup old dotfiles
rm -rf "$HOME/.dotfiles.bak" >/dev/null
mkdir -p $HOME/.dotfiles.bak/.config/{autostart,bat,flameshot,git,Nextcloud,pop-system-updater,psql,pypoetry,shell} && \
mkdir -p $HOME/.dotfiles.bak/.mackup && \
mkdir -p $HOME/.dotfiles.bak/.vim/{after/ftplugin,backup,swap,undo} && \
mkdir -p $HOME/.dotfiles.bak/.ssh && \
/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME checkout 2>&1 | egrep "\s+\." | awk {'print $1'} | \
xargs -I{} mv {} "$HOME/.dotfiles.bak"/{}
# Put new dotfiles in $HOME
/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME checkout --force
/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME config --local status.showUntrackedFiles no
/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME status
# Set up `zsh` only if it is available
# Note: on many servers I use these dotfiles, `zsh` is not installed
if command_exists zsh; then
# Install oh-my-zsh
export ZSH="$HOME/.oh-my-zsh"
rm -rf $ZSH >/dev/null
git clone https://github.com/ohmyzsh/ohmyzsh.git $ZSH
# Install zplug
export ZPLUG_HOME="$HOME/.zplug"
rm -rf $ZPLUG_HOME >/dev/null
git clone https://github.com/zplug/zplug $ZPLUG_HOME
# Set up all the zplug plugins (must be run interacticely
# so that `~/.zshrc` & friends are sourced again)
zsh -i -c "zplug install"
fi
echo
echo "Probably it's a good idea to restart the shell"
echo "Make sure to start bash or zsh as a login shell the next time"
echo

25
.config/shell/logout
View file

@ -1,25 +0,0 @@
#!/bin/sh
# When logging out of a machine, clear the screen to increase privacy
if [ "$SHLVL" = 1 ]; then # If on the outermost shell instance
# Clear screen and scrollback in SSH/terminal emulators
if _command_exists clear; then
clear
printf '\e[3J' # Clear scrollback buffer in modern emulators
fi
# On real Linux tty, run `clear_console` for full reset as well
if [ -t 0 ] && [ "$(tty)" != "not a tty" ]; then
case "$(tty)" in
/dev/tty[0-9]*)
if _command_exists clear_console; then
clear_console -q
fi
;;
esac
fi
fi

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

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

@ -0,0 +1,488 @@
# 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" ]
}
# 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
}
# =========================
# 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)"
# Initialize pyenv if it is installed
if command_exists pyenv; then
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
fi
# 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"
# ==========================
# Command not found handlers
# ==========================
# Check if an unknown command is in a local Python venv
command_not_found_handle() {
if [ -x ".venv/bin/$1" ]; then
echo 'You forgot to activate the virtualenv' 1>&2
exe=".venv/bin/$1"
shift
"$exe" "$@"
return $?
else
echo "$1: command not found" 1>&2
return 127
fi
}
# zsh uses another name for the handler
command_not_found_handler() {
command_not_found_handle "$@"
}
# ==============================
# 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
}
# ===================================================
# Set up & maintain the Python (develop) environments
# ===================================================
# TODO: This needs to be updated regularly (or find an automated solution)
# The Python versions `pyenv` creates (in descending order)
_py3_versions=('3.10.5' '3.9.13' '3.8.13' '3.7.13')
_py2_version='2.7.18'
# Each Python environment uses its own `poetry` installation to avoid
# integration problems between `pyenv` and `poetry`
# Source: https://github.com/python-poetry/poetry/issues/5252#issuecomment-1055697424
_py3_site_packages=('poetry')
# The pyenv virtualenv "utils" contains some globally available tools (e.g., `mackup`)
_py3_utils=('mackup')
install-pyenv() {
echo -e "\nInstalling pyenv\n"
# The official installer does a bit more than the `git clone`s below
# `curl https://pyenv.run | bash`
git clone https://github.com/pyenv/pyenv.git "$HOME/.pyenv"
git clone https://github.com/pyenv/pyenv-doctor.git "$HOME/.pyenv/plugins/pyenv-doctor"
git clone https://github.com/pyenv/pyenv-update.git "$HOME/.pyenv/plugins/pyenv-update"
git clone https://github.com/pyenv/pyenv-virtualenv.git "$HOME/.pyenv/plugins/pyenv-virtualenv"
git clone https://github.com/pyenv/pyenv-which-ext.git "$HOME/.pyenv/plugins/pyenv-which-ext"
# On a first install, "$PYENV_ROOT/bin" is NOT on the $PATH
_prepend_to_path "$PYENV_ROOT/bin"
}
re-install-pyenv() {
echo -e "\nRemoving pyenv\n"
rm -rf "$HOME/.pyenv" >/dev/null
install-pyenv
}
create-or-update-python-envs() {
command_exists pyenv || install-pyenv
eval "$(pyenv init --path)"
# Keep a legacy Python 2.7, just in case
echo -e "\nInstalling/updating Python $_py2_version\n"
pyenv install --skip-existing $_py2_version
PYENV_VERSION=$_py2_version pip install --upgrade pip setuptools
PYENV_VERSION=$_py2_version python -c "import sys; print sys.version"
for version in ${_py3_versions[@]}; do
echo -e "\nInstalling/updating Python $version\n"
pyenv install --skip-existing $version
# Start the new environment with the latest `pip` and `setuptools` versions
PYENV_VERSION=$version pip install --upgrade pip setuptools
# Put the specified utilities in the fresh environments (or update them)
for lib in ${_py3_site_packages[@]}; do
PYENV_VERSION=$version pip install --upgrade $lib
done
done
# Create a virtualenv based off the latest Python version to host global utilities
echo -e "\nInstalling/updating global Python utilities\n"
pyenv virtualenv $_py3_versions[1] 'utils'
PYENV_VERSION='utils' pip install --upgrade pip setuptools
for util in ${_py3_utils[@]}; do
PYENV_VERSION='utils' pip install --upgrade $util
done
# Create a virtualenv based off the latest Python version for interactive usage
# (This virtualenv is empty and is the target of accidental `pip install`s)
echo -e "\nInstalling/updating the default/interactive Python environment\n"
pyenv virtualenv $_py3_versions[1] 'interactive'
PYENV_VERSION='interactive' pip install --upgrade pip setuptools
# Put all Python binaries and the utilities on the $PATH
pyenv global 'interactive' $_py3_versions 'utils' $_py2_version
}
# =============================
# 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
}
# Update the entire Python tool chain
update-python() {
echo -e '\nUpdating the Python tool chain\n'
if command_exists pyenv; then
echo -e '\nUpdating pyenv\n'
pyenv update
echo
echo -e '\nUpdating Python environments\n'
create-or-update-python-envs
echo
fi
if command_exists zsh-pip-cache-packages; then
echo -e '\nUpdating pip packages cache\n'
zsh-pip-clear-cache
zsh-pip-cache-packages
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-python
update-dotfiles
update-zsh
echo -e '\nUpdating the configs managed by mackup'
mackup restore --force
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
}

44
.config/shell/welcome
View file

@ -1,44 +0,0 @@
#!/bin/sh
# Show system info each time a shell is started
_hostname=$(hostname)
_os="$(uname -s) $(uname -r)"
_uptime=$(uptime -p | sed 's/up //; s/weeks\?/w/g; s/days\?/d/g; s/hours\?/h/g; s/minutes\?/m/g; s/ //g')
_user=$(whoami)
_work_dir=$(echo "$PWD" | sed "s|^$HOME|~|")
if [ "$(id -u)" -eq 0 ]; then
_prompt="#"
else
_prompt="$"
fi
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
_remote=" ssh"
else
_remote=" local"
fi
if _in_bash; then
_shell_type="bash"
elif _in_zsh; then
_shell_type="zsh"
else
_shell_type="non-bash/zsh shell"
fi
_info_line="$_user@$_hostname:$_work_dir$_prompt$_remote $_os uptime: $_uptime $_shell_type"
_sep_line=$(echo "$_info_line" | sed 's/./─/g')
echo ""
echo "$_sep_line"
echo "$_info_line"
echo "$_sep_line"
echo ""

10
.config/user-dirs.dirs Normal file
View file

@ -0,0 +1,10 @@
# Configure the XDG user directories to integrate Nextcloud
XDG_DESKTOP_DIR="$HOME/desktop"
XDG_DOCUMENTS_DIR="$HOME/nextcloud"
XDG_DOWNLOAD_DIR="$HOME/downloads"
XDG_MUSIC_DIR="$HOME/nextcloud"
XDG_PICTURES_DIR="$HOME/nextcloud/photos"
XDG_PUBLICSHARE_DIR="$HOME/nextcloud/shares"
XDG_TEMPLATES_DIR="$HOME/nextcloud/templates"
XDG_VIDEOS_DIR="$HOME/nextcloud/photos"

10
.config/zsh/.zshrc
View file

@ -1,10 +0,0 @@
#!/bin/zsh
# Load the real `zsh` config file in ~/
#
# Recent Debian/Ubuntu versions look for .zshrc
# in .config/zsh and no longer in ~/ which
# is still the main location in many other distributions
. "$HOME/.zshrc"

3
.config/zsh/README.md
View file

@ -1,3 +0,0 @@
# `zsh`-related Configurations
This folder contains files that are sourced by `zsh`.

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

2
.hidden Normal file
View file

@ -0,0 +1,2 @@
LICENSE.txt
README.md

3
.local/bin/README.md
View file

@ -1,3 +0,0 @@
# User-local Executables
This folder contains executable files that are on the `$PATH`.

78
.local/bin/install-dotfiles
View file

@ -1,78 +0,0 @@
#!/bin/sh
# Installation script to make the dotfiles available in ~/
#
# `git` is the only dependency for this script to run (See: https://git-scm.com)
#
# See: https://code.webartifex.biz/alexander/dotfiles#installation
set -e
XDG_DATA_HOME="$HOME/.local/share" # also set in ~/.config/shell/env
DOTFILES_DIR="$XDG_DATA_HOME/dotfiles" # also set in ~/.config/shell/env
# Check if the dotfiles were installed previously
if [ -d "$DOTFILES_DIR" ] && [ "${FORCE_INSTALL:-}" != "1" ]; then
echo ""
echo "The dotfiles are already installed at: $DOTFILES_DIR"
echo ""
echo "Options:"
echo " - Set 'export FORCE_INSTALL=1' and run installation again"
echo " - Update with 'dotfiles pull' and continue using them"
echo ""
else
# Remove an already installed dotfiles repository
if [ -d "$DOTFILES_DIR" ]; then
rm -rf "$DOTFILES_DIR"
fi
if [ -z "$DOTFILES_BRANCH" ]; then
# Auto-detect if we're on a desktop system
if [ -n "$DISPLAY" ] || [ -n "$WAYLAND_DISPLAY" ] || [ "$(systemctl --user is-active graphical-session.target 2>/dev/null)" = "active" ]; then
export DOTFILES_BRANCH="desktop"
else
export DOTFILES_BRANCH="main"
fi
elif [ "$DOTFILES_BRANCH" != "desktop" ] && [ "$DOTFILES_BRANCH" != "main" ]; then
echo ""
echo "'DOTFILES_BRANCH' may only be one of: 'desktop' or 'main'"
exit 1
fi
mkdir -p "$XDG_DATA_HOME"
git clone --bare https://code.webartifex.biz/alexander/dotfiles "$XDG_DATA_HOME/dotfiles"
# Do not checkout project documentation intended for web GUIs (e.g., GitHub)
git --git-dir="$DOTFILES_DIR" --work-tree="$HOME" config core.sparseCheckout true
echo "/*" > "$DOTFILES_DIR/info/sparse-checkout"
echo "!LICENSE.txt" >> "$DOTFILES_DIR/info/sparse-checkout"
echo "!README.md" >> "$DOTFILES_DIR/info/sparse-checkout"
# Put the dotfiles in the user's `$HOME` folder
git --git-dir="$DOTFILES_DIR" --work-tree="$HOME" checkout --force "$DOTFILES_BRANCH"
# Do not show files not tracked in the dotfiles repository because there are simply too many
git --git-dir="$DOTFILES_DIR" --work-tree="$HOME" config --local status.showUntrackedFiles no
# The author of this file prefers to use SSH to sync his machines with the origin
git --git-dir="$DOTFILES_DIR" --work-tree="$HOME" remote set-url origin git@git.webartifex.biz:alexander/dotfiles.git
# Remove potentially conflicting `bash` startup files
rm -f "$HOME/.bash_login"
rm -f "$HOME/.bash_profile"
echo ""
echo "The dotfiles were installed successfully"
# Mimic starting a new shell to get new dotfiles right away
if [ -n "$ZSH_VERSION" ]; then
. "$HOME/.zshrc"
else
. "$HOME/.profile"
fi
fi

0
.local/state/psql/.gitkeep
View file

0
.local/state/python/.gitkeep
View file

0
.local/state/vim/backup/.gitkeep
View file

0
.local/state/vim/swap/.gitkeep
View file

0
.local/state/vim/undo/.gitkeep
View file

0
.local/state/zsh/.gitkeep
View file

24
.mackup.cfg Normal file
View file

@ -0,0 +1,24 @@
[storage]
engine = file_system
path = nextcloud/getraenkemarkt
directory = mackup
[applications_to_ignore]
# Do not sync configuration files that are kept in `git`
# See: https://gitlab.webartifex.biz/alexander/dotfiles
bash
bat
git
flameshot
mackup
p10k
pgsql
poetry
ssh
vim
wget
zsh
# Somehow, libreoffice cannot start with some other machine's configuration
libreoffice

7
.mackup/README.md Normal file
View file

@ -0,0 +1,7 @@
# Custom Configuration for `mackup`
This folder contains various **config** files
to include all kinds of files in the [`mackup backup`](https://github.com/lra/mackup).
Their format is described [here](https://github.com/lra/mackup/tree/master/doc#add-support-for-an-application-or-almost-any-file-or-directory).
`mackup` is used to synchronize (dot) files the general public should *not* see.

5
.mackup/anyconnect.cfg Normal file
View file

@ -0,0 +1,5 @@
[application]
name = Cisco's AnyConnect
[configuration_files]
.anyconnect

13
.mackup/histories.cfg Normal file
View file

@ -0,0 +1,13 @@
[application]
name = various history files
[configuration_files]
.bash_history
.lesshst
.python_history
.tig_history
.zsh_history
[xdg_configuration_files]
# `~/.config/psql` is set in `~/.psqlrc` for all history files
psql

5
.mackup/nautilus.cfg Normal file
View file

@ -0,0 +1,5 @@
[application]
name = GNOME Files a.k.a. Nautilus
[xdg_configuration_files]
gtk-3.0/bookmarks

7
.mackup/ssh_non-public.cfg Normal file
View file

@ -0,0 +1,7 @@
[application]
name = non-public SSH (config) files
[configuration_files]
.ssh/config
.ssh/known_hosts
.ssh/known_hosts.old

1622
.p10k.zsh Normal file
View file

File diff suppressed because it is too large Load diff

90
.profile
View file

@ -1,31 +1,7 @@
#!/bin/sh
# Main setup file executed for all kinds of shells
#
# For `bash`, the following two files must not exist:
# - ~/.bash_login
# - ~/.bash_profile
# If they do, this file may not be executed!
# Executed by a login shell (e.g., bash or sh) during start
# Prevent loading ~/.profile twice in `bash`
export PROFILE_LOADED=1
# Basic utilities
_command_exists() {
command -v "$1" 1>/dev/null 2>&1
}
_in_bash() {
[ -n "$BASH_VERSION" ]
}
_in_zsh() {
[ -n "$ZSH_VERSION" ]
}
# Prepend a folder to $PATH if it is not already there
_prepend_to_path () {
if [ -d "$1" ] ; then
case :$PATH: in
@ -35,33 +11,45 @@ _prepend_to_path () {
fi
}
# Load configuration files common to all kinds of shells
[ -f "$HOME/.config/shell/env" ] && . "$HOME/.config/shell/env"
[ -f "$HOME/.config/shell/aliases" ] && . "$HOME/.config/shell/aliases"
# Source ~/.profile_local, which holds machine-specific ENV variables
[ -f "$HOME/.profile_local" ] && . "$HOME/.profile_local"
# Load `bash`-specific configurations for non-login `bash` shells
if [ -n "$BASH_VERSION" ] && [ -f "$HOME/.bashrc" ]; then
. "$HOME/.bashrc"
fi
# `zsh`-specific configurations are automatically sourced from ~/.zshrc,
# which then also ensures that this file is sourced
# Put local executables on the `$PATH`
# Put some private bin directories on the $PATH
_prepend_to_path "$HOME/bin"
_prepend_to_path "$HOME/.local/bin"
# Ensure ~/.profile is loaded each time `bash` starts
unset PROFILE_LOADED
# 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"
# When everything is loaded, show a little welcome message
[ -f "$HOME/.config/shell/welcome" ] && . "$HOME/.config/shell/welcome"
# Configurations for various utilities
export BAT_CONFIG_PATH="$HOME/.config/bat/config"
export LESSHISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/.lesshst"
export PYENV_ROOT="$HOME/.pyenv"
_prepend_to_path "$PYENV_ROOT/bin"
# No need for *.pyc files on a dev machine
export PYTHONDONTWRITEBYTECODE=1
export PSQLRC="$HOME/.psqlrc"
# 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

34
.psqlrc Normal file
View file

@ -0,0 +1,34 @@
-- `psql` executes the commands in this `~/.psqlrc` creating output
-- (this flag hides that and is unset again at the bottom)
\set QUIET 1
-- Show verbose error messages
\set VERBOSITY verbose
-- Use normal "table" format by default and "expanded table" with lots of columns
\x auto
-- By default, NULLs show up as empty spaces, which looks like empty strings
\pset null 'NULL'
-- Ignore errors in interactive sessions but not when executing scripts
\set ON_ERROR_ROLLBACK interactive
-- Upper case SQL keywords
\set COMP_KEYWORD_CASE upper
-- Use the best text editor in the world
\set EDITOR vi
-- Use separate history files per database
-- and keep them in one folder for easier sync with `mackup`
\set HISTFILE ~/.config/psql/.psql_history- :DBNAME
-- Don't store the same SQL statement repeatedly
\set HISTCONTROL ignoredups
-- Make all queries display query times
\timing
-- Unset the flag set at the top of this file
\unset QUIET

11
.ssh/authorized_keys
View file

@ -1,5 +1,6 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN0GVKtgpgzpdf7E6e2vCytDSa2zPSgZ+8fAKCOotugH alexander@webartifex.biz (getraenkemarkt.io)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMRDaWrT2hH7BOV4Zv1ctVGqwfeqkssnHklRXBmng6Wr alexander@webartifex.biz (laptop1.getraenkemarkt.io)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOhhfx063dGoaE62cbdyGL3kp1AIovWFojQGNdqUpxr8 alexander@webartifex.biz (laptop2.getraenkemarkt.io)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGGNCrFt/gUbBHVqhthBuRmdDH6yS30+GGcCnARSzg+q alexander@webartifex.biz (workstation1.getraenkemarkt.io)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKfaK5LUp7ghZLfl7urwQx+l+m/Vm7iksz8deGx4L5sD alexander@webartifex.biz (workstation2.getraenkemarkt.io)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMe2fzyH4b4AwQBRgZ60enFagogaEG2dkO4NIOKllss alexander@webartifex.biz (gateway)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMRDaWrT2hH7BOV4Zv1ctVGqwfeqkssnHklRXBmng6Wr alexander@webartifex.biz (laptop1)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOhhfx063dGoaE62cbdyGL3kp1AIovWFojQGNdqUpxr8 alexander@webartifex.biz (laptop2)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WZPkmknmo3R+DLjWrebt+X8UrHgoWwjHckbhxHVKC alexander@webartifex.biz (phone1)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIbVaLHl4T+TjphPGSutYKH00Z3cNG+EmlhUfh+N/m6E alexander@webartifex.biz (tablet1)
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGGNCrFt/gUbBHVqhthBuRmdDH6yS30+GGcCnARSzg+q alexander@webartifex.biz (workstation1)

0
.config/vim/after/ftplugin/python.vim → .vim/after/ftplugin/python.vim
View file

0
.config/vim/spell/.gitkeep → .vim/backup/.gitkeep
View file

0
.local/state/bash/.gitkeep → .vim/swap/.gitkeep
View file

0
.local/state/less/.gitkeep → .vim/undo/.gitkeep
View file

27
.config/vim/vimrc → .vim/vimrc
View file

@ -1,9 +1,12 @@
" Good sources on vimrc files:
" - https://www.youtube.com/watch?v=Gs1VDYnS-Ac
" Use VIM improved mode
set nocompatible
" Set environment variables for convenient usage
let $RC="$XDG_CONFIG_HOME/vim/vimrc"
let $RC="$HOME/.vim/vimrc"
let $RTP=split(&runtimepath, ',')[0]
" Disable VIM's startup message
@ -36,13 +39,13 @@ set hidden
set path=.,**
" Store all vim-related working files in the ~/.local/state/vim folder
set viminfo+=n$XDG_STATE_HOME/vim/viminfo
" Store all vim-related working files in ~/.vim
set viminfo+=n~/.vim/viminfo
" Use dedicated folders to store temporary backup, swap, and undo files
" (the // means that VIM adapts names automatically to avoid duplicates)
set backupdir=$XDG_STATE_HOME/vim/backup//
set directory=$XDG_STATE_HOME/vim/swap//
set undodir=$XDG_STATE_HOME/vim/undo//
set backupdir=~/.vim/backup//
set directory=~/.vim/swap//
set undodir=~/.vim/undo//
" To disable any of the temporary files, uncomment one of the following
" set nobackup
@ -51,9 +54,6 @@ set undodir=$XDG_STATE_HOME/vim/undo//
" set noundofile
set runtimepath+=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after,$VIM,$VIMRUNTIME
" Show the filename in the terminal window's title bar
set title
@ -130,11 +130,6 @@ nmap Q <Nop>
cnoremap w!! w !sudo tee % >/dev/null
" Fix mouse issues with Alacritty terminal
" Source: https://wiki.archlinux.org/title/Alacritty#Mouse_not_working_properly_in_Vim
set ttymouse=sgr
" Enable the mouse for selections, including a toggle for this mode
set mouse=a
let g:mouse_enabled=1
@ -300,7 +295,7 @@ augroup checktime
augroup END
" Auto-reload ~/.config/vim/vimrc
" Auto-reload ~/.vim/vimrc
augroup vimrc
autocmd! BufWritePost $RC source % | redraw
augroup END

4
.zlogout
View file

@ -1,3 +1,3 @@
#!/bin/zsh
# Executed by zsh when a login shell exits
. "$XDG_CONFIG_HOME/shell/logout"
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"

197
.zshrc
View file

@ -1,55 +1,128 @@
#!/bin/zsh
# `zsh`-specific configurations
# Executed by zsg when a non-login shell starts
# Remove built-in aliases because we use our own, sourced via ~/.profile
# 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
# Load configuration files common to all kinds of shells
[ -f "$HOME/.profile" ] && . "$HOME/.profile"
# =======
# History
# =======
# Ensure `zsh` is running interactively
[[ -o interactive ]] || return
# Cannot be set in `~/.profile` due to conflict with `bash` (same env variable)
export HISTFILE="$HOME/.zsh_history"
# Make `zsh` behave like `bash` for prompts
PS1='%n@%m:%~%(!.#.$) '
# =========================
# Shell Utilities & Aliases
# =========================
# Configure the `history`
# Set these environment variables here
# to avoid conflict/overlap with `bash`
export HISTFILE="$XDG_STATE_HOME/zsh/history"
export HISTSIZE=999999 # Number of lines kept in memory
export SAVEHIST=999999 # Number of lines kept in the `$HISTFILE`
setopt APPEND_HISTORY # Do not overwrite the `$HISTFILE`
setopt INC_APPEND_HISTORY # Write to the `$HISTFILE` immediately
setopt HIST_REDUCE_BLANKS # Remove superfluous blanks from the `history`
setopt HIST_VERIFY # Show expanded `history` before executing
source "$HOME/.config/shell/utils.sh"
source "$HOME/.config/shell/aliases.sh"
# Make `zsh` feel even nicer
setopt AUTO_CD # Just type the directory to `cd` into it
setopt EXTENDED_GLOB # Advanced globbing patterns
setopt NULL_GLOB # Remove patterns with no matches
setopt CORRECT # Correct spelling of commands
setopt CHECK_JOBS # Show number of running jobs when exiting `zsh`
setopt NO_BEEP # Silence `zsh`
# 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'
stty -ixon # Prevent Ctrl+S from freezing `zsh`
# ===============
# zplug & Plugins
# ===============
# Enable (tab) completions
source "$ZSH/oh-my-zsh.sh"
source "$HOME/.zplug/init.zsh" # config in `~/.zshenv`
autoload -Uz compinit && compinit
# 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/invoke", from:oh-my-zsh # completions for `invoke`
zplug "plugins/jsontools", from:oh-my-zsh
zplug "plugins/pip", from:oh-my-zsh # completions for `pip`
zplug "plugins/poetry", from:oh-my-zsh # completions for `poetry`
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
@ -58,17 +131,44 @@ zmodload zsh/complist
# Include hidden files in tab completion
_comp_options+=(GLOB_DOTS)
# Make selecting completions nicer with a visual menu
# Enable arrow-key driven interface
zstyle ':completion:*' menu select
# Make new executables completable right away
# 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 ''
# Configure key bindings
# VI mode
bindkey -v
# Enable completions for various tools
# invoke -> see plugins above
# command_exists invoke && eval "$(invoke --print-completion-script=zsh)"
command_exists nox && eval "$(register-python-argcomplete nox)"
# pip -> see plugins above
# command_exists pip && eval "$(pip completion --zsh)"
command_exists pipx && eval "$(register-python-argcomplete pipx)"
# poetry -> see plugins above
# ============
# 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
@ -76,5 +176,20 @@ 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
# Enable Ctrl-R for reverse history search
bindkey "^R" history-incremental-search-backward
# 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

2
LICENSE.txt
View file

@ -1,4 +1,4 @@
Copyright (c) 2022-2025 Alexander Hess [alexander@webartifex.biz]
Copyright (c) 2022 Alexander Hess [alexander@webartifex.biz]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

70
README.md
View file

@ -1,50 +1,50 @@
# Dotfiles
This repository contains useful (config) files.
It is structured into two branches:
- [desktop](https://code.webartifex.biz/alexander/dotfiles/src/branch/desktop)
- [main](https://code.webartifex.biz/alexander/dotfiles/src/branch/main)
`main` contains dotfiles intended to be used on all kinds of machines
and can be thought of as a "minimal" or "server" version.
`desktop` is (re-)based on top of `main`
and adds "desktop" related dotfiles (e.g., GNOME stuff).
This repository contains useful (config) files that I use on my machines.
## Installation
## Initialization
Simply run:
On a freshly set up machine, run:
```sh
curl https://code.webartifex.biz/alexander/dotfiles/raw/branch/main/.local/bin/install-dotfiles > install-dotfiles && . ./install-dotfiles && rm ./install-dotfiles
```bash
curl https://gitlab.webartifex.biz/alexander/dotfiles/-/raw/main/.config/shell/init_dotfiles.sh \
> /tmp/init_dotfiles.sh \
&& source /tmp/init_dotfiles.sh \
&& rm /tmp/init_dotfiles.sh
```
or
This gives you a local copy of the latest version of this repository
(located in `~/.dotfiles`)
and initializes all the dotfiles provided here on your system.
Furthermore, `zsh` is set up with [`oh-my-zsh`](https://ohmyz.sh/) and `zplug`.
```
wget https://code.webartifex.biz/alexander/dotfiles/raw/branch/main/.local/bin/install-dotfiles -O install-dotfiles && . ./install-dotfiles && rm ./install-dotfiles
**Note**: Log out and in again so that `bash` and `zsh` run as *login* shells.
Otherwise, `~/.profile` is probably *not* sourced.
Don't worry: Your current dotfiles are backed up in the `~/.dotfiles.bak` folder!
### Python Development Environments
The develop environments for Python are managed by [`pyenv`](https://github.com/pyenv/pyenv).
To set them up, run:
```bash
install-pyenv && create-or-update-python-envs
```
This downloads a simple [installation script](.local/bin/install-dotfiles)
and then executes it.
The script has only one dependency, namely [git](https://git-scm.com).
So, it should not be too hard to get this going.
Several Python binaries are installed.
Additionally, two `virtualenv`s, "interactive" and "utils", are also created:
- "interactive" is the default environment with *no* libraries installed, and
- "utils" hosts globally available utilities.
Normally, I advice against executing shell scripts from the internet,
but this one is short enough to be read even by beginners.
So, convince yourself that it is not harmful!
Use `pyenv local ...` to specify a particular Python binary for a project.
## Shells
### Non-public Dotfiles
The config files in this repository are optimized for usage with
[GNU's Bourne again shell](https://man7.org/linux/man-pages/man1/bash.1.html),
or `bash` for short,
and the popular [zsh](https://www.zsh.org/).
## Copyright
This repository and *all* of its contents are open-source
under the [MIT license](./LICENSE.txt).
After setting up the Python environments (i.e., the "utils"),
running `mackup restore` symlinks further dotfiles into `~/`.
This only works for this project's maintainer.