[emacs] assimilate haskell-mode

diff --git a/.gitmodules b/.gitmodules
index d300637..fdcca20 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -52,6 +52,9 @@
 [submodule "git-modes"]
        path = lib/git-modes
        url = git@github.com:magit/git-modes.git
 [submodule "git-modes"]
        path = lib/git-modes
        url = git@github.com:magit/git-modes.git

+[submodule "haskell-mode"]
+       path = lib/haskell-mode
+       url = git@github.com:haskell/haskell-mode.git

 [submodule "helm"]
        path = lib/helm
        url = git@github.com:emacs-helm/helm.git
 [submodule "helm"]
        path = lib/helm
        url = git@github.com:emacs-helm/helm.git

diff --git a/init.org b/init.org
index 1062c17..84f8408 100644 (file)
--- a/init.org
+++ b/init.org
@@ -933,7 +933,7 @@ TODO: break this giant source block down into individual org sections.
 
 * Programming modes
 
 
 * Programming modes
 

-** Lean mode
+** [[https://github.com/leanprover/lean-mode][Lean]]

 
 #+begin_src emacs-lisp
 (use-package lean-mode
 
 #+begin_src emacs-lisp
 (use-package lean-mode


@@ -941,6 +941,15 @@ TODO: break this giant source block down into individual org sections.
              ("S-SPC" . company-complete)))
 #+end_src
 
              ("S-SPC" . company-complete)))
 #+end_src
 

+** [[https://github.com/haskell/haskell-mode][Haskell]]
+
+#+begin_src emacs-lisp
+(use-package haskell-mode
+  :config
+  (setq haskell-indentation-layout-offset 4
+        haskell-indentation-left-offset 4
+        haskell-indentation-ifte-offset 4))
+#+end_src

 * Post initialization
 :PROPERTIES:
 :CUSTOM_ID: post-initialization
 * Post initialization
 :PROPERTIES:
 :CUSTOM_ID: post-initialization

diff --git a/lib/haskell-mode b/lib/haskell-mode
new file mode 160000 (submodule)
index 0000000..d71cca7
--- /dev/null
+++ b/lib/haskell-mode
@@ -0,0 +1 @@
+Subproject commit d71cca7f5ddc8178f5fe331563edcefe91cc0bcb