diff --git a/.github/workflows/dispatch_ci.yml b/.github/workflows/dispatch_ci.yml index b0fd232..de73193 100644 --- a/.github/workflows/dispatch_ci.yml +++ b/.github/workflows/dispatch_ci.yml @@ -1,4 +1,4 @@ -name: CI +name: Dispatch CI on: workflow_dispatch: diff --git a/dot_config/chezmoi/macos_packages b/dot_config/chezmoi/macos_packages index ac29e63..399f66c 100644 --- a/dot_config/chezmoi/macos_packages +++ b/dot_config/chezmoi/macos_packages @@ -3,7 +3,7 @@ colima djvulibre docker-cli docker-buildx -docker-credential-helper +docker-credential-helpers ghostscript lima-vm mas diff --git a/dot_config/chezmoi/python_packages b/dot_config/chezmoi/python_packages index 2da035c..fe56124 100644 --- a/dot_config/chezmoi/python_packages +++ b/dot_config/chezmoi/python_packages @@ -67,7 +67,6 @@ sos sos-bash sos-notebook sos-python -sos-r sympy usort yapf diff --git a/run_once_install-packages.sh.tmpl b/run_once_install-packages.sh.tmpl index 669e110..e7e23fb 100755 --- a/run_once_install-packages.sh.tmpl +++ b/run_once_install-packages.sh.tmpl @@ -3,6 +3,9 @@ set -o xtrace -o errexit if [ ! -f $HOME/.pixi/bin/pixi ]; then +{{ if eq .chezmoi.os "darwin" -}} + export PIXI_VERSION=v0.38.0 +{{end }} curl -fsSL https://pixi.sh/install.sh | bash if [ ! -f $HOME/.bashrc ]; then echo 'PATH="${HOME}/.pixi/bin:${PATH}"' >> ${HOME}/.bashrc @@ -55,6 +58,9 @@ fi {{ if eq .chezmoi.arch "amd64" -}} pixi global install -c dnachun -c conda-forge $(tr '\n' ' ' < $HOME/.local/share/chezmoi/dot_config/chezmoi/intel_packages) {{ end }} +if [[ ${CI} != "true" ]]; then + pixi self-update +fi micromamba shell init --shell=bash $HOME/micromamba micromamba shell init --shell zsh