Skip to content

Commit

Permalink
Update macos bootstrap script
Browse files Browse the repository at this point in the history
  • Loading branch information
llago-atlassian committed Apr 24, 2023
1 parent bad0b30 commit 678b649
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Brewfile.lock.json
nvim/plugin/packer_*
27 changes: 7 additions & 20 deletions macos-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,11 @@ if [[ ! -e /usr/local/bin/z.sh ]]; then
sudo cp ./z/z.sh /usr/local/bin && rm -rf ./z
fi

VIM_PLUG_FILE="${HOME}/.vim/autoload/plug.vim"
if [ ! -f "${VIM_PLUG_FILE}" ]; then
echo "==> Installing vim plug"
curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
echo " ==> Vim plugins will be installed on vim startup"
fi

NEOVIM_PLUG_FILE="${HOME}/.local/share/nvim/site/autoload/plug.vim"
if [ ! -f "${NEOVIM_PLUG_FILE}" ]; then
echo "==> Installing neovim plug"
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'
echo "==> Neovim plugins will be installed on nvim startup"
PACKER_DIST="${HOME}/.local/share/nvim/site/pack/packer/start/packer.nvim"
if [ ! -d "${PACKER_DIST}" ]; then
echo "==> Installing Packer"
git clone --depth 1 https://github.com/wbthomason/packer.nvim\
~/.local/share/nvim/site/pack/packer/start/packer.nvim
fi

if [ ! -d "${HOME}/.oh-my-zsh" ]; then
Expand All @@ -42,24 +33,20 @@ mkdir -p ~/Development
echo "==> Setting up dotfiles"
git remote set-url origin [email protected]:lucaslago/dotfiles.git

ln -sf $(pwd)/vimrc "${HOME}/.vimrc"

mkdir -p "${HOME}/.config/nvim" && ln -sf $(pwd)/init.vim "${HOME}/.config/nvim/init.vim" && ln -sf $(pwd)/coc-settings.json "${HOME}/.config/nvim/coc-settings.json"

ln -sf $(pwd)/zshrc "${HOME}/.zshrc"
ln -sf $(pwd)/tmux.conf "${HOME}/.tmux.conf"
ln -sf $(pwd)/tmate.conf "${HOME}/.tmate.conf"
ln -sf $(pwd)/gitconfig "${HOME}/.gitconfig"
ln -s "$(pwd)/nvim" "${HOME}/.config/nvim"

mkdir -p "${HOME}/.config/coc/extensions" && ln -sf $(pwd)/coc-nvim/package.json "$HOME/.config/coc/extensions/package.json" && (cd "$HOME/.config/coc/extensions" && npm install --global-style --ignore-scripts --no-bin-links --no-package-lock --only=prod)
mkdir -p "${HOME}/.config/coc/extensions"

if [ ! -d "${HOME}/.tmux/plugins" ]; then
echo " ==> Installing tmux plugins"
git clone https://github.com/tmux-plugins/tpm "${HOME}/.tmux/plugins/tpm"
${HOME}/.tmux/plugins/tpm/bin/install_plugins
fi


if ! command -v graphql-lsp > /dev/null; then
echo "==> Installing graphql-lsp"
npm install --global graphql-language-service-cli
Expand Down
2 changes: 1 addition & 1 deletion nvim/after/plugin/treesitter.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require'nvim-treesitter.configs'.setup {
-- A list of parser names, or "all"
ensure_installed = { "help", "c", "lua", "rust", "javascript", "typescript", "go", "vim"},
ensure_installed = { "c", "lua", "rust", "javascript", "typescript", "go", "vim"},

-- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = false,
Expand Down

0 comments on commit 678b649

Please sign in to comment.