lksz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix TrueNAS SCALE oriented cli tools

This commit is contained in:
Lockszmith (@kateryna) 2024-11-24 21:54:37 -05:00
parent db7ba3de56
commit ec1123ecb9
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_home/private_dot_config/sz.env/fix-kubectl.env
View File

@ -1,5 +1,7 @@
#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
if is_cmd fix-kubectl; then if is_cmd szetup-kubectl4k3s && [ "$(systemctl is-active k3s.service)" = "active" ]; then
. <( fix-kubectl - ) . <( szetup-kubectl4k3s - )
[[ -n "${DBG}" ]] && echo "kubectl for k3s setup complete."
fi fi

8
_home/private_dot_config/sz.env/truenas-scale.env
View File

@ -5,6 +5,14 @@ if is_cmd midclt; then
if [ -e "$SCALE_POOL_ROOT/jailmaker/jlmkr.py" ]; then if [ -e "$SCALE_POOL_ROOT/jailmaker/jlmkr.py" ]; then
#alias jlmkr="bash -c '_jlmkr() { $SCALE_POOL_ROOT/jailmaker/jlmkr.py \${@:---help}; }; _jlmkr \$@' " #alias jlmkr="bash -c '_jlmkr() { $SCALE_POOL_ROOT/jailmaker/jlmkr.py \${@:---help}; }; _jlmkr \$@' "
function jlmkr() { sudo $SCALE_POOL_ROOT/jailmaker/jlmkr.py "${@:---help}"; } function jlmkr() { sudo $SCALE_POOL_ROOT/jailmaker/jlmkr.py "${@:---help}"; }
jlmkr-zellij() {
zellij action go-to-tab-name --create "jailmkr"
zellij action new-pane --name "${1:?must pass jail name}@jlmkr" -- sh -ci "reset; sudo $SCALE_POOL_ROOT/jailmaker/jlmkr.py shell --uid ${UID} ${1}"
zellij action focus-previous-pane
zellij action close-pane
}
fi fi
fi fi
fi fi

9
_home/private_dot_local/bin/executable_load-zellij
View File

@ -15,9 +15,9 @@ BASE_SHELL=$(basename "$SHELL")
if is_sourced; then if is_sourced; then
zellij-cleanup() { zellij-cleanup() {
[[ -r "$HOME/bin/zellij" ]] && rm "$HOME/bin/zellij" type -pa zellij > /dev/null && type -pa zellij | sed -Ee 's/^.* is //' | awk '{ print $1 }' | grep -E "^$HOME" | xargs -tr rm
[[ -d "$HOME/.cache/zellij" ]] && rm -fR "$HOME/.cache/zellij" [[ -d "$HOME/.cache/zellij" ]] && echo "$HOME/.cache/zellij" | xargs -rt rm -fR
[[ -d /tmp/zellij ]] && rm -fR /tmp/zellij find /tmp -maxdepth 1 -mindepth 1 -type d -name 'zellij*' -print0 | xargs -r0t rm -fR
printf 'Zellij has been cleaned up, you can now reinstall it.\n' printf 'Zellij has been cleaned up, you can now reinstall it.\n'
} }
zellij() { zellij() {
@ -38,11 +38,14 @@ if is_sourced; then
fi fi
} }
zellij-completion() {
if [[ "${BASE_SHELL}" == "zsh" ]]; then if [[ "${BASE_SHELL}" == "zsh" ]]; then
. <( zellij setup --generate-completion zsh | sed -Ee 's/^(_(zellij) ).*/compdef \1\2/' ) . <( zellij setup --generate-completion zsh | sed -Ee 's/^(_(zellij) ).*/compdef \1\2/' )
else else
. <( zellij setup --generate-completion "$BASE_SHELL" ) . <( zellij setup --generate-completion "$BASE_SHELL" )
fi fi
}
zellij-completion
# Was needed when zsh would load # Was needed when zsh would load
# . <( zellij setup --generate-completion "$BASE_SHELL" | sed -ne '/^function/,$p' ) # . <( zellij setup --generate-completion "$BASE_SHELL" | sed -ne '/^function/,$p' )
if [[ -z "$ZELLIJ_SESSION_NAME" ]]; then if [[ -z "$ZELLIJ_SESSION_NAME" ]]; then