rearrange some more things

68 files changed, 58 insertions, 66 deletions

diff --git a/local/.bin/ag b/bin/.bin/ag
index 5b2ddf3..5b2ddf3 120000
--- a/local/.bin/ag
+++ b/bin/.bin/ag
diff --git a/local/.bin/cryptdir b/bin/.bin/cryptdir
index eb63300..eb63300 100755
--- a/local/.bin/cryptdir
+++ b/bin/.bin/cryptdir
diff --git a/local/.bin/cryptoloop b/bin/.bin/cryptoloop
index 493c74e..493c74e 100755
--- a/local/.bin/cryptoloop
+++ b/bin/.bin/cryptoloop
diff --git a/local/.bin/files-between b/bin/.bin/files-between
index 634b61c..634b61c 100755
--- a/local/.bin/files-between
+++ b/bin/.bin/files-between
diff --git a/local/.bin/fm22avi b/bin/.bin/fm22avi
index eebfb4f..eebfb4f 100755
--- a/local/.bin/fm22avi
+++ b/bin/.bin/fm22avi
diff --git a/local/.bin/history-stats b/bin/.bin/history-stats
index 0fead1f..0fead1f 100755
--- a/local/.bin/history-stats
+++ b/bin/.bin/history-stats
diff --git a/local/.bin/hostcert b/bin/.bin/hostcert
index 61f519d..61f519d 100755
--- a/local/.bin/hostcert
+++ b/bin/.bin/hostcert
diff --git a/local/.bin/mem-usage b/bin/.bin/mem-usage
index 19e8c32..19e8c32 100755
--- a/local/.bin/mem-usage
+++ b/bin/.bin/mem-usage
diff --git a/local/.bin/on-lock b/bin/.bin/on-lock
index 3de3724..3de3724 100755
--- a/local/.bin/on-lock
+++ b/bin/.bin/on-lock
diff --git a/local/.bin/pacman-dump b/bin/.bin/pacman-dump
index b32ed16..b32ed16 100755
--- a/local/.bin/pacman-dump
+++ b/bin/.bin/pacman-dump
diff --git a/local/.bin/pdfcat b/bin/.bin/pdfcat
index ff4edaa..ff4edaa 100755
--- a/local/.bin/pdfcat
+++ b/bin/.bin/pdfcat
diff --git a/local/.bin/reply b/bin/.bin/reply
index 412189f..412189f 100755
--- a/local/.bin/reply
+++ b/bin/.bin/reply
diff --git a/local/.bin/rg b/bin/.bin/rg
index ea88361..ea88361 100755
--- a/local/.bin/rg
+++ b/bin/.bin/rg
diff --git a/local/.bin/scanpdf b/bin/.bin/scanpdf
index 31ebb14..31ebb14 100755
--- a/local/.bin/scanpdf
+++ b/bin/.bin/scanpdf
diff --git a/local/.bin/scratch b/bin/.bin/scratch
index 0cca01c..0cca01c 100755
--- a/local/.bin/scratch
+++ b/bin/.bin/scratch
diff --git a/local/.bin/set-mac b/bin/.bin/set-mac
index 986d333..986d333 100755
--- a/local/.bin/set-mac
+++ b/bin/.bin/set-mac
diff --git a/local/.bin/show-colors b/bin/.bin/show-colors
index 47e0d32..47e0d32 100755
--- a/local/.bin/show-colors
+++ b/bin/.bin/show-colors
diff --git a/local/.bin/smt b/bin/.bin/smt
index 446197d..446197d 100755
--- a/local/.bin/smt
+++ b/bin/.bin/smt
diff --git a/local/.bin/sum b/bin/.bin/sum
index cf21bfd..cf21bfd 100755
--- a/local/.bin/sum
+++ b/bin/.bin/sum
diff --git a/local/.bin/vimmanpager b/bin/.bin/vimmanpager
index dfd36f3..dfd36f3 100755
--- a/local/.bin/vimmanpager
+++ b/bin/.bin/vimmanpager
diff --git a/local/.bin/web b/bin/.bin/web
index f8484c0..f8484c0 100755
--- a/local/.bin/web
+++ b/bin/.bin/web
diff --git a/local/.gitignore b/bin/.gitignore
index 550df27..550df27 100644
--- a/local/.gitignore
+++ b/bin/.gitignore
diff --git a/crawl/.config/sh/rc.d/crawl b/crawl/.config/sh/rc.d/crawl
new file mode 100644
index 0000000..704f723
--- /dev/null
+++ b/crawl/.config/sh/rc.d/crawl
@@ -0,0 +1,2 @@
+alias cao="env TERM=screen-256color /usr/bin/ssh -C -i \$HOME/.ssh/cao_key joshua@crawl.akrasiac.org"
+alias cdo="ssh -C -i \$HOME/.ssh/cao_key crawl@crawl.develz.org"
diff --git a/ssh/.ssh/cao_key b/crawl/.ssh/cao_key
index 59af0f8..59af0f8 100644
--- a/ssh/.ssh/cao_key
+++ b/crawl/.ssh/cao_key
diff --git a/ssh/Makefile b/crawl/Makefile
index d0eb8d6..d0eb8d6 100644
--- a/ssh/Makefile
+++ b/crawl/Makefile
diff --git a/exa/.config/sh/rc.d/exa b/exa/.config/sh/rc.d/exa
new file mode 100644
index 0000000..b6c9a9c
--- /dev/null
+++ b/exa/.config/sh/rc.d/exa
@@ -0,0 +1 @@
+alias ls="exa --group-directories-first --time-style=long-iso --git --color-scale"
diff --git a/fzf/.config/sh/rc.d/fzf b/fzf/.config/sh/rc.d/fzf
new file mode 100644
index 0000000..27a1c89
--- /dev/null
+++ b/fzf/.config/sh/rc.d/fzf
@@ -0,0 +1,2 @@
+export FZF_DEFAULT_OPTS="--reverse --inline-info --bind=tab:down,shift-tab:up,change:top,ctrl-space:toggle"
+export FZF_DEFAULT_COMMAND="rg --hidden -l ."
diff --git a/git/.config/sh/rc.d/git b/git/.config/sh/rc.d/git
new file mode 100644
index 0000000..52d6b5e
--- /dev/null
+++ b/git/.config/sh/rc.d/git
@@ -0,0 +1 @@
+alias cdu="cd \"\$(git root)\""
diff --git a/helix/.config/sh/rc.d/helix b/helix/.config/sh/rc.d/helix
new file mode 100644
index 0000000..2dad3e5
--- /dev/null
+++ b/helix/.config/sh/rc.d/helix
@@ -0,0 +1,2 @@
+alias hx="helix"
+export EDITOR=$(command -v helix)
diff --git a/local/.bin/hornet/backlight b/laptop/.bin/backlight
index 314e874..314e874 100755
--- a/local/.bin/hornet/backlight
+++ b/laptop/.bin/backlight
diff --git a/local/.bin/hornet/import b/laptop/.bin/import
index ea4f1f2..ea4f1f2 100755
--- a/local/.bin/hornet/import
+++ b/laptop/.bin/import
diff --git a/local/.bin/hornet/numkeys b/laptop/.bin/numkeys
index 9b284bb..9b284bb 100755
--- a/local/.bin/hornet/numkeys
+++ b/laptop/.bin/numkeys
diff --git a/local/.bin/hornet/sc b/laptop/.bin/sc
index 614a1bc..614a1bc 100755
--- a/local/.bin/hornet/sc
+++ b/laptop/.bin/sc
diff --git a/local/.bin/hornet/setup-inputs b/laptop/.bin/setup-inputs
index cd1b4cf..cd1b4cf 100755
--- a/local/.bin/hornet/setup-inputs
+++ b/laptop/.bin/setup-inputs
diff --git a/local/.bin/hornet/tv b/laptop/.bin/tv
index 1c99e2e..1c99e2e 100755
--- a/local/.bin/hornet/tv
+++ b/laptop/.bin/tv
diff --git a/local/.bin/hornet/volume b/laptop/.bin/volume
index 668c1b1..668c1b1 100755
--- a/local/.bin/hornet/volume
+++ b/laptop/.bin/volume
diff --git a/local/.bin/hornet/vscreen b/laptop/.bin/vscreen
index 52fc5cc..52fc5cc 100755
--- a/local/.bin/hornet/vscreen
+++ b/laptop/.bin/vscreen
diff --git a/local/.bin/hornet/webcam b/laptop/.bin/webcam
index fdac5f8..fdac5f8 100755
--- a/local/.bin/hornet/webcam
+++ b/laptop/.bin/webcam
diff --git a/laptop/.config/sh/rc.d/laptop b/laptop/.config/sh/rc.d/laptop
new file mode 100644
index 0000000..6f95731
--- /dev/null
+++ b/laptop/.config/sh/rc.d/laptop
@@ -0,0 +1 @@
+alias wifi="sudo systemctl restart iwd"
diff --git a/less/.config/sh/rc.d/less b/less/.config/sh/rc.d/less
new file mode 100644
index 0000000..fd25dbd
--- /dev/null
+++ b/less/.config/sh/rc.d/less
@@ -0,0 +1 @@
+export LESS='-QR'
diff --git a/local/.bin/mz-doy1/backlight b/local/.bin/mz-doy1/backlight
deleted file mode 120000
index 41f9edb..0000000
--- a/local/.bin/mz-doy1/backlight
+++ /dev/null
@@ -1 +0,0 @@
-../hornet/backlight
\ No newline at end of file
diff --git a/local/.bin/mz-doy1/import b/local/.bin/mz-doy1/import
deleted file mode 120000
index b928fa0..0000000
--- a/local/.bin/mz-doy1/import
+++ /dev/null
@@ -1 +0,0 @@
-../hornet/import
\ No newline at end of file
diff --git a/local/.bin/mz-doy1/numkeys b/local/.bin/mz-doy1/numkeys
deleted file mode 120000
index 2e7ec6c..0000000
--- a/local/.bin/mz-doy1/numkeys
+++ /dev/null
@@ -1 +0,0 @@
-../hornet/numkeys
\ No newline at end of file
diff --git a/local/.bin/mz-doy1/sc b/local/.bin/mz-doy1/sc
deleted file mode 120000
index 634301f..0000000
--- a/local/.bin/mz-doy1/sc
+++ /dev/null
@@ -1 +0,0 @@
-../hornet/sc
\ No newline at end of file
diff --git a/local/.bin/mz-doy1/setup-inputs b/local/.bin/mz-doy1/setup-inputs
deleted file mode 120000
index 7bec592..0000000
--- a/local/.bin/mz-doy1/setup-inputs
+++ /dev/null
@@ -1 +0,0 @@
-../hornet/setup-inputs
\ No newline at end of file
diff --git a/local/.bin/mz-doy1/volume b/local/.bin/mz-doy1/volume
deleted file mode 120000
index 3c17399..0000000
--- a/local/.bin/mz-doy1/volume
+++ /dev/null
@@ -1 +0,0 @@
-../hornet/volume
\ No newline at end of file
diff --git a/nethack/.config/sh/rc.d/nethack b/nethack/.config/sh/rc.d/nethack
new file mode 100644
index 0000000..27583ba
--- /dev/null
+++ b/nethack/.config/sh/rc.d/nethack
@@ -0,0 +1 @@
+alias nao="ssh nethack@alt.org"
diff --git a/packages.hornet b/packages.hornet
index 2326275..f1556ee 100644
--- a/packages.hornet
+++ b/packages.hornet
@@ -1,7 +1,10 @@
 alacritty
 bash
