Revert back to stock zim completion matcher-list

Current config has really annoying behaviour with options that have
both shared prefix and suffix, and it seems that the original issue
was fixed at some point.

.aliases/command-specific/.dir-locals.el

@@ -0,0 +1,5 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+;; set sh mode for all files
+((nil . ((mode . sh))))

.aliases/command-specific/apt-get

@@ -1,21 +1,7 @@
 ## Various update aliases
 ### apt
 alias ai="noglob sudo apt-get install"
-alias aup="sudo apt-get update; sudo apt-get upgrade"
 alias adup="sudo apt-get dist-upgrade"
 alias aclean="sudo apt-get autoremove; sudo apt-get autoclean"
 alias apt="noglob apt"
-
-### mr
-alias mup="mr -mj update"
-alias cmup="mup 2>&1|sed -ur 's/mr update: \/(.*)/'\"$(tput bold)\1$(tput sgr0)\"'/g
-/mr update: command failed/c'\"$(tput setf 4)mr update: command failed$(tput sgr0)\"'
-s/\/?home\/adam/~/g
-/Already up-to-date/d
-/Tree is up to date/d
-/Updating '\''\.'\'':/d
-/At revision/d
-/^$/d'"
-
-### general
-alias up="(aup;aclean;cmup) | tee /tmp/up.log"
+alias up="sudo apt-get update; sudo apt-get upgrade"

.aliases/command-specific/brew

@@ -0,0 +1 @@
+alias bup="brew update && brew upgrade"

.aliases/command-specific/emacsclient

@@ -4,3 +4,7 @@ alias en="e -n"
 alias et="e -t"
 alias ec="e -c"
 alias ecn="ec -n"
+
+function magit() {
+	ecn -e '(magit-status-no-new-window "'"$(realpath ${1-.})"'")'
+}

.aliases/command-specific/git

@@ -1,2 +1,4 @@
 ## git
 alias git-yolo='git commit -am "`curl -s http://whatthecommit.com/index.txt`"'
+alias diff='git diff --no-index'
+alias gcdr='cd "$(git rev-parse --show-toplevel)"' # cd to top level

.aliases/command-specific/makepkg

@@ -1,3 +1,4 @@
 ## makepkg
 
