Skip to content

Commit b0a00c0

Browse files
committed
feat: update distros and optimize packages for latest versions
1 parent 1abaf97 commit b0a00c0

12 files changed

+31
-25
lines changed

Dockerfile.alpine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# alpine:3.20.3
2-
FROM alpine@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d AS alpine
1+
# alpine:3.21.0
2+
FROM alpine@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45 AS alpine
33

44
ARG username=vortex
55
ARG skipExtras=false

Dockerfile.arch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# archlinux:base-20240929.0.266368
2-
FROM --platform=linux/amd64 archlinux@sha256:c8501ab8b970205491501ba01d9bce9a04d70537fc15596360f1ce1011b08569 AS arch
1+
# archlinux:base-20241201.0.284684
2+
FROM --platform=linux/amd64 archlinux@sha256:ad18112a3888d427b18a004309eff649418b68ddee0e71004c36b87630baac4c AS arch
33

44
ARG username=vortex
55
ARG skipExtras=false

Dockerfile.debian

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# debian:trixie-20240926-slim
2-
FROM debian@sha256:c63174f799a74411a0290f25086fdc5dc939aa1f8971a16ad6fb1b7658a25126 AS debian
1+
# debian:trixie-20241202-slim
2+
FROM debian@sha256:ea037584ebc42a1144ff5ca16add337920cd4cad175431ea0ee3310a0133c0ba AS debian
33

44
ARG username=vortex
55
ARG skipExtras=false

Dockerfile.kali

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# kalilinux/kali-last-release:latest
2-
FROM kalilinux/kali-last-release@sha256:d58bc738b023ea499b1191154773d82ed4f7420dcbf7fb292767386809472400 AS kali
2+
FROM kalilinux/kali-last-release@sha256:c91acd9b9022487f780c379a6acbba5123f505d3bd0341ddb2e3feeda1e10e65 AS kali
33

44
ARG username=vortex
55
ARG skipExtras=false

Dockerfile.ubuntu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# ubuntu:noble-20240904.1
2-
FROM ubuntu@sha256:b359f1067efa76f37863778f7b6d0e8d911e3ee8efa807ad01fbf5dc1ef9006b AS ubuntu
1+
# ubuntu:noble-20241118.1
2+
FROM ubuntu@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab AS ubuntu
33

44
ARG username=vortex
55
ARG skipExtras=false

run_once_000_install_dependencies.sh.tmpl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ sudo /opt/pkg/bin/pkgin -y install \
1818
ripgrep \
1919
sd \
2020
tealdeer \
21-
tokei \
2221
wget
2322

2423
{{ else if (and (eq .chezmoi.os "linux") (not .codespaces)) -}}
@@ -41,7 +40,6 @@ sudo apt-get install -y --no-install-recommends \
4140
ripgrep \
4241
sd \
4342
tealdeer \
44-
tokei \
4543
wget
4644
{{ else if eq .chezmoi.osRelease.id "arch" -}}
4745
sudo pacman -Sy --noconfirm \
@@ -59,7 +57,6 @@ sudo pacman -Sy --noconfirm \
5957
ripgrep \
6058
sd \
6159
tealdeer \
62-
tokei \
6360
wget
6461
{{ else if eq .chezmoi.osRelease.id "fedora" -}}
6562
sudo dnf install -y \
@@ -80,7 +77,6 @@ sudo dnf install -y \
8077
ripgrep \
8178
sd \
8279
tealdeer \
83-
tokei \
8480
wget \
8581
which
8682
{{ else if eq .chezmoi.osRelease.id "alpine" -}}
@@ -95,12 +91,11 @@ sudo apk add --update \
9591
sudo \
9692
zsh \
9793
mc \
98-
neofetch \
9994
ripgrep \
10095
sd \
101-
tealdeer \
102-
tokei \
10396
wget
97+
sudo bash -c "echo \"@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing\" >> /etc/apk/repositories"
98+
sudo apk add --update tealdeer@testing neofetch@testing
10499
# alpine profile is dirty
105100
sudo rm -rf /etc/profile
106101
{{ end -}}

