From d2510183b0b11dd4b3cac273aa7b4c8c058c18bc Mon Sep 17 00:00:00 2001
From: Stephen Parkinson <smparkin@calpoly.edu>
Date: Mon, 28 Feb 2022 15:06:26 -0800
Subject: [PATCH] clean setup and update brewfile

---
 Brewfile | 19 +++++++++++++++----
 aliases  |  6 ++++++
 setup.sh | 36 +++++++++++++++++++-----------------
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/Brewfile b/Brewfile
index 96ab2f5..2f27e40 100644
--- a/Brewfile
+++ b/Brewfile
@@ -27,6 +27,7 @@ brew "exiftool"
 brew "sdl2"
 brew "ffmpeg"
 brew "figlet"
+brew "fortune"
 brew "gcc"
 brew "gdb"
 brew "git"
@@ -39,6 +40,7 @@ brew "jq"
 brew "ldid"
 brew "libusbmuxd"
 brew "libimobiledevice"
+brew "librsvg"
 brew "llvm"
 brew "lolcat"
 brew "ruby"
@@ -55,7 +57,9 @@ brew "pngcheck"
 brew "rsync"
 brew "sl"
 brew "speedtest-cli"
+brew "svg2png"
 brew "telnet"
+brew "tldr"
 brew "tmux"
 brew "tree"
 brew "watch"
@@ -68,26 +72,33 @@ brew "zsh-history-substring-search"
 brew "zsh-syntax-highlighting"
 brew "zzz"
 cask "adoptopenjdk"
+cask "alacritty"
 cask "android-platform-tools"
 cask "appcleaner"
 cask "burp-suite"
+cask "cinebench"
 cask "daisydisk"
 cask "discord"
+cask "dolphin"
 cask "firefox"
 cask "font-fira-code"
+cask "handbrake"
 cask "hex-fiend"
 cask "iina"
+cask "iterm2"
 cask "melonds"
+cask "minecraft"
 cask "mpv"
+cask "openemu"
 cask "plex"
+cask "qbittorrent"
+cask "rectangle"
 cask "slack"
 cask "steam"
 cask "visual-studio-code"
+cask "vlc"
 cask "wireshark"
 cask "xquartz"
-cask "handbrake"
-cask "minecraft"
-cask "rectangle"
 cask "zoom"
 mas "1Password 7", id: 1333542190
 mas "Dark Reader for Safari", id: 1438243180
@@ -97,8 +108,8 @@ mas "Keynote", id: 409183694
 mas "Notability", id: 360593530
 mas "Pages", id: 409201541
 mas "Paste", id: 967805235
-mas "Speedtest", id: 1153157709
 mas "Tampermonkey", id: 1482490089
 mas "The Unarchiver", id: 425424353
 mas "Wipr", id: 1320666476
+mas "Xcode", id: 497799835
 mas "Yoink", id: 457622435
diff --git a/aliases b/aliases
index 740873b..cef8260 100644
--- a/aliases
+++ b/aliases
@@ -19,3 +19,9 @@ alias nf='cl; neofetch; shownetinfo && batt'
 alias servers='python3 /Users/smparkin/Development/server_stats/servers.py'
 alias hekate='python3 /Users/smparkin/Development/fusee-launcher/fusee-launcher.py /Users/smparkin/Development/fusee-launcher/hekate/hekate.bin'
 alias src='omz reload'
+
+# Music
+alias amp='python3 ~/Development/abandoned/SSiTerm/music.py play'
+alias amn='python3 ~/Development/abandoned/SSiTerm/music.py next'
+alias amr='python3 ~/Development/abandoned/SSiTerm/music.py prev'
+alias amv='python3 ~/Development/abandoned/SSiTerm/music.py playback --volume '
diff --git a/setup.sh b/setup.sh
index 89cf67f..5526b24 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,19 +2,24 @@
 
 OSTYPE=$(uname -s)
 
-# assume were on ubuntu because thats reasonable
-# and get package manager up to date
 if [ "$OSTYPE" = "Linux" ]; then
-	sudo apt update
-	sudo apt install coreutils zsh net-tools jq python3-pip -y
-	sudo apt upgrade -y
+    DISTRO=$(lsb_release -i -s)
+    if [ "$DISTRO" = "Ubuntu" ]; then
+        sudo apt update
+        sudo apt install coreutils vim zsh jq python3 python3-pip -y
+        sudo apt upgrade -y
+    else
+        # pretty safe assumption that if not ubuntu were on arch
+        sudo pacman -Syu
+        sudo pacman -Sy coreutils vim zsh jq python3
+    fi
 elif [ "$OSTYPE" = "Darwin" ]; then
-	echo "Install Homebrew? [y/n]"
-	read homebrew
-	if [ "$homebrew" = "y" ]; then
-		/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-        	brew bundle install --file=Brewfile
-	fi
+    echo "Install Homebrew? [y/n]"
+    read homebrew
+    if [ "$homebrew" = "y" ]; then
+	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+        brew bundle install --file=Brewfile
+    fi
 fi
 
 # silence login message
@@ -23,7 +28,8 @@ touch .hushlogin
 # get ohmyzsh setup
 git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh/
 
-# symlink files
+# remove common files and symlink new files
+rm ~/.zshrc ~/.vimrc ~/.tmux.conf
 mkdir ~/.zsh.d
 ln -s ~/dotfiles/aliases ~/.zsh.d/aliases
 ln -s ~/dotfiles/functions ~/.zsh.d/functions
@@ -35,14 +41,10 @@ ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 ln -s ~/dotfiles/vimrc ~/.vimrc
 
 mkdir ~/Development
-git clone https://github.com/smparkin/SpotifyCLI.git ~/Development/SSiTerm
-cd ~/Development/SSiTerm
-pip3 install -r requirements.txt
-cd ~/
 
 echo "Change shell to zsh? [y/n]"
 read shell
 if [ "$shell" = "y" ]; then
-	chsh -s /bin/zsh
+    chsh -s /bin/zsh
 fi
 exit