Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2016-10-19 17:26:16 -07:00
commit a87da9360d
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
6 changed files with 16 additions and 6 deletions

View File

@ -3161,7 +3161,6 @@ background of code to whatever theme I'm using's background"
(add-hook 'markdown-mode-hook 'imalison:disable-linum-mode))) (add-hook 'markdown-mode-hook 'imalison:disable-linum-mode)))
#+END_SRC #+END_SRC
*** plantuml-mode *** plantuml-mode
This mode seems to be better maintained than plantuml-mode
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package plantuml-mode (use-package plantuml-mode
:commands plantuml-mode :commands plantuml-mode

View File

@ -445,6 +445,10 @@ function in_git_directory {
[ -d .git ] [ -d .git ]
} }
function process_running {
[[ ! -z "$(pgrep $@)" ]]
}
function which_readlink { function which_readlink {
readlink -f "$(which $1)" readlink -f "$(which $1)"
} }

View File

@ -1,7 +1,7 @@
SYNERGY_CONF="$HOME/.synergy.conf" SYNERGY_CONF="$HOME/.synergy.conf"
synergy_start_client_at() { 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() { synergy_start_server_here() {

View File

@ -38,6 +38,7 @@ brew 'reattach-to-user-namespace'
brew 'rust' brew 'rust'
brew 'sbt' brew 'sbt'
brew 'scala' brew 'scala'
brew 'stack'
brew 'sqlite' brew 'sqlite'
brew 'the_silver_searcher' brew 'the_silver_searcher'
brew 'thrift' brew 'thrift'
@ -56,11 +57,14 @@ cask 'google-hangouts'
cask 'gpgtools' cask 'gpgtools'
cask 'iterm2' cask 'iterm2'
cask 'java' cask 'java'
cask 'karabiner' cask 'karabiner-elements'
cask 'macpass' cask 'macpass'
cask 'mactex'
cask 'mirrordisplays' cask 'mirrordisplays'
cask 'osxfuse' cask 'osxfuse'
cask 'steam'
cask 'slate' cask 'slate'
cask 'sling'
cask 'sparkleshare' cask 'sparkleshare'
cask 'spotify' cask 'spotify'
cask 'synergy' cask 'synergy'

View File

@ -1,5 +1,6 @@
tap 'thoughtbot/formulae' tap 'thoughtbot/formulae'
brew 'cask'
brew 'coreutils' brew 'coreutils'
brew 'emacs', args: ['with-cocoa', 'with-librsvg', 'with-gnutls', 'with-imagemagick'] brew 'emacs', args: ['with-cocoa', 'with-librsvg', 'with-gnutls', 'with-imagemagick']
brew 'findutils' brew 'findutils'
@ -29,6 +30,7 @@ cask 'gpgtools'
cask 'iterm2' cask 'iterm2'
cask 'java' cask 'java'
cask 'karabiner' cask 'karabiner'
cask 'macpass'
cask 'slate' cask 'slate'
cask 'sparkleshare' cask 'sparkleshare'
cask 'spotify' cask 'spotify'

View File

@ -115,10 +115,11 @@ SCRIPTS_NEEDING_ASSISTIVE_DEVICE_ACCESS = [
@ctask @ctask
def tccutil(ctx): def tccutil(ctx):
ctx.run('wget -O "$HOME/.lib/bin/tccutil.py" "https://raw.githubusercontent.com/IvanMalison/tccutil/master/tccutil.py"') if not os.path.exists(os.path.expanduser("~/.lib/bin/tccutil.py")):
ctx.run('chmod 755 "$HOME/.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: 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) print(command)
ctx.run(command) ctx.run(command)