Fix memory reporting

It's too noisy

.gitmodules

@@ -61,3 +61,6 @@
 [submodule "zsh/.config/zsh/plugins/zsh-auto-notify"]
 	path = zsh/.config/zsh/plugins/zsh-auto-notify
 	url = https://github.com/MichaelAquilina/zsh-auto-notify.git
+[submodule "vim/.vim/pack/bundle/start/vim-pkgbuild"]
+	path = vim/.vim/pack/bundle/start/vim-pkgbuild
+	url = https://github.com/m-pilia/vim-pkgbuild.git

git/.config/git/config

@@ -20,9 +20,11 @@
 [push]
 	default = simple
 	autoSetupRemote = true
+	followTags = true
 
 [merge]
 	tool = vimdiff
+	conflictstyle = zdiff3
 
 [help]
 	autocorrect = 10
@@ -46,11 +48,13 @@
 
 [rebase]
 	autosquash = true
-	updateRefs = true
+	updaterefs = true
 	autoStash = true
 
 [fetch]
 	prune = true
+	pruneTags = true
+	all = true
 
 [sendemail]
 	smtpserver = charon.bertptrs.nl
@@ -72,3 +76,15 @@
 	# Mark any lines that were added in a skipped commit and can not be
 	# attributed with a `*`
 	markUnblamableLines = true
+[branch]
+	sort = -committerdate
+[diff]
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicprefix = true
+	renames = true
+[rerere]
+	enabled = true
+	autoupdate = true
+[tag]
+	sort = version:refname

pacman/.config/pacman/makepkg.conf

@@ -1,10 +1,6 @@
 #!/hint/bash
-# Modify default build parameters to build native optimizations
+PACKAGER="Bert Peters <bertptrs@archlinux.org>"
-CFLAGS="${CFLAGS/-mtune=generic/-mtune=native}"
+GPGKEY="0x38100C24376CD5F6ED4FF4B46918400C2703040C"
-CXXFLAGS="${CXXFLAGS/-mtune=generic/-mtune=native}"
-
-# Enable rust to do the same
-export RUSTFLAGS="-C target_cpu=native"
 
 # Do a parallel build and enable output combining
 MAKEFLAGS="-j$(nproc) -Otarget -k"

ruby/.bundle/config

@@ -1,3 +1,2 @@
 ---
-BUNDLE_PATH: "~/.gem"
 BUNDLE_AUTO_INSTALL: "true"

vim/.vim/vimrc

@@ -54,6 +54,7 @@ fun! StripTrailingWhitespace()
 endfun
 
 autocmd BufWritePre * call StripTrailingWhitespace()
+autocmd filetype pkgbuild setlocal tabstop=2 shiftwidth=2 expandtab
 
 " Keep backup files etc out of the way
 set undofile

zsh/.config/zsh/.zshrc

@@ -50,7 +50,6 @@ plugins=(
 	zsh-autosuggestions/zsh-autosuggestions.zsh
 	zsh-you-should-use/you-should-use.plugin.zsh
 	nix-zsh-completions/nix-zsh-completions.plugin.zsh
-	zsh-auto-notify/auto-notify.plugin.zsh
 )
 
 for plugin in "${plugins[@]}"; do
@@ -61,24 +60,6 @@ done
 
 fpath+=("$ZDOTDIR/plugins/nix-zsh-completions")
 
-# Configure auto-notify
-AUTO_NOTIFY_IGNORE+=(
-	"gcloud compute ssh"
-	"nix run"
-	"bash"
-	"sem debug"
-	"git "{commit,grep,log}
-	"journalctl"
-	"jekyll serve"
-	"sudoedit"
-	"ipython"{,3}
-	"sem "{attach,debug}
-	"psql"
-	"sqlite3"
-	"iotop"
-)
-
-
 ## Autosuggest plugin configuration
 # Consider autocomplete in completion
 ZSH_AUTOSUGGEST_STRATEGY=(history completion)
@@ -104,16 +85,27 @@ alias nrc='nix shell --file default.nix -c'
 alias gcs='gcloud compute ssh --tunnel-through-iap'
 alias gscp='gcloud compute scp --tunnel-through-iap'
 alias gci='gcloud compute instances'
+# This invocation is so much more complicated than it needs to be, but
+# Google will only show mountain time otherwise.
+alias gops='gcloud compute operations list --format=":(TIMESTAMP.date(tz=LOCAL))" --sort-by=TIMESTAMP'
 
 # Not an alias but useful nonetheless.
 function pasters() {
 	local file=${1:-/dev/stdin}
-	curl --data-binary @${file} https://paste.rs
+	# Explicitly write the newline because paste.rs doesn't and sakura
+	# gets confused.
+	curl --write-out "\n" --data-binary @${file} https://paste.rs
 }
 
 # Ensure we can make cheap copies on btrfs
 alias cp='cp --reflink=auto'
 
+function pullall() {
+	for repo in "$@"; do
+		echo "$repo"
+	done | xargs -P0 -I{} git -C {} pull
+}
+
 if (( $+commands[thefuck] ))
 then
 	alias fuck='$(thefuck $(fc -ln -1))'
@@ -123,6 +115,11 @@ eval "$(dircolors)"
 
 # Initialize the prompt
 source "${ZDOTDIR:-$HOME}/.zshtheme"
+# Report commands that take longer than ten seconds, or more than 10MB
+# of RAM
+REPORTTIME=10
+REPORTMEMORY=10240
+TIMEFMT='%J  %U user %S system %P cpu %*E total; max RSS %MkB'
 
 # Setup the CNF hook
 if [[ -s /usr/share/doc/pkgfile/command-not-found.zsh ]]; then
@@ -308,7 +305,30 @@ if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then
 	. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
 fi
 
-# Initialize direnv if available
+#####################
-if (($+commands[direnv])); then
+# Arch Linux things #
-	eval "$(direnv hook zsh)"
+#####################
-fi
+function arch-pkg-cd() {
+	# Inspired by Segaja: https://gitlab.com/Segaja/dotfiles_base/-/blob/main/distro_arch/.config/zsh/os.zsh#L118-133
+	local arch_repo_folder="${HOME}/projects/arch/packaging/packages"
+
+	if [[ ! -d "$arch_repo_folder/$1" ]]; then
+		if pacman -Si "$1" &> /dev/null; then
+			cd "$arch_repo_folder"
+			pkgctl repo clone "$1"
+		elif [[ "$2" = '-c' ]]; then
+			cd "$arch_repo_folder"
+			pkgctl repo create --clone "$1"
+		else
+			echo "Non-existent package, use -c to create" >&2
+			return 1
+		fi
+
+		cd "$1"
+		return 0
+	else
+		cd "$arch_repo_folder/$1"
+		pkgctl repo configure
+		git pull --rebase --autostash
+	fi
+}

zsh/.config/zsh/.zshtheme

@@ -53,6 +53,7 @@ function prompt_ps1() {
 		host="%S%B$host"
 	fi
 
+	local shlvl="%{$fg[black]%}%{$bg[magenta]%}\${(l:$SHLVL-1::>:)}%{$reset_color%}"
 	local prompt="%n@%{$fg[cyan]%}%m$rs %# "
 	ps1=(
 		"$host"
@@ -61,6 +62,7 @@ function prompt_ps1() {
 		$'\n'
 		'$(prompt_handle_virtualenv)'
 		'${vcs_info_msg_0_:+${vcs_info_msg_0_}\n}'
+		"$shlvl"
 		"$prompt"
 	)
     echo "${(j::)ps1}"