From 5073f2b7a3862ec4f1e7591ea60a2e4d1a74967d Mon Sep 17 00:00:00 2001 From: phalanx-hk Date: Sat, 14 Sep 2024 00:22:04 +0900 Subject: [PATCH 1/3] add: mise --- .github/workflows/lint.yml | 2 +- .pre-commit-config.yaml | 13 ++++++++ config/homebrew/Brewfile | 17 ---------- config/mise/mise.toml | 30 ++++++++++++++++++ config/zsh/.zshenv | 12 +++----- config/zsh/.zshrc | 4 --- install/common/golang.sh | 53 -------------------------------- install/common/mise.sh | 19 ++++++++++++ install/common/poetry.sh | 21 ------------- install/common/pyenv.sh | 31 ------------------- install/common/tfenv.sh | 33 -------------------- install/link.sh | 8 +++++ install/mac/setup.sh | 3 ++ install/ubuntu/apt.sh | 36 ---------------------- install/ubuntu/setup.sh | 15 ++------- install/ubuntu/tools/act.sh | 23 -------------- install/ubuntu/tools/bottom.sh | 29 ----------------- install/ubuntu/tools/delta.sh | 30 ------------------ install/ubuntu/tools/dust.sh | 35 --------------------- install/ubuntu/tools/hadolint.sh | 32 ------------------- install/ubuntu/tools/just.sh | 26 ---------------- install/ubuntu/tools/sheldon.sh | 26 ---------------- install/ubuntu/tools/starship.sh | 19 ------------ install/ubuntu/tools/tfsec.sh | 20 ------------ 24 files changed, 81 insertions(+), 456 deletions(-) create mode 100644 .pre-commit-config.yaml create mode 100644 config/mise/mise.toml delete mode 100755 install/common/golang.sh create mode 100755 install/common/mise.sh delete mode 100755 install/common/poetry.sh delete mode 100755 install/common/pyenv.sh delete mode 100755 install/common/tfenv.sh delete mode 100755 install/ubuntu/tools/act.sh delete mode 100755 install/ubuntu/tools/bottom.sh delete mode 100755 install/ubuntu/tools/delta.sh delete mode 100755 install/ubuntu/tools/dust.sh delete mode 100755 install/ubuntu/tools/hadolint.sh delete mode 100755 install/ubuntu/tools/just.sh delete mode 100755 install/ubuntu/tools/sheldon.sh delete mode 100755 install/ubuntu/tools/starship.sh delete mode 100755 install/ubuntu/tools/tfsec.sh diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 772d2ea..0caa219 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run actionlint shell: bash run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..d3bd2a4 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,13 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.6.0 + hooks: + - id: no-commit-to-branch + args: ["--branch", "main"] + + - repo: local + hooks: + - id: secretlint + name: secretlint + language: docker_image + entry: secretlint/secretlint:latest secretlint diff --git a/config/homebrew/Brewfile b/config/homebrew/Brewfile index 4953e16..bf96590 100644 --- a/config/homebrew/Brewfile +++ b/config/homebrew/Brewfile @@ -2,46 +2,29 @@ tap "hashicorp/tap" tap "homebrew/bundle" tap "rcmdnk/file" tap "homebrew/cask-fonts" -brew "act" -brew "bat" -brew "bottom" brew "glib" brew "cairo" brew "coreutils" -brew "dust" -brew "eza" -brew "fd" brew "gcc" brew "gdrive" brew "genact" -brew "gh" brew "git" -brew "git-delta" -brew "hadolint" brew "hdf5" brew "helix" brew "libdap" brew "libpq" brew "little-cms2" brew "netcdf" -brew "node" brew "openblas" brew "webp" brew "qt@5" brew "poppler-qt5" brew "virtualenv" -brew "ripgrep" -brew "sheldon" brew "shellcheck" -brew "starship" brew "tealdeer" -brew "tfsec" brew "tree" -brew "hashicorp/tap/packer" brew "rcmdnk/file/brew-file" cask "1password" -cask "1password-cli" -cask "codewhisperer" cask "docker" cask "font-hack-nerd-font" cask "google-cloud-sdk" diff --git a/config/mise/mise.toml b/config/mise/mise.toml new file mode 100644 index 0000000..cbc6685 --- /dev/null +++ b/config/mise/mise.toml @@ -0,0 +1,30 @@ +[tools] +# languages +python = ["3.11", "3.12"] +rust = "1.81.0" +terraform = "1.9.5" +go = "1.23.1" + +# tools +uv = "0.4.9" +act = "latest" +actionlint = "latest" +hadolint = "latest" +1password-cli = "latest" +pre-commit = "latest" +bat = "latest" +bottom = "latest" +eza = "latest" +ripgrep = "latest" +dust = "latest" +github-cli = "latest" +delta = "latest" +starship = "latest" +tflint = "latest" +tfsec = "latest" +packer = "latest" +gcloud = "latest" +just = "latest" + +# runtime +node = "22.8.0" diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv index 2bd5b95..e051ab4 100644 --- a/config/zsh/.zshenv +++ b/config/zsh/.zshenv @@ -3,12 +3,8 @@ unsetopt GLOBAL_RCS export PATH="$HOME/.local/bin:$PATH" -### tfenv ### -export PATH="$HOME/.tfenv/bin:$PATH" +# docker +export PATH="$HOME/.docker/bin/docker:$PATH" -### pyenv ### -export PATH="$HOME/.pyenv/bin:$PATH" - -### golang ### -export PATH="/usr/local/go/bin:$PATH" -export GOPATH="$HOME/go" \ No newline at end of file +# mise +export PATH="$HOME/.local/share/mise/shims:$PATH" diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 877007d..82f065c 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -4,16 +4,12 @@ eval "$(starship init zsh)" # sheldon eval "$(sheldon source)" -# pyenv -eval "$(pyenv init -)" - setopt AUTO_CD setopt AUTO_PARAM_KEYS setopt nonomatch alias cat='bat' alias ls='eza --icons --long --time-style=long-iso --header' -alias find='fd' alias grep='rg' alias top='btm' alias act='act --container-architecture linux/amd64' diff --git a/install/common/golang.sh b/install/common/golang.sh deleted file mode 100755 index d381ae8..0000000 --- a/install/common/golang.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -set -Eeuxo pipefail - -INSTALL_DIR=/usr/local -system=$(uname -s) -machine=$(uname -m) -temp_file=$(mktemp /tmp/go-install-XXXXXXXXX.tar.gz) -LATEST_VERSION=$(curl "https://go.dev/VERSION?m=text" | head -n 1) -readonly INSTALL_DIR system machine temp_file LATEST_VERSION - -function install() { - if [ "${system}" == "Darwin" ]; then - curl -L https://go.dev/dl/"$LATEST_VERSION".darwin-arm64.tar.gz -o "${temp_file}" - else - if [ "${machine}" != "x86_64" ]; then - curl -L https://go.dev/dl/"$LATEST_VERSION".linux-arm64.tar.gz -o "${temp_file}" - else - curl -L https://go.dev/dl/"$LATEST_VERSION".linux-amd64.tar.gz -o "${temp_file}" - fi - fi - sudo tar -C "${INSTALL_DIR}" -xzf "${temp_file}" - sudo rm "${temp_file}" -} - -function install_go() { - if [ -d "${INSTALL_DIR}"/go ]; then - OLD_VERSION=$("${INSTALL_DIR}"/go/bin/go version | grep -oP 'go\K\d+\.\d+(\.\d+)?') - read -rp "go(version ${OLD_VERSION}) already exists. install latest version? [y/N] > " ans - if [[ $ans =~ ^[Yy]$ ]]; then - echo "Remove ${INSTALL_DIR}/go" - sudo rm -rf "${INSTALL_DIR}"/go - install - else - echo "Skipped golang install" - exit 0 - fi - else - install - fi -} - -function uninstall_go() { - sudo rm -rf "${INSTALL_DIR}"/go -} - -function main() { - install_go -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/common/mise.sh b/install/common/mise.sh new file mode 100755 index 0000000..18cb2cd --- /dev/null +++ b/install/common/mise.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -Eeuxo pipefail + +function install_mise() { + curl https://mise.run | sh +} + +function uninstall_mise() { + rm ~/.local/bin/mise +} + +function main() { + install_mise +} + +if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then + main +fi \ No newline at end of file diff --git a/install/common/poetry.sh b/install/common/poetry.sh deleted file mode 100755 index e844256..0000000 --- a/install/common/poetry.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -readonly INSTALL_DIR="$HOME/.local/" - -function install_poetry() { - curl -sSL https://install.python-poetry.org | POETRY_HOME="${INSTALL_DIR}" python3 - -} - -function uninstall_poetry() { - rm "${INSTALL_DIR}"/bin/poetry -} - -function main() { - install_poetry -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/common/pyenv.sh b/install/common/pyenv.sh deleted file mode 100755 index 363d393..0000000 --- a/install/common/pyenv.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -function install_pyenv() { - if [ -d "$HOME"/.pyenv ]; then - read -rp ".pyenv already exists. Reinstall? [y/N] > " ans - if [[ $ans =~ ^[Yy]$ ]]; then - echo "Remove .pyenv" - rm -rf "$HOME"/.pyenv/ - curl https://pyenv.run | bash - else - echo "Skipped pyenv install" - exit 0 - fi - else - curl https://pyenv.run | bash - fi -} - -function uninstall_pyenv() { - rm -rf "$HOME"/.pyenv/ -} - -function main() { - install_pyenv -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/common/tfenv.sh b/install/common/tfenv.sh deleted file mode 100755 index bd6aaf0..0000000 --- a/install/common/tfenv.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -readonly INSTALL_DIR="$HOME/.tfenv" - -function install_tfenv() { - if [ -d "${INSTALL_DIR}" ]; then - read -rp ".tfenv already exists. Reinstall? [y/N] > " ans - if [[ $ans =~ ^[Yy]$ ]]; then - echo "Remove .tfenv" - rm -rf "$INSTALL_DIR" - git clone --depth=1 https://github.com/tfutils/tfenv.git "$INSTALL_DIR" - else - echo "Skipped tfenv install" - exit 0 - fi - else - git clone --depth=1 https://github.com/tfutils/tfenv.git "$INSTALL_DIR" - fi -} - -function uninstall_tfenv() { - rm -rf "${INSTALL_DIR}" -} - -function main() { - install_tfenv -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/link.sh b/install/link.sh index 4d031ce..db353c4 100644 --- a/install/link.sh +++ b/install/link.sh @@ -63,3 +63,11 @@ ln -sf "${REPO_DIR}/config/vscode/settings.json" "${VSCODE_SETTING_DIR}/settings ### zsh ### ln -sf "$REPO_DIR"/config/zsh/.zshrc ~/.zshrc ln -sf "$REPO_DIR"/config/zsh/.zshenv ~/.zshenv + + +### mise ### +readonly MISE_CONFIG_DIR="$HOME/.config/mise" +if [ ! -d "$MISE_CONFIG_DIR" ]; then + mkdir -p "$MISE_CONFIG_DIR" +fi +ln -sf "$REPO_DIR"/config/mise/mise.toml ~/.config/mise/config.toml diff --git a/install/mac/setup.sh b/install/mac/setup.sh index cb7cde7..d7d6108 100644 --- a/install/mac/setup.sh +++ b/install/mac/setup.sh @@ -24,3 +24,6 @@ for SCRIPT in "${COMMON_DIR}"/*.sh; do echo "No shell scripts found in ${COMMON_DIR}." fi done + +### install mise dependencies ### +mise install -y \ No newline at end of file diff --git a/install/ubuntu/apt.sh b/install/ubuntu/apt.sh index bd7421c..69d81bf 100644 --- a/install/ubuntu/apt.sh +++ b/install/ubuntu/apt.sh @@ -2,15 +2,6 @@ set -Eeuxo pipefail -function addPackerRepo() { - curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add - - if [ "$(uname -m)" != "x86_64" ]; then - apt-add-repository -y "deb [arch=arm64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" - else - apt-add-repository -y "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" - fi -} - function addDockerRepo() { install -m 0755 -d /etc/apt/keyrings curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc @@ -22,19 +13,6 @@ function addDockerRepo() { tee /etc/apt/sources.list.d/docker.list > /dev/null } -function addGhRepo() { - curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && - chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list >/dev/null -} - -function addEzaRepo() { - mkdir -p /etc/apt/keyrings - wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | gpg --yes --dearmor -o /etc/apt/keyrings/gierens.gpg - echo "deb [signed-by=/etc/apt/keyrings/gierens.gpg] http://deb.gierens.de stable main" | tee /etc/apt/sources.list.d/gierens.list - chmod 644 /etc/apt/keyrings/gierens.gpg /etc/apt/sources.list.d/gierens.list -} - function install_apt_package() { add-apt-repository -y ppa:git-core/ppa apt-get update @@ -42,7 +20,6 @@ function install_apt_package() { apt-get install -y \ apt-utils \ autoconf \ - bat \ build-essential \ ca-certificates \ clang \ @@ -50,7 +27,6 @@ function install_apt_package() { clang-format \ cmake \ curl \ - fd-find \ git \ git-lfs \ gpg \ @@ -61,9 +37,6 @@ function install_apt_package() { liblzma-dev \ libbz2-dev \ libreadline-dev \ - python3 \ - python3-pip \ - ripgrep \ shellcheck \ sqlite3 \ trash-cli \ @@ -71,7 +44,6 @@ function install_apt_package() { wget \ zip \ zsh - mv /usr/bin/batcat /usr/bin/bat if ! command -v docker &> /dev/null; then addDockerRepo apt-get update @@ -82,14 +54,6 @@ function install_apt_package() { docker-buildx-plugin \ docker-compose-plugin fi - addPackerRepo - addGhRepo - addEzaRepo - apt-get update - apt-get install -y \ - gh \ - eza \ - packer } function main() { diff --git a/install/ubuntu/setup.sh b/install/ubuntu/setup.sh index 9892bc3..26feffa 100644 --- a/install/ubuntu/setup.sh +++ b/install/ubuntu/setup.sh @@ -13,18 +13,6 @@ sudo bash "${CUR_DIR}"/apt.sh #### link dotfiles #### bash "${ROOT_DIR}"/link.sh -#### ubuntu tools #### -readonly TOOL_DIR="${CUR_DIR}"/tools/ -for SCRIPT in "${TOOL_DIR}"/*.sh; do - if [ -f "$SCRIPT" ]; then - echo "Executing ${SCRIPT}..." - chmod +x "${SCRIPT}" - sudo bash "${SCRIPT}" - else - echo "No shell scripts found in ${COMMON_DIR}." - fi -done - #### common tools #### readonly COMMON_DIR="${ROOT_DIR}"/common/ for SCRIPT in "${COMMON_DIR}"/*.sh; do @@ -36,3 +24,6 @@ for SCRIPT in "${COMMON_DIR}"/*.sh; do echo "No shell scripts found in ${COMMON_DIR}." fi done + +#### install mise dependencies #### +mise install -y \ No newline at end of file diff --git a/install/ubuntu/tools/act.sh b/install/ubuntu/tools/act.sh deleted file mode 100755 index f236ebf..0000000 --- a/install/ubuntu/tools/act.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -readonly BIN_DIR=/usr/local/bin - -function install_act() { - tmp_file="$(mktemp /tmp/act-install-XXXXXXXXXX.sh)" - curl -Lo "${tmp_file}" https://raw.githubusercontent.com/nektos/act/master/install.sh - bash "${tmp_file}" -b "${BIN_DIR}" -} - -function uninstall_act() { - rm "${BIN_DIR}"/act -} - -function main() { - install_act -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/ubuntu/tools/bottom.sh b/install/ubuntu/tools/bottom.sh deleted file mode 100755 index 0f7d4ea..0000000 --- a/install/ubuntu/tools/bottom.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -function install_bottom() { - tmp_file="$(mktemp /tmp/bottom-XXXXXXXXXX.deb)" - api_endpoint="https://api.github.com/repos/ClementTsang/bottom/releases/latest" - latest_version=$(curl -s $api_endpoint | jq -r '.tag_name') - if [ "$(uname -m)" != "x86_64" ]; then - deb_url=https://github.com/ClementTsang/bottom/releases/download/${latest_version}/bottom_${latest_version}_arm64.deb - else - deb_url=https://github.com/ClementTsang/bottom/releases/download/${latest_version}/bottom_${latest_version}_amd64.deb - fi - curl -fSL "{$deb_url}" -o "${tmp_file}" - dpkg -i "$tmp_file" -} - - -function uninstall_bottom() { - rm "$(which btm)" -} - -function main() { - install_bottom -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/ubuntu/tools/delta.sh b/install/ubuntu/tools/delta.sh deleted file mode 100755 index f9ed0cc..0000000 --- a/install/ubuntu/tools/delta.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -function install_delta() { - tmp_file="$(mktemp /tmp/delta-XXXXXXXXXX.deb)" - api_endpoint="https://api.github.com/repos/dandavison/delta/releases/latest" - latest_version=$(curl -s $api_endpoint | jq -r '.tag_name') - if [ "$(uname -m)" != "x86_64" ]; then - https://github.com/dandavison/delta/releases/download/0.16.5/delta-0.16.5-aarch64-apple-darwin.tar.gz - deb_url=https://github.com/dandavison/delta/releases/download/${latest_version}/git-delta_${latest_version}_arm64.deb - else - deb_url=https://github.com/dandavison/delta/releases/download/${latest_version}/git-delta_${latest_version}_amd64.deb - fi - curl -fSL "{$deb_url}" -o "${tmp_file}" - dpkg -i "$tmp_file" -} - - -function uninstall_delta() { - rm "$(which delta)" -} - -function main() { - install_delta -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/ubuntu/tools/dust.sh b/install/ubuntu/tools/dust.sh deleted file mode 100755 index d3d33ec..0000000 --- a/install/ubuntu/tools/dust.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -function install_dust() { - tmp_file="$(mktemp /tmp/dust-XXXXXXXXXX.tar.gz)" - tmp_dir="$(mktemp -d /tmp/dust-XXXXXXXXXX)" - api_endpoint="https://api.github.com/repos/bootandy/dust/releases/latest" - latest_version=$(curl -s $api_endpoint | jq -r '.tag_name') - readonly tmp_file tmp_dir api_endpoint latest_version - - if [ "$(uname -m)" != "x86_64" ]; then - tar_url=https://github.com/bootandy/dust/releases/download/${latest_version}/dust-${latest_version}-aarch64-unknown-linux-gnu.tar.gz - else - tar_url=https://github.com/bootandy/dust/releases/download/${latest_version}/dust-${latest_version}-x86_64-unknown-linux-gnu.tar.gz - fi - curl -Lo "${tmp_file}" "{$tar_url}" - tar xf "${tmp_file}" --strip-components=1 -C "${tmp_dir}" - mv "${tmp_dir}"/dust /usr/local/bin - rm "${tmp_file}" - rm -rf "${tmp_dir}" -} - - -function uninstall_dust() { - rm "$(which dust)" -} - -function main() { - install_dust -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/ubuntu/tools/hadolint.sh b/install/ubuntu/tools/hadolint.sh deleted file mode 100755 index 42e531b..0000000 --- a/install/ubuntu/tools/hadolint.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -readonly BIN_DIR=/usr/local/bin/ -readonly BIN_PATH="${BIN_DIR}"/hadolint - -function install_hadolint() { - api_url="https://api.github.com/repos/hadolint/hadolint/releases/latest" - tag_name=$(curl -s $api_url | jq -r '.tag_name') - readonly tag_name api_url - - if [ "$(uname -m)" != "x86_64" ]; then - curl -fSL "https://github.com/hadolint/hadolint/releases/download/${tag_name}/hadolint-Linux-arm64" -o "${BIN_PATH}" - else - curl -fSL "https://github.com/hadolint/hadolint/releases/download/${tag_name}/hadolint-Linux-x86_64" -o "${BIN_PATH}" - fi - chmod 755 "${BIN_PATH}" -} - - -function uninstall_hadolint() { - rm "${BIN_PATH}" -} - -function main() { - install_hadolint -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi diff --git a/install/ubuntu/tools/just.sh b/install/ubuntu/tools/just.sh deleted file mode 100755 index 84dfa3b..0000000 --- a/install/ubuntu/tools/just.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -readonly BIN_DIR=/usr/local/bin - -function install_just() { - if [ -f "${BIN_DIR}"/just ]; then - echo "just has been already installed, skip." - else - curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to "${BIN_DIR}" - fi -} - -function uninstall_just() { - rm "${BIN_DIR}/just" -} - - -function main() { - install_just -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/ubuntu/tools/sheldon.sh b/install/ubuntu/tools/sheldon.sh deleted file mode 100755 index 87e94b2..0000000 --- a/install/ubuntu/tools/sheldon.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -readonly BIN_DIR=/usr/local/bin - -function install_sheldon() { - if [ -f "${BIN_DIR}"/sheldon ]; then - echo "sheldon has been already installed, skip." - else - curl --proto '=https' -fLsS https://rossmacarthur.github.io/install/crate.sh \ - | bash -s -- --repo rossmacarthur/sheldon --to "${BIN_DIR}" - fi -} - -function uninstall_sheldon() { - rm "${BIN_DIR}"/sheldon -} - -function main() { - install_sheldon -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/ubuntu/tools/starship.sh b/install/ubuntu/tools/starship.sh deleted file mode 100755 index 4d1a7ad..0000000 --- a/install/ubuntu/tools/starship.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -function install_starship() { - curl https://starship.rs/install.sh | sh -s -- -y -} - -function uninstall_starship() { - rm "$(which starship)" -} - -function main() { - install_starship -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file diff --git a/install/ubuntu/tools/tfsec.sh b/install/ubuntu/tools/tfsec.sh deleted file mode 100755 index 57537d5..0000000 --- a/install/ubuntu/tools/tfsec.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -function install_tfsec() { - curl -s https://raw.githubusercontent.com/aquasecurity/tfsec/master/scripts/install_linux.sh | bash -} - - -function uninstall_tfsec() { - rm "$(which tfsec)" -} - -function main() { - install_tfsec -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file From a8113bb5f3dd23b87ef6976825f3aa92a6151250 Mon Sep 17 00:00:00 2001 From: phalanx-hk Date: Sat, 14 Sep 2024 00:40:59 +0900 Subject: [PATCH 2/3] fix: Brewfile --- config/homebrew/Brewfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/homebrew/Brewfile b/config/homebrew/Brewfile index bf96590..be92a04 100644 --- a/config/homebrew/Brewfile +++ b/config/homebrew/Brewfile @@ -1,7 +1,5 @@ -tap "hashicorp/tap" tap "homebrew/bundle" tap "rcmdnk/file" -tap "homebrew/cask-fonts" brew "glib" brew "cairo" brew "coreutils" From a29514692e82764c600304894056e7efbe37974a Mon Sep 17 00:00:00 2001 From: phalanx-hk Date: Sat, 14 Sep 2024 00:45:07 +0900 Subject: [PATCH 3/3] remove: rye --- install/common/rye.sh | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 install/common/rye.sh diff --git a/install/common/rye.sh b/install/common/rye.sh deleted file mode 100644 index 0e84de1..0000000 --- a/install/common/rye.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuxo pipefail - -readonly RYE_HOME="$HOME/.rye" - -function install_rye() { - curl -sSf https://rye.astral.sh/get | RYE_NO_AUTO_INSTALL=1 RYE_INSTALL_OPTION="--yes" bash -} - -function uninstall_rye() { - rm -rf "${RYE_HOME}" -} - -function main() { - install_rye -} - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - main -fi \ No newline at end of file