From 749b57966d381c432b97f376a347b5b7c316670b Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 13 Jun 2025 16:28:38 -0600 Subject: [PATCH] replace webman with mise --- .chezmoidata/packages.yaml | 35 +++++++++++++++------ Dockerfile | 2 +- README.md | 11 ++++--- dot_config/private_fish/config.fish | 12 ++++--- dot_config/private_fish/dot_on_install.fish | 2 +- run_once_after_install2.sh.tmpl | 21 ------------- run_once_before_install.sh.tmpl | 8 ++--- run_onchange_install-packages.sh.tmpl | 21 ++----------- 8 files changed, 47 insertions(+), 65 deletions(-) diff --git a/.chezmoidata/packages.yaml b/.chezmoidata/packages.yaml index 7993efa..0c67c1b 100644 --- a/.chezmoidata/packages.yaml +++ b/.chezmoidata/packages.yaml @@ -7,6 +7,9 @@ packages: - direnv casks: - git-credential-manager + - ghostty + - orbstack + - raycast linux: dnfs: - git-all @@ -26,13 +29,25 @@ packages: - bash - fish - direnv - webman: - pkgs: - - bat - - lsd - - fzf - - zellij - - nvim - - jj - groups: - - modern-unix + mise: + - jj + - lsd + - fzf + - zellij + - neovim + - delta + - bat + - fd + - rg + - hyperfine + - yazi + - jq + - btop + - bottom + - uv + - dust + - glow + - lazygit + - lazydocker + - zoxide + diff --git a/Dockerfile b/Dockerfile index 236a17a..38a62b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && \ apt update && \ apt install -y git curl fish sudo && \ rm -rf /var/lib/apt/lists/* -RUN sh -c "$(curl -fsLS get.chezmoi.io)" +RUN sh -c "$(curl -fsLS get.chezmoi.io/lb)" COPY . /root/.local/share/chezmoi/ RUN chezmoi init --apply diff --git a/README.md b/README.md index 9f19f8d..d20f4c0 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,12 @@ These dotfiles are managed using [chezmoi](https://www.chezmoi.io/). If you'd like to use these files long-term, fork this project to manage your own configuration. Then: - Change the `email` and `name` in `.chezmoi.toml.tmpl` to your own info. - - Install with `sh -c "$(curl -fsLS git.io/chezmoi)" -- init --apply && fish` + - Install with `sh -c "$(curl -fsLS get.chezmoi.io/lb)" -- -b $HOME/.local/bin init --apply && fish` -Personally, I run `sh -c "$(curl -fsLS git.io/chezmoi)" -- init --apply candrewlee14 && fish` +Personally, I run +```bash +sh -c "$(curl -fsLS get.chezmoi.io/lb)" -- -b $HOME/.local/bin init --apply candrewlee14 && fish +``` ## Information @@ -27,9 +30,7 @@ Here are a few of the primary tools installed here: - **Post-Install**: run `tide configure` to change the appearance of the prompt - [atuin](https://github.com/atuinsh/atuin) - helpful shell history - by default, it rebinds `ctrl+r` and `up` to use `atuin` -- [webman](https://github.com/candrewlee14/webman) - cross-platform binary package manager - - run `webman upgrade nvim` to upgrade to the latest `nvim`, for example - - run `webman switch node` to use other versions of packages +- [mise](https://mise.jdx.dev) - a polyglot tool version manager - [nvim](https://github.com/neovim/neovim) - a better vim-fork - we use [AstroNvim](https://astronvim.com/) to get an IDE-like terminal editor experience - [zellij](https://github.com/zellij-org/zellij) - a modern `tmux` replacement diff --git a/dot_config/private_fish/config.fish b/dot_config/private_fish/config.fish index cbcc776..631d788 100644 --- a/dot_config/private_fish/config.fish +++ b/dot_config/private_fish/config.fish @@ -10,6 +10,13 @@ if status is-interactive direnv hook fish | source end + if type -q mise + mise activate fish | source + end + + alias ls="lsd" + set -gx EDITOR nvim + if test -f ~/.config/fish/config.fish.local source ~/.config/fish/config.fish.local end @@ -18,9 +25,4 @@ if status is-interactive end end -alias ls="lsd" - -fish_add_path $HOME/.webman/bin - -set -gx EDITOR nvim diff --git a/dot_config/private_fish/dot_on_install.fish b/dot_config/private_fish/dot_on_install.fish index 7f48fca..0f2c838 100644 --- a/dot_config/private_fish/dot_on_install.fish +++ b/dot_config/private_fish/dot_on_install.fish @@ -9,7 +9,7 @@ if not functions -q fisher end end -fish_add_path ~/.webman/bin/ +fish_add_path ~/.local/bin/ set -gx --path XDG_DATA_DIRS $XDG_DATA_DIRS:$HOME/.local/share/ # if atuin is not installed, install it diff --git a/run_once_after_install2.sh.tmpl b/run_once_after_install2.sh.tmpl index 5908d0c..b10778a 100644 --- a/run_once_after_install2.sh.tmpl +++ b/run_once_after_install2.sh.tmpl @@ -57,26 +57,5 @@ else chsh -s $(which fish) || echo "chsh failed" fi - - -if test -x ~/.webman/bin/nvim; then - echo "nvim already installed" -else - echo "\n[-] Installing nvim [-]" - ~/.webman/bin/webman add nvim -fi - echo "\n[-] Running fish install setup [-]" /usr/bin/env fish ~/.config/fish/.on_install.fish - -if test -f ~/.config/nvim/README.md ; then - echo "Already installed AstroNvim" -else - echo "\n[-] Installing AstroNvim [-]" - - if test -x ~/.webman/bin/nvim ; then - ~/.webman/bin/nvim --headless +q - else - echo "~/.webman/bin/nvim does not exist or is not executable" - fi -fi diff --git a/run_once_before_install.sh.tmpl b/run_once_before_install.sh.tmpl index e6ecb0b..d373d22 100644 --- a/run_once_before_install.sh.tmpl +++ b/run_once_before_install.sh.tmpl @@ -42,9 +42,9 @@ fi {{- end }} -echo "\n[-] Installing webman [-]" -if test -x ~/.webman/bin/webman; then - echo "webman already installed" +echo "\n[-] Installing mise [-]" +if test -x ~/.local/bin/mise; then + echo "mise already installed" else - curl https://raw.githubusercontent.com/candrewlee14/webman/main/scripts/install.sh | sh + curl https://mise.run | sh fi diff --git a/run_onchange_install-packages.sh.tmpl b/run_onchange_install-packages.sh.tmpl index 5286ed1..b615a5c 100644 --- a/run_onchange_install-packages.sh.tmpl +++ b/run_onchange_install-packages.sh.tmpl @@ -35,22 +35,7 @@ echo "[-] Updating casks [-]" {{ end -}} {{ end -}} -echo "[-] Updating Webman groups [-]" - -if test -x ~/.webman/bin/webman; then - echo "webman already installed" -else - echo "\n[-] Installing webman [-]" - curl https://raw.githubusercontent.com/candrewlee14/webman/main/scripts/install.sh | sh -fi - -~/.webman/bin/webman upgrade webman - -{{ range .packages.webman.groups -}} -~/.webman/bin/webman group upgrade {{ . | quote }} -a -{{ end -}} - -echo "[-] Updating Webman packages [-]" -{{ range .packages.webman.pkgs -}} -~/.webman/bin/webman upgrade {{ . | quote }} +echo "[-] Updating Mise tools [-]" +{{ range .packages.mise -}} +~/.local/bin/mise use --global {{ . | quote }} {{ end -}}