README.md

@@ -1,28 +1,15 @@
-# osx
+# osximage
 
-New deal for Catalina/Big Sur: Imaging is dead.  Install a fresh install
+New deal for Catalina: Imaging is dead.  Install a fresh install
 manually, then do the following.
 
-# Manual Prerequisite Steps
+# Manual Steps
 
 Open System Preferences.
 
 * Sharing > Set Hostname
-* Security and Privacy > FileVault > Enable
 
 Open a terminal and run the following:
 
-* `chsh -s /bin/bash` and enter password
-* `sudo xcodebuild -license accept` and click ok/install on developer tools
-  installer popup window
-* `sudo xcode-select --install`
-# The Install
-
-```bash
-bash <(curl -s https://git.eeqj.de/sneak/osx/raw/branch/master/install.sh)
-```
-
-# Uninstall (not 100%, only for dev)
-```bash
-rm -rfv ~/.profile ~/.bashrc ~/Library/Homebrew ~/Library/bashrc.d ~/Library/profile.d ~/Library/user-setup $TMPDIR/osx
-```
+* `sudo xcodebuild -license accept`
+* `bash <(curl -s https://github.com/sneak/osximage/FIXME)`

custompkg/root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh

@@ -1 +0,0 @@
-export BASH_SILENCE_DEPRECATION_WARNING=1

custompkg/root/etc/skel/Library/bashrc.d/000.nix.sh

@@ -1,3 +0,0 @@
-if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then
-    . $HOME/.nix-profile/etc/profile.d/nix.sh;
-fi

custompkg/root/etc/skel/Library/bashrc.d/099.brew-path.sh

@@ -1,4 +0,0 @@
-if [[ -d $HOME/Library/Homebrew ]]; then
-    export PATH="$PATH:$HOME/Library/Homebrew/bin"
-fi
-

custompkg/root/etc/skel/Library/bashrc.d/100.caskroom-dest.sh

@@ -0,0 +1 @@
+export HOMEBREW_CASK_OPTS="--appdir=$HOME/Applications"

custompkg/root/etc/skel/Library/bashrc.d/100.disable-spyware.sh

@@ -1,10 +0,0 @@
-export DO_NOT_TRACK=1
-
-# the rest
-
-export HOMEBREW_NO_ANALYTICS=1
-export GATSBY_TELEMETRY_DISABLED=1
-export STNOUPGRADE=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export SAM_CLI_TELEMETRY=0
-export AZURE_CORE_COLLECT_TELEMETRY=0

custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-no-spyware.sh

@@ -0,0 +1 @@
+export HOMEBREW_NO_ANALYTICS=1

custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-paths.sh

@@ -0,0 +1,2 @@
+export PATH="$HOME/Library/Homebrew/sbin:$PATH"
+export PATH="$HOME/Library/Homebrew/bin:$PATH"

custompkg/root/etc/skel/Library/bashrc.d/150.ldflags.sh

@@ -0,0 +1 @@
+export LDFLAGS="$LDFLAGS -I$(brew --prefix)/opt/openssl/include -L$(brew --prefix)/opt/openssl/lib"

custompkg/root/etc/skel/Library/bashrc.d/200.google-cloud-sdk.sh

@@ -0,0 +1,4 @@
+if [[ -e "$HOME/Library/Homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk" ]]; then
+    source "$HOME/Library/Homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.bash.inc"
+    source "$HOME/Library/Homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.bash.inc"
+fi

custompkg/root/etc/skel/Library/profile.d/900.gpg-agent.sh

@@ -13,7 +13,7 @@ if [[ ! -e $HOME/.gpg-agent-info ]]; then
         gpg-agent \
             --enable-ssh-support \
             --daemon \
-            --pinentry-program $HOME/.nix-profile/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac \
+            --pinentry-program $(brew --prefix)/bin/pinentry-mac \
             2> /dev/null > $HOME/.gpg-agent-info
     fi
 fi

custompkg/root/etc/skel/Library/profile.d/900.homebrew-completion.sh

@@ -1,5 +1,3 @@
-if which brew 2>&1 >/dev/null ; then
-    if [ -f $(brew --prefix)/etc/bash_completion ]; then
+if [ -f $(brew --prefix)/etc/bash_completion ]; then
     source $(brew --prefix)/etc/bash_completion
-    fi
 fi

custompkg/root/etc/skel/Library/user-setup/000.install-homebrew.sh

@@ -1,15 +1,8 @@
 #!/bin/bash
 ############################################# install homebrew under homedir
-
-# reminder: homebrew is *spyware*. using it in the default configuration is
-# *unsafe*. other scripts elsewhere set HOMEBREW_NO_ANALYTICS to disable 
-# its spying; do not use this file in isolation.
-
 if [[ ! -d ~/Library/Homebrew ]]; then
     mkdir -p ~/Library/Homebrew
     cd ~/Library/Homebrew
     curl -fsSL https://github.com/Homebrew/brew/tarball/master | \
         tar --strip-components 1 -xvf -
 fi
-
-~/Library/Homebrew/bin/brew analytics off

custompkg/root/etc/skel/Library/user-setup/010.install-cli-tools.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-xcode-select --license accept
-xcode-select --install
-xcode-select --license accept

custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh

@@ -1,6 +1,4 @@
 # adds homebrew python packages dir to python paths
 
-if [[ -d "$HOME/Library/Python/2.7/lib/python/site-packages/" ]]; then
 echo "import site; site.addsitedir(\"$HOME/Library/Homebrew/lib/python2.7/site-packages\")" >> \
 	$HOME/Library/Python/2.7/lib/python/site-packages/homebrew.pth
-fi

custompkg/root/etc/skel/Library/user-setup/099.git-config.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# a small vote for the status quo, or perhaps just a vote against the cost of change vs the zero benefit
-git config --global init.defaultBranch master

custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh

@@ -1,12 +1,7 @@
 #!/bin/bash
 
-# set up paths and whatnot and ensure homebrew's spyware is disabled
+# set up paths and whatnot
 source $HOME/.profile
-export HOMEBREW_NO_ANALYTICS=1
-
-# this shouldn't be needed but it is
-export PATH="$PATH:$HOME/Library/Homebrew/bin"
-
 
 # per default settings apps are installed in homedir
 if [[ ! -d ~/Applications ]]; then
@@ -14,36 +9,49 @@ if [[ ! -d ~/Applications ]]; then
 fi
 
 # install caskroom
-brew tap homebrew/cask
-
-# the following is required for fetching some of the fonts
-brew install --build-from-source svn
+brew tap caskroom/cask
 
 # no google-drive-file-stream because it requires admin privs and installs to /Applications systemwide
 CASKS="
-    alacritty
+    1password
+    1password-cli
+    ableton-live-suite
+    anki
     atom
-    bitwarden
+    dashlane
     deluge
     disk-inventory-x
-    eloston-chromium
-    homebrew/cask/handbrake
+    expandrive
+    google-chrome
+    google-cloud-sdk
+    handbrake
     iterm2
-    signal
-    homebrew/cask/syncthing
+    keepassx
+    keybase
+    lastpass
+    little-snitch
+    minikube
+    openscad
+    sketch
+    slack
+    spotify
+    sublime-text
+    syncthing-app
     tor-browser
+    vcv-rack
     vlc
     wasabi-wallet
     xscreensaver
 "
 
 for CASK in $CASKS ; do
-    brew install --appdir="$HOME/Applications" $CASK
+    brew cask install $CASK
 done
 
-brew tap homebrew/cask-fonts
+brew tap caskroom/fonts
 
 FONTS="
+    font-anonymice-powerline
     font-consolas-for-powerline
     font-dejavu-sans-mono-for-powerline
     font-droid-sans-mono-for-powerline
@@ -62,5 +70,5 @@ FONTS="
 "
 
 for FONT in $FONTS ; do
-    brew install $FONT
+    brew cask install $FONT
 done

custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh

@@ -1,32 +1,19 @@
 #!/bin/bash
 
-# reminder: homebrew is *spyware*. if you don't do this, it won't
-# set HOMEBREW_NO_ANALYTICS and it will silently spy on you when you use it.
-# this should happen in the .profile but let's do it again here to be certain:
-source $HOME/.bashrc
-export HOMEBREW_NO_ANALYTICS=1
-
-# this shouldn't be needed but it is
-export PATH="$PATH:$HOME/Library/Homebrew/bin"
-
-# Homebrew's package database is on GitHub.  The hashes to verify the
-# authenticity of the source archive downloads are in the package database.
-# Microsoft, a large US military contractor with long ties to illegal NSA spying
-# programs, bought GitHub and can exercise control over them.
-
-# What this means is that a large US military contractor has control over the
-# precise software that gets installed on your computer when you
-# type "brew install x".  Cool, huh?
+# set up paths and whatnot
+source $HOME/.profile
 
 HOMEBREW_PKGS="
     asciinema
     autoconf
     automake
+    bash-completion
+    bash-git-prompt
     bonnie++
     bwm-ng
     byobu
-    cksfv
     cmake
+    corelocationcli
     coreutils
     curl
     daemontools
@@ -43,6 +30,9 @@ HOMEBREW_PKGS="
     gnupg
     gnupg2
     go
+    gpg-agent
+    graphviz
+    heroku
     homebrew/dupes/rsync
     httpie
     httrack
@@ -55,21 +45,25 @@ HOMEBREW_PKGS="
     mutt
     neovim
     nmap
+    node
     offlineimap
     p7zip
     par2
     pbzip2
     pgpdump
     pinentry-mac
+    postgres
     protobuf
     pv
     pwgen
     python3
-    rename
+    rust
     socat
     sox
     speedtest_cli
+    syncthing
     tcptraceroute
+    terraform
     tor
     torsocks
     trash
@@ -82,5 +76,5 @@ HOMEBREW_PKGS="
 "
 
 for PKG in $HOMEBREW_PKGS ; do
-    brew install --build-from-source $PKG
+    brew install $PKG
 done

custompkg/root/etc/skel/Library/user-setup/100.install-python-packages.sh

@@ -6,11 +6,6 @@ PYTHON_PKGS="
     virtualenv
 "
 
-
-# first, upgrade pip:
-
-/usr/bin/pip3 install --upgrade --user pip
-
 for PKG in $PYTHON_PKGS ; do
-    /usr/bin/pip3 install --user $PKG
+    /usr/local/bin/pip install --user $PKG
 done

custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# set up paths and whatnot
+source $HOME/.profile
+
+NPM_PKGS="
+    coffee-script
+    yarn
+"
+
+for PKG in $NPM_PKGS ; do
+    # -g is okay because "global" prefix is where homebrew
+    # installed npm, i.e. in ~/Library/Homebrew, not actually systemwide
+    npm install -g $PKG
+done
+
+YARN_PKGS="
+    now
+"
+
+for PKG in $YARN_PKGS ; do
+    yarn global add $PKG
+done

custompkg/root/etc/skel/Library/user-setup/200.install-yarn-packages.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# set up paths and whatnot
-source $HOME/.profile
-
-YARN_PKGS="
-    now
-    prettier
-"
-
-for PKG in $YARN_PKGS ; do
-    yarn global add $PKG
-done

custompkg/root/etc/skel/Library/user-setup/900.link-googledrive.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# setup google drive as synceddir in ~/.paths
+if [[ ! -e ~/.paths/synceddir ]]; then
+    ln -s ~/Google\ Drive\ File\ Stream/My\ Drive ~/.paths/synceddir
+fi

custompkg/root/etc/skel/Library/user-setup/999.disable-gcloud-spyware.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if command -v gcloud >/dev/null 2>&1 >/dev/null ; then
-  gcloud config set disable_usage_reporting true >/dev/null 2>&1
-fi

install.sh

@@ -2,39 +2,26 @@
 
 function run_install {
 
-    mkdir -p $HOME/Library/Caches/Homebrew
-    rm -rf $HOME/Library/Caches/Homebrew/*
+    sudo pmset -g
+    sudo pmset -a disablesleep 1
 
-    REPO="https://git.eeqj.de/sneak/osx.git"
-    DEST="$TMPDIR/osx"
+    REPO="https://github.com/sneak/osximage.git"
+    DEST="$TMPDIR/osximage"
 
     if [[ ! -d "$DEST" ]]; then
         git clone "$REPO" "$DEST"
-    else
-        cd "$DEST" && git pull && cd -
     fi
 
     rsync -avP "$DEST/custompkg/root/etc/skel/" "$HOME/"
-    mkdir -p $HOME/Library/bashrc.d
-    mkdir -p $HOME/Library/profile.d
-    touch $HOME/Library/bashrc.d/000keep.sh
-    touch $HOME/Library/profile.d/000keep.sh
-    
-    # FIXME move this into the modular setup scripts
-    mkdir -p "$HOME/Library/Desktop Pictures"
-    rsync -avP $TMPDIR/osx/custompkg/root/Library/Desktop?Pictures/ $HOME/Library/Desktop?Pictures/
-    defaults write \
-        ~/Library/Preferences/com.apple.systempreferences DSKDesktopPrefPane \
-        '<dict><key>UserFolderPaths</key><array><string>/Users/user/Library/Desktop Pictures</string></array></dict>'
 
     # run modular setup scripts
-    for FN in "$HOME/Library/user-setup/"*.sh ; do
-        echo "new-user-setup: starting $(basename "$FN")..."
-        # we used to run these in a subshell but not we don't because we want the environment to persist between
-        source "$FN"
+    for FN in $HOME/Library/user-setup/*.sh ; do
+        echo "new-user-setup: starting $(basename $FN)..."
+        bash "$FN" 2>&1 | tee -a $HOME/Library/Logs/user-setup.log
         rm "$FN"
         echo "new-user-setup: removed $(basename $FN)..."
     done
+    sudo pmset -a disablesleep 0
 }
 
 run_install