More moving stuff around

dev/setup.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+source ${DOTFILES}/helpers.sh
+
+function main()
+{
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
+  print_info "Preparing development environment"
+
+  ${scriptdir}/git/setup.sh
+
+  brewget vim --with-override-system-vi
+  caskget docker
+
+  print_ok "Development environment setup"
+
+}
+
+main "$@"

helpers.sh

@@ -18,7 +18,7 @@ function caskget()
   # if not already installed
   local caskname=$(basename $1)
 
-  if ! brew cask list | grep ${caskname} >/dev/null; then
+  if ! brew cask list | grep -w ${caskname} >/dev/null; then
     print_info "Installing ${caskname} from cask"
     brew cask install "$@"
   fi
@@ -29,7 +29,7 @@ function brewget()
   # if not already installed
   local brewname=$(basename $1)
 
-  if ! brew list | grep ${brewname} >/dev/null; then
+  if ! brew list | grep -w ${brewname} >/dev/null; then
     print_info "Brewing ${brewname}"
     brew install "$@"
   fi

install.sh

@@ -6,3 +6,4 @@ ${DOTFILES}/system/setup.sh
 ${DOTFILES}/network/setup.sh
 ${DOTFILES}/terminal/setup.sh
 ${DOTFILES}/wm/setup.sh
+${DOTFILES}/dev/setup.sh

system/setup.sh

@@ -9,7 +9,6 @@ function main()
   ${scriptdir}/setup_homebrew.sh
 
   caskget google-chrome
-  caskget docker
 
 }
 

terminal/setup.sh

@@ -8,11 +8,9 @@ function main()
 
   ${scriptdir}/kitty/setup.sh
   ${scriptdir}/fish/setup.sh
-  ${scriptdir}/git/setup.sh
 
   print_info "Installing terminal applications"
   brewget tmux
-  brewget neovim
   print_ok "Terminal applications installed"
 
 }