From 74a42a42a3371280475cdbd4fb5cf69da2952eef Mon Sep 17 00:00:00 2001
From: Jake Howard <jake.howard@dabapps.com>
Date: Mon, 9 Jan 2017 09:19:24 +0000
Subject: [PATCH] Remove ubuntu configs

---
 bash/applications.sh | 2 ++
 bash/arch.sh         | 1 -
 bash/base.sh         | 6 ------
 bash/catfish.sh      | 2 ++
 bash/ubuntu.sh       | 5 -----
 5 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 bash/arch.sh
 delete mode 100644 bash/ubuntu.sh

diff --git a/bash/applications.sh b/bash/applications.sh
index 517432b..cc05c94 100644
--- a/bash/applications.sh
+++ b/bash/applications.sh
@@ -43,6 +43,8 @@ alias make-dotfiles="cd ~/.dotfiles/ && make && cd - > /dev/null"
 alias edit-dotfiles="atom ~/.dotfiles/"
 alias vi="vim"
 alias regen-ssh-conf="assh config build > ~/.ssh/config"
+alias yolo="yaourt -Syau --noconfirm"
+
 
 # colored GCC warnings and errors
 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
diff --git a/bash/arch.sh b/bash/arch.sh
deleted file mode 100644
index 6c84a6b..0000000
--- a/bash/arch.sh
+++ /dev/null
@@ -1 +0,0 @@
-alias yolo="yaourt -Syau --noconfirm"
diff --git a/bash/base.sh b/bash/base.sh
index b3e7100..d8ab0e0 100644
--- a/bash/base.sh
+++ b/bash/base.sh
@@ -2,12 +2,6 @@ source $DOTFILES/bash/catfish.sh
 source $DOTFILES/bash/javascript.sh
 source $DOTFILES/bash/applications.sh
 
-if [ -f "$(command -v lsb_release)" ]; then
-  source $DOTFILES/bash/ubuntu.sh  # Ubuntu only stuff
-elif [ -f "$(command -v pacman)" ]; then
-  source $DOTFILES/bash/arch.sh  # Arch only stuff
-fi
-
 # Export some variables
 export ANDROID_HOME=/opt/android-sdk
 export EDITOR=/bin/nano
diff --git a/bash/catfish.sh b/bash/catfish.sh
index d0d5736..45d63eb 100644
--- a/bash/catfish.sh
+++ b/bash/catfish.sh
@@ -23,3 +23,5 @@ ctp() {
 }
 
 alias ctfs="cd ~/catfish && ./start && cd - > /dev/null"
+
+export CATFISH_HOSTNAME_OVERRIDE=localhost
diff --git a/bash/ubuntu.sh b/bash/ubuntu.sh
deleted file mode 100644
index 3c03419..0000000
--- a/bash/ubuntu.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-export JAVA_HOME=/usr/local/java/jdk1.8.0_73
-export PATH=${PATH}:$JAVA_HOME/bin
-
-
-alias yolo="sudo apt update && sudo apt upgrade -y"