Let editorconfig handle settings

This commit is contained in:
Henrik Lissner 2016-01-18 01:43:28 -05:00
parent 6abef3c705
commit 52f1f3b943
4 changed files with 17 additions and 19 deletions

View file

@ -201,9 +201,6 @@ Examples:
(defun narf|enable-hard-wrap ()
(turn-on-auto-fill))
(defun narf|disable-delete-trailing-whitespace ()
(remove-hook 'before-save-hook 'delete-trailing-whitespace))
(defun narf|update-scratch-buffer-cwd () ; see core-editor.el
"Make sure scratch buffer is always 'in a project.'"
(let ((dir (narf/project-root)))

View file

@ -82,10 +82,7 @@
(use-package unityjs-mode
:mode "/Assets/.*\\.js$"
:config
(add-hook! unityjs-mode
(flycheck-mode 1)
(narf|enable-tab-width-2)
(setq js-indent-level 2)))
(add-hook! unityjs-mode 'flycheck-mode))
(use-package typescript-mode
:mode "\\.ts$"

View file

@ -320,7 +320,6 @@ will function properly."
(setq buffer-face-mode-face `(:family ,(symbol-name (font-get narf-writing-font :family))))
(buffer-face-mode +1)
(narf|enable-tab-width-2)
(setq truncate-lines nil)
(setq line-spacing '2)

View file

@ -41,23 +41,28 @@
(add-hook! css-mode (setenv "jsbeautify_indent_size" "2"))
(map! :map css-mode-map :m "gQ" 'web-beautify-css)))
(use-package jade-mode
(use-package jaded-mode
:load-path "/Volumes/hlissner/Dropbox/work/plugins/jaded-mode"
:mode "\\.jade$"
:config (require 'sws-mode))
:config
(map! :map jaded-mode-map
:i [tab] 'narf/dumb-indent
:i [backtab] 'narf/dumb-dedent))
(use-package slim-mode :mode "\\.slim$")
(use-package slim-mode
:load-path "~/Dropbox/work/plugins/emacs-slim"
:mode "\\.slim$"
:config
;; Don't hijack my indentation
(map! :map slim-mode-map
:i [tab] 'narf/dumb-indent
:i [backtab] 'narf/dumb-dedent))
(use-package web-mode
:mode ("\\.\\(p\\)?htm\\(l\\)?$" "\\.tpl\\(\\.php\\)?$" "\\.erb$" "wp-content/themes/.+/.+\\.php$")
:init
(setq web-mode-markup-indent-offset 2
web-mode-code-indent-offset 2
web-mode-css-indent-offset 2
web-mode-style-padding 2
web-mode-script-padding 2
web-mode-block-padding 2
;; smartparens handles this
web-mode-enable-auto-pairing nil
;; smartparens handles this
(setq web-mode-enable-auto-pairing nil
web-mode-enable-auto-quoting nil)
:config
(after! web-beautify