From 503a019babc4eed0c7357ba01e3d288a0b0bbc52 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 29 Jan 2016 07:03:43 -0500 Subject: [PATCH] Move mac/ios config to module-apple.el --- core/core-os-osx.el | 2 -- modules/module-apple.el | 34 ++++++++++++++++++++++++++++++++++ modules/module-swift.el | 16 ---------------- 3 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 modules/module-apple.el delete mode 100644 modules/module-swift.el diff --git a/core/core-os-osx.el b/core/core-os-osx.el index 013c9a8b9..3f12e631e 100644 --- a/core/core-os-osx.el +++ b/core/core-os-osx.el @@ -42,8 +42,6 @@ ;; OSX Related Plugins ;;;;;;;;;;;;;;;;; -(use-package applescript-mode :mode "\\.applescript$") - (use-package dash-at-point :commands (dash-at-point dash-at-point-with-docset) :config diff --git a/modules/module-apple.el b/modules/module-apple.el new file mode 100644 index 000000000..8544c7ac6 --- /dev/null +++ b/modules/module-apple.el @@ -0,0 +1,34 @@ +;;; module-apple.el + +(use-package applescript-mode :mode "\\.applescript$") + +;; TODO Set up emacs task runners for fruitstrap +(use-package swift-mode + :mode "\\.swift$" + :init + (add-hook! swift-mode 'flycheck-mode) + :config + (after! flycheck (add-to-list 'flycheck-checkers 'swift)) + (after! company + (require 'company-sourcekit) + (define-company-backend! swift-mode (sourcekit yasnippet)))) + +(defun narf-lb6-reload () + (interactive) + (let ((dir (f-traverse-upwards (lambda (f) (string-suffix-p ".lbaction" f))))) + (shell-command (format "open %s" dir)))) + +(define-minor-mode lb6-mode + "Launchbar development mode." + :init-value nil + :lighter " lb6" + :keymap (let ((map (make-sparse-keymap))) + (map! :map map + (:localleader + :n "b" 'narf-lb6-reload)) + map) + (add-yas-minor-mode! 'lb6-mode)) +(associate! lb6-mode :match "\\.lb\\(action\\|ext\\)/.+$") + +(provide 'module-apple) +;;; module-apple.el ends here diff --git a/modules/module-swift.el b/modules/module-swift.el deleted file mode 100644 index df12797c8..000000000 --- a/modules/module-swift.el +++ /dev/null @@ -1,16 +0,0 @@ -;;; module-swift.el - -(use-package swift-mode - :mode "\\.swift$" - :init - (add-hook! swift-mode 'flycheck-mode) - :config - (after! flycheck (add-to-list 'flycheck-checkers 'swift)) - (after! company - (require 'company-sourcekit) - (define-company-backend! swift-mode (sourcekit yasnippet)))) - -;; TODO Set up emacs task runners for fruitstrap - -(provide 'module-swift) -;;; module-swift.el ends here