Add comment

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

@@ -1,5 +0,0 @@
-;;; 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,7 +1,21 @@
 ## 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"
-alias up="sudo apt-get update; sudo apt-get upgrade"
+
+### 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"

.aliases/command-specific/borg

@@ -0,0 +1,14 @@
+#!/bin/zsh
+# borg
+
+backupName='{hostname}-{now:%Y-%m-%d}'
+borgArgs="--compression lzma,9 \
+          --progress \
+          --exclude-caches \
+          --exclude-from ~/Documents/backuplist.txt"
+backupTargets="/home/adam/ /etc/"
+
+alias borg-backup="sudo borg create /run/media/adam/Backup/borg-backups::$backupName $backupTargets $borgArgs"
+alias borg-backup-home="sudo BORG_RSH='sudo -u adam ssh' borg create thewarehouse:borg-backups::$backupName $backupTargets $borgArgs --ignore-inode --remote-path /var/services/homes/adam/bin/borg"
+
+unset backupName borgArgs backupTargets

.aliases/command-specific/brew

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

.aliases/command-specific/emacsclient

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

.aliases/command-specific/makepkg

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

.aliases/command-specific/notify-send

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

.aliases/command-specific/notmuch

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

.aliases/command-specific/open

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

.aliases/command-specific/pacman

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

.aliases/command-specific/rdiff-backup

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

.aliases/command-specific/softwareupdate

@@ -1,5 +0,0 @@
-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,30 +1,14 @@
 #-*- 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/wg

@@ -1,5 +0,0 @@
-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,9 +4,6 @@
 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"
 
@@ -18,12 +15,3 @@ alias irc='ssh ag tmux a -t irc'
 
 #quick alias for enabling bluetooth
 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

@@ -1,26 +0,0 @@
-# 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

@@ -1,42 +0,0 @@
-# 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'

.gitignore

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

.profile

@@ -1,3 +1,48 @@
 #-*- mode: sh; -*-
+# Environment variables
+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=gtk2
+export QT_AUTO_SCREEN_SCALE_FACTOR=true
+export ALTERNATE_EDITOR=""
+export TERMINAL=roxterm
+export CALIBRE_USE_SYSTEM_THEME=true
 
-source $HOME/.zshenv
+export WORDCHARS=${WORDCHARS/\//}
+export PAGER=less
+
+# Add $HOME/.bin to PATH if it exists
+if [[ -d "$HOME/.bin" ]]; then
+  export PATH="$PATH:$HOME/.bin"
+fi
+
+# Set temporary files locations
+if [[ ! -d "$TMPDIR" ]]; then
+  export TMPDIR="/tmp/$LOGNAME"
+  mkdir -p -m 700 "$TMPDIR"
+fi
+
+TMPPREFIX="${TMPDIR%/}/zsh"
+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
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
+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

.zimrc

@@ -1,27 +0,0 @@
-# -*- mode: sh; -*-
-
-#
-# Modules
-#
-
-zmodule environment
-zmodule git
-zmodule input
-zmodule termtitle
-zmodule utility
-
-# Prompt
-zmodule git-info
-zmodule duration-info
-zmodule https://git.adamgoldsmith.name/adam/fred-prompt.git
-
-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

.zshenv

@@ -1,53 +0,0 @@
-#-*- 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 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
-  export TMPDIR="/tmp/$LOGNAME"
-  mkdir -p -m 700 "$TMPDIR"
-fi
-
-TMPPREFIX="${TMPDIR%/}/zsh"
-if [[ ! -d "$TMPPREFIX" ]]
-then
-  mkdir -p "$TMPPREFIX"
-fi
-
-# Set SSH auth socket
-unset SSH_AGENT_PID
-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

.zshrc

@@ -1,89 +1,76 @@
-if [ ! -d "$HOME/.zim" ]
+# Antigen Stuff
-then
+ADOTDIR="$HOME/.antigen"
-    git clone https://github.com/zimfw/zimfw $HOME/.zim
+[ ! -e "$ADOTDIR" ] && git clone https://github.com/zsh-users/antigen.git "$ADOTDIR"
-    source ~/.zim/zimfw.zsh install
+source "$ADOTDIR/antigen.zsh"
-fi
 
-# Set editor default keymap to emacs
+# Temporary, hopefully remove later when antigen correctly fails to shallow clone from http
-bindkey -e
+[ ! -e "$ADOTDIR/bundles/zsh/fred-prompt" ] && git clone https://adamgoldsmith.name/cgit/zsh/fred-prompt.git/ $ADOTDIR/bundles/zsh/fred-prompt
-stty -ixon #disable XON/XOFF, which breaks C-s
 
-# Prompt for spelling correction of commands.
+antigen bundles <<EOBUNDLES
-setopt CORRECT
+  https://adamgoldsmith.name/cgit/zsh/fred-prompt.git prompt_fred_setup
-CORRECT_IGNORE="_*" # don't suggest completion functions
+  zsh-users/zsh-syntax-highlighting
+  zsh-users/zsh-history-substring-search
+  Eriner/zim modules/directory
+  Eriner/zim modules/git
+  Eriner/zim modules/history
+  Eriner/zim modules/input
+  Eriner/zim modules/utility
+  Eriner/zim modules/completion
+EOBUNDLES
+antigen apply
 
-# Customize spelling correction prompt.
+# Command Specific Aliases
-SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
+for i in $HOME/.aliases/command-specific/*
+do
+  if hash $(basename $i) 2>/dev/null # check if command exists
+  then
+    source $i
+  fi
+done
 
-# Remove path separator from WORDCHARS.
+# General Aliases
-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
-unsetopt NOMATCH # turn off "no matches found" on glob failure
+setopt EXTENDED_GLOB
-
+unsetopt NOMATCH
-# Remove older command from the history if a duplicate is to be added.
+setopt CORRECT
-setopt HIST_IGNORE_ALL_DUPS
+CORRECT_IGNORE="_*"
-unsetopt SHARE_HISTORY # don't share history between terminals
+zhighlighters=(main brackets)
-setopt INC_APPEND_HISTORY
+stty -ixon #disable XON/XOFF, which breaks C-s
-
+setopt no_share_history
 # rehashes on bin change, might cause performance issues
 zstyle ':completion:*' rehash true
 
+#load fasd if it exists
+hash fasd 2>/dev/null && eval "$(fasd --init auto)"
+
+# Load run-help
+unalias run-help
+autoload run-help
+
+# 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
+
+
 # History Substring Search bindings (PageUp and PageDown)
 bindkey '^[[5~' history-substring-search-up
 bindkey '^[[6~' history-substring-search-down
 
-# fine word navigation
+# Expands ... to ../..
-backward-word-fine() WORDCHARS='' zle .backward-word
+function expand-dot-to-parent-directory-path {
-forward-word-fine() WORDCHARS='' zle .forward-word
+  if [[ $LBUFFER = *.. ]]; then
-zle -N backward-word-fine
+    LBUFFER+='/..'
-zle -N forward-word-fine
+  else
-bindkey '^[F' forward-word-fine
+    LBUFFER+='.'
-bindkey '^[B' backward-word-fine
+  fi
-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 delete-horizontal-space
+zle -N expand-dot-to-parent-directory-path
-bindkey '\e\\' delete-horizontal-space
+bindkey -M emacs "." expand-dot-to-parent-directory-path
-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() {
@@ -98,10 +85,3 @@ bindkey "^X^S" prepend-sudo
 # 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,3 +0,0 @@
-#!/bin/bash
-
-mkdir -p ~/.config