From 965bbeaee87df5397660a5a0a01e38e0ee091164 Mon Sep 17 00:00:00 2001
From: T31M <t31m@cyberstuff.me>
Date: Sat, 22 Feb 2020 22:10:35 +0100
Subject: [PATCH] feat: env config

---
 fish_setup.sh |  7 +++++++
 main.sh       | 15 ++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/fish_setup.sh b/fish_setup.sh
index e7126b4..2282509 100644
--- a/fish_setup.sh
+++ b/fish_setup.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+# install nvm
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
+
+# install pyenv
+git clone https://github.com/pyenv/pyenv.git ~/.pyenv
+git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv
+
 # install fisher
 curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish
 
diff --git a/main.sh b/main.sh
index f4349c5..64942ce 100644
--- a/main.sh
+++ b/main.sh
@@ -2,19 +2,11 @@
 
 USER=t31m
 
-# we need to be root for this install script
-if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root" 
-   exit 1
-fi
-
-# Ubuntu Baseline Packages
-
 # update repos + system
 apt get update && apt upgrade
 
 # install env packages
-apt install git fish fzf pyenv pyenv-virtualenv
+apt install git fish fzf
 
 # install docker stable, if this failes try below
 curl -fsSL https://get.docker.com | sh
@@ -26,7 +18,4 @@ chmod +x /usr/local/bin/docker-compose
 
 usermod -aG docker t31m
 
-# install nvm
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
-
-
+echo "Initial Setup Complete. Please run fish_setup.sh for env setup"