From 52f1f3b9433b00f0515c73e30b4e6cccfafe5752 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 18 Jan 2016 01:43:28 -0500
Subject: [PATCH] Let editorconfig handle settings

---
 core/core-defuns.el   |  3 ---
 modules/module-js.el  |  5 +----
 modules/module-org.el |  1 -
 modules/module-web.el | 27 ++++++++++++++++-----------
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/core/core-defuns.el b/core/core-defuns.el
index 1816f6b61..14e859a17 100644
--- a/core/core-defuns.el
+++ b/core/core-defuns.el
@@ -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)))
diff --git a/modules/module-js.el b/modules/module-js.el
index 32220d903..a6d006a3f 100644
--- a/modules/module-js.el
+++ b/modules/module-js.el
@@ -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$"
diff --git a/modules/module-org.el b/modules/module-org.el
index d3291a91d..282614ca2 100644
--- a/modules/module-org.el
+++ b/modules/module-org.el
@@ -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)
 
diff --git a/modules/module-web.el b/modules/module-web.el
index c9f10046f..ac8fdceea 100644
--- a/modules/module-web.el
+++ b/modules/module-web.el
@@ -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