diff --git a/config.json b/config.json
index 1c99fbf..e01a154 100644
--- a/config.json
+++ b/config.json
@@ -5,31 +5,20 @@
"railwaycat/emacsmacport"
],
"brew": [
- "ansible",
- "automake",
- "awscli",
"bash",
- "binwalk",
- "cask",
- "chezscheme",
"clojure",
"cmake",
"coreutils",
"curl",
- "dep",
"direnv",
"emacs-mac",
- "entr",
"fd",
- "fzf",
"gawk",
"git",
"git-lfs",
"global",
"gnu-sed",
- "gradle",
"httpie",
- "ical-buddy",
"imagemagick",
"jam",
"jq",
@@ -38,35 +27,17 @@
"librsvg",
"libssh2",
"libxml2",
- "mosh",
"neovim",
- "nim",
- "nmap",
- "nnn",
- "osquery",
- "pandoc",
"parallel",
- "pdfgrep",
"pkg-config",
- "qrencode",
- "qt",
"ripgrep",
- "sdl_mixer",
- "sdl_sound",
- "shellcheck",
- "smpeg",
- "socat",
"stubby",
- "swiftlint",
"tag",
- "tailor",
"terminal-notifier",
- "tesseract",
"texinfo",
"the_silver_searcher",
"tmux",
"unbound",
- "unison",
"vim",
"watchman",
"wget",
@@ -78,39 +49,34 @@
],
"casks": [
"alfred",
- "arq",
+ {"name": "arq", "when": "home"},
"bettertouchtool",
+ "brave-browser",
"dash",
{"name": "epic-games", "when": "home"},
"fantastical",
"firefox",
"font-fira-code",
"font-fira-mono",
- "franz",
+ {"name": "franz", "when": "home"},
{"name": "gog-galaxy", "when": "home"},
- "google-chrome",
"hammerspoon",
"iina",
- "iridient-developer",
- "java8",
- "julia",
+ {"name": "iridient-developer", "when": "home"},
+ {"name": "java8", "when": "home"},
"keka",
- "keybase",
+ {"name": "keybase", "when": "home"},
"lunchy",
- "onyx",
{"name": "openemu", "when": "home"},
"osxfuse",
- "popclip",
- "r-app",
"racket",
- "rstudio",
- "signal",
+ {"name": "signal", "when": "home"},
"skim",
{"name": "steam", "when": "home"},
"tla-plus-toolbox",
- "transmission",
+ {"name": "transmission", "when": "home"},
"virtualbox",
- "vmware-fusion",
+ {"name": "vmware-fusion", "when": "home"},
"xquartz"
],
"mas": [
@@ -148,8 +114,8 @@
"config/*": "~/.config/",
"launchagents/*.plist":"~/Library/LaunchAgents/",
"hammerspoon/*": "~/.hammerspoon/",
- "etc/unbound/*": "/usr/local/opt/unbound/etc/unbound/",
- "etc/stubby/*": "/usr/local/etc/stubby/"
+ "etc/unbound/*": "~/homebrew/opt/unbound/etc/unbound/",
+ "etc/stubby/*": "~/homebrew/etc/stubby/"
},
"post-install": [
"brew cleanup",
diff --git a/install.py b/install.py
index 950e92c..4c0e666 100644
--- a/install.py
+++ b/install.py
@@ -161,9 +161,9 @@ def install_mas(apps, tags):
def check_install_deps_macos():
- if not os.path.isdir("/usr/local/Cellar"):
- print('Installing homebrew')
- runcmd('/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"', stderr=STDOUT, shell=True)
+ if not os.path.isdir(os.path.expanduser("~/homebrew/Cellar")):
+ print('installing homebrew for the current user')
+ runcmd('mkdir ~/homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C ~/homebrew')
if not os.path.isfile('/usr/local/bin/mas'):
print('Installing mas')
runcmd('brew install mas')
@@ -188,7 +188,7 @@ def install_from_config(config_file, tags):
# FIXME: only do the following four on macos hosts
if platform.system() == 'Darwin':
check_install_deps_macos()
- install_taps(config.get('brew-taps', []))
+ install_taps(config.get('taps', []))
install_brew(config.get('brew', []), tags)
install_casks(config.get('casks', []), tags)
install_mas(config.get('mas', []), tags)
diff --git a/launchagents/local.timods.watchman.plist b/launchagents/local.timods.watchman.plist
index 02c74b4..05541d4 100644
--- a/launchagents/local.timods.watchman.plist
+++ b/launchagents/local.timods.watchman.plist
@@ -8,13 +8,13 @@
ProgramArguments
- /usr/local/Cellar/watchman/4.9.0_2/libexec/bin/watchman
+ /Users/timods/homebrew/Cellar/watchman/4.9.0_2/libexec/bin/watchman
--foreground
- --logfile=/usr/local/var/run/watchman/timods-state/log
+ --logfile=/Users/timods/homebrew/var/run/watchman/timods-state/log
--log-level=1
- --sockname=/usr/local/var/run/watchman/timods-state/sock
- --statefile=/usr/local/var/run/watchman/timods-state/state
- --pidfile=/usr/local/var/run/watchman/timods-state/pid
+ --sockname=/Users/timods/homebrew/var/run/watchman/timods-state/sock
+ --statefile=/Users/timods/homebrew/var/run/watchman/timods-state/state
+ --pidfile=/Users/timods/homebrew/var/run/watchman/timods-state/pid
KeepAlive
@@ -26,7 +26,7 @@
EnvironmentVariables
PATH
-
+
ProcessType
Interactive
diff --git a/launchdaemons/local.timods.stubby.plist b/launchdaemons/local.timods.stubby.plist
deleted file mode 100644
index e0a88f8..0000000
--- a/launchdaemons/local.timods.stubby.plist
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- Label
- local.timods.stubby
- KeepAlive
-
- RunAtLoad
-
- ProgramArguments
-
- /usr/local/opt/stubby/bin/stubby
- -C
- /usr/local/etc/stubby/stubby.yml
- -l
-
- StandardErrorPath
- /usr/local/var/log/stubby/stubby.log
- StandardOutPath
- /usr/local/var/log/stubby/stubby.log
-
-
diff --git a/launchdaemons/local.timods.unbound.plist b/launchdaemons/local.timods.unbound.plist
deleted file mode 100644
index f3a72ea..0000000
--- a/launchdaemons/local.timods.unbound.plist
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
- Label
- local.timods.unbound
- KeepAlive
-
- RunAtLoad
-
- ProgramArguments
-
- /usr/local/opt/unbound/sbin/unbound
- -d
- -c
- /usr/local/opt/unbound/etc/unbound/unbound.conf
-
- UserName
- root
- StandardErrorPath
- /dev/null
- StandardOutPath
- /dev/null
-
-
diff --git a/setup.sh b/setup.sh
index 8886ef1..ea6e19b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -9,7 +9,7 @@ python3 install.py config.json $* || (echo "Setup failed!" && exit 1)
test -f /tmp/casks && xargs