install.sh

@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-readonly PROGNAME=$(basename $0)
-readonly PROGDIR=$(readlink -m $(dirname $0))
-readonly ARGS="$@"
-
 install_homebrew() {
   echo -n Checking homebrew...
   if command -v brew > /dev/null; then
@@ -168,16 +164,8 @@ install_darwin_brew_packages() {
 
 install_darwin_brew_cask_packages() {
   echo -n Checking Darwin brew cask packages...
-  package_files="packages-darwin-brew-cask.txt"
-  if [[ $ARGS == "personal" ]]; then
-    package_files+=" packages-darwin-brew-cask-personal.txt"
-  fi
-  if [[ $ARGS == "work" ]]; then
-    package_files+=" packages-darwin-brew-cask-work.txt"
-  fi
-
   missing_packages=$(
-    comm -23  <(cat $package_files | sort) <(brew list | sort) \
+    comm -23  <(cat packages-darwin-brew-cask.txt) <(brew list | sort) \
       | tr "\n" " "
   )
 
@@ -192,7 +180,7 @@ install_darwin_brew_cask_packages() {
 
 install_color_default() {
   echo -n Checking color default file...
-  if [[ -f $HOME/.config/$USER/color.yml ]]; then
+  if [[ -f $HOME/.config/atomaka/color.yml ]]; then
     echo -n already installed...
   else
     echo -n installing....
@@ -209,18 +197,6 @@ install_darwin_profile_hack() {
     echo -n installing...
     sudo mv /etc/{zprofile,zprofile.old}
   fi
-  echo done
-}
-
-install_rosetta() {
-  echo -n Installing Rosetta...
-  if pkgutil --pkg-info com.apple.pkg.RosettaUpdateAuto &> /dev/null; then
-    echo -n already installled...
-  else
-    echo -n installing...
-    softwareupdate --install-rosetta --agree-to-license
-  fi
-  echo done
 }
 
 install_env() {
@@ -234,10 +210,6 @@ install_env() {
   echo done
 }
 
-install_stow_paths() {
-  stow alacritty bin git nvim ruby tmux zsh
-}
-
 install_linux() {
   if ! command -v apt-get > /dev/null; then
     echo apt-get is required, but not available
@@ -252,8 +224,6 @@ install_linux() {
   install_rust
   install_alacritty
   install_alacritty_terminfo
-  install_stow_paths
-  install_color_default
 }
 
 install_darwin() {
@@ -263,12 +233,10 @@ install_darwin() {
   install_shared_brew_packages
   install_fzf
   install_rust
-  install_rosetta
+  softwareupdate --install-rosetta --agree-to-license
   install_darwin_brew_packages
   install_darwin_brew_cask_packages
   install_tmux_terminfo
-  install_stow_paths
-  install_color_default
 }
 
 main() {
@@ -282,6 +250,10 @@ main() {
       exit 1
       ;;
   esac
+
+  stow alacritty bin git nvim ruby tmux zsh
+
+  install_color_default
 }
 
 main

packages-darwin-brew-cask-personal.txt

@@ -1,4 +0,0 @@
-arduino-ide
-battle-net
-prusaslicer
-zwift

packages-darwin-brew-cask-work.txt

@@ -1 +0,0 @@
-notion

packages-darwin-brew-cask.txt

@@ -1,8 +1,11 @@
 alacritty
 brave-browser
 discord
+element
 firefox
 google-chrome
+notion
 rectangle
 slack
+telegram
 zoom