.config/zsh/alias/containers.zsh

@@ -3,47 +3,12 @@
 alias bud='buildah bud --isolation chroot --network host --format docker -f '
 
 alias pod-run='podman run -e "TERM=${TERM:-linux}" --rm -it '
+alias pod-run-sh="pod-run --network host --entrypoint='[\"/bin/sh\"]' --user=0:0 "
+alias pod-ps='podman ps '
 alias pod-images='podman images --format "table {{.ID}} {{.Repository}}:{{.Tag}} {{.Size}} {{.Created}} |{{.CreatedAt}}" '
 alias pod-inspect='podman inspect '
 alias pod-logs='podman logs '
 
-typeset -Uga ZSHU_CNTR_SHELLS=( /bin/bash /bin/sh /bin/ash )
-typeset -ga ZSHU_CNTR_FALLBACK_SHELL=( /busybox/busybox sh )
-
-z-pod() { command podman "$@" ; }
-
-z-pod-run() {
-    z-pod run -e "TERM=${TERM:-linux}" --rm -it "$@"
-}
-
-## NB: naive. rewrite!
-pod-run-sh() {
-    local -a cntr_opts=( --network=host --entrypoint='[]' --user=0:0 )
-    local i
-    local -a shell
-    for i ( ${ZSHU_CNTR_SHELLS} ) ; do
-        echo "pod-run-sh: trying $i as shell" >&2
-        z-pod-run ${cntr_opts[@]} "$@" "$i" -c ':' 2>/dev/null || continue
-        shell=($i) ; break
-    done
-    while [ -z "${shell}" ] ; do
-        echo "pod-run-sh: trying '${ZSHU_CNTR_FALLBACK_SHELL[*]}' as last-resort shell" >&2
-        z-pod-run ${cntr_opts[@]} "$@" ${ZSHU_CNTR_FALLBACK_SHELL[@]} -c ':' 2>/dev/null || break
-        shell=(${ZSHU_CNTR_FALLBACK_SHELL})
-        break
-    done
-    if [ -z "${shell}" ] ; then
-        echo "unable to run: $*"
-        return 1
-    fi
-    z-pod-run ${cntr_opts[@]} "$@" ${shell[@]}
-}
-
-pod-ps() {
-    [ $# -ne 0 ] || set -- -a --format 'table {{.ID}} {{.Names}} {{.Image}} {{.CreatedHuman}} {{.Status}}'
-    command podman ps "$@"
-}
-
 sko-inspect() {
     local i
     i="${1:?}" ; shift
@@ -63,80 +28,24 @@ pod-dive() {
 }
 
 jq-visual() {
-    command jq -C | less
+    jq -C | less
 }
 
 jq-config() {
-    command jq '.[].Config'
+    jq '.[].Config'
 }
 
 jq-tags() {
-    command jq -r '.Tags[]'
+    jq -r '.Tags[]'
 }
 
+if [ ${UID} -ne 0 ] ; then
+    alias docker='sudo docker '
+fi
 alias dkr='docker '
-alias dkr-run='dkr run -e "TERM=${TERM:-linux}" --rm -it '
+alias dkr-run='dkr run -e "TERM=${TERM:-linux}" --network host --rm -it '
+alias dkr-run-sh="dkr-run --entrypoint='' --user=0:0 "
 alias dkr-ps='dkr ps '
 alias dkr-images='dkr images --format "table {{.ID}}\\t{{.Repository}}:{{.Tag}}\\t{{.Size}}\\t{{.CreatedAt}}" '
 alias dkr-inspect='dkr inspect '
 alias dkr-logs='dkr logs '
-
-z-dkr() { command docker "$@" ; }
-
-z-dkr-run() {
-    z-dkr run -e "TERM=${TERM:-linux}" --rm -it "$@"
-}
-
-## NB: naive. rewrite!
-dkr-run-sh() {
-    local -a cntr_opts=( --network=host --entrypoint='' --user=0:0 )
-    local i
-    local -a shell
-    for i ( ${ZSHU_CNTR_SHELLS} ) ; do
-        echo "dkr-run-sh: trying $i as shell" >&2
-        z-dkr-run ${cntr_opts[@]} "$@" "$i" -c ':' 2>/dev/null || continue
-        shell=($i) ; break
-    done
-    while [ -z "${shell}" ] ; do
-        echo "dkr-run-sh: trying '${ZSHU_CNTR_FALLBACK_SHELL[*]}' as last-resort shell" >&2
-        z-dkr-run ${cntr_opts[@]} "$@" ${ZSHU_CNTR_FALLBACK_SHELL[@]} -c ':' 2>/dev/null || break
-        shell=(${ZSHU_CNTR_FALLBACK_SHELL})
-        break
-    done
-    if [ -z "${shell}" ] ; then
-        echo "unable to run: $*"
-        return 1
-    fi
-    z-dkr-run ${cntr_opts[@]} "$@" ${shell[@]}
-}
-
-dkr-dive() {
-    local i
-    i="${1:?}" ; shift
-    command dive "$@" "docker://$i"
-}
-
-typeset -ga ZSHU_GRP_DOCKER=docker
-z-adjust-docker() {
-    [ ${UID} -eq 0 ] && return 0
-
-    getent group "${ZSHU_GRP_DOCKER}" >/dev/null || return 1
-    (( ${+commands[docker]} )) || return 127
-
-    local _users=$(getent group "${ZSHU_GRP_DOCKER}" | cut -d: -f4)
-    local -a users=("${(@s[,])_users}")
-    local i found
-    for i ( ${users}) ; do
-        if [ "$i" = "${USERNAME}" ] ; then
-            found=1
-            break
-        fi
-    done
-    [ -n "${found}" ] && return 0
-
-    (( ${+commands[sudo]} )) || return 127
-
-    alias docker='sudo docker '
-    z-dkr() { command sudo docker "$@" ; }
-    return 0
-}

.config/zsh/lib/pswalk.zsh

@@ -78,6 +78,6 @@ z-run-test() {
 }
 
 z-run-test gui       konsole xterm x-terminal-emulator
-z-run-test nested    SCREEN screen tmux mc
+z-run-test nested    screen tmux mc
 z-run-test nested1L  mc
 z-run-test elevated  sudo su

.config/zsh/local/env.zsh.example

@@ -2,7 +2,6 @@
 
 z-ssh-agent
 z-gpg-agent
-z-adjust-docker
 
 ## systemctl status podman.socket
 export DOCKER_HOST=unix:///run/podman/podman.sock