run_once_010_install_fonts.sh.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ cp ~/.vendor/font-jetbrains/ttf/*.ttf ~/Library/Fonts
1515

1616
echo "installing fonts for osRelease: {{ .chezmoi.osRelease.id }}"
1717

18-
{{ if (or (eq .chezmoi.osRelease.id "debian") (eq .chezmoi.osRelease.id "ubuntu")) -}}
19-
sudo apt-get install -y --no-install-recommends fonts-powerline fonts-jetbrains-mono
18+
{{ if (or (eq .chezmoi.osRelease.id "debian") (eq .chezmoi.osRelease.id "ubuntu") (eq .chezmoi.osRelease.id "kali")) -}}
19+
~/.vendor/font-powerline/install.sh
20+
sudo apt-get install -y --no-install-recommends fonts-jetbrains-mono
2021
{{ else if eq .chezmoi.osRelease.id "arch" -}}
2122
sudo pacman -Sy --noconfirm powerline-fonts ttf-jetbrains-mono
2223
{{ else if eq .chezmoi.osRelease.id "fedora" -}}

run_once_020_install_git_extras.sh.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,18 @@ sudo apt-get install -y --no-install-recommends git-extras git-quick-stats
2525
curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/git-extras.tar.gz
2626
tar -xvf git-extras.tar.gz && cd git-extras && makepkg
2727
sudo pacman -U --noconfirm git-extras*.pkg.tar.zst && cd ..
28+
rm -rf git-extras*
2829
# install git-extras from aur
2930
curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/git-quick-stats.tar.gz
3031
tar -xvf git-quick-stats.tar.gz && cd git-quick-stats && makepkg
3132
sudo pacman -U --noconfirm git-quick-stats*.pkg.tar.zst && cd ..
33+
rm -rf git-quick-stats*
3234
{{ else if eq .chezmoi.osRelease.id "fedora" -}}
3335
sudo dnf install -y git-extras
3436
git clone https://github.com/arzzen/git-quick-stats.git && cd git-quick-stats
3537
sudo make install
36-
cd .. && rm -rf git-quick-stats
38+
cd .. && rm -rf git-quick-stats*
3739
{{ else if eq .chezmoi.osRelease.id "alpine" -}}
38-
sudo bash -c "echo \"@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing\" >> /etc/apk/repositories"
3940
sudo apk add --update git-extras@testing git-quick-stats@testing
4041
{{ end -}}
4142

run_once_200_python3_packages.sh.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fi
88

99
{{ if (and (eq .chezmoi.os "linux") (not .codespaces)) -}}
1010

11-
{{ if (or (eq .chezmoi.osRelease.id "debian") (eq .chezmoi.osRelease.id "ubuntu") (eq .chezmoi.osRelease.id "arch") (eq .chezmoi.osRelease.id "alpine")) -}}
11+
{{ if (or (eq .chezmoi.osRelease.id "debian") (eq .chezmoi.osRelease.id "ubuntu") (eq .chezmoi.osRelease.id "kali") (eq .chezmoi.osRelease.id "arch") (eq .chezmoi.osRelease.id "alpine")) -}}
1212
sudo rm /usr/lib/python3.12/EXTERNALLY-MANAGED
1313
{{ end }}
1414

run_once_210_node_packages.sh.tmpl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ if [[ -n "${DRY_RUN}" && "${DRY_RUN}" == true ]]; then
55
exit 0
66
fi
77

8+
SCRIPTS_FOLDER="$HOME/.dotfiles/scripts"
9+
10+
{{ if (eq .chezmoi.os ".codespaces") -}}
11+
SCRIPTS_FOLDER="/__w/dotfiles/dotfiles/scripts"
12+
{{ end -}}
813

914
# set global prefix
1015
npm config set prefix "$HOME/.npm-global"
1116

1217
# install Node global packages
13-
~/.dotfiles/scripts/npm.sh \
18+
$SCRIPTS_FOLDER/npm.sh \
1419
commitizen \
1520
depcheck \
1621
dree \

0 commit comments

Comments
 (0)