From 14cfa4bf3374edb61d1a85ec4c3ba2c86f70d251 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 8 Nov 2023 13:25:14 +0100 Subject: [PATCH] feat: server packages --- groups/shell/basics | 10 +-- groups/shell/extrac | 3 + groups/{server => shell/minimal} | 1 - groups/shell/tools | 3 +- instalee | 9 ++- packages/bpytop/apt | 0 packages/bpytop/arch | 0 packages/fd/apt | 1 + packages/instalee/linux | 3 +- packages/k9s-toggle/depends | 1 + packages/k9s-toggle/k9s-toggle.yml | 99 ++++++++++++++++++++++++++++++ packages/k9s-toggle/linux | 2 + packages/lzop/aur | 1 + packages/vma/_aur | 1 + packages/vma/binary | 1 + 15 files changed, 125 insertions(+), 10 deletions(-) create mode 100644 groups/shell/extrac rename groups/{server => shell/minimal} (88%) create mode 100644 packages/bpytop/apt create mode 100644 packages/bpytop/arch create mode 100644 packages/fd/apt create mode 100644 packages/k9s-toggle/depends create mode 100644 packages/k9s-toggle/k9s-toggle.yml create mode 100755 packages/k9s-toggle/linux create mode 100644 packages/lzop/aur create mode 100644 packages/vma/_aur create mode 100644 packages/vma/binary diff --git a/groups/shell/basics b/groups/shell/basics index 3720a03..1dc8413 100644 --- a/groups/shell/basics +++ b/groups/shell/basics @@ -1,6 +1,8 @@ -curl -git -zsh +shell/minimal +man bat neovim -man-db +fd +bpytop +tree +wget diff --git a/groups/shell/extrac b/groups/shell/extrac new file mode 100644 index 0000000..7b33c8c --- /dev/null +++ b/groups/shell/extrac @@ -0,0 +1,3 @@ +# Dependencies for my pve backup extraction script +vma +lzop diff --git a/groups/server b/groups/shell/minimal similarity index 88% rename from groups/server rename to groups/shell/minimal index e488221..3dc74e0 100644 --- a/groups/server +++ b/groups/shell/minimal @@ -3,5 +3,4 @@ sudo git tmux curl -man pfetch diff --git a/groups/shell/tools b/groups/shell/tools index 9eca899..ed83498 100644 --- a/groups/shell/tools +++ b/groups/shell/tools @@ -1,6 +1,5 @@ shell/basics -tree -wget +zsh texinfo fzf expect diff --git a/instalee b/instalee index 6ea6456..29b6c57 100755 --- a/instalee +++ b/instalee @@ -19,19 +19,24 @@ dir_packages="$dir_home/packages" highlight() { echo $2 "$1" >&2; } destress() { echo $2 "$1" >&2; } +# Cat a file, filtering out dos line endings and commented lines +catfile() { + cat "$@" | tr -d '\r' | sed '/^#/d' +} + # Get the content of a file or the output of its execution getcontent() { for arg; do if test -z "$noexec" && test -x "$arg" then "$arg" - else cat "$arg" | tr -d '\r' + else catfile "$arg" fi done } # Get available package entries for given package getentries() { - cat "$handlersfile" | tr -d '\r' | while read handler + catfile "$handlersfile" | while read handler do find "$dir_packages/$1/" -depth -type f -name "$handler*" 2>/dev/null | tac done } diff --git a/packages/bpytop/apt b/packages/bpytop/apt new file mode 100644 index 0000000..e69de29 diff --git a/packages/bpytop/arch b/packages/bpytop/arch new file mode 100644 index 0000000..e69de29 diff --git a/packages/fd/apt b/packages/fd/apt new file mode 100644 index 0000000..c11a923 --- /dev/null +++ b/packages/fd/apt @@ -0,0 +1 @@ +fd-find diff --git a/packages/instalee/linux b/packages/instalee/linux index 0a998a6..3bf7c21 100755 --- a/packages/instalee/linux +++ b/packages/instalee/linux @@ -1,7 +1,8 @@ #!/bin/sh -e # From https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=instalee-git _pkgname='instalee' -cd "$(readlink /proc/$(ps -o ppid= $PPID | tr -d ' ')/cwd || $dir_home)" +cd $(dirname $(dirname $(dirname "$0"))) +#cd "$(readlink /proc/$(ps -o ppid= $PPID | tr -d ' ')/cwd || $dir_home)" #cd "$(readlink /proc/$(ps -o ppid= $(ps -o ppid= $PPID) | tr -d ' ')/cwd || $dir_home)" usrdir="${pkgdir}/usr/local" bin="${usrdir}/bin" diff --git a/packages/k9s-toggle/depends b/packages/k9s-toggle/depends new file mode 100644 index 0000000..5479dc9 --- /dev/null +++ b/packages/k9s-toggle/depends @@ -0,0 +1 @@ +k9s diff --git a/packages/k9s-toggle/k9s-toggle.yml b/packages/k9s-toggle/k9s-toggle.yml new file mode 100644 index 0000000..766237b --- /dev/null +++ b/packages/k9s-toggle/k9s-toggle.yml @@ -0,0 +1,99 @@ +# https://github.com/derailed/k9s/blob/master/plugins/flux.yaml +# move selected line to chosen resource in K9s, then: +# Shift-T (with confirmation) to toggle helm releases or kustomizations suspend and resume +# Shift-R (no confirmation) to reconcile a git source or a helm release or a kustomization +plugin: + + toggle-helmrelease: + shortCut: Shift-T + confirm: true + scopes: + - helmreleases + description: Toggle to suspend or resume a HelmRelease + command: sh + background: true + args: + - -c + - "flux $([ $(kubectl get helmreleases -n $NAMESPACE $NAME -o=custom-columns=TYPE:.spec.suspend | tail -1) = \"true\" ] && echo \"resume\" || echo \"suspend\") helmrelease -n $NAMESPACE $NAME | less" + + toggle-kustomization: + shortCut: Shift-T + confirm: true + scopes: + - kustomizations + description: Toggle to suspend or resume a Kustomization + command: sh + background: true + args: + - -c + - "flux $([ $(kubectl get kustomizations -n $NAMESPACE $NAME -o=custom-columns=TYPE:.spec.suspend | tail -1) = \"true\" ] && echo \"resume\" || echo \"suspend\") kustomization -n $NAMESPACE $NAME | less" + + reconcile-git: + shortCut: Shift-R + confirm: false + description: Flux reconcile + scopes: + - gitrepositories + command: sh + # background: false + background: true + args: + - -c + - "flux reconcile source git -n $NAMESPACE $NAME | less" + + reconcile-hr: + shortCut: Shift-R + confirm: false + description: Flux reconcile + scopes: + - helmreleases + command: sh + # background: false + background: true + args: + - -c + - "flux reconcile helmrelease -n $NAMESPACE $NAME | less" + + reconcile-ks: + shortCut: Shift-R + confirm: false + description: Flux reconcile + scopes: + - kustomizations + command: sh + # background: false + background: true + args: + - -c + - "flux reconcile kustomization -n $NAMESPACE $NAME | less" + + getall-ns: + shortCut: Shift-G + confirm: false + description: Get All Resources in NS + scopes: + - namespaces + command: sh + background: false + args: + - -c + - "kubectl get all -n $NAME | less" + + # https://github.com/derailed/k9s/issues/1017#issuecomment-769005253 + # requires https://github.com/rajatjindal/kubectl-modify-secret installed + # i.e. by krew install modify-secret + edit-secret: + shortCut: Ctrl-X + confirm: false + description: "Edit Decoded Secret" + scopes: + - secrets + command: kubectl + background: false + args: + - modify-secret + - --namespace + - $NAMESPACE + - --context + - $CONTEXT + - $NAME diff --git a/packages/k9s-toggle/linux b/packages/k9s-toggle/linux new file mode 100755 index 0000000..48d8531 --- /dev/null +++ b/packages/k9s-toggle/linux @@ -0,0 +1,2 @@ +#!/bin/sh +install -D $(dirname $0)/k9s-toggle.yml ${XDG_CONFIG_HOME:-$HOME/.config}/k9s/plugin.yml diff --git a/packages/lzop/aur b/packages/lzop/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/lzop/aur @@ -0,0 +1 @@ + diff --git a/packages/vma/_aur b/packages/vma/_aur new file mode 100644 index 0000000..2581701 --- /dev/null +++ b/packages/vma/_aur @@ -0,0 +1 @@ +vma-git diff --git a/packages/vma/binary b/packages/vma/binary new file mode 100644 index 0000000..d330dd7 --- /dev/null +++ b/packages/vma/binary @@ -0,0 +1 @@ +https://raw.githubusercontent.com/jancc/vma-extractor/master/vma.py