emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Massive refactor. Refactor all the things

Browse source
This commit is contained in:
Henrik Lissner 2016-04-23 22:08:46 -04:00
parent 03514fc09d
commit f234be68a4
56 changed files with 792 additions and 831 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/module-web.el
View file

@ -1,8 +1,8 @@
;;; module-web.el
(define-company-backend! sass-mode (css))
(define-company-backend! scss-mode (css))
(define-docset! scss-mode "sass,bourbon")
(def-company-backend! sass-mode (css))
(def-company-backend! scss-mode (css))
(def-docset! scss-mode "sass,bourbon")
(add-hook! (sass-mode scss-mode less-css-mode)
'(flycheck-mode narf|hl-line-off hs-minor-mode))
@ -34,9 +34,6 @@
:n ";" 'helm-css-scss
:n ":" 'helm-css-scss-multi))
(after! web-beautify
(map! :map scss-mode-map :m "gQ" 'web-beautify-css))
(after! emr
(emr-declare-command 'narf/scss-toggle-inline-or-block
:title "toggle inline/block"
@ -44,21 +41,29 @@
:predicate (lambda () (not (use-region-p))))))
(use-package jaded-mode
:load-path "/Volumes/hlissner/Dropbox/work/plugins/jaded-mode"
:mode "\\.jade$"
:config
(push '("jade" "html") projectile-other-file-alist)
(map! :map jaded-mode-map
:i [tab] 'narf/dumb-indent
:i [backtab] 'narf/dumb-dedent))
(use-package web-mode
:mode ("\\.\\(p\\)?htm\\(l\\)?$"
:mode ("\\.p?html?$"
"\\.\\(tpl\\|blade\\)\\(\\.php\\)?$"
"\\.erb$"
"\\.as[cp]x$"
"\\.mustache$"
"wp-content/themes/.+/.+\\.php$")
:init
(add-hook 'web-mode-hook 'turn-off-smartparens-mode)
:config
(setq web-mode-enable-html-entities-fontification t
web-mode-enable-current-column-highlight t)
(push '("html" "jade") projectile-other-file-alist)
(map! :map web-mode-map :i "SPC" 'self-insert-command)
(after! nlinum
@ -67,12 +72,11 @@
(map! :map web-mode-map
"M-/" 'web-mode-comment-or-uncomment
:n "M-r" 'narf/web-refresh-browser
:n "za" 'web-mode-fold-or-unfold
(:localleader :n "t" 'web-mode-element-rename)
:n "M-r" 'narf/web-refresh-browser
:nv "]a" 'web-mode-attribute-next
:nv "[a" 'web-mode-attribute-previous
:nv "]t" 'web-mode-tag-next
@ -81,15 +85,6 @@
:nv "[T" 'web-mode-element-parent))
;;
(use-package web-beautify
:commands (web-beautify-js web-beautify-css web-beautify-html)
:init
(add-hook! (web-mode css-mode scss-mode sass-mode less-css-mode js2-mode)
(setenv "jsbeautify_indent_size" (int-to-string tab-width)))
(map! (:after web-mode :map web-mode-map :m "gQ" 'web-beautify-html)
(:after css-mode :map css-mode-map :m "gQ" 'web-beautify-css)
(:after js2-mode :map js2-mode-map :m "gQ" 'web-beautify-js)))
(use-package emmet-mode
:commands (emmet-mode)
:init
@ -103,7 +98,7 @@
:i "M-E" 'emmet-expand-line))
;;
(define-project-type! jekyll ":{"
(def-project-type! jekyll ":{"
:modes (web-mode scss-mode html-mode markdown-mode yaml-mode)
:match "/\\(\\(css\\|_\\(layouts\\|posts\\|sass\\)\\)/.+\\|.+.html\\)$"
:files ("config.yml" "_layouts/")
@ -111,7 +106,7 @@
(when (eq major-mode 'web-mode)
(web-mode-set-engine "django"))))
(define-project-type! wordpress "wp"
(def-project-type! wordpress "wp"
:modes (php-mode web-mode css-mode scss-mode sass-mode)
:match "/wp-\\(\\(content\\|admin\\|includes\\)/\\)?.+$"
:files ("wp-config.php" "wp-content/"))