-alias fmakepkg='PKGEXT='''.pkg.tar''' makepkg'
+alias fmakepkg='PKGEXT='''.pkg.tar''' makepkg'
+alias mksrcinfo='makepkg --printsrcinfo > .SRCINFO'

.aliases/command-specific/notify-send

@@ -1,2 +1,3 @@
 ## notify-send
-alias N='notify-send "Command finished"'
+alias N='notify-send "Command finished" -i text-x-script'
+alias NS='N -u critical' # sticky

.aliases/command-specific/notmuch

@@ -0,0 +1,3 @@
+alias n="notmuch"
+alias nco="n compact"
+alias nag="mujmap -C ~/mail/adamgoldsmith.name sync"

.aliases/command-specific/open

@@ -0,0 +1 @@
+alias o="open"

.aliases/command-specific/pacman

@@ -1,19 +1,10 @@
 # pacman
-alias pup='apacman -Syu --noedit --purgebuild'
-alias pr='sudo apacman -Rs'
+alias pi='paru'
+alias pup='pi -Syu'
+alias pr='pi -Rs'
 alias prc='pr -c'
-alias pi='apacman --purgebuild'
-alias pin='pi --noedit --noconfirm'
+alias pin='pi --noconfirm'
 alias pis='pi -S'
 alias pins='pin -S'
-piro() { #remove orphans
-	if [[ ! -n $(apacman -Qdt) ]]; then
-		echo "No orphans to remove."
-	else
-		apacman -Rns $(pacman -Qdtq)
-	fi
-}	
-
-compdef apacman=pacman
-
+alias piro='pi -c'
 alias up='pup'

.aliases/command-specific/rdiff-backup

@@ -1,2 +0,0 @@
-## rdiff-backup
-alias backup="rdiff-backup --exclude-globbing-filelist /home/adam/Documents/backuplist.txt /home/adam/" #target

.aliases/command-specific/softwareupdate

@@ -0,0 +1,5 @@
+alias sup="softwareupdate -ia"
+
+alias up='tmux new-session "tmux split-window \"$(whence sup)\"; \
+                            tmux split-window \"$(whence npmgup)\"; \
+							$(whence bup)"'

.aliases/command-specific/systemctl

@@ -1,14 +1,30 @@
 #-*- mode: sh; -*-
 alias sy="systemctl"
+alias sydr="sy daemon-reload"
 alias sye="sy enable"
 alias syd="sy disable"
+alias syre="sy restart"
 alias systa="sy start"
 alias systo="sy stop"
 alias systat="sy status"
 
 alias ssy="sudo systemctl"
+alias ssydr="ssy daemon-reload"
 alias ssye="ssy enable"
 alias ssyd="ssy disable"
+alias ssyre="ssy restart"
 alias ssysta="ssy start"
 alias ssysto="ssy stop"
 alias ssystat="ssy status"
+
+alias jo="journalctl"
+alias joe="jo -e"
+alias joeu="jo -eu"
+alias jof="jo -f"
+alias jofu="jo -fu"
+
+alias sjo="sudo journalctl"
+alias sjoe="sjo -e"
+alias sjoeu="sjo -eu"
+alias sjof="sjo -f"
+alias sjofu="sjo -fu"

.aliases/command-specific/todo.sh

@@ -1,5 +1,11 @@
 ## todo.sh
 alias taz='todo.sh add "(Z)"'
+tap() {
+	pri="$1:u" #uppercase
+	shift
+	todo.sh add "($pri) $@"
+}
+compdef -e 'words[1]=(todo.sh add); service=todo.sh; (( CURRENT+=1 )); _todo.sh' tap
 alias t='todo.sh'
 alias hw='t hw'
 alias hwr="hw rel"

.aliases/command-specific/wg

@@ -0,0 +1,5 @@
+for interface in cms homeserver
+do
+    alias wg${interface}="sudo systemctl restart wg-quick@wg-${interface}"
+    alias wg${interface}D="sudo systemctl stop wg-quick@wg-${interface}"
+done

.aliases/general

@@ -4,6 +4,9 @@
 alias l='ls -1a'
 alias la='ll -a'
 
+# zim updates
+alias zup="zimfw update && zimfw upgrade"
+
 ## Disable Globbing (for some things)
 alias nmap="noglob nmap"
 
@@ -14,4 +17,13 @@ mcd() { mkdir -p "$1" && cd "$1"; }
 alias irc='ssh ag tmux a -t irc'
 
 #quick alias for enabling bluetooth
-alias ebluetooth="sudo modprobe btusb;blueman-manager"
+alias ebluetooth="sudo modprobe btusb;ssy start bluetooth;blueman-manager"
+
+# Command Specific Aliases
+for i in $HOME/.aliases/command-specific/*
+do
+  if hash $(basename $i) 2>/dev/null # check if command exists
+  then
+    source $i
+  fi
+done

.config/htop/htoprc

@@ -0,0 +1,26 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+fields=0 48 17 18 38 39 40 2 46 47 49 1
+sort_key=46
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=0
+shadow_other_users=0
+show_thread_names=0
+show_program_path=1
+highlight_base_name=0
+highlight_megabytes=1
+highlight_threads=1
+tree_view=0
+header_margin=1
+detailed_cpu_time=0
+cpu_count_from_zero=0
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=0
+delay=15
+left_meters=AllCPUs2 Memory Swap
+left_meter_modes=1 1 1
+right_meters=Tasks LoadAverage Uptime Battery
+right_meter_modes=2 2 2 1

.config/tmux/tmux.conf

@@ -0,0 +1,42 @@
+# set prefix to C-z
+set -g prefix C-z
+unbind C-b
+bind C-z send-prefix
+
+# enable mouse support
+set -g mouse on
+
+# open new panes in current directory
+bind  %  split-window -h -c "#{pane_current_path}"
+bind '"' split-window -v -c "#{pane_current_path}"
+
+# vim-like pane navigation
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+# resizing
+bind -r C-h resize-pane -L
+bind -r C-j resize-pane -D
+bind -r C-k resize-pane -U
+bind -r C-l resize-pane -R
+bind -r M-h resize-pane -L 5
+bind -r M-j resize-pane -D 5
+bind -r M-k resize-pane -U 5
+bind -r M-l resize-pane -R 5
+
+set -g history-file ~/.local/state/tmux_history
+
+# plugins
+set-option -g @plugin 'tmux-plugins/tpm'
+set-option -g @plugin 'noscript/tmux-mighty-scroll'
+set-option -g @mighty-scroll-by-line 'man less pager fzf emacs emacsclient'
+
+# install/update tpm
+if-shell "test ! -d  ~/.config/tmux/plugins/tpm" {
+  run-shell 'git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm'
+}
+# start tpm
+run-shell '~/.config/tmux/plugins/tpm/tpm'
+# install and update plugins in background
+run-shell -b '($TMUX_PLUGIN_MANAGER_PATH/tpm/bin/install_plugins && $TMUX_PLUGIN_MANAGER_PATH/tpm/bin/clean_plugins && $TMUX_PLUGIN_MANAGER_PATH/tpm/bin/update_plugins all && $TMUX_PLUGIN_MANAGER_PATH/tpm/scripts/source_plugins.sh) > /dev/null'

.config/yay/config.json

@@ -0,0 +1,39 @@
+{
+	"buildDir": "/home/adam/.cache/yay",
+	"editor": "",
+	"editorflags": "",
+	"makepkgbin": "makepkg",
+	"makepkgconf": "",
+	"pacmanbin": "pacman",
+	"pacmanconf": "/etc/pacman.conf",
+	"tarbin": "bsdtar",
+	"redownload": "no",
+	"rebuild": "no",
+	"answerclean": "",
+	"answerdiff": "",
+	"answeredit": "",
+	"answerupgrade": "",
+	"gitbin": "git",
+	"gpgbin": "gpg",
+	"gpgflags": "",
+	"mflags": "",
+	"sortby": "votes",
+	"gitflags": "",
+	"removemake": "yes",
+	"requestsplitn": 150,
+	"sortmode": 0,
+	"completionrefreshtime": 7,
+	"sudoloop": false,
+	"timeupdate": false,
+	"devel": false,
+	"cleanAfter": false,
+	"gitclone": true,
+	"provides": true,
+	"pgpfetch": true,
+	"upgrademenu": true,
+	"cleanmenu": false,
+	"diffmenu": false,
+	"editmenu": false,
+	"combinedupgrade": false,
+	"useask": false
+}

.gitignore

@@ -0,0 +1 @@
+/.config/tmux/plugins/

.gitmodules

@@ -1,3 +0,0 @@
-[submodule ".zim"]
-	path = .zim
-	url = http://adamgoldsmith.name/cgit/zim.git

.profile

@@ -0,0 +1,3 @@
+#-*- mode: sh; -*-
+
+source $HOME/.zshenv

.zim

@@ -1 +0,0 @@
-Subproject commit a51d94b91d52cc25503ed6d1c0f685d0ff71c0b3

.zimrc

@@ -1,27 +1,27 @@
-#-*- mode: sh; -*-
-## Zim settings
+# -*- mode: sh; -*-
 
-# Select what modules you would like enabled.
-# The second line of modules may depend on options set by modules in the first line.
-# These dependencies are noted on the respective module's README.md.
-zmodules=(directory environment git history input utility custom \
-          syntax-highlighting prompt git completion)
+#
+# Modules
+#
 
-## Prompt
-# Set your desired prompt here
-zprompt_theme='fred'
+zmodule environment
+zmodule git
+zmodule input
+zmodule termtitle
+zmodule utility
 
-## Utility
-# Uncomment to enable command correction prompts; 'setopt CORRECT'
-# See: http://zsh.sourceforge.net/Doc/Release/Options.html#Input_002fOutput
-zcorrection='true'
+# Prompt
+zmodule git-info
+zmodule duration-info
+zmodule https://git.adamgoldsmith.name/adam/fred-prompt.git
 
-## Syntax-Highlighting
-# This determines what highlighters will be used with the completion module.
-# Documentation of the highlighters can be found here:
-#   https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
-zhighlighters=(main brackets)
-
-## SSH
-# Load these ssh identities with the ssh module
-zssh_ids=(id_rsa)
+zmodule zsh-users/zsh-completions
+# completion must be sourced after zsh-users/zsh-completions
+zmodule completion
+# fast must be loaded after completion
+zmodule fasd
+zmodule zsh-users/zsh-autosuggestions
+# zsh-users/zsh-syntax-highlighting must be sourced after completion
+zmodule zsh-users/zsh-syntax-highlighting
+# zsh-users/zsh-history-substring-search must be sourced after zsh-users/zsh-syntax-highlighting
+zmodule zsh-users/zsh-history-substring-search

.zlogin

@@ -1,47 +0,0 @@
-#-*- mode: sh; -*-
-# startup file read in interactive login shells
-
-# The following code helps us by optimizing the existing framework.
-# This includes zcompile, zcompdump, etc.
-
-(
-  # Function to determine the need of a zcompile. If the .zwc file
-  # does not exist, or the base file is newer, we need to compile.
-  # These jobs are asynchronous, and will not impact the interactive shell
-  zcompare() {
-    if [[ -s ${1} && ( ! -s ${1}.zwc || ${1} -nt ${1}.zwc) ]]; then
-      zcompile ${1}
-    fi
-  }
-
-  zim_mods=${ZDOTDIR:-${HOME}}/.zim/modules
-  setopt EXTENDED_GLOB
-
-  # zcompile the completion cache; siginificant speedup.
-  zcompare ${ZDOTDIR:-${HOME}}/.zcompdump
-
-  # zcompile .zshrc
-  zcompare ${ZDOTDIR:-${HOME}}/.zshrc
-
-  # zcompile some light module init scripts
-  zcompare ${zim_mods}/git/init.zsh
-  zcompare ${zim_mods}/utility/init.zsh
-  zcompare ${zim_mods}/pacman/init.zsh
-  zcompare ${zim_mods}/spectrum/init.zsh
-  zcompare ${zim_mods}/completion/init.zsh
-
-  # zcompile all .zsh files in the custom module
-  for file in ${zim_mods}/custom/**/*.zsh; do
-    zcompare ${file}
-  done
-
-  # syntax-highlighting
-  for file in ${zim_mods}/syntax-highlighting/external/highlighters/**/*.zsh; do
-    zcompare ${file}
-  done
-  zcompare ${zim_mods}/syntax-highlighting/external/zsh-syntax-highlighting.zsh
-
-  # zsh-histery-substring-search
-  zcompare ${zim_mods}/history-substring-search/external/zsh-history-substring-search.zsh
-
-) &!

.zshenv

@@ -1,38 +1,53 @@
 #-*- mode: sh; -*-
+
+# Define Zim location
+ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim
+
 # Environment variables
+export EDITOR="emacsclient -t"
+export ALTERNATE_EDITOR=""
+export VISUAL="emacsclient -c -n"
+export PAGER=less
+export TERMINAL=alacritty
+
 export ARDUINO_DIR="/usr/share/arduino"
 export ARDMK_DIR="$HOME/Programs/Arduino-Makefile"
 export STEAMAPPS="$HOME/.local/share/Steam/steamapps/common"
-export QT_STYLE_OVERRIDE=gtk
-export ALTERNATE_EDITOR=""
-export TERMINAL=roxterm
+
+export GTK_THEME=Arc-Dark-solid
+export QT_STYLE_OVERRIDE=gtk2
+export QT_QPA_PLATFORMTHEME=qt6gtk2
+export QT_AUTO_SCREEN_SCALE_FACTOR=true
+export CALIBRE_USE_SYSTEM_THEME=true
+
+export WINEDLLOVERRIDES=winemenubuilder.exe=d
+
+# Don't allow duplicate values in path
+typeset -U path
+path=(
+    $HOME/.bin
+    $HOME/.local/bin
+    $HOME/.dotfiles/
+    $HOME/.cargo/bin
+    $path
+)
 
 # Set temporary files locations
-if [[ ! -d "$TMPDIR" ]]; then
+if [[ ! -d "$TMPDIR" ]]
+then
   export TMPDIR="/tmp/$LOGNAME"
   mkdir -p -m 700 "$TMPDIR"
 fi
 
 TMPPREFIX="${TMPDIR%/}/zsh"
-if [[ ! -d "$TMPPREFIX" ]]; then
+if [[ ! -d "$TMPPREFIX" ]]
+then
   mkdir -p "$TMPPREFIX"
 fi
 
-# Gnupg setup
-## Start the gpg-agent if not already running
-if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
-    gpg-connect-agent /bye >/dev/null 2>&1
-fi
-
-## Set SSH to use gpg-agent
+# Set SSH auth socket
 unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-    export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh"
+if hash gpgconf 2>/dev/null && [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]
+then
+  export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 fi
-
-## Set GPG TTY
-GPG_TTY=$(tty)
-export GPG_TTY
-
-## Refresh gpg-agent tty in case user switches into an X session
-gpg-connect-agent updatestartuptty /bye >/dev/null

.zshrc

@@ -1,34 +1,89 @@
-#-*- mode: sh; -*-
-# User configuration sourced by interactive shells
-
-# Source zim
-if [[ -s ${ZDOTDIR:-${HOME}}/.zim/init.zsh ]]; then
-  source ${ZDOTDIR:-${HOME}}/.zim/init.zsh
+if [ ! -d "$HOME/.zim" ]
+then
+    git clone https://github.com/zimfw/zimfw $HOME/.zim
+    source ~/.zim/zimfw.zsh install
 fi
 
-# Command Specific Aliases
-for i in $HOME/.aliases/command-specific/*
-do
-  if hash $(basename $i) 2>/dev/null
-  then
-    source $i
-  fi
-done
+# Set editor default keymap to emacs
+bindkey -e
+stty -ixon #disable XON/XOFF, which breaks C-s
 
-# General Aliases
+# Prompt for spelling correction of commands.
+setopt CORRECT
+CORRECT_IGNORE="_*" # don't suggest completion functions
+
+# Customize spelling correction prompt.
+SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
+
+# Remove path separator from WORDCHARS.
+WORDCHARS=${WORDCHARS//[\/]}
+
+# Set window title format
+# Escape % in commands
+zstyle ':zim:termtitle' format '%~:${${1:-zsh}//\\%/%%}'
+# Set window title before running a command
+zstyle ':zim:termtitle' hooks 'precmd' 'preexec'
+
+# Append `../` to your input for each `.` you type after an initial `..`
+zstyle ':zim:input' double-dot-expand yes
+
+# Set what highlighters will be used.
+# See https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
+
+# Set zsh-autosuggestions highlight style
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=black,bold,underline"
+
+# Initialize Zim modules
+if [[ ${ZIM_HOME}/init.zsh -ot ${ZDOTDIR:-${HOME}}/.zimrc ]]; then
+  # Update static initialization script if it's outdated, before sourcing it
+  source ${ZIM_HOME}/zimfw.zsh init -q
+fi
+source ${ZIM_HOME}/init.zsh
+
+# Source aliases
 source $HOME/.aliases/general
 
 # Various Options
-CORRECT_IGNORE="_*"
-stty -ixon #disable XON/XOFF, which breaks C-s
+unsetopt NOMATCH # turn off "no matches found" on glob failure
 
-# Keybindings
-my-backward-kill-word () {
-	local WORDCHARS=${WORDCHARS/\//}
-	zle backward-kill-word
+# Remove older command from the history if a duplicate is to be added.
+setopt HIST_IGNORE_ALL_DUPS
+unsetopt SHARE_HISTORY # don't share history between terminals
+setopt INC_APPEND_HISTORY
+
+# rehashes on bin change, might cause performance issues
+zstyle ':completion:*' rehash true
+
+# History Substring Search bindings (PageUp and PageDown)
+bindkey '^[[5~' history-substring-search-up
+bindkey '^[[6~' history-substring-search-down
+
+# fine word navigation
+backward-word-fine() WORDCHARS='' zle .backward-word
+forward-word-fine() WORDCHARS='' zle .forward-word
+zle -N backward-word-fine
+zle -N forward-word-fine
+bindkey '^[F' forward-word-fine
+bindkey '^[B' backward-word-fine
+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS+=(forward-word-fine backward-word-fine)
+
+# equivalents of eponymous Emacs functions
+# from https://unix.stackexchange.com/a/595157
+delete-horizontal-space() {
+  emulate -L zsh
+  set -o extendedglob
+  LBUFFER=${LBUFFER%%[[:blank:]]##}
+  RBUFFER=${RBUFFER##[[:blank:]]##}
 }
-zle -N my-backward-kill-word
-bindkey '^H' my-backward-kill-word
+zle -N delete-horizontal-space
+bindkey '\e\\' delete-horizontal-space
+just-one-space() {
+  delete-horizontal-space
+  LBUFFER="$LBUFFER "
+}
+zle -N just-one-space
+bindkey '\e ' just-one-space
 
 # Inserts 'sudo ' at the beginning of the line.
 function prepend-sudo() {
@@ -40,5 +95,13 @@ function prepend-sudo() {
 zle -N prepend-sudo
 bindkey "^X^S" prepend-sudo
 
-#load fasd if it exists
-hash fasd 2>/dev/null && eval "$(fasd --init auto)"
+# Control-Backspace and Control-Delete
+bindkey '^H' backward-kill-word
+bindkey '5~' kill-word
+
+# Auto start tmux if a remote connection
+if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -n "$SSH_TTY" ]]
+then
+  # Attach only to the 'auto' session
+  exec tmux new-session -A -s 'auto'
+fi

PRESTOW

@@ -1,17 +1,3 @@
 #!/bin/bash
 
-[ -d .zim ] && firstRun=1
-
-echo "Getting zim"
-git submodule update --init --recursive
-
-echo "Updating .dotfiles/zsh/.zim"
-cd .zim
-if [ $firstRun -eq 1 ]
-then
-	git remote set-url origin "http://adamgoldsmith.name/cgit/zim.git"
-	git remote set-url --push origin "ag:/srv/git/zim.git"
-	git remote add upstream "https://github.com/Eriner/zim.git"
-fi
-git submodule init
-git submodule update
+mkdir -p ~/.config