diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index efaff654..5cdf00ba 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -3161,7 +3161,6 @@ background of code to whatever theme I'm using's background" (add-hook 'markdown-mode-hook 'imalison:disable-linum-mode))) #+END_SRC *** plantuml-mode -This mode seems to be better maintained than plantuml-mode #+BEGIN_SRC emacs-lisp (use-package plantuml-mode :commands plantuml-mode diff --git a/dotfiles/lib/shellenv/functions.sh b/dotfiles/lib/shellenv/functions.sh index eb294624..bde28fc4 100644 --- a/dotfiles/lib/shellenv/functions.sh +++ b/dotfiles/lib/shellenv/functions.sh @@ -445,6 +445,10 @@ function in_git_directory { [ -d .git ] } +function process_running { + [[ ! -z "$(pgrep $@)" ]] +} + function which_readlink { readlink -f "$(which $1)" } diff --git a/dotfiles/lib/shellenv/synergy.sh b/dotfiles/lib/shellenv/synergy.sh index 44667a8d..4807b694 100644 --- a/dotfiles/lib/shellenv/synergy.sh +++ b/dotfiles/lib/shellenv/synergy.sh @@ -1,7 +1,7 @@ SYNERGY_CONF="$HOME/.synergy.conf" synergy_start_client_at() { - ssh "$1" 'test -z $(pgrep synergyc) || synergyc '"$(localip)"'; ps aux | grep synergyc' + ssh "$1" '[[ -z "$(pgrep synergyc)" ]] && synergyc '"$(localip)" } synergy_start_server_here() { diff --git a/tasks/brewfiles/default b/tasks/brewfiles/default index bf34a3a1..d30fe56f 100644 --- a/tasks/brewfiles/default +++ b/tasks/brewfiles/default @@ -38,6 +38,7 @@ brew 'reattach-to-user-namespace' brew 'rust' brew 'sbt' brew 'scala' +brew 'stack' brew 'sqlite' brew 'the_silver_searcher' brew 'thrift' @@ -56,11 +57,14 @@ cask 'google-hangouts' cask 'gpgtools' cask 'iterm2' cask 'java' -cask 'karabiner' +cask 'karabiner-elements' cask 'macpass' +cask 'mactex' cask 'mirrordisplays' cask 'osxfuse' +cask 'steam' cask 'slate' +cask 'sling' cask 'sparkleshare' cask 'spotify' cask 'synergy' diff --git a/tasks/brewfiles/essential b/tasks/brewfiles/essential index 2b32b74f..7bb8415c 100644 --- a/tasks/brewfiles/essential +++ b/tasks/brewfiles/essential @@ -1,5 +1,6 @@ tap 'thoughtbot/formulae' +brew 'cask' brew 'coreutils' brew 'emacs', args: ['with-cocoa', 'with-librsvg', 'with-gnutls', 'with-imagemagick'] brew 'findutils' @@ -29,6 +30,7 @@ cask 'gpgtools' cask 'iterm2' cask 'java' cask 'karabiner' +cask 'macpass' cask 'slate' cask 'sparkleshare' cask 'spotify' diff --git a/tasks/osx.py b/tasks/osx.py index eaefc425..856f2669 100644 --- a/tasks/osx.py +++ b/tasks/osx.py @@ -115,10 +115,11 @@ SCRIPTS_NEEDING_ASSISTIVE_DEVICE_ACCESS = [ @ctask def tccutil(ctx): - ctx.run('wget -O "$HOME/.lib/bin/tccutil.py" "https://raw.githubusercontent.com/IvanMalison/tccutil/master/tccutil.py"') - ctx.run('chmod 755 "$HOME/.lib/bin/tccutil.py"') + if not os.path.exists(os.path.expanduser("~/.lib/bin/tccutil.py")): + ctx.run('wget -O "$HOME/.lib/bin/tccutil.py" "https://raw.githubusercontent.com/IvanMalison/tccutil/master/tccutil.py"') + ctx.run('chmod 755 "$HOME/.lib/bin/tccutil.py"') for script in SCRIPTS_NEEDING_ASSISTIVE_DEVICE_ACCESS: - command = 'sudo tccutil.py -i "{0}" && sudo tccutil.py -e "{0}"'.format(script) + command = 'sudo tccutil.py -v -i "{0}" && sudo tccutil.py -v -e "{0}"'.format(script) print(command) ctx.run(command)