From c83d12a0d4a1217f15447def6cac1555e17471e2 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 15 May 2019 16:46:10 +0100
Subject: [PATCH] Refactor org-mode setup, adding ox-jira package

---
 core/siren-modules.el                         |  7 +++++-
 modules/org-mode/siren-htmlize.el             | 12 ++++++++++
 .../{languages => org-mode}/siren-org-mode.el | 22 +++++++++----------
 modules/org-mode/siren-org-mouse.el           | 14 ++++++++++++
 modules/org-mode/siren-ox-jira.el             | 22 +++++++++++++++++++
 5 files changed, 64 insertions(+), 13 deletions(-)
 create mode 100644 modules/org-mode/siren-htmlize.el
 rename modules/{languages => org-mode}/siren-org-mode.el (59%)
 create mode 100644 modules/org-mode/siren-org-mouse.el
 create mode 100644 modules/org-mode/siren-ox-jira.el

diff --git a/core/siren-modules.el b/core/siren-modules.el
index 7b846d1..feec8ac 100644
--- a/core/siren-modules.el
+++ b/core/siren-modules.el
@@ -115,6 +115,12 @@
 ;; Workspace management
 (require 'siren-escreen)
 
+;; Org-mode
+(require 'siren-htmlize)
+(require 'siren-org-mode)
+(require 'siren-org-mouse)
+(require 'siren-ox-jira)
+
 ;; Languages
 (require 'siren-coffee)
 (require 'siren-conf)
@@ -133,7 +139,6 @@
 (require 'siren-lua)
 (require 'siren-makefile)
 (require 'siren-markdown)
-(require 'siren-org-mode)
 (require 'siren-php)
 (require 'siren-plantuml)
 (require 'siren-prog-mode)
diff --git a/modules/org-mode/siren-htmlize.el b/modules/org-mode/siren-htmlize.el
new file mode 100644
index 0000000..620f44c
--- /dev/null
+++ b/modules/org-mode/siren-htmlize.el
@@ -0,0 +1,12 @@
+;;; siren-htmlize.el --- jimeh's Emacs Siren: htmlize configuration.
+
+;;; Commentary:
+
+;; Basic configuration for htmlize.
+
+;;; Code:
+
+(use-package htmlize)
+
+(provide 'siren-htmlize)
+;;; siren-htmlize.el ends here
diff --git a/modules/languages/siren-org-mode.el b/modules/org-mode/siren-org-mode.el
similarity index 59%
rename from modules/languages/siren-org-mode.el
rename to modules/org-mode/siren-org-mode.el
index 34d7b55..6b0ebd9 100644
--- a/modules/languages/siren-org-mode.el
+++ b/modules/org-mode/siren-org-mode.el
@@ -13,6 +13,15 @@
 
 (use-package org-mode
   :ensure nil ;; loaded from emacs built-ins
+  :bind (:map org-mode-map
+              ("C-j" . newline-and-indent)
+              ("RET" . newline-and-indent)
+              ("M-{" . org-promote-subtree)
+              ("M-}" . org-demote-subtree)
+              ("M-P" . org-metaup)
+              ("M-N" . org-metadown)
+              ("C-M-n" . outline-next-visible-heading)
+              ("C-M-p" . outline-previous-visible-heading))
   :hook (org-mode . siren-org-mode-setup)
 
   :init
@@ -26,18 +35,7 @@
     (fci-mode)
     (smartparens-mode +1)
     (visual-line-mode +1)
-    (whitespace-mode +1)
-    (let ((map org-mode-map))
-      (define-key map (kbd "M-[") 'org-promote-subtree)
-      (define-key map (kbd "M-]") 'org-demote-subtree)
-      (define-key map (kbd "M-p") 'org-metaup)
-      (define-key map (kbd "M-n") 'org-metadown)
-      (define-key map (kbd "C-M-n") 'outline-next-visible-heading)
-      (define-key map (kbd "C-M-p") 'outline-previous-visible-heading))))
-
-(use-package org-mouse
-  :ensure nil ;; loaded from emacs built-ins
-  )
+    (whitespace-mode +1)))
 
 (provide 'siren-org-mode)
 ;;; siren-org-mode.el ends here
diff --git a/modules/org-mode/siren-org-mouse.el b/modules/org-mode/siren-org-mouse.el
new file mode 100644
index 0000000..39fb5c8
--- /dev/null
+++ b/modules/org-mode/siren-org-mouse.el
@@ -0,0 +1,14 @@
+;;; siren-org-mouse.el --- jimeh's Emacs Siren: org-mouse configuration.
+
+;;; Commentary:
+
+;; Basic configuration for org-mouse.
+
+;;; Code:
+
+(use-package org-mouse
+  :ensure nil ;; loaded from emacs built-ins
+  )
+
+(provide 'siren-org-mouse)
+;;; siren-org-mouse.el ends here
diff --git a/modules/org-mode/siren-ox-jira.el b/modules/org-mode/siren-ox-jira.el
new file mode 100644
index 0000000..e9c3b32
--- /dev/null
+++ b/modules/org-mode/siren-ox-jira.el
@@ -0,0 +1,22 @@
+;;; siren-ox-jira.el --- jimeh's Emacs Siren: ox-jira configuration.
+
+;;; Commentary:
+
+;; Basic configuration for ox-jira.
+
+;;; Code:
+
+(require 'siren-org-mode)
+
+(use-package ox-jira
+  :defer t
+
+  :hook
+  (org-mode . siren-ox-jira-setup)
+
+  :init
+  (defun siren-ox-jira-setup ()
+    (require 'ox-jira)))
+
+(provide 'siren-ox-jira)
+;;; siren-ox-jira.el ends here