Merge branch 'master' of github.com:IvanMalison/dotfiles
This commit is contained in:
commit
4cc2dc2f29
@ -2678,7 +2678,7 @@ Intero seems to be causing hangs, so it has been disabled
|
||||
(sp-local-pair 'org-mode "~" "~")
|
||||
|
||||
(add-to-list
|
||||
'org-src-lang-modes '("plantuml" . puml))
|
||||
'org-src-lang-modes '("plantuml" . plantuml))
|
||||
|
||||
(org-babel-do-load-languages
|
||||
'org-babel-load-languages
|
||||
@ -3096,11 +3096,11 @@ Intero seems to be causing hangs, so it has been disabled
|
||||
(progn
|
||||
(add-hook 'markdown-mode-hook 'imalison:disable-linum-mode)))
|
||||
#+END_SRC
|
||||
*** puml-mode (plantuml-support)
|
||||
*** plantuml-mode
|
||||
This mode seems to be better maintained than plantuml-mode
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package puml-mode
|
||||
:commands puml-mode
|
||||
(use-package plantuml-mode
|
||||
:commands plantuml-mode
|
||||
:mode ("\\.puml\\'" "\\.plantuml\\'")
|
||||
:preface
|
||||
(progn
|
||||
@ -3112,14 +3112,14 @@ This mode seems to be better maintained than plantuml-mode
|
||||
(--first (s-ends-with? ".jar" it) (directory-files plantuml-dir))))
|
||||
(filepath (when filename
|
||||
(imalison:join-paths plantuml-dir filename))))
|
||||
(setq puml-plantuml-jar-path filepath
|
||||
(setq plantuml-jar-path filepath
|
||||
org-plantuml-jar-path filepath)))
|
||||
((equal system-type 'gnu/linux)
|
||||
(let ((filepath "/opt/plantuml/plantuml.jar"))
|
||||
(setq puml-plantuml-jar-path filepath
|
||||
(setq plantuml-jar-path filepath
|
||||
org-plantuml-jar-path filepath))))
|
||||
(add-to-list
|
||||
'org-src-lang-modes '("plantuml" . puml))))
|
||||
'org-src-lang-modes '("plantuml" . plantuml))))
|
||||
#+END_SRC
|
||||
*** wsd-mode
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
|
@ -114,13 +114,11 @@ function _tex_setup {
|
||||
}
|
||||
|
||||
function _racket_setup {
|
||||
if command_exists; then
|
||||
if is_osx; then
|
||||
local racket_base_path="$(brew --prefix racket)"
|
||||
# XXX: Seems maybe this is not needed
|
||||
# local newest_version_number="$(ls \"$racket_base_path\" | sort -Vr | head -n1)"
|
||||
add_to_path "$racket_base_path/bin" --before
|
||||
fi
|
||||
if is_osx; then
|
||||
local racket_base_path="$(brew --prefix racket)"
|
||||
# XXX: Seems maybe this is not needed
|
||||
# local newest_version_number="$(ls \"$racket_base_path\" | sort -Vr | head -n1)"
|
||||
add_to_path "$racket_base_path/bin" --before
|
||||
fi
|
||||
}
|
||||
|
||||
|
35
tasks/osx.py
35
tasks/osx.py
@ -9,8 +9,8 @@ from . import util
|
||||
def setup(ctx):
|
||||
brew(ctx)
|
||||
brew_essential(ctx)
|
||||
access_for_assistive_devices(ctx)
|
||||
tccutil(ctx)
|
||||
access_for_assistive_devices(ctx)
|
||||
karabiner(ctx)
|
||||
locate(ctx)
|
||||
set_path_for_launchd(ctx)
|
||||
@ -93,15 +93,16 @@ def access_for_assistive_devices(ctx):
|
||||
user_application = os.path.expanduser('~' + app_string)
|
||||
access_if_exists(ctx, user_application)
|
||||
access_if_exists(ctx, app_string)
|
||||
access_if_exists(
|
||||
ctx,
|
||||
"/Applications/Karabiner.app/"
|
||||
)
|
||||
access_if_exists(
|
||||
ctx,
|
||||
"/Applications/Karabiner.app/Contents/Applications/"
|
||||
"Karabiner_AXNotifier.app"
|
||||
)
|
||||
|
||||
access_if_exists(
|
||||
ctx,
|
||||
"/Applications/Karabiner.app/"
|
||||
)
|
||||
access_if_exists(
|
||||
ctx,
|
||||
"/Applications/Karabiner.app/Contents/Applications/"
|
||||
"Karabiner_AXNotifier.app"
|
||||
)
|
||||
|
||||
SYNERGY_BINARIES_PATH = '/Applications/Synergy.app/Contents/MacOS/'
|
||||
|
||||
@ -114,18 +115,18 @@ 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"')
|
||||
for script in SCRIPTS_NEEDING_ASSISTIVE_DEVICE_ACCESS:
|
||||
ctx.run(
|
||||
'sudo tccutil -i "{}"'.format(script)
|
||||
)
|
||||
ctx.run(
|
||||
'sudo tccutil -e "{}"'.format(script)
|
||||
)
|
||||
command = 'sudo tccutil.py -i "{0}" && sudo tccutil.py -e "{0}"'.format(script)
|
||||
print(command)
|
||||
ctx.run(command)
|
||||
|
||||
|
||||
def access_if_exists(ctx, app_string):
|
||||
print("attempting access for {0}".format(app_string))
|
||||
if os.path.exists(app_string):
|
||||
print("enabling access for {0}", app_string)
|
||||
print("enabling access for {0}".format(app_string))
|
||||
ctx.run(
|
||||
'zsh -c "source ~/.zshrc && '
|
||||
'enable_access_for_assistive_devices \"{0}\""'.format(
|
||||
|
Loading…
Reference in New Issue
Block a user