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

Revert macros to ...! name convention (elisp doesn't like @...)

Browse source
This commit is contained in:
Henrik Lissner 2017-02-23 00:06:12 -05:00
parent b64d5554e3
commit 33c88d4f82
125 changed files with 877 additions and 880 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/lang/web/+css.el
View file

@ -3,7 +3,7 @@
(sp-with-modes '(css-mode scss-mode less-css-mode stylus-mode)
(sp-local-pair "/*" "*/" :post-handlers '(("[d-3]||\n[i]" "RET") ("| " "SPC"))))
(@map :map* (css-mode-map scss-mode-map less-css-mode-map)
(map! :map* (css-mode-map scss-mode-map less-css-mode-map)
:n "M-R" '+css/web-refresh-browser
:localleader
:nv ";" '+css/append-semicolon
@ -15,33 +15,33 @@
;; Packages
;;
(@def-package css-mode
(def-package! css-mode
:mode "\\.css$"
:mode ("\\.scss$" . scss-mode)
:init
(@add-hook css-mode
(add-hook! css-mode
'(yas-minor-mode-on flycheck-mode rainbow-mode highlight-numbers-mode
;; doom|counsel-css-imenu-setup
))
:config
(@set :company-backend '(css-mode scss-mode) '(company-css company-yasnippet))
(@set :build 'scss 'scss-mode '+css/scss-build))
(set! :company-backend '(css-mode scss-mode) '(company-css company-yasnippet))
(set! :build 'scss 'scss-mode '+css/scss-build))
(@def-package sass-mode
(def-package! sass-mode
:mode "\\.sass$"
:config
(setq sass-command-options '("--style compressed"))
(@set :build 'sass 'sass-mode '+css/sass-build)
(@set :company-backend 'sass-mode '(company-css company-yasnippet)))
(set! :build 'sass 'sass-mode '+css/sass-build)
(set! :company-backend 'sass-mode '(company-css company-yasnippet)))
(@def-package less-css-mode
(def-package! less-css-mode
:mode "\\.less$")
(@def-package stylus-mode
(def-package! stylus-mode
:mode "\\.styl$"
:init (@add-hook stylus-mode '(yas-minor-mode-on flycheck-mode)))
:init (add-hook! stylus-mode '(yas-minor-mode-on flycheck-mode)))

22
modules/lang/web/+html.el
View file

@ -1,6 +1,6 @@
;;; lang/web/config.el
(@def-package web-mode
(def-package! web-mode
:mode ("\\.p?html?$"
"\\.\\(tpl\\|blade\\)\\(\\.php\\)?$"
"\\.erb$"
@ -12,13 +12,13 @@
:init
(add-hook 'web-mode-hook 'turn-off-smartparens-mode)
:config
(@set :company-backend 'web-mode '(company-web-html company-yasnippet))
(set! :company-backend 'web-mode '(company-web-html company-yasnippet))
(setq web-mode-enable-html-entities-fontification t)
;; Fix blank line numbers after unfolding
(advice-add 'web-mode-fold-or-unfold :after 'nlinum--flush)
(@map :map web-mode-map
(map! :map web-mode-map
(:localleader :n "t" 'web-mode-element-rename)
"M-/" 'web-mode-comment-or-uncomment
:i "SPC" 'self-insert-command
@ -31,17 +31,17 @@
:nv "]T" 'web-mode-element-child
:nv "[T" 'web-mode-element-parent)
(@def-package company-web :after company))
(def-package! company-web :after company))
(@def-package haml-mode :mode "\\.haml$")
(def-package! haml-mode :mode "\\.haml$")
(@def-package pug-mode
(def-package! pug-mode
:mode ("\\.jade$" "\\.pug$")
:config
(@set :company-backend 'pug-mode '(company-yasnippet))
(@map :map pug-mode-map
(set! :company-backend 'pug-mode '(company-yasnippet))
(map! :map pug-mode-map
:i [tab] 'doom/dumb-indent
:i [backtab] 'doom/dumb-dedent))
@ -50,14 +50,14 @@
;; Tools
;;
(@def-package emmet-mode
(def-package! emmet-mode
:commands emmet-mode
:preface (defvar emmet-mode-keymap (make-sparse-keymap))
:init
(@add-hook (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
(add-hook! (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
:config
(setq emmet-move-cursor-between-quotes t)
(@map :map emmet-mode-keymap
(map! :map emmet-mode-keymap
:v "M-e" 'emmet-wrap-with-markup
:i "M-e" 'emmet-expand-yas
:i "M-E" 'emmet-expand-line))

14
modules/lang/web/config.el
View file

@ -1,7 +1,7 @@
;;; lang/web/config.el
(@load +html)
(@load +css)
(load! +html)
(load! +css)
;;
@ -9,7 +9,7 @@
;;
;; (defvar bower-conf (make-hash-table :test 'equal))
;; (@def-project bower "bower"
;; (def-project! bower "bower"
;; :modes (web-mode js-mode coffee-mode css-mode sass-mode pug-mode)
;; :files ("bower.json")
;; :when
@ -23,7 +23,7 @@
;; (puthash project-path it bower-conf)))
;; t))
;; (@def-project angularjs "angular"
;; (def-project! angularjs "angular"
;; :modes (nodejs-project-mode bower-project-mode)
;; :when
;; (lambda (&rest _)
@ -36,15 +36,15 @@
;; (cdr-safe (assq 'devDependencies npm)))))
;; (assq 'angular deps))))
;; (@def-project jekyll ":{"
;; (def-project! jekyll ":{"
;; :modes (web-mode js-mode coffee-mode css-mode haml-mode pug-mode)
;; :match "/\\(\\(css\\|_\\(layouts\\|posts\\|sass\\)\\)/.+\\|.+.html\\)$"
;; :files ("config.yml" "_layouts/")
;; (@add-hook mode
;; (add-hook! mode
;; (when (eq major-mode 'web-mode)
;; (web-mode-set-engine "django"))))
;; (@def-project wordpress "wp"
;; (def-project! wordpress "wp"
;; :modes (php-mode web-mode css-mode haml-mode pug-mode)
;; :match "/wp-\\(\\(content\\|admin\\|includes\\)/\\)?.+$"
;; :files ("wp-config.php" "wp-content/"))

16
modules/lang/web/packages.el
View file

@ -5,14 +5,14 @@
;; n/a
;; +html.el
(@package company-web)
(@package emmet-mode)
(@package haml-mode)
(@package pug-mode)
(@package web-mode)
(package! company-web)
(package! emmet-mode)
(package! haml-mode)
(package! pug-mode)
(package! web-mode)
;; +css.el
(@package less-css-mode)
(@package sass-mode)
(@package stylus-mode)
(package! less-css-mode)
(package! sass-mode)
(package! stylus-mode)