From d8b137e382a6ed2fc99bd8f2a4e2a252630ba29d Mon Sep 17 00:00:00 2001 From: cupcakearmy Date: Wed, 9 Nov 2022 13:12:37 +0100 Subject: [PATCH] remove brew plugin --- .gitmodules | 3 --- files/fish/functions/n.fish | 3 +++ install | 29 ++++++++++++++++++++++++----- install.conf.yaml | 6 ------ plugins/dotbot-brew | 1 - 5 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 files/fish/functions/n.fish delete mode 160000 plugins/dotbot-brew diff --git a/.gitmodules b/.gitmodules index f4b151f..1af14d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,3 @@ path = dotbot url = https://github.com/anishathalye/dotbot ignore = dirty -[submodule "plugins/dotbot-brew"] - path = plugins/dotbot-brew - url = https://github.com/d12frosted/dotbot-brew.git diff --git a/files/fish/functions/n.fish b/files/fish/functions/n.fish new file mode 100644 index 0000000..18432fd --- /dev/null +++ b/files/fish/functions/n.fish @@ -0,0 +1,3 @@ +function n --wraps='pnpm env use --global' --description 'alias n pnpm env use --global' + pnpm env use --global $argv; +end diff --git a/install b/install index 67bb704..d233683 100755 --- a/install +++ b/install @@ -12,14 +12,33 @@ cd "${BASEDIR}" git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive git submodule update --init --recursive +"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" + +# Own Stuff platform="$(uname -s)" -if [[ $platform == "Darwin" ]]; then - # Brew - "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" --plugin-dir plugins/dotbot-brew -c "${CONFIG}" "${@}" -else - "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" + +function uninstalled() { + if which $1 >/dev/null; then + return 1 + else + return 0 + fi +} + +# PNPM +if uninstalled pnpm; then + curl -fsSL https://get.pnpm.io/install.sh | sh - fi +# Brew +if [[ $platform == "Darwin" ]]; then + if uninstalled brew; then + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + fi + brew bundle --file ./files/Brewfile +fi + + # NeoVim & Vim Plugins https://github.com/junegunn/vim-plug curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' diff --git a/install.conf.yaml b/install.conf.yaml index 0e806ac..be25aa2 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -16,9 +16,3 @@ ~/.config/key-mapper: files/key-mapper ~/.gitignore_global: files/git/gitignore_global ~/.tmux.conf: files/tmux.conf - -- shell: - - [git submodule update --init --recursive, Installing submodules] - -- brewfile: - - files/Brewfile diff --git a/plugins/dotbot-brew b/plugins/dotbot-brew deleted file mode 160000 index 0f8c541..0000000 --- a/plugins/dotbot-brew +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0f8c541d5ca06db89337d561de3e1d1fdeb030cb