diff --git a/Dockerfile.alpine b/Dockerfile.alpine index e552ca3..fe12c0a 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,5 +1,5 @@ -# alpine:3.20.3 -FROM alpine@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d AS alpine +# alpine:3.21.0 +FROM alpine@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45 AS alpine ARG username=vortex ARG skipExtras=false diff --git a/Dockerfile.arch b/Dockerfile.arch index 068cf51..50f6535 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -1,5 +1,5 @@ -# archlinux:base-20240929.0.266368 -FROM --platform=linux/amd64 archlinux@sha256:c8501ab8b970205491501ba01d9bce9a04d70537fc15596360f1ce1011b08569 AS arch +# archlinux:base-20241201.0.284684 +FROM --platform=linux/amd64 archlinux@sha256:ad18112a3888d427b18a004309eff649418b68ddee0e71004c36b87630baac4c AS arch ARG username=vortex ARG skipExtras=false diff --git a/Dockerfile.debian b/Dockerfile.debian index 02b171b..a5110e2 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,5 +1,5 @@ -# debian:trixie-20240926-slim -FROM debian@sha256:c63174f799a74411a0290f25086fdc5dc939aa1f8971a16ad6fb1b7658a25126 AS debian +# debian:trixie-20241202-slim +FROM debian@sha256:ea037584ebc42a1144ff5ca16add337920cd4cad175431ea0ee3310a0133c0ba AS debian ARG username=vortex ARG skipExtras=false diff --git a/Dockerfile.kali b/Dockerfile.kali index 0a58ad3..2079e58 100644 --- a/Dockerfile.kali +++ b/Dockerfile.kali @@ -1,5 +1,5 @@ # kalilinux/kali-last-release:latest -FROM kalilinux/kali-last-release@sha256:d58bc738b023ea499b1191154773d82ed4f7420dcbf7fb292767386809472400 AS kali +FROM kalilinux/kali-last-release@sha256:c91acd9b9022487f780c379a6acbba5123f505d3bd0341ddb2e3feeda1e10e65 AS kali ARG username=vortex ARG skipExtras=false diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 2d88711..4ed09d6 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,5 +1,5 @@ -# ubuntu:noble-20240904.1 -FROM ubuntu@sha256:b359f1067efa76f37863778f7b6d0e8d911e3ee8efa807ad01fbf5dc1ef9006b AS ubuntu +# ubuntu:noble-20241118.1 +FROM ubuntu@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab AS ubuntu ARG username=vortex ARG skipExtras=false diff --git a/run_once_000_install_dependencies.sh.tmpl b/run_once_000_install_dependencies.sh.tmpl index e45be52..5fd9a39 100644 --- a/run_once_000_install_dependencies.sh.tmpl +++ b/run_once_000_install_dependencies.sh.tmpl @@ -18,7 +18,6 @@ sudo /opt/pkg/bin/pkgin -y install \ ripgrep \ sd \ tealdeer \ - tokei \ wget {{ else if (and (eq .chezmoi.os "linux") (not .codespaces)) -}} @@ -41,7 +40,6 @@ sudo apt-get install -y --no-install-recommends \ ripgrep \ sd \ tealdeer \ - tokei \ wget {{ else if eq .chezmoi.osRelease.id "arch" -}} sudo pacman -Sy --noconfirm \ @@ -59,7 +57,6 @@ sudo pacman -Sy --noconfirm \ ripgrep \ sd \ tealdeer \ - tokei \ wget {{ else if eq .chezmoi.osRelease.id "fedora" -}} sudo dnf install -y \ @@ -80,7 +77,6 @@ sudo dnf install -y \ ripgrep \ sd \ tealdeer \ - tokei \ wget \ which {{ else if eq .chezmoi.osRelease.id "alpine" -}} @@ -95,12 +91,11 @@ sudo apk add --update \ sudo \ zsh \ mc \ - neofetch \ ripgrep \ sd \ - tealdeer \ - tokei \ wget +sudo bash -c "echo \"@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing\" >> /etc/apk/repositories" +sudo apk add --update tealdeer@testing neofetch@testing # alpine profile is dirty sudo rm -rf /etc/profile {{ end -}} diff --git a/run_once_010_install_fonts.sh.tmpl b/run_once_010_install_fonts.sh.tmpl index e428e8b..ac4706d 100644 --- a/run_once_010_install_fonts.sh.tmpl +++ b/run_once_010_install_fonts.sh.tmpl @@ -15,8 +15,9 @@ cp ~/.vendor/font-jetbrains/ttf/*.ttf ~/Library/Fonts echo "installing fonts for osRelease: {{ .chezmoi.osRelease.id }}" -{{ if (or (eq .chezmoi.osRelease.id "debian") (eq .chezmoi.osRelease.id "ubuntu")) -}} -sudo apt-get install -y --no-install-recommends fonts-powerline fonts-jetbrains-mono +{{ if (or (eq .chezmoi.osRelease.id "debian") (eq .chezmoi.osRelease.id "ubuntu") (eq .chezmoi.osRelease.id "kali")) -}} +~/.vendor/font-powerline/install.sh +sudo apt-get install -y --no-install-recommends fonts-jetbrains-mono {{ else if eq .chezmoi.osRelease.id "arch" -}} sudo pacman -Sy --noconfirm powerline-fonts ttf-jetbrains-mono {{ else if eq .chezmoi.osRelease.id "fedora" -}} diff --git a/run_once_020_install_git_extras.sh.tmpl b/run_once_020_install_git_extras.sh.tmpl index 7205d00..335d01a 100644 --- a/run_once_020_install_git_extras.sh.tmpl +++ b/run_once_020_install_git_extras.sh.tmpl @@ -25,17 +25,18 @@ sudo apt-get install -y --no-install-recommends git-extras git-quick-stats curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/git-extras.tar.gz tar -xvf git-extras.tar.gz && cd git-extras && makepkg sudo pacman -U --noconfirm git-extras*.pkg.tar.zst && cd .. +rm -rf git-extras* # install git-extras from aur curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/git-quick-stats.tar.gz tar -xvf git-quick-stats.tar.gz && cd git-quick-stats && makepkg sudo pacman -U --noconfirm git-quick-stats*.pkg.tar.zst && cd .. +rm -rf git-quick-stats* {{ else if eq .chezmoi.osRelease.id "fedora" -}} sudo dnf install -y git-extras git clone https://github.com/arzzen/git-quick-stats.git && cd git-quick-stats sudo make install -cd .. && rm -rf git-quick-stats +cd .. && rm -rf git-quick-stats* {{ else if eq .chezmoi.osRelease.id "alpine" -}} -sudo bash -c "echo \"@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing\" >> /etc/apk/repositories" sudo apk add --update git-extras@testing git-quick-stats@testing {{ end -}} diff --git a/run_once_200_python3_packages.sh.tmpl b/run_once_200_python3_packages.sh.tmpl index b034b9f..5c5d027 100644 --- a/run_once_200_python3_packages.sh.tmpl +++ b/run_once_200_python3_packages.sh.tmpl @@ -8,7 +8,7 @@ fi {{ if (and (eq .chezmoi.os "linux") (not .codespaces)) -}} -{{ if (or (eq .chezmoi.osRelease.id "debian") (eq .chezmoi.osRelease.id "ubuntu") (eq .chezmoi.osRelease.id "arch") (eq .chezmoi.osRelease.id "alpine")) -}} +{{ 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")) -}} sudo rm /usr/lib/python3.12/EXTERNALLY-MANAGED {{ end }} diff --git a/run_once_210_node_packages.sh.tmpl b/run_once_210_node_packages.sh.tmpl index cc185ea..919e68a 100644 --- a/run_once_210_node_packages.sh.tmpl +++ b/run_once_210_node_packages.sh.tmpl @@ -5,12 +5,17 @@ if [[ -n "${DRY_RUN}" && "${DRY_RUN}" == true ]]; then exit 0 fi +SCRIPTS_FOLDER="$HOME/.dotfiles/scripts" + +{{ if (eq .chezmoi.os ".codespaces") -}} + SCRIPTS_FOLDER="/__w/dotfiles/dotfiles/scripts" +{{ end -}} # set global prefix npm config set prefix "$HOME/.npm-global" # install Node global packages -~/.dotfiles/scripts/npm.sh \ +$SCRIPTS_FOLDER/npm.sh \ commitizen \ depcheck \ dree \ diff --git a/run_once_220_go_packages.sh.tmpl b/run_once_220_go_packages.sh.tmpl index f49080f..db340bd 100644 --- a/run_once_220_go_packages.sh.tmpl +++ b/run_once_220_go_packages.sh.tmpl @@ -5,9 +5,14 @@ if [[ -n "${DRY_RUN}" && "${DRY_RUN}" == true ]]; then exit 0 fi +SCRIPTS_FOLDER="$HOME/.dotfiles/scripts" + +{{ if (eq .chezmoi.os ".codespaces") -}} + SCRIPTS_FOLDER="/__w/dotfiles/dotfiles/scripts" +{{ end -}} # install Go global packages -~/.dotfiles/scripts/go.sh \ +$SCRIPTS_FOLDER/go.sh \ schollz/croc/v9 \ muesli/duf \ charmbracelet/glow \ diff --git a/run_once_230_rust_packages.sh.tmpl b/run_once_230_rust_packages.sh.tmpl index 1f25230..78047af 100644 --- a/run_once_230_rust_packages.sh.tmpl +++ b/run_once_230_rust_packages.sh.tmpl @@ -5,9 +5,8 @@ if [[ -n "${DRY_RUN}" && "${DRY_RUN}" == true ]]; then exit 0 fi - # install Rust global packages -~/.cargo/bin/cargo install \ +"$HOME"/.cargo/bin/cargo install \ dotenv-linter \ hexyl \ petname