From d668c03630d859d328ead27690718e6862275771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Mon, 16 Oct 2017 23:58:59 +0200
Subject: [PATCH] More moving stuff around

---
 dev/setup.sh                | 2 ++
 system/setup.sh             | 1 +
 {bin => terminal}/columnize | 0
 terminal/fish/config.fish   | 9 +++++----
 terminal/setup.sh           | 3 +++
 5 files changed, 11 insertions(+), 4 deletions(-)
 rename {bin => terminal}/columnize (100%)

diff --git a/dev/setup.sh b/dev/setup.sh
index 3c7edea..6cb6da9 100755
--- a/dev/setup.sh
+++ b/dev/setup.sh
@@ -13,6 +13,8 @@ function main()
   brewget vim --with-override-system-vi
   caskget docker
 
+  makedir ${HOME}/code
+
   print_ok "Development environment setup"
 
 }
diff --git a/system/setup.sh b/system/setup.sh
index ef3e5dc..041a134 100755
--- a/system/setup.sh
+++ b/system/setup.sh
@@ -9,6 +9,7 @@ function main()
   ${scriptdir}/setup_homebrew.sh
 
   caskget google-chrome
+  caskget dropbox
 
 }
 
diff --git a/bin/columnize b/terminal/columnize
similarity index 100%
rename from bin/columnize
rename to terminal/columnize
diff --git a/terminal/fish/config.fish b/terminal/fish/config.fish
index e7cc4a2..685f69d 100755
--- a/terminal/fish/config.fish
+++ b/terminal/fish/config.fish
@@ -3,16 +3,17 @@ set -x DOTFILES /Users/thomas/dotfiles
 # Don't change it!
 
 if test "$SHLVL" -le 1
+  # Homebrew path
   set -x PATH /usr/local/bin /usr/local/sbin $PATH
-  set -x PATH $DOTFILES/bin $PATH
-  if test -d $HOME/bin
-    set -x PATH $HOME/bin $PATH
-  end
+  # Personal scripts
+  set -x PATH $HOME/bin $PATH
+  # To easily run things in current directory
   set -x PATH . $PATH
 
   set -x FISH_SETUP_PATH 'yes'
 end
 
+# Locale settings
 set -x LANG sv_SE.UTF-8
 set -x LC_ALL sv_SE.UTF-8
 
diff --git a/terminal/setup.sh b/terminal/setup.sh
index 7fce661..c246108 100755
--- a/terminal/setup.sh
+++ b/terminal/setup.sh
@@ -11,6 +11,9 @@ function main()
 
   print_info "Installing terminal applications"
   brewget tmux
+
+  makedir ${HOME}/bin
+  linkfile ${scriptdir}/columnize ${HOME}/bin/columnize
   print_ok "Terminal applications installed"
 
 }