+bin
 crawl
+exa
 fortune-mod
+fzf
 gdb
 git
 helix
@@ -9,7 +12,6 @@ i3
 i3status
 laptop
 less
-local
 mbsync
 mbsyncloop
 msmtp
@@ -17,7 +19,9 @@ mutt
 nethack
 notmuch
 picom
+podman
 ra-multiplex
+rbw
 readline
 redshift
 reply
diff --git a/packages.mail b/packages.mail
index 304771e..b304105 100644
--- a/packages.mail
+++ b/packages.mail
@@ -1,11 +1,13 @@
 bash
+bin
 crawl
+exa
 fortune-mod
+fzf
 gdb
 git
 helix
 less
-local
 mutt
 nethack
 readline
diff --git a/packages.mz-doy1 b/packages.mz-doy1
index aff328c..d5c164f 100644
--- a/packages.mz-doy1
+++ b/packages.mz-doy1
@@ -1,7 +1,10 @@
 alacritty
 bash
+bin
 docker
+exa
 fortune-mod
+fzf
 gdb
 git
 helix
@@ -9,7 +12,6 @@ i3
 i3status
 laptop
 less
-local
 picom
 ra-multiplex
 readline
diff --git a/packages.partofme b/packages.partofme
index 304771e..b304105 100644
--- a/packages.partofme
+++ b/packages.partofme
@@ -1,11 +1,13 @@
 bash
