1 files changed, 63 insertions, 77 deletions

diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index c628e2e9..702990c3 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -2,17 +2,14 @@ dir() {
     curlArchive=false
     templateArchive=""
     repoUrl=""
-    nixShell=""
-    findNix=false
     dir=""
     forceShell=false
     wormhole=false
     gitWorktree=""
-    # notmuchMsg=""
-    quickserve=false
     modifyPDF=""
+    miniserve=false
 
-    while getopts ':t:a:s:Sd:ir:wqg:p:' arg; do
+    while getopts ':t:a:d:ir:wg:p:m' arg; do
         case $arg in
             "t") ;;
             "a")
@@ -23,16 +20,13 @@ dir() {
                     templateArchive=${OPTARG:a}
                 fi
                 ;;
-            "s") nixShell=${OPTARG:a} ;;
-            "S") findNix=true ;;
             "d") dir=${OPTARG} ;;
             "i") forceShell=true ;;
             "r") repoUrl=${OPTARG} ;;
             "w") wormhole=true ;;
             "g") gitWorktree=${OPTARG} ;;
-            # "n") notmuchMsg=${OPTARG} ;;
-            "q") quickserve=true ;;
             "p") modifyPDF=${OPTARG:a} ;;
+            "m") miniserve=true ;;
             *) printf "Invalid option: %s\n" $arg >&2; exit 2 ;;
         esac
     done
@@ -56,20 +50,34 @@ dir() {
         gitWorktree=""
     fi
 
+    miniservePIDFile=""
+    if [[ ${miniserve} = "true" ]]; then
+      miniservePIDFile=$(mktemp --tmpdir --suffix=.pid)
+    fi
+
     cleanup()
     {
-        cd ${modifyPDF:h}
-        [[ -n ${modifyPDF} ]] && nix shell 'nixos#imagemagick' -c convert -verbose ${dir}/${modifyPDF:t:r}_*.png(on) ${modifyPDF}
+        if [[ -n ${modifyPDF} ]]; then
+           cd ${modifyPDF:h}
+           typeset -a pages
+           eval 'pages=(${dir}/${modifyPDF:t:r}_*.png(on))'
+           magick -verbose "$pages" ${modifyPDF}
+           modifyPDF=""
+        fi
+        if [[ -n ${miniservePIDFile} ]]; then
+           command kill --verbose -- $(cat ${miniservePIDFile}) && wait $(cat ${miniservePIDFile})
+           miniservePIDFile=""
+        fi
     }
 
     (
+        set -o localoptions -o localtraps
+        trap 'return 1' INT TERM
         trap cleanup EXIT
 
         cd ${dir}
         export dir;
 
-        ${findNix} && { nixShell=$(findNix) || return $? }
-
         [[ -n ${repoUrl} ]] && git clone -- ${repoUrl} .
 
         [[ -n ${modifyPDF} ]] && templateArchive=${modifyPDF}
@@ -82,23 +90,23 @@ dir() {
                 }
                 trap cleanup EXIT
 
-                if ${curlArchive}; then
+                if [[ $curlArchive = "true" ]]; then
                     archiveFile=$(mktemp -t "archive.XXXXXXXXXX.${templateArchive:t}")
 
-                    curl -L -o ${archiveFile} ${templateArchive}
+                    curl -SfL -o ${archiveFile} ${templateArchive}
 
                     templateArchive=${archiveFile}
                 fi
 
                 unpack=true
-                while ${unpack}; do
+                while [[ $unpack = "true" ]]; do
                     case $(file --brief --mime-type --dereference ${templateArchive}) in
                         application/zip)
                             unzip ${templateArchive}
                             unpack=false
                         ;;
                         application/vnd.debian.binary-package)
-                            nix shell 'nixos#binutils' --command ar x ${templateArchive}
+                            ar x ${templateArchive}
                             mkdir control data
                             tar -C control -xvaf control.*
                             tar -C data -xvaf data.*
@@ -106,7 +114,7 @@ dir() {
                         ;;
                         application/x-rpm)
                             cpioArchive=$(mktemp -t "archive.XXXXXXXXXX.${templateArchive:t:r}.cpio")
-                            nix shell 'nixos#busybox' --command rpm2cpio ${templateArchive} > ${cpioArchive}
+                            rpm2cpio ${templateArchive} > ${cpioArchive}
                             templateArchive=${cpioArchive}
                             unpack=true
                         ;;
@@ -115,15 +123,19 @@ dir() {
                             unpack=false
                         ;;
                         application/pdf)
-                            nix shell 'nixos#ghostscript' 'nixos#imagemagick' -c convert -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png
+                            magick -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png
                             unpack=false
                         ;;
                         application/octet-stream)
-                            if [[ $(file --brief --dereferenc ${templateArchive}) =~ Squashfs ]]; then
-                               nix shell 'nixos#squashfsTools' -c unsquashfs -d . ${templateArchive}
+                            if [[ $(file --brief --dereference ${templateArchive}) =~ Squashfs ]]; then
+                               unsquashfs -d . ${templateArchive}
                                unpack=false
                             fi
                         ;;
