From 848627e95ecc81af5d069bd690e6481a428bf700 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Thu, 2 May 2024 17:14:15 +0200
Subject: [PATCH 01/32] fix: add missing permissions to release-please

---
 .github/workflows/release-please.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index f2aa6b0..ed205d1 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -2,6 +2,12 @@ on:
   push:
     branches:
       - main
+
+
+permissions:
+  contents: write
+  pull-requests: write
+
 name: release-please
 jobs:
   release-please:

From 949f39209f8ccc8786fd94eba8350d796ab006a6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 15:16:35 +0000
Subject: [PATCH 02/32] chore(main): release 1.0.0

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8aa4b9..492df3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.0.0 (2024-05-02)
+
+
+### Features
+
+* add go packages ([d134acb](https://github.com/babariviere/boxkit/commit/d134acbceecd4a51a193e921e2602f04c197b4a1))
+
+
+### Bug Fixes
+
+* add missing permissions to release-please ([848627e](https://github.com/babariviere/boxkit/commit/848627e95ecc81af5d069bd690e6481a428bf700))
+
 ## [1.1.0](https://github.com/ublue-os/boxkit/compare/v1.0.0...v1.1.0) (2023-10-09)
 
 

From ed8f7a436fff0bc77783776917f566342bb25078 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Thu, 2 May 2024 17:14:15 +0200
Subject: [PATCH 03/32] chore: remove release-please

---
 .github/workflows/release-please.yml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 .github/workflows/release-please.yml

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
deleted file mode 100644
index f2aa6b0..0000000
--- a/.github/workflows/release-please.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-name: release-please
-jobs:
-  release-please:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: google-github-actions/release-please-action@v4
-        with:
-          release-type: simple
-          package-name: release-please-action

From ca0505ca5f121c71ed6af77adf40b695c69e21c9 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Thu, 2 May 2024 17:28:29 +0200
Subject: [PATCH 04/32] chore: add zoxide

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index af4ac64..a01fe1f 100644
--- a/extra-packages
+++ b/extra-packages
@@ -31,3 +31,4 @@ starship
 wl-clipboard
 yq-go
 zstd
+zoxide
\ No newline at end of file

From 97123369e3415baf55ac1a994a67ee258936ed05 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Thu, 2 May 2024 17:59:20 +0200
Subject: [PATCH 05/32] chore: add kubeseal

---
 go-packages | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/go-packages b/go-packages
index 6450439..8992550 100644
--- a/go-packages
+++ b/go-packages
@@ -1 +1,2 @@
-forge.babariviere.com/babariviere/sealme@latest
\ No newline at end of file
+forge.babariviere.com/babariviere/sealme@latest
+github.com/bitnami-labs/sealed-secrets/cmd/kubeseal@main
\ No newline at end of file

From aa0deb29f5b0ffd0f78c9140b94fc753bbaeb564 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Thu, 2 May 2024 18:03:55 +0200
Subject: [PATCH 06/32] fix: use xargs -n1 to spawn individual go install

---
 Containerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index b259d16..45e1e8e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -12,7 +12,7 @@ RUN apk update && \
 RUN rm /extra-packages
 
 COPY go-packages /
-RUN grep -v '^#' /go-packages | xargs go install
+RUN grep -v '^#' /go-packages | xargs -n1 go install
 RUN rm /go-packages
 RUN mv /root/go/bin/* /usr/local/bin/
 

From 5e02c379a33c61eef5a90453df6a00534a1e84b5 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Thu, 2 May 2024 18:26:13 +0200
Subject: [PATCH 07/32] chore: add flux

---
 Containerfile  | 2 ++
 extra-packages | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Containerfile b/Containerfile
index 45e1e8e..4db9746 100644
--- a/Containerfile
+++ b/Containerfile
@@ -5,6 +5,8 @@ LABEL com.github.containers.toolbox="true" \
       summary="A cloud-native terminal experience" \
       maintainer="jorge.castro@gmail.com"
 
+RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+
 COPY extra-packages /
 RUN apk update && \
     apk upgrade && \
diff --git a/extra-packages b/extra-packages
index a01fe1f..7b85472 100644
--- a/extra-packages
+++ b/extra-packages
@@ -10,6 +10,7 @@ emacs-pgtk
 eza
 fd
 ffmpeg
+flux
 fzf
 github-cli
 go

From 095b3eb588edd09e35b09e26ac117462f7534a33 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Thu, 2 May 2024 19:11:11 +0200
Subject: [PATCH 08/32] chore: add bash completion

---
 extra-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extra-packages b/extra-packages
index 7b85472..0e0668b 100644
--- a/extra-packages
+++ b/extra-packages
@@ -19,7 +19,9 @@ helm
 jq
 just
 kubectl
+kubectl-bash-completion
 kubectx
+kubectx-bash-completion
 make
 micro
 nano

From 7434336baf4d1625355b31a57b1b731e0c9b4b4d Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Fri, 3 May 2024 13:40:48 +0200
Subject: [PATCH 09/32] chore: add fish

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index 0e0668b..1a838eb 100644
--- a/extra-packages
+++ b/extra-packages
@@ -10,6 +10,7 @@ emacs-pgtk
 eza
 fd
 ffmpeg
+fish
 flux
 fzf
 github-cli

From de2132ca106d6bae50a96e9be548785a4cb5e8a4 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Mon, 20 May 2024 14:23:52 +0200
Subject: [PATCH 10/32] chore: add kustomize

---
 extra-packages | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extra-packages b/extra-packages
index 1a838eb..01a139d 100644
--- a/extra-packages
+++ b/extra-packages
@@ -21,8 +21,13 @@ jq
 just
 kubectl
 kubectl-bash-completion
+kubectl-fish-completion
 kubectx
 kubectx-bash-completion
+kubectx-fish-completion
+kustomize
+kustomize-bash-completion
+kustomize-fish-completion
 make
 micro
 nano

From e3cef9a42c912956bc166d61044c1d0117058fd4 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 15 Jun 2024 15:37:06 +0200
Subject: [PATCH 11/32] chore: add sops

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index 01a139d..c1b9741 100644
--- a/extra-packages
+++ b/extra-packages
@@ -35,6 +35,7 @@ ncdu
 ncurses
 plocate
 ripgrep
+sops
 speedtest-cli
 starship
 wl-clipboard

From 97ab8e7730df0755947a4e23b5fdd4a27816addf Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 15 Jun 2024 15:40:11 +0200
Subject: [PATCH 12/32] fix: remove kubectl-fish-completion

---
 extra-packages | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extra-packages b/extra-packages
index c1b9741..8a69865 100644
--- a/extra-packages
+++ b/extra-packages
@@ -21,7 +21,6 @@ jq
 just
 kubectl
 kubectl-bash-completion
-kubectl-fish-completion
 kubectx
 kubectx-bash-completion
 kubectx-fish-completion

From 56931810ace49617a83becdbaca952cfa53859dc Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 15 Jun 2024 16:23:56 +0200
Subject: [PATCH 13/32] feat: add tealdeer

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index 8a69865..51bc583 100644
--- a/extra-packages
+++ b/extra-packages
@@ -37,6 +37,7 @@ ripgrep
 sops
 speedtest-cli
 starship
+tealdeer
 wl-clipboard
 yq-go
 zstd

From da34d13ababccfdff5d3ed970300d89bf02135bc Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 16 Jun 2024 16:30:29 +0200
Subject: [PATCH 14/32] feat: add viddy

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index 51bc583..d98df5b 100644
--- a/extra-packages
+++ b/extra-packages
@@ -38,6 +38,7 @@ sops
 speedtest-cli
 starship
 tealdeer
+viddy
 wl-clipboard
 yq-go
 zstd

From 4c42f3cfbeb836b8fd119d575c8f94555f548e86 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Fri, 28 Jun 2024 21:24:03 +0200
Subject: [PATCH 15/32] feat: add atuin

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index d98df5b..1272d41 100644
--- a/extra-packages
+++ b/extra-packages
@@ -1,4 +1,5 @@
 age
+atuin
 bat
 btop
 chezmoi

From db5c7cbb1b988e6975cfc44cb66e5718ebfb7c60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2024 05:59:32 +0000
Subject: [PATCH 16/32] chore(deps): bump sigstore/cosign-installer from 3.5.0
 to 3.6.0

Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](https://github.com/sigstore/cosign-installer/compare/v3.5.0...v3.6.0)

---
updated-dependencies:
- dependency-name: sigstore/cosign-installer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-boxkit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-boxkit.yml b/.github/workflows/build-boxkit.yml
index 6333416..2e9d8b1 100644
--- a/.github/workflows/build-boxkit.yml
+++ b/.github/workflows/build-boxkit.yml
@@ -84,7 +84,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
             
       # Sign container
-      - uses: sigstore/cosign-installer@v3.5.0
+      - uses: sigstore/cosign-installer@v3.6.0
 
       - name: Sign container image
         if: github.event_name != 'pull_request'

From 63e8d8b0510b974eb9f70c8e7ae79bcd88197eee Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Thu, 22 Aug 2024 21:15:56 +0200
Subject: [PATCH 17/32] feat: add stern

---
 Containerfile  | 2 +-
 extra-packages | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index 4db9746..d9a389d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -3,7 +3,7 @@ FROM quay.io/toolbx-images/alpine-toolbox:edge
 LABEL com.github.containers.toolbox="true" \
       usage="This image is meant to be used with the toolbox or distrobox command" \
       summary="A cloud-native terminal experience" \
-      maintainer="jorge.castro@gmail.com"
+      maintainer="me@babariviere.com"
 
 RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 
diff --git a/extra-packages b/extra-packages
index 1272d41..abe1a54 100644
--- a/extra-packages
+++ b/extra-packages
@@ -38,6 +38,7 @@ ripgrep
 sops
 speedtest-cli
 starship
+stern
 tealdeer
 viddy
 wl-clipboard

From 3f40ceea74c4a1c8041cc8552d50394c85219345 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 6 Oct 2024 15:43:48 +0200
Subject: [PATCH 18/32] feat: add kakoune, elvish & co

---
 extra-packages | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extra-packages b/extra-packages
index abe1a54..873a06e 100644
--- a/extra-packages
+++ b/extra-packages
@@ -7,7 +7,7 @@ clipboard
 cosign
 dbus-x11
 direnv
-emacs-pgtk
+elvish
 eza
 fd
 ffmpeg
@@ -20,6 +20,8 @@ gopls
 helm
 jq
 just
+kakoune
+kakoune-lsp
 kubectl
 kubectl-bash-completion
 kubectx
@@ -35,13 +37,15 @@ ncdu
 ncurses
 plocate
 ripgrep
+sad
 sops
 speedtest-cli
 starship
 stern
 tealdeer
+tmux
 viddy
 wl-clipboard
 yq-go
+zoxide
 zstd
-zoxide
\ No newline at end of file

From 62fa771b0cb9aa262877a68349ea2ab248a65e4e Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 6 Oct 2024 16:03:51 +0200
Subject: [PATCH 19/32] chore: add carapace

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index 873a06e..968c3d9 100644
--- a/extra-packages
+++ b/extra-packages
@@ -2,6 +2,7 @@ age
 atuin
 bat
 btop
+carapace
 chezmoi
 clipboard
 cosign

From 7a857b1dd1173be16d3c34e1c29c1d743df3b10d Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 6 Oct 2024 16:16:39 +0200
Subject: [PATCH 20/32] chore: add editorconfig

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index 968c3d9..0bb8db3 100644
--- a/extra-packages
+++ b/extra-packages
@@ -8,6 +8,7 @@ clipboard
 cosign
 dbus-x11
 direnv
+editorconfig
 elvish
 eza
 fd

From 78c16daa4ae728253cfc435e7749582c1b9c484c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 05:50:15 +0000
Subject: [PATCH 21/32] chore(deps): bump sigstore/cosign-installer from 3.6.0
 to 3.7.0

Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](https://github.com/sigstore/cosign-installer/compare/v3.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: sigstore/cosign-installer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-boxkit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-boxkit.yml b/.github/workflows/build-boxkit.yml
index 2e9d8b1..59dd18f 100644
--- a/.github/workflows/build-boxkit.yml
+++ b/.github/workflows/build-boxkit.yml
@@ -84,7 +84,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
             
       # Sign container
-      - uses: sigstore/cosign-installer@v3.6.0
+      - uses: sigstore/cosign-installer@v3.7.0
 
       - name: Sign container image
         if: github.event_name != 'pull_request'

From 71916da84888ec9d6cf032e7aa50fd4fe333e614 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 12 Oct 2024 18:56:54 +0200
Subject: [PATCH 22/32] feat: use elvish as default shell

---
 Containerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Containerfile b/Containerfile
index d9a389d..4953d19 100644
--- a/Containerfile
+++ b/Containerfile
@@ -24,3 +24,5 @@ RUN   ln -fs /bin/sh /usr/bin/sh && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update
+
+RUN which elvish | tee -a /etc/shells && chsh -s $(which elvish)

From 8dfe035f686bb633a26f4c4475a2d9b028cc36f2 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 12 Oct 2024 19:33:27 +0200
Subject: [PATCH 23/32] chore: remove elvish chsh which is not working

---
 Containerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Containerfile b/Containerfile
index 4953d19..d9a389d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -24,5 +24,3 @@ RUN   ln -fs /bin/sh /usr/bin/sh && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update
-
-RUN which elvish | tee -a /etc/shells && chsh -s $(which elvish)

From 624c8a52f77e6026c4098c6015f85964eb985f92 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 12 Oct 2024 21:36:53 +0200
Subject: [PATCH 24/32] chore: add aerc

---
 extra-packages | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/extra-packages b/extra-packages
index 0bb8db3..b99c980 100644
--- a/extra-packages
+++ b/extra-packages
@@ -1,6 +1,8 @@
+aerc
 age
 atuin
 bat
+broot
 btop
 carapace
 chezmoi
@@ -13,7 +15,6 @@ elvish
 eza
 fd
 ffmpeg
-fish
 flux
 fzf
 github-cli
@@ -28,16 +29,14 @@ kubectl
 kubectl-bash-completion
 kubectx
 kubectx-bash-completion
-kubectx-fish-completion
 kustomize
 kustomize-bash-completion
-kustomize-fish-completion
 make
-micro
 nano
 ncdu
 ncurses
 plocate
+podman-tui
 ripgrep
 sad
 sops

From 7eb7bf6c7a6c48293e6c196d382ed4ea33771335 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 13 Oct 2024 16:55:56 +0200
Subject: [PATCH 25/32] chore: add k9s

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index b99c980..3a4a3f8 100644
--- a/extra-packages
+++ b/extra-packages
@@ -23,6 +23,7 @@ gopls
 helm
 jq
 just
+k9s
 kakoune
 kakoune-lsp
 kubectl

From a675404690e214b9855d385909c913310a48af10 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 13 Oct 2024 17:54:50 +0200
Subject: [PATCH 26/32] chore: add fzf-tmux

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index 3a4a3f8..0a9beb7 100644
--- a/extra-packages
+++ b/extra-packages
@@ -17,6 +17,7 @@ fd
 ffmpeg
 flux
 fzf
+fzf-tmux
 github-cli
 go
 gopls

From 312c8add9e5275fca56e22aebe3364d7aa2542ed Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 13 Oct 2024 18:03:58 +0200
Subject: [PATCH 27/32] chore: add lazygit

---
 extra-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra-packages b/extra-packages
index 0a9beb7..93073fa 100644
--- a/extra-packages
+++ b/extra-packages
@@ -33,6 +33,7 @@ kubectx
 kubectx-bash-completion
 kustomize
 kustomize-bash-completion
+lazygit
 make
 nano
 ncdu

From 3d9e5a96d793281c979b90f0ba32488a22bd233c Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 13 Oct 2024 18:15:00 +0200
Subject: [PATCH 28/32] chore: use system op

---
 Containerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index d9a389d..897da87 100644
--- a/Containerfile
+++ b/Containerfile
@@ -23,4 +23,5 @@ RUN   ln -fs /bin/sh /usr/bin/sh && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update
+      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update && \
+      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/op

From 23e085f375b7c67b2cd9d71ff1187ac752c2e7ee Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Tue, 15 Oct 2024 19:54:35 +0200
Subject: [PATCH 29/32] chore: install rust

---
 extra-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra-packages b/extra-packages
index 93073fa..77c9610 100644
--- a/extra-packages
+++ b/extra-packages
@@ -26,7 +26,6 @@ jq
 just
 k9s
 kakoune
-kakoune-lsp
 kubectl
 kubectl-bash-completion
 kubectx
@@ -41,6 +40,7 @@ ncurses
 plocate
 podman-tui
 ripgrep
+rust
 sad
 sops
 speedtest-cli

From 0e8cf5c63aba7f6cf15814a195d9c9f53f2bbaa8 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Tue, 15 Oct 2024 22:37:56 +0200
Subject: [PATCH 30/32] feat: add krew plugins

---
 Containerfile              | 11 ++++++++---
 krew-plugins               |  4 ++++
 extra-packages => packages |  2 ++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 krew-plugins
 rename extra-packages => packages (95%)

diff --git a/Containerfile b/Containerfile
index 897da87..79c9e8e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -7,17 +7,22 @@ LABEL com.github.containers.toolbox="true" \
 
 RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 
-COPY extra-packages /
+COPY packages /
 RUN apk update && \
     apk upgrade && \
-    grep -v '^#' /extra-packages | xargs apk add
-RUN rm /extra-packages
+    grep -v '^#' /packages | xargs apk add
+RUN rm /packages
 
 COPY go-packages /
 RUN grep -v '^#' /go-packages | xargs -n1 go install
 RUN rm /go-packages
 RUN mv /root/go/bin/* /usr/local/bin/
 
+COPY krew-plugins /
+RUN grep -v '^#' /krew-plugins | xargs -n1 kubectl krew install
+RUN rm /krew-plugins
+RUN mv /root/.krew/bin/* /usr/local/bin/
+
 RUN   ln -fs /bin/sh /usr/bin/sh && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
diff --git a/krew-plugins b/krew-plugins
new file mode 100644
index 0000000..9b1c344
--- /dev/null
+++ b/krew-plugins
@@ -0,0 +1,4 @@
+cilium
+node-shell
+popeye
+rook-ceph
diff --git a/extra-packages b/packages
similarity index 95%
rename from extra-packages
rename to packages
index 77c9610..f3835d6 100644
--- a/extra-packages
+++ b/packages
@@ -28,6 +28,7 @@ k9s
 kakoune
 kubectl
 kubectl-bash-completion
+kubectl-krew
 kubectx
 kubectx-bash-completion
 kustomize
@@ -40,6 +41,7 @@ ncurses
 plocate
 podman-tui
 ripgrep
+cargo
 rust
 sad
 sops

From cb3f6373509eda897a8338c6630066bd3650259d Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Tue, 15 Oct 2024 22:47:47 +0200
Subject: [PATCH 31/32] fix: readlink before mv

---
 Containerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index 79c9e8e..b4a5d51 100644
--- a/Containerfile
+++ b/Containerfile
@@ -21,7 +21,9 @@ RUN mv /root/go/bin/* /usr/local/bin/
 COPY krew-plugins /
 RUN grep -v '^#' /krew-plugins | xargs -n1 kubectl krew install
 RUN rm /krew-plugins
-RUN mv /root/.krew/bin/* /usr/local/bin/
+RUN for bin in /root/.krew/bin/*; do \
+      mv $(readlink $bin) /usr/local/bin/$(basename $bin); \
+    done
 
 RUN   ln -fs /bin/sh /usr/bin/sh && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \

From 5e4c0349019a3575eaf3f419173fc192ca865146 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Tue, 15 Oct 2024 22:48:52 +0200
Subject: [PATCH 32/32] chore: cleanup krew

---
 Containerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Containerfile b/Containerfile
index b4a5d51..785dab2 100644
--- a/Containerfile
+++ b/Containerfile
@@ -24,6 +24,7 @@ RUN rm /krew-plugins
 RUN for bin in /root/.krew/bin/*; do \
       mv $(readlink $bin) /usr/local/bin/$(basename $bin); \
     done
+RUN rm -rf /root/.krew
 
 RUN   ln -fs /bin/sh /usr/bin/sh && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \