From bb0e35029758a829f07e1923b724b9f07eb98f5c Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:13:22 -0800
Subject: [PATCH 01/18] Create 000.disable-catalina-nag.sh

---
 .../root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh   | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 custompkg/root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh

diff --git a/custompkg/root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh b/custompkg/root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh
new file mode 100644
index 0000000..c7ed5e7
--- /dev/null
+++ b/custompkg/root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh
@@ -0,0 +1 @@
+export BASH_SILENCE_DEPRECATION_WARNING=1

From ad660d451833001e57c365fa4a9fb7fac797599b Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:17:42 -0800
Subject: [PATCH 02/18] Update 100.install-caskroom-apps.sh

---
 .../skel/Library/user-setup/100.install-caskroom-apps.sh    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index 344c7c2..c9a69da 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -13,12 +13,9 @@ brew tap caskroom/cask
 
 # no google-drive-file-stream because it requires admin privs and installs to /Applications systemwide
 CASKS="
-    1password
-    1password-cli
     ableton-live-suite
     anki
     atom
-    dashlane
     deluge
     disk-inventory-x
     expandrive
@@ -26,11 +23,8 @@ CASKS="
     google-cloud-sdk
     handbrake
     iterm2
-    keepassx
     keybase
-    lastpass
     little-snitch
-    minikube
     openscad
     sketch
     slack

From 94fac4b6ece5023a4aa3ff62c0751734cd4e4249 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:18:05 -0800
Subject: [PATCH 03/18] Update 100.install-caskroom-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-caskroom-apps.sh     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index c9a69da..945c219 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -18,7 +18,6 @@ CASKS="
     atom
     deluge
     disk-inventory-x
-    expandrive
     google-chrome
     google-cloud-sdk
     handbrake

From 77018df61d047bab7db05df170f284f2420c0522 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:19:44 -0800
Subject: [PATCH 04/18] Update 100.install-caskroom-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-caskroom-apps.sh     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index 945c219..6c5738c 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -16,6 +16,7 @@ CASKS="
     ableton-live-suite
     anki
     atom
+    bitwarden
     deluge
     disk-inventory-x
     google-chrome

From 66dee78df169693d9e18ca4b6980070005a0d683 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:22:36 -0800
Subject: [PATCH 05/18] wrap python path adder in if statement to prevent error

---
 .../root/etc/skel/Library/user-setup/099.add-python-path.sh     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh b/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh
index 4b92648..6a49d23 100755
--- a/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh
@@ -1,4 +1,6 @@
 # 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

From 2d1b600b8de408a38b5d380d12730aaf1e31efbb Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:28:15 -0800
Subject: [PATCH 06/18] Update 100.install-caskroom-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-caskroom-apps.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index 6c5738c..d144c83 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -42,7 +42,7 @@ for CASK in $CASKS ; do
     brew cask install $CASK
 done
 
-brew tap caskroom/fonts
+brew tap homebrew/cask-fonts
 
 FONTS="
     font-anonymice-powerline

From bf698eb2b943c3025f452aa7517dc4d02374bc2c Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:29:02 -0800
Subject: [PATCH 07/18] Update 100.install-caskroom-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-caskroom-apps.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index d144c83..275f79f 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -9,7 +9,7 @@ if [[ ! -d ~/Applications ]]; then
 fi
 
 # install caskroom
-brew tap caskroom/cask
+brew tap homebrew/cask-cask
 
 # no google-drive-file-stream because it requires admin privs and installs to /Applications systemwide
 CASKS="

From c3315b88b994dd6359b9244141e713b8868c7a1c Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:30:08 -0800
Subject: [PATCH 08/18] Update 100.install-caskroom-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-caskroom-apps.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index 275f79f..d144c83 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -9,7 +9,7 @@ if [[ ! -d ~/Applications ]]; then
 fi
 
 # install caskroom
-brew tap homebrew/cask-cask
+brew tap caskroom/cask
 
 # no google-drive-file-stream because it requires admin privs and installs to /Applications systemwide
 CASKS="

From 4e603fb3124cfe980bb2ed248adfa9e98277e489 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:35:21 -0800
Subject: [PATCH 09/18] Update 100.install-homebrew-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-homebrew-apps.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
index 50c01ef..0e49898 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
@@ -76,5 +76,5 @@ HOMEBREW_PKGS="
 "
 
 for PKG in $HOMEBREW_PKGS ; do
-    brew install $PKG
+    brew install --build-from-source $PKG
 done

From d2879463351ebcdc104d410b57dd722b47be530c Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:35:44 -0800
Subject: [PATCH 10/18] Delete 900.link-googledrive.sh

---
 .../root/etc/skel/Library/user-setup/900.link-googledrive.sh | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 custompkg/root/etc/skel/Library/user-setup/900.link-googledrive.sh

diff --git a/custompkg/root/etc/skel/Library/user-setup/900.link-googledrive.sh b/custompkg/root/etc/skel/Library/user-setup/900.link-googledrive.sh
deleted file mode 100644
index 7cedb4d..0000000
--- a/custompkg/root/etc/skel/Library/user-setup/900.link-googledrive.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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

From b11899c17a55163082db0088f652cabb7da84177 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:36:29 -0800
Subject: [PATCH 11/18] Update 200.install-npm-packages.sh

---
 .../Library/user-setup/200.install-npm-packages.sh   | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh b/custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh
index c142e1d..179241e 100644
--- a/custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh
@@ -3,19 +3,9 @@
 # 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
+    prettier
 "
 
 for PKG in $YARN_PKGS ; do

From dfbb1503320218d27ac5bc388cf7d847f74c2b81 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:36:45 -0800
Subject: [PATCH 12/18] Rename 200.install-npm-packages.sh to
 200.install-yarn-packages.sh

---
 .../{200.install-npm-packages.sh => 200.install-yarn-packages.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename custompkg/root/etc/skel/Library/user-setup/{200.install-npm-packages.sh => 200.install-yarn-packages.sh} (100%)

diff --git a/custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh b/custompkg/root/etc/skel/Library/user-setup/200.install-yarn-packages.sh
similarity index 100%
rename from custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh
rename to custompkg/root/etc/skel/Library/user-setup/200.install-yarn-packages.sh

From b59eda10580fe66bec0dba5fda3153f483fbeaeb Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:37:05 -0800
Subject: [PATCH 13/18] Update 100.install-homebrew-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-homebrew-apps.sh     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
index 0e49898..fe79b5b 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
@@ -73,6 +73,7 @@ HOMEBREW_PKGS="
     watch
     wget
     whatmask
+    yarn
 "
 
 for PKG in $HOMEBREW_PKGS ; do

From e4be87da13e1a45863fcf8d845bf8955f4b8c870 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 04:38:59 -0800
Subject: [PATCH 15/18] Update and rename 100.homebrew-no-spyware.sh to
 100.disable-spyware.sh

---
 .../skel/Library/bashrc.d/100.disable-spyware.sh   | 14 ++++++++++++++
 .../Library/bashrc.d/100.homebrew-no-spyware.sh    |  1 -
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 custompkg/root/etc/skel/Library/bashrc.d/100.disable-spyware.sh
 delete mode 100644 custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-no-spyware.sh

diff --git a/custompkg/root/etc/skel/Library/bashrc.d/100.disable-spyware.sh b/custompkg/root/etc/skel/Library/bashrc.d/100.disable-spyware.sh
new file mode 100644
index 0000000..8b24e93
--- /dev/null
+++ b/custompkg/root/etc/skel/Library/bashrc.d/100.disable-spyware.sh
@@ -0,0 +1,14 @@
+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
+
+if command -v gcloud >/dev/null 2>&1 >/dev/null ; then
+    gcloud config set disable_usage_reporting true >/dev/null 2>&1
+fi
diff --git a/custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-no-spyware.sh b/custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-no-spyware.sh
deleted file mode 100644
index 8602170..0000000
--- a/custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-no-spyware.sh
+++ /dev/null
@@ -1 +0,0 @@
-export HOMEBREW_NO_ANALYTICS=1

From 6ca8acfdd25936e928e08126e9d9040a4bc4693c Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 05:14:17 -0800
Subject: [PATCH 16/18] Update 100.install-caskroom-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-caskroom-apps.sh     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index d144c83..0bdc3ee 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -14,6 +14,7 @@ brew tap caskroom/cask
 # no google-drive-file-stream because it requires admin privs and installs to /Applications systemwide
 CASKS="
     ableton-live-suite
+    alacritty
     anki
     atom
     bitwarden

From 6e0149adc5e5cd563f95e20e2b5000c1c828f560 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 07:19:06 -0800
Subject: [PATCH 17/18] Update 100.install-caskroom-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-caskroom-apps.sh     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index 0bdc3ee..4bcb749 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -27,6 +27,7 @@ CASKS="
     keybase
     little-snitch
     openscad
+    signal
     sketch
     slack
     spotify

From df79a49e876886bbcb34a14ace509c3ac5495534 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@sneak.berlin>
Date: Mon, 18 Nov 2019 07:31:00 -0800
Subject: [PATCH 18/18] Update 100.install-caskroom-apps.sh

---
 .../etc/skel/Library/user-setup/100.install-caskroom-apps.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index 4bcb749..e858e25 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -32,7 +32,7 @@ CASKS="
     slack
     spotify
     sublime-text
-    syncthing-app
+    syncthing
     tor-browser
     vcv-rack
     vlc