Grouping stuff

install.sh

@@ -2,10 +2,7 @@
 
 DOTFILES="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
-${DOTFILES}/homebrew/setup.sh
-${DOTFILES}/ssh/setup.sh
-${DOTFILES}/git/setup.sh
-${DOTFILES}/NAS_mounts/setup.sh
+${DOTFILES}/system/setup.sh
+${DOTFILES}/network/setup.sh
 ${DOTFILES}/terminal/setup.sh
-${DOTFILES}/fish/setup.sh
 ${DOTFILES}/wm/setup.sh

network/NAS_mounts/setup.sh

@@ -4,6 +4,8 @@ source ${DOTFILES}/helpers.sh
 
 function main()
 {
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
   print_info "Setting up user homedir mounts"
 
   makedir "${HOME}/mnt"
@@ -26,7 +28,7 @@ function main()
     sed -e "s/\[\[USERNAME\]\]/${NAS_USERNAME}/" \
       -e "s/\[\[PASSWORD\]\]/${NAS_PASSWORD}/" \
       -e "s/\[\[UNAME\]\]/$(whoami)/" \
-      < "${DOTFILES}/NAS_mounts/auto_nas" \
+      < "${scriptdir}/auto_nas" \
       | sudo tee "/etc/${auto_file}" \
       > /dev/null
 
@@ -59,7 +61,7 @@ function main()
   # Copy and set up mount-fixing script
   if [ ! -f "${script}" ]; then
     sed -e "s/\[\[USERNAME\]\]/$(whoami)/" \
-      < "${DOTFILES}/NAS_mounts/fix_mounts.sh" \
+      < "${scriptdir}/fix_mounts.sh" \
       > "${script}"
     chmod +x "${script}"
   fi
@@ -67,13 +69,15 @@ function main()
   # Install a launchd service to run it every 15 seconds
   if [ ! -f "${plistloc}" ]; then
     sed -e "s/\[\[USERNAME\]\]/$(whoami)/" \
-      < "${DOTFILES}/NAS_mounts/${plist}" \
+      < "${scriptdir}/${plist}" \
       | sudo tee "${plistloc}" \
       > /dev/null
 
     sudo chmod 644 "${plistloc}"
 
     sudo launchctl load "${plistloc}"
+
+    sudo autmount -vc
   fi
 
   print_ok "User homedir mounts set up"

network/git/setup.sh

@@ -4,6 +4,8 @@ source ${DOTFILES}/helpers.sh
 
 function main()
 {
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
   print_info "Configuring git"
 
   brewget git
@@ -11,9 +13,9 @@ function main()
   if [ ! -f "${HOME}/.gitconfig" ]; then
     cat << EOF > ${HOME}/.gitconfig
 [include]
-  path = ${DOTFILES}/git/gitconfig
+  path = ${scriptdir}/gitconfig
 [core]
-  excludesfile = ${DOTFILES}/git/gitignore_global
+  excludesfile = ${scriptdir}/gitignore_global
 EOF
   fi
 

network/setup.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source ${DOTFILES}/helpers.sh
+
+function main()
+{
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
+  ${scriptdir}/ssh/setup.sh
+  ${scriptdir}/git/setup.sh
+  ${scriptdir}/NAS_mounts/setup.sh
+
+  brewget arp-scan
+}
+
+main "$@"

network/ssh/setup.sh

@@ -4,12 +4,14 @@ source ${DOTFILES}/helpers.sh
 
 function main()
 {
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
   print_info "Setting up SSH"
   # copy private key to .ssh
   # cp ${KEYFILE} ~/.ssh/thomas_rsa
   # chmod 400 ~/.ssh/thomas_rsa
   # ssh-add -K ~/.ssh/thomas_rsa
-  linkfile ${DOTFILES}/ssh/config ${HOME}/.ssh/config
+  linkfile ${scriptdir}/config ${HOME}/.ssh/config
 
   print_ok "SSH settings installed"
 }

system/setup.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source ${DOTFILES}/helpers.sh
+
+function main()
+{
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
+  ${scriptdir}/setup_homebrew.sh
+
+  caskget google-chrome
+  caskget docker
+
+}
+
+main "$@"

system/setup_homebrew.sh

@@ -4,7 +4,7 @@ source ${DOTFILES}/helpers.sh
 
 function main()
 {
-  print_info "Setting up homebrew and brewing misc stuff"
+  print_info "Setting up homebrew"
 
   if ! which brew>/dev/null; then
     echo "Installing Homebrew"
@@ -16,15 +16,7 @@ function main()
     brew tap caskroom/cask
   fi
 
-
-  caskget google-chrome
-  caskget docker
-  caskget caskroom/drivers/logitech-options
-
-  brewget arp-scan
-  brewget neovim
-
-  print_ok "Homebrew and misc. brews insalled"
+  print_ok "Homebrew insalled"
 }
 
 main "$@"

terminal/fish/fishd.10ddb19c5a35

@@ -0,0 +1,31 @@
+# This file is automatically generated by the fish.
+# Do NOT edit it directly, your changes will be overwritten.
+SET __fish_init_2_39_8:\x1d
+SET __fish_init_2_3_0:\x1d
+SET fish_color_autosuggestion:555\x1ebrblack
+SET fish_color_cancel:\x2dr
+SET fish_color_command:\x2d\x2dbold
+SET fish_color_comment:red
+SET fish_color_cwd:green
+SET fish_color_cwd_root:red
+SET fish_color_end:brmagenta
+SET fish_color_error:brred
+SET fish_color_escape:bryellow\x1e\x2d\x2dbold
+SET fish_color_history_current:\x2d\x2dbold
+SET fish_color_host:normal
+SET fish_color_match:\x2d\x2dbackground\x3dbrblue
+SET fish_color_normal:normal
+SET fish_color_operator:bryellow
+SET fish_color_param:cyan
+SET fish_color_quote:yellow
+SET fish_color_redirection:brblue
+SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
+SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SET fish_color_user:brgreen
+SET fish_color_valid_path:\x2d\x2dunderline
+SET fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell
+SET fish_key_bindings:fish_default_key_bindings
+SET fish_pager_color_completion:\x1d
+SET fish_pager_color_description:B3A06D\x1eyellow
+SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan

terminal/fish/setup.sh

@@ -4,6 +4,8 @@ source ${DOTFILES}/helpers.sh
 
 function main()
 {
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
   print_info "Installing fish shell"
 
   # Install fish shell
@@ -18,11 +20,11 @@ function main()
   # Install configuration files
   makedir ${HOME}/.config
 
-  if ! head -n 1 ${DOTFILES}/fish/config.fish | grep ${DOTFILES} >/dev/null; then
-    sed -i '' "1s;.*;set -x DOTFILES ${DOTFILES};" ${DOTFILES}/fish/config.fish
+  if ! head -n 1 ${scriptdir}/config.fish | grep ${DOTFILES} >/dev/null; then
+    sed -i '' "1s;.*;set -x DOTFILES ${DOTFILES};" ${scriptdir}/config.fish
   fi
 
-  linkfile ${DOTFILES}/fish ${HOME}/.config/fish
+  linkfile ${scriptdir} ${HOME}/.config/fish
 
   print_ok "Fish shell installed"
 }

terminal/kitty/setup.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+source ${DOTFILES}/helpers.sh
+
+function main()
+{
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
+  print_info "Installing kitty terminal"
+
+  # Copy kitty.app to /Applications
+  # cp ${KITTY_PATH} /Applications/.
+
+  # Install configuration file
+  linkfile ${scriptdir}/kitty.conf ${HOME}/Library/Preferences/kitty/kitty.conf
+
+  print_ok "Kitty terminal installed"
+
+}
+
+main "$@"

terminal/setup.sh

@@ -4,21 +4,16 @@ source ${DOTFILES}/helpers.sh
 
 function main()
 {
-  print_info "Installing kitty terminal"
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
-  # Copy kitty.app to /Applications
-  # cp ${KITTY_PATH} /Applications/.
-
-  # Install configuration file
-  linkfile ${DOTFILES}/terminal/kitty.conf ${HOME}/Library/Preferences/kitty/kitty.conf
-
-  print_ok "Kitty terminal installed"
+  ${scriptdir}/kitty/setup.sh
+  ${scriptdir}/fish/setup.sh
 
   print_info "Installing terminal applications"
-
   brewget tmux
-
+  brewget neovim
   print_ok "Terminal applications installed"
+
 }
 
 main "$@"

wm/setup.sh

@@ -4,22 +4,27 @@ source ${DOTFILES}/helpers.sh
 
 function main()
 {
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
   print_info "Installing window manager"
   # Install chunkwm and khd
   brewget crisidev/homebrew-chunkwm/chunkwm
   brewget keokeishiya/formulae/khd
 
   # Link configuration files
-  linkfile ${DOTFILES}/wm/khdrc ${HOME}/.khdrc
-  linkfile ${DOTFILES}/wm/chunkwmrc ${HOME}/.chunkwmrc
+  linkfile ${scriptdir}/khdrc ${HOME}/.khdrc
+  linkfile ${scriptdir}/chunkwmrc ${HOME}/.chunkwmrc
 
   # Start services
   if ! brew services list | grep chunkwm >/dev/null; then
     brew services start khd
     brew services start chunkwm
   fi
-
   print_ok "Window manager installed and activated"
+
+  print_info "Installing logitech drivers"
+  caskget caskroom/drivers/logitech-options
+  print_ok "Logitech drivers installed"
 }
 
 main "$@"