Mercurial > dotfiles
changeset 1036:31351132efca
feat: switch rtx to mise and fixes for clean installs
| author | Zeger Van de Vannet <zeger@vandevan.net> |
|---|---|
| date | Sun, 16 Jun 2024 20:24:58 +0200 |
| parents | 45d1a5571c52 |
| children | 38b8060cdf24 |
| files | .chezmoiscripts/run_once_after_30-generate-completions.sh.tmpl .chezmoiscripts/run_once_after_39-install-helix.sh.tmpl .chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl .chezmoiscripts/run_onchange_after_15-install-ubuntu-packages.sh.tmpl .chezmoiscripts/run_onchange_after_17-install-rtx-and-plugins.sh.tmpl .chezmoiscripts/run_onchange_after_19-install-bitwarden.sh.tmpl .chezmoiscripts/run_onchange_after_20-install-rtx-and-plugins.sh.tmpl .chezmoiscripts/run_onchange_after_41-install-language-servers.sh.tmpl dot_config/private_fish/themes/Catppuccin Mocha.theme |
| diffstat | 9 files changed, 59 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/.chezmoiscripts/run_once_after_30-generate-completions.sh.tmpl Thu Jun 13 19:39:13 2024 +0200 +++ b/.chezmoiscripts/run_once_after_30-generate-completions.sh.tmpl Sun Jun 16 20:24:58 2024 +0200 @@ -4,8 +4,8 @@ set -xe -eval "$($HOME/bin/rtx activate bash)" -eval "$($HOME/bin/rtx hook-env)" +eval "$($HOME/bin/mise activate bash)" +eval "$($HOME/bin/mise hook-env)" chezmoi completion zsh > $HOME/.zsh/completions/_chezmoi
--- a/.chezmoiscripts/run_once_after_39-install-helix.sh.tmpl Thu Jun 13 19:39:13 2024 +0200 +++ b/.chezmoiscripts/run_once_after_39-install-helix.sh.tmpl Sun Jun 16 20:24:58 2024 +0200 @@ -16,7 +16,7 @@ bash setup.sh popd -cargo build --release --locked +{{ if (eq .chezmoi.osRelease.name "Ubuntu") }} $HOME/bin/mise x [email protected] -- {{ end }} cargo build --release --locked rm -rf $HELIX_DEFAULT_RUNTIME mkdir -p $HELIX_DEFAULT_RUNTIME cp -r runtime/* $HELIX_DEFAULT_RUNTIME/ @@ -26,7 +26,7 @@ if [ -L $dest ] && [ -e $dest ]; then echo 'Already linked!' else - ln -s $HELIX_INSTALL_DIR/hx + ln -s $HELIX_INSTALL_DIR/hx $dest fi {{ end }}
--- a/.chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl Thu Jun 13 19:39:13 2024 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -{{ if (or (eq .chezmoi.os "darwin") (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.name "Ubuntu"))) -}} -#!/usr/bin/env zsh - -source $HOME/.asdf/asdf.sh -asdf shell rust 1.64.0 -brew unlink sqlite - -HISTDB_SKIM_DIR="$HOME/.local/share/zsh-histdb-skim" -if [[ -d "$HISTDB_SKIM_DIR" ]] -then - cd "$HISTDB_SKIM_DIR" - git pull -else - git clone https://github.com/zegervdv/zsh-histdb-skim "$HISTDB_SKIM_DIR" -fi -cd "$HISTDB_SKIM_DIR" - -cargo build --release -cp target/release/zsh-histdb-skim zsh-histdb-skim - -{{ end -}}
--- a/.chezmoiscripts/run_onchange_after_15-install-ubuntu-packages.sh.tmpl Thu Jun 13 19:39:13 2024 +0200 +++ b/.chezmoiscripts/run_onchange_after_15-install-ubuntu-packages.sh.tmpl Sun Jun 16 20:24:58 2024 +0200 @@ -24,7 +24,8 @@ "pipx" "bison" "flex" - "libnotify4" -}} + "libnotify4" + "autoconf" -}} {{ $ppa := list "ppa:maveonair/helix-editor"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.chezmoiscripts/run_onchange_after_17-install-rtx-and-plugins.sh.tmpl Sun Jun 16 20:24:58 2024 +0200 @@ -0,0 +1,20 @@ +{{ if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.name "Ubuntu" )) -}} +#!/usr/bin/env bash + +set -xe + +# tool-versions hash: {{ include "dot_tool-versions" | sha256sum }} + +: "${XDG_CONFIG_HOME:=$HOME/.config}" +RTX_BIN=$HOME/bin/mise +curl -fsSL https://github.com/jdx/mise/releases/download/v2024.6.2/mise-v2024.6.2-linux-x64 | sudo install -m 755 /dev/stdin $RTX_BIN + +export PYTHON_CONFIGURE_OPTS="--enable-shared" +$RTX_BIN install --verbose --yes + +mkdir -p $XDG_CONFIG_HOME/direnv/lib +$RTX_BIN direnv activate > $XDG_CONFIG_HOME/direnv/lib/use_rtx.sh +$RTX_BIN completion zsh > ~/.zsh/completetions + + +{{ end }}
--- a/.chezmoiscripts/run_onchange_after_19-install-bitwarden.sh.tmpl Thu Jun 13 19:39:13 2024 +0200 +++ b/.chezmoiscripts/run_onchange_after_19-install-bitwarden.sh.tmpl Sun Jun 16 20:24:58 2024 +0200 @@ -9,6 +9,6 @@ sudo dpkg --install --skip-same-version $DOWNLOADFILE rm -rf $DOWNLOADFILE -rtx x [email protected] -- cargo install rbw +$HOME/bin/mise x [email protected] -- cargo install rbw {{ end }}
--- a/.chezmoiscripts/run_onchange_after_20-install-rtx-and-plugins.sh.tmpl Thu Jun 13 19:39:13 2024 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -{{ if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.name "Ubuntu" )) -}} -#!/usr/bin/env bash - -set -xe - -# tool-versions hash: {{ include "dot_tool-versions" | sha256sum }} - -RTX_BIN=$HOME/bin/rtx -curl -fsSL https://github.com/jdx/rtx/releases/download/v2023.12.8/rtx-v2023.12.8-linux-x64 | sudo install -m 755 /dev/stdin $RTX_BIN - -$RTX_BIN install --verbose --yes - -mkdir -p $XDG_CONFIG_HOME/direnv/lib -$RTX_BIN direnv activate > $XDG_CONFIG_HOME/direnv/lib/use_rtx.sh -$RTX_BIN completion zsh > ~/.zsh/completetions - - -{{ end }}
--- a/.chezmoiscripts/run_onchange_after_41-install-language-servers.sh.tmpl Thu Jun 13 19:39:13 2024 +0200 +++ b/.chezmoiscripts/run_onchange_after_41-install-language-servers.sh.tmpl Sun Jun 16 20:24:58 2024 +0200 @@ -7,8 +7,8 @@ set -xe -eval "$($HOME/bin/rtx activate bash)" -eval "$($HOME/bin/rtx hook-env)" +eval "$($HOME/bin/mise activate bash)" +eval "$($HOME/bin/mise hook-env)" curl -fsSL https://github.com/tamasfe/taplo/releases/download/{{ $taplo_version }}/taplo-full-linux-x86_64.gz | gzip -d - | sudo install -m 755 /dev/stdin /usr/local/bin/taplo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dot_config/private_fish/themes/Catppuccin Mocha.theme Sun Jun 16 20:24:58 2024 +0200 @@ -0,0 +1,30 @@ +# name: 'Catppuccin Mocha' +# url: 'https://github.com/catppuccin/fish' +# preferred_background: 1e1e2e + +fish_color_normal cdd6f4 +fish_color_command 89b4fa +fish_color_param f2cdcd +fish_color_keyword f38ba8 +fish_color_quote a6e3a1 +fish_color_redirection f5c2e7 +fish_color_end fab387 +fish_color_comment 7f849c +fish_color_error f38ba8 +fish_color_gray 6c7086 +fish_color_selection --background=313244 +fish_color_search_match --background=313244 +fish_color_option a6e3a1 +fish_color_operator f5c2e7 +fish_color_escape eba0ac +fish_color_autosuggestion 6c7086 +fish_color_cancel f38ba8 +fish_color_cwd f9e2af +fish_color_user 94e2d5 +fish_color_host 89b4fa +fish_color_host_remote a6e3a1 +fish_color_status f38ba8 +fish_pager_color_progress 6c7086 +fish_pager_color_prefix f5c2e7 +fish_pager_color_completion cdd6f4 +fish_pager_color_description 6c7086 \ No newline at end of file