Add: haxe modes; swap out writreoom for olivetti

1 files changed, 31 insertions, 30 deletions

diff --git a/init-el.org b/init-el.org
index 3d4047a..26f0a64 100644
--- a/init-el.org
+++ b/init-el.org
@@ -183,7 +183,8 @@ I'm using melpa and elpa package archives.
       '((org-mode my-org-command)
         (pdf-view-mode my-pdf-view-mod-command)
 	(lisp-mode my-lisp-mode-command)
-        (sly-mrepl-mode my-lisp-mode-command)))
+        (sly-mrepl-mode my-lisp-mode-command)
+        (haxe-mode my-haxe-mode-command)))
 
 
 (defun my-major-mode-command ()
@@ -501,7 +502,7 @@ again, if it  was whent he org edit src buffer was opened."
        (?f "[f]it window" my-fit-window-to-buffer)
        (?p "font [p]itch shift" variable-pitch-mode)
        (?v "[v]isual line mode" visual-line-mode)
-       (?w "[w]riteroom mode" writeroom-mode)))
+       (?w "[w]riting mode" olivetti-mode)))
 #+end_src
 
 *** Buffer Leader Key Menu
@@ -680,6 +681,7 @@ LOAD-THEME"
 (setq *coding-themes*
       '(
         ;; light
+        leuven
         flexoki-themes-light
         silkworm
         faff
@@ -1018,33 +1020,11 @@ imenu-list displayes imenu results in a a navigable table-of-contents tree-like
 
 #+end_src
 
-** Writeroom 
+** Olivetti 
 
-#+name: writeroom
+#+name: olivetti
 #+begin_src elisp :results none
-(package-install 'writeroom-mode)
-
-;; (setq my-writeroom-theme 'poet-dark)
-;; (setq my-writeroom-cached-theme nil)
-
-;; (add-hook 'writeroom-mode-enable-hook
-;;           (lambda ()
-;;             (when my-writeroom-theme
-;;                    (setf my-writeroom-cached-theme
-;;                          (car custom-enabled-themes))
-;;                    (disable-theme (car custom-enabled-themes))
-;;                    (load-theme my-writeroom-theme))
-;;             (variable-pitch-mode)))
-
-
-;; (add-hook 'writeroom-mode-disable-hook
-;;           (lambda ()
-;;             (variable-pitch-mode 0)
-;;             (disable-theme (car custom-enabled-themes))
-;;             (when my-writeroom-cached-theme
-;;               (enable-theme my-writeroom-cached-theme))
-;;             (setf my-writeroom-cached-theme nil)))
-
+(package-install 'olivetti)
 
 #+end_src
 
@@ -1055,9 +1035,6 @@ imenu-list displayes imenu results in a a navigable table-of-contents tree-like
 
 (setq browse-url-browser-function 'eww-browse-url)
 
-;; (add-hook 'eww-mode-hook
-;;           (lambda ()
-;;             (writeroom-mode t)))
 
 #+end_src
 
@@ -1443,9 +1420,33 @@ association one shell with each perspective layout
 
 ** Haxe 
 
+In order to use ~battle-haxe-mode~, you must put an ~.hxml~ file into
+the root directory for the haxe project.
+
+Here is an example for an openfl project 
+#+begin_example
+-cp Source
+-lib lime
+-lib openfl
+#+end_example
+
+This lists where the source root is ~-cp Source~ and which haxelib
+libraries should be available
+
 #+name: haxe-config
 #+begin_src elisp :noweb no-export
 (package-install 'haxe-mode)
+(package-install 'battle-haxe)
+
+(add-hook 'haxe-mode-hook #'battle-haxe-mode)
+
+(custom-set-variables
+ '(battle-haxe-immediate-completion t))
+
+(def-my-command my-haxe-mode-command
+  '((?. "[.] jump to definition" battle-haxe-goto-definition)
+    (?, "[,] pop global mark" pop-global-mark)
+    (?/ "[/] find references" battle-haxe-helm-find-references)))
 #+end_src
 
 #+RESULTS: haxe-config