Rewrote initfiles

This commit is contained in:
Henrik Lissner 2014-08-21 03:33:30 -04:00
parent a58f4246ba
commit e0c72477ae
16 changed files with 345 additions and 206 deletions

View file

@ -4,14 +4,9 @@
(use-package scss-mode :ensure t
:mode "\\.scss\\'"
:config
(add-hook 'scss-mode-hook (lambda() (add-to-list 'ac-sources 'ac-css-mode-setup))))
:config (add-hook 'scss-mode-hook 'ac-css-mode-setup))
(use-package haml-mode :ensure t :mode "\\.haml\\'")
(use-package web-mode :ensure t
:mode (("\\.\\(p\\)?htm\\(l\\)?\\'" . web-mode)
("\\.tpl\\(\\.php\\)?\\'" . web-mode)
("\\.erb\\'" . web-mode)))
(use-package php-mode :ensure t
:mode (("\\.php\\'" . php-mode)
@ -22,9 +17,13 @@
(my/setup-run-code php-mode-map "php")
(setq php-template-compatibility nil)))
(use-package js-mode
:mode "\\.js\\'"
:interpreter "node")
(use-package web-mode :ensure t
:mode (("\\.\\(p\\)?htm\\(l\\)?\\'" . web-mode)
("\\.tpl\\(\\.php\\)?\\'" . web-mode)
("\\.erb\\'" . web-mode)
("wp-content/themes/.+/.+\\.php\\'" . web-mode))
:config
(add-hook 'web-mode-hook 'jekyll-mode-maybe))
(use-package tern :ensure t
:commands tern-mode
@ -44,12 +43,36 @@
(use-package emmet-mode :ensure t
:defer t
:config
(imap 'emmet-mode-map (kbd "s-e") 'emmet-expand-line)
(progn
(imap emmet-mode-keymap (kbd "s-e") 'emmet-expand-yas)
(imap emmet-mode-keymap (kbd "s-E") 'emmet-expand-line)
(setq emmet-move-cursor-between-quotes t))
:init
(progn
(add-hook 'scss-mode-hook 'emmet-mode)
(add-hook 'web-mode-hook 'emmet-mode)
(add-hook 'haml-mode-hook 'emmet-mode)
(add-hook 'nxml-mode-hook 'emmet-mode)))
;; Jekyll support
(define-minor-mode jekyll-mode
:init-value nil
:lighter " :{"
:keymap (make-sparse-keymap))
(defun jekyll-mode-maybe()
(let ((root (projectile-project-root)))
(if (or (string-match "[.-]jekyll/" root)
(file-exists-p (concat root ".jekyll-mode")))
(jekyll-mode t))))
(nmap jekyll-mode-map (kbd ",b")
(λ (open-file-with "http://localhost:4000")))
(add-hook 'scss-mode-hook 'jekyll-mode-maybe)
(add-hook 'web-mode-hook 'jekyll-mode-maybe)
(add-hook 'markdown-mode-hook 'jekyll-mode-maybe)
;;
(provide 'mod-webdev)