From b3f74071f962778b0c11fd28f4c21ec8b7a7d114 Mon Sep 17 00:00:00 2001 From: Charles Gould Date: Mon, 8 Jun 2020 19:36:19 -0500 Subject: [PATCH] install: stop using Linuxbrew --- fish/config.fish | 5 ----- install.sh | 11 +++++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/fish/config.fish b/fish/config.fish index 93f17f2..eee459a 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -67,11 +67,6 @@ if not functions -q fisher fish -c fisher end -# Homebrew package manager -if test -x /home/linuxbrew/.linuxbrew/bin/brew - eval (/home/linuxbrew/.linuxbrew/bin/brew shellenv) -end - # Nix package manager if test -f ~/.nix-profile/etc/profile.d/nix.sh functions -q fenv && fenv source ~/.nix-profile/etc/profile.d/nix.sh diff --git a/install.sh b/install.sh index c663888..c91b2db 100755 --- a/install.sh +++ b/install.sh @@ -17,10 +17,13 @@ confirm() { } # Install tools -confirm "Install Homebrew?" && "$DOTFILES/install/install-brew.sh" -confirm "Install Homebrew packages?" && "$DOTFILES/install/install-brew-packages.sh" -confirm "Install Nix?" && "$DOTFILES/install/install-nix.sh" -confirm "Install Nix packages?" && "$DOTFILES/install/install-nix-packages.sh" +if [[ "$OSTYPE" == linux-gnu* ]]; then + confirm "Install Nix?" && "$DOTFILES/install/install-nix.sh" + confirm "Install Nix packages?" && "$DOTFILES/install/install-nix-packages.sh" +elif [[ "$OSTYPE" == darwin* ]]; then + confirm "Install Homebrew?" && "$DOTFILES/install/install-brew.sh" + confirm "Install Homebrew packages?" && "$DOTFILES/install/install-brew-packages.sh" +fi # Extra steps confirm "Set login shell?" && "$DOTFILES/install/install-shell.sh"