From 42f9622bc1e51ea089ea62c9a020a1278acc0e97 Mon Sep 17 00:00:00 2001 From: raphy Date: Sun, 2 Feb 2025 01:49:58 +0100 Subject: [PATCH 01/10] ho aggiunto sta roba --- .forgejo/workflows/action.yaml | 1 - Dockerfile | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/action.yaml b/.forgejo/workflows/action.yaml index 116c442..b4ccb7b 100644 --- a/.forgejo/workflows/action.yaml +++ b/.forgejo/workflows/action.yaml @@ -21,4 +21,3 @@ jobs: password: ${{ secrets.TOKEN }} registry: git.dekedin.me - diff --git a/Dockerfile b/Dockerfile index 18f6666..3db9506 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,11 @@ RUN apk add --no-cache \ zstd \ jq \ tcpdump \ + lazygit \ + jj \ + most \ + k9s \ git -# zig (actually doubles as a c/c++) -RUN apk add --no-cache \ - zig \ - zls - # Set the entrypoint to fish ENTRYPOINT ["fish"] From b09bd5fa628e3e3f89c1dd1d0af28574fa0d5aab Mon Sep 17 00:00:00 2001 From: raphy Date: Sun, 2 Feb 2025 01:53:23 +0100 Subject: [PATCH 02/10] ho tolto jj --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3db9506..afc13e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,6 @@ RUN apk add --no-cache \ jq \ tcpdump \ lazygit \ - jj \ most \ k9s \ git From 1fdf0a1f3f01ce01c4ce685c52f9298c73cca83c Mon Sep 17 00:00:00 2001 From: Raphael Jacobs Date: Sun, 2 Feb 2025 19:22:10 +0100 Subject: [PATCH 03/10] add rust setup --- .config/fish/config.fish | 2 ++ Dockerfile | 6 ++++++ setup_langs/rust.sh | 7 +++++++ 3 files changed, 15 insertions(+) create mode 100644 .config/fish/config.fish create mode 100644 setup_langs/rust.sh diff --git a/.config/fish/config.fish b/.config/fish/config.fish new file mode 100644 index 0000000..a0bd4a9 --- /dev/null +++ b/.config/fish/config.fish @@ -0,0 +1,2 @@ + +fish_add_path /root/.cargo/bin/ diff --git a/Dockerfile b/Dockerfile index afc13e5..fa9d465 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,13 @@ RUN apk add --no-cache \ lazygit \ most \ k9s \ + bash \ + curl \ + cargo \ git +RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash +RUN cargo binstall --strategies crate-meta-data jj-cli + # Set the entrypoint to fish ENTRYPOINT ["fish"] diff --git a/setup_langs/rust.sh b/setup_langs/rust.sh new file mode 100644 index 0000000..93b16c9 --- /dev/null +++ b/setup_langs/rust.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash + +apk add --no-cache \ + rust \ + cargo \ + rust-analyzer \ + clippy From 7ff1de3c4c07dfc1fc07473f36e1098c2df998bc Mon Sep 17 00:00:00 2001 From: Raphael Jacobs Date: Sun, 2 Feb 2025 19:52:00 +0100 Subject: [PATCH 04/10] copy fish after installing fish --- .config/fish/config.fish | 5 ++++- Dockerfile | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index a0bd4a9..6ad4a22 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,2 +1,5 @@ -fish_add_path /root/.cargo/bin/ +if status is-interactive + fish_add_path /root/.cargo/bin/ + # Commands to run in interactive sessions can go here +end diff --git a/Dockerfile b/Dockerfile index fa9d465..20478aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM alpine:edge + # Install base dependencies and build tools RUN apk add --no-cache \ fish \ @@ -21,6 +22,9 @@ RUN apk add --no-cache \ cargo \ git +COPY ./setup_langs ./setup_langs +COPY ./.config ./root/.config + RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash RUN cargo binstall --strategies crate-meta-data jj-cli From 938c5a799268e5b519dfba81e1eb277d3b93864b Mon Sep 17 00:00:00 2001 From: Raphael Jacobs Date: Sun, 2 Feb 2025 19:59:55 +0100 Subject: [PATCH 05/10] Try simpler copy --- Dockerfile | 7 ++++--- setup_langs/rust.sh | 0 2 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 setup_langs/rust.sh diff --git a/Dockerfile b/Dockerfile index 20478aa..d808a50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,11 +22,12 @@ RUN apk add --no-cache \ cargo \ git -COPY ./setup_langs ./setup_langs -COPY ./.config ./root/.config +COPY setup_langs /root/setup_langs +COPY .config /root/.config RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash -RUN cargo binstall --strategies crate-meta-data jj-cli +RUN cargo binstall --strategies crate-meta-data jj-cli; cargo binstall lazyjj # Set the entrypoint to fish +WORKDIR /root/ ENTRYPOINT ["fish"] diff --git a/setup_langs/rust.sh b/setup_langs/rust.sh old mode 100644 new mode 100755 From 4da65198a7ed905243aeba21360210fb7bfbf800 Mon Sep 17 00:00:00 2001 From: Raphael Jacobs Date: Sun, 2 Feb 2025 20:46:15 +0100 Subject: [PATCH 06/10] add helix conf and change rust installation to slim down image again --- .config/cargo/config.toml | 2 ++ .config/helix/config.toml | 9 +++++++++ .config/helix/languages.toml | 3 +++ Dockerfile | 12 ++++++++---- 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 .config/cargo/config.toml create mode 100644 .config/helix/config.toml create mode 100644 .config/helix/languages.toml diff --git a/.config/cargo/config.toml b/.config/cargo/config.toml new file mode 100644 index 0000000..b650e8b --- /dev/null +++ b/.config/cargo/config.toml @@ -0,0 +1,2 @@ +[unstable] +gc = true diff --git a/.config/helix/config.toml b/.config/helix/config.toml new file mode 100644 index 0000000..953a4ec --- /dev/null +++ b/.config/helix/config.toml @@ -0,0 +1,9 @@ +theme = "tokyonight_moon" + +[editor] +line-number = "relative" +mouse = true + +[editor.file-picker] +hidden = false + diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml new file mode 100644 index 0000000..cd519cd --- /dev/null +++ b/.config/helix/languages.toml @@ -0,0 +1,3 @@ +[editor.lsp.rust-analyzer.config.check] +command = "clippy" + diff --git a/Dockerfile b/Dockerfile index d808a50..75ff565 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,16 +17,20 @@ RUN apk add --no-cache \ lazygit \ most \ k9s \ - bash \ curl \ - cargo \ git COPY setup_langs /root/setup_langs COPY .config /root/.config -RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash -RUN cargo binstall --strategies crate-meta-data jj-cli; cargo binstall lazyjj +RUN apk add --no-cache cargo bash; \ + curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash; \ + cargo binstall --strategies crate-meta-data jj-cli; \ + cargo binstall lazyjj; \ + apk del cargo bash; + +ENV TERM="xterm-256color" +ENV COLORTERM="truecolor" # Set the entrypoint to fish WORKDIR /root/ From 3cc98a97839918bf6f49caa9364f88a23527c578 Mon Sep 17 00:00:00 2001 From: Raphael Jacobs Date: Sun, 2 Feb 2025 23:04:07 +0100 Subject: [PATCH 07/10] improve greeting message and list packages --- .config/fish/functions/fish_greeting.fish | 13 +++++++++++++ Dockerfile | 23 ++++++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 .config/fish/functions/fish_greeting.fish diff --git a/.config/fish/functions/fish_greeting.fish b/.config/fish/functions/fish_greeting.fish new file mode 100644 index 0000000..59790cc --- /dev/null +++ b/.config/fish/functions/fish_greeting.fish @@ -0,0 +1,13 @@ +function fish_greeting --description 'Welcome the user' + printf "%s" (set_color -o brblue) + date +"%A %H:%M, %d/%m/%y" + echo -e "\n" + printf "Welcome to alpine, deke/dev-env edition\n" + printf " Check out these tools:\n" + printf " %sDiagnostics: %s btop, tcpdump, dust, fd, rg%s\n" (set_color white) (set_color -i brblue) (set_color normal) + printf " %sCLI: %s zellij, helix, curl, wget, tar, zstd, jq%s\n" (set_color white) (set_color -i brblue) (set_color normal) + printf " %sSVN: %s git, jj, lazygit, lazyjj%s\n" (set_color white) (set_color -i brblue) (set_color normal) + printf " %sSVN: %s git, jj, lazygit, lazyjj%s\n" (set_color white) (set_color -i brblue) (set_color normal) + printf " %sK8S: %s k0s, kubectl\n" (set_color white) (set_color -i brblue) (set_color normal) + echo -e "\n" +end diff --git a/Dockerfile b/Dockerfile index 75ff565..3eaaf6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,25 +3,23 @@ FROM alpine:edge # Install base dependencies and build tools RUN apk add --no-cache \ - fish \ - helix \ - ripgrep \ - fd \ - dust \ btop \ - tmux \ + tcpdump \ + dust \ + fd \ + ripgrep \ + fish \ + zellij \ + helix \ + curl \ + wget \ tar \ zstd \ jq \ - tcpdump \ lazygit \ - most \ k9s \ - curl \ git -COPY setup_langs /root/setup_langs -COPY .config /root/.config RUN apk add --no-cache cargo bash; \ curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash; \ @@ -29,6 +27,9 @@ RUN apk add --no-cache cargo bash; \ cargo binstall lazyjj; \ apk del cargo bash; +COPY setup_langs /root/setup_langs +COPY .config /root/.config + ENV TERM="xterm-256color" ENV COLORTERM="truecolor" From 97266ef796b621be52630b8fb73a1f33c8a13432 Mon Sep 17 00:00:00 2001 From: Raphael Jacobs Date: Sun, 2 Feb 2025 23:09:42 +0100 Subject: [PATCH 08/10] Improve motd message --- .config/fish/functions/fish_greeting.fish | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.config/fish/functions/fish_greeting.fish b/.config/fish/functions/fish_greeting.fish index 59790cc..148e376 100644 --- a/.config/fish/functions/fish_greeting.fish +++ b/.config/fish/functions/fish_greeting.fish @@ -4,10 +4,9 @@ function fish_greeting --description 'Welcome the user' echo -e "\n" printf "Welcome to alpine, deke/dev-env edition\n" printf " Check out these tools:\n" - printf " %sDiagnostics: %s btop, tcpdump, dust, fd, rg%s\n" (set_color white) (set_color -i brblue) (set_color normal) - printf " %sCLI: %s zellij, helix, curl, wget, tar, zstd, jq%s\n" (set_color white) (set_color -i brblue) (set_color normal) - printf " %sSVN: %s git, jj, lazygit, lazyjj%s\n" (set_color white) (set_color -i brblue) (set_color normal) - printf " %sSVN: %s git, jj, lazygit, lazyjj%s\n" (set_color white) (set_color -i brblue) (set_color normal) - printf " %sK8S: %s k0s, kubectl\n" (set_color white) (set_color -i brblue) (set_color normal) + printf " %s%sDiagnostics: %s btop, tcpdump, dust, fd, rg%s\n" (set_color normal) (set_color white) (set_color -o -i brblue) + printf " %s%sCLI: %s zellij, helix, curl, wget, tar, zstd, jq%s\n" (set_color normal) (set_color white) (set_color -o -i brblue) + printf " %s%sSVN: %s git, jj, lazygit, lazyjj%s\n" (set_color normal) (set_color white) (set_color -o -i brblue) + printf " %s%sK8S: %s k0s, kubectl\n" (set_color normal) (set_color white) (set_color -o -i brblue) echo -e "\n" end From 77194963046ba75a059a194e65cbd9b8ca8604f9 Mon Sep 17 00:00:00 2001 From: deke Date: Sun, 2 Feb 2025 22:14:59 +0000 Subject: [PATCH 09/10] Add README.md --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..119f30f --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +```bash +~/D/P/D/Dev-Env @3cc98a9• λ❱ podman run --rm -it dev-env:latest +Sunday 22:10, 02/02/25 + + +Welcome to alpine, deke/dev-env edition + Check out these tools: + Diagnostics: btop, tcpdump, dust, fd, rg + CLI: zellij, helix, curl, wget, tar, zstd, jq + SVN: git, jj, lazygit, lazyjj + K8S: k0s, kubectl + +``` + +This is my development environment with a bunch of .config files that I enjoy. +It's not exactly "slim" but I wanted to do an experiment. \ No newline at end of file From a91cd4e823e7371bdc5c306222389abb1b8fff70 Mon Sep 17 00:00:00 2001 From: raphy Date: Sun, 20 Jul 2025 09:40:59 +0200 Subject: [PATCH 10/10] edit registry?? --- .forgejo/workflows/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/action.yaml b/.forgejo/workflows/action.yaml index b4ccb7b..d59bf89 100644 --- a/.forgejo/workflows/action.yaml +++ b/.forgejo/workflows/action.yaml @@ -7,7 +7,7 @@ jobs: checkout: runs-on: docker container: - image: docker:dind + image: ghcr.io/docker:dind steps: - name: Get git and docker run: apk add git nodejs