+bin
 crawl
+exa
 fortune-mod
+fzf
 gdb
 git
 helix
 less
-local
 mutt
 nethack
 readline
diff --git a/packages.root b/packages.root
index 4030e75..7dd524e 100644
--- a/packages.root
+++ b/packages.root
@@ -1,10 +1,12 @@
 bash
+bin
+exa
 fortune-mod
+fzf
 gdb
 git
 helix
 less
-local
 readline
 reply
 sh
diff --git a/packages.tozt b/packages.tozt
index 304771e..b304105 100644
--- a/packages.tozt
+++ b/packages.tozt
@@ -1,11 +1,13 @@
 bash
+bin
 crawl
+exa
 fortune-mod
+fzf
 gdb
 git
 helix
 less
-local
 mutt
 nethack
 readline
diff --git a/podman/.config/sh/rc.d/podman b/podman/.config/sh/rc.d/podman
new file mode 100644
index 0000000..0669942
--- /dev/null
+++ b/podman/.config/sh/rc.d/podman
@@ -0,0 +1,4 @@
+alias debian="podman run --rm -itv "${HOME}:${HOME}" docker.io/debian:stable bash"
+alias ubuntu="podman run --rm -itv "${HOME}:${HOME}" docker.io/ubuntu:latest bash"
+alias alpine="podman run --rm -itv "${HOME}:${HOME}" docker.io/alpine:latest sh"
+alias arch="podman run --rm -itv "${HOME}:${HOME}" docker.io/archlinux:latest sh"
diff --git a/local/.bin/hornet/p b/rbw/.bin/p
index cbf15c4..cbf15c4 100755
--- a/local/.bin/hornet/p
+++ b/rbw/.bin/p
diff --git a/local/.bin/hornet/scp b/rbw/.bin/scp
index ffd8d03..ffd8d03 120000
--- a/local/.bin/hornet/scp
+++ b/rbw/.bin/scp
diff --git a/local/.bin/hornet/sftp b/rbw/.bin/sftp
index ffd8d03..ffd8d03 120000
--- a/local/.bin/hornet/sftp
+++ b/rbw/.bin/sftp
diff --git a/local/.bin/hornet/ssh b/rbw/.bin/ssh
index bbacdf9..bbacdf9 100755
--- a/local/.bin/hornet/ssh
+++ b/rbw/.bin/ssh
diff --git a/local/.bin/hornet/ssh-askpass b/rbw/.bin/ssh-askpass
index ace037c..ace037c 100755
--- a/local/.bin/hornet/ssh-askpass
+++ b/rbw/.bin/ssh-askpass
diff --git a/local/.bin/hornet/sudo b/rbw/.bin/sudo
index 1ff8b23..1ff8b23 100755
--- a/local/.bin/hornet/sudo
+++ b/rbw/.bin/sudo
diff --git a/local/.bin/hornet/sudo-askpass b/rbw/.bin/sudo-askpass
index 2f928ed..2f928ed 100755
--- a/local/.bin/hornet/sudo-askpass
+++ b/rbw/.bin/sudo-askpass
diff --git a/rbw/.config/sh/rc.d/rbw b/rbw/.config/sh/rc.d/rbw
new file mode 100644
index 0000000..e40af5c
--- /dev/null
+++ b/rbw/.config/sh/rc.d/rbw
@@ -0,0 +1,5 @@
+alias pc="p | xclip -l 1"
+
+export GIT_SSH="${HOME}/.bin/ssh"
+export RSYNC_RSH="${HOME}/.bin/ssh"
+export SUDO_ASKPASS="${HOME}/.bin/sudo-askpass"
diff --git a/sh/.config/sh/rc.d/aliases b/sh/.config/sh/rc.d/aliases
deleted file mode 100644
index c5b716f..0000000
--- a/sh/.config/sh/rc.d/aliases
+++ /dev/null
@@ -1,35 +0,0 @@
-# improvements to common commands {{{
-alias ls="exa --group-directories-first --time-style=long-iso --git --color-scale"
-alias ll="ls -l"
-alias grep="grep --color=auto"
-alias rm="rm -i"
-alias cp="cp -i"
-alias mv="mv -i"
-alias bc="bc -lq"
-alias hx="helix"
-type tput >/dev/null 2>&1 && alias reset="tput reset"
-# }}}
-# games {{{
-alias nao="ssh nethack@alt.org"
-alias cao="env TERM=screen-256color /usr/bin/ssh -C -i \$HOME/.ssh/cao_key joshua@crawl.akrasiac.org"
-alias cdo="ssh -C -i \$HOME/.ssh/cao_key crawl@crawl.develz.org"
-# }}}
-# tmux sessions {{{
-alias main='tmux new -As main'
-alias chat='tmux new -As chat'
-alias work='tmux new -As work'
-alias docs='tmux new -As docs'
-alias misc='tmux new -As misc'
-# }}}
-# other {{{
-alias utc="env TZ=UTC date"
-alias pc="p | xclip -l 1"
-alias wifi="sudo systemctl restart iwd"
-alias debian="podman run --rm -itv "${HOME}:${HOME}" docker.io/debian:stable bash"
-alias ubuntu="podman run --rm -itv "${HOME}:${HOME}" docker.io/ubuntu:latest bash"
-alias alpine="podman run --rm -itv "${HOME}:${HOME}" docker.io/alpine:latest sh"
-alias arch="podman run --rm -itv "${HOME}:${HOME}" docker.io/archlinux:latest sh"
-alias cdu="cd \"\$(git root)\""
-# }}}
-
-# vim:ft=sh:fdm=marker
diff --git a/sh/.config/sh/rc.d/env b/sh/.config/sh/rc.d/env
deleted file mode 100644
index a715fdb..0000000
--- a/sh/.config/sh/rc.d/env
+++ /dev/null
@@ -1,19 +0,0 @@
-export MANPAGER="$HOME/.bin/vimmanpager"
-export PERLDOC_PAGER="$HOME/.bin/vimmanpager"
-EDITOR=$(command -v helix)
-export EDITOR
-ssh="${HOME}/.bin/$(hostname)/ssh"
-if [ -x "$ssh" ]; then
-    export GIT_SSH="$ssh"
-    export RSYNC_RSH="$ssh"
-fi
-if type sudo-askpass >/dev/null 2>&1; then
-    SUDO_ASKPASS=$(command -v sudo-askpass)
-    export SUDO_ASKPASS
-fi
-export TEXINPUTS=".:$HOME/.config/tex:"
-export LESS='-QR'
-export FZF_DEFAULT_OPTS="--reverse --inline-info --bind=tab:down,shift-tab:up,change:top,ctrl-space:toggle"
-export FZF_DEFAULT_COMMAND="rg --hidden -l ."
-
-# vim:ft=sh:
diff --git a/sh/.config/sh/rc.d/sh b/sh/.config/sh/rc.d/sh
new file mode 100644
index 0000000..319b6d9
--- /dev/null
+++ b/sh/.config/sh/rc.d/sh
@@ -0,0 +1,10 @@
+alias ll="ls -l"
+alias grep="grep --color=auto"
+alias rm="rm -i"
+alias cp="cp -i"
+alias mv="mv -i"
+alias bc="bc -lq"
+type tput >/dev/null 2>&1 && alias reset="tput reset"
+alias utc="env TZ=UTC date"
+
+# vim:ft=sh:fdm=marker
diff --git a/tex/.config/sh/rc.d/tex b/tex/.config/sh/rc.d/tex
new file mode 100644
index 0000000..7a0fba8
--- /dev/null
+++ b/tex/.config/sh/rc.d/tex
@@ -0,0 +1 @@
+export TEXINPUTS=".:$HOME/.config/tex:"
diff --git a/tmux/.config/sh/rc.d/tmux b/tmux/.config/sh/rc.d/tmux
new file mode 100644
index 0000000..520e98c
--- /dev/null
+++ b/tmux/.config/sh/rc.d/tmux
@@ -0,0 +1,5 @@
+alias main='tmux new -As main'
+alias chat='tmux new -As chat'
+alias work='tmux new -As work'
+alias docs='tmux new -As docs'
+alias misc='tmux new -As misc'
diff --git a/vimmanpager/.config/sh/rc.d/vimmanpager b/vimmanpager/.config/sh/rc.d/vimmanpager
new file mode 100644
index 0000000..2dda5dd
--- /dev/null
+++ b/vimmanpager/.config/sh/rc.d/vimmanpager
@@ -0,0 +1,2 @@
+export MANPAGER="$HOME/.bin/vimmanpager"
+export PERLDOC_PAGER="$HOME/.bin/vimmanpager"