+                        application/x-iso9660-image)
+                          7z x ${templateArchive}
+                          unpack=false
+                        ;;
                         *)
                             tar -xvaf ${templateArchive}
                             unpack=false
@@ -134,25 +146,21 @@ dir() {
         fi
 
 
-        ${wormhole} && wormhole receive --accept-file
+        [[ $wormhole = "true" ]] && wormhole receive --accept-file
 
 
-        if ${quickserve}; then
-          quickserve --root . --upload . --show-hidden --tar gz
+        if [[ ${#@} -gt 0 ]]; then
+            ${@}
         fi
 
+        cd $(pwd) # Needed for mounting to work
 
-        if [[ ${#@} -eq 0 ]] || ${forceShell}; then
-            if [[ ${#@} -gt 0 ]]; then
-                if [[ -z ${nixShell} ]]; then
-                    ${@}
-                else
-                    nix-shell ${nixShell} --run "${@}"
-                fi
-            fi
-
-            cd $(pwd) # Needed for mounting to work
+        if [[ ${miniserve} = "true" ]]; then
+           miniserve --random-route --hidden --enable-tar-gz --enable-zip . &
+           echo $! > "${miniservePIDFile}"
+        fi
 
+        if [[ ${#@} -eq 0 ]] && [[ ${miniserve} != "true" ]] || [[ $forceShell = "true" ]]; then
             isSingleDir() {
                 typeset -a contents
                 contents=(*(N) .*(N))
@@ -166,18 +174,9 @@ dir() {
             }
             while d=$(isSingleDir); do cd ${d}; done
 
-
-            if [[ -z ${nixShell} ]]; then
-                zsh
-            else
-                nix-shell ${nixShell} --run zsh
-            fi
-        else
-            if [[ -z ${nixShell} ]]; then
-                ${@}
-            else
-                nix-shell ${nixShell} --run "${@}"
-            fi
+            zsh
+        elif [[ ${miniserve} == "true" ]]; then
+            wait $(cat "${miniservePIDFile}")
         fi
     )
 }
@@ -185,27 +184,30 @@ dir() {
 tmpdir() {
     cleanup()
     {
-      cd /
+        cd /
         unmount() {
             printf "Unmounting %s\n" ${1} >&2
             fusermount -u ${1} || umount ${1} || sudo umount ${1}
         }
 
-        if mountpoint -q -- ${dir}; then
-            unmount ${dir} || return $?
-        else
-            while read -d $'\0' subDir; do
-                mountpoint -q -- ${subDir} || continue
-                unmount ${subDir} || return $?
-            done <<<$(find ${dir} -xdev -type d -print0 | sort -zr)
-        fi
-
-        rm -rfv --one-file-system -- ${dir}
+        if [[ -n ${dir} ]]; then
+            if mountpoint -q -- ${dir}; then
+                unmount ${dir} || return $?
+            else
+                while read -d $'\0' subDir; do
+                    mountpoint -q -- ${subDir} || continue
+                    unmount ${subDir} || return $?
+                done <<<$(find ${dir} -xdev -type d -print0 | sort -zr)
+            fi
+
+            rm -rfv --one-file-system -- ${dir}
+            dir=""
+        fi
     }
 
     local tmpdir=""
 
-    while getopts ':t:a:s:Sd:ir:wqg:p:' arg; do
+    while getopts ':t:a:d:ir:wg:p:m' arg; do
         case $arg in
             "t") tmpdir="=${OPTARG}" ;;
             "?"|":") printf "Invalid option: %s\n" $arg >&2; exit 2 ;;
@@ -213,6 +215,8 @@ tmpdir() {
     done
 
     (
+        set -o localoptions -o localtraps
+        trap 'return 1' INT TERM
         trap cleanup EXIT
 
 
@@ -231,17 +235,7 @@ clock() {
 }
 
 public-ip() {
-    curl -s -H 'Accept: application/json' $@ ifconfig.co | jq -r '.ip'
-}
-
-nix-ghci() {
-    pkgExpr=""
-    if [[ ${#@} -gt 0 ]]; then
-        pkgExpr="${1}"
-        shift
-    fi
-
-    nix-shell -p "with (import <nixpkgs> {}); pkgs.haskellPackages.ghcWithPackages (p: with p; [${pkgExpr}])" --run "ghci ${@}"
+    curl -sSf -H 'Accept: application/json' $@ ifconfig.co | jq -r '.ip'
 }
 
 swap() {
@@ -271,14 +265,6 @@ l() {
   ls --long --binary --git --time-style=iso --header $@
 }
 
-re() {
-  systemctl restart $@
-}
-
-ure() {
-  systemctl --user restart $@
-}
-
 ssh-installer() {
   ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/gkleen@sif.midgard.yggdrasil $@
 }