Merge branch 'master' of git.awful.club:jowj/chd

- no trello mdoe
- fix specialblock extras
- comment out amtrix refile / molly.

.emacs.d/jlj-generic.el

@@ -218,6 +218,17 @@
 (use-package ansible
   :ensure t)
 
+(use-package terraform-mode
+  :ensure t
+  :custom (terraform-indent-level 4)
+  :config
+  (defun my-terraform-mode-init ()
+    ;; if you want to use outline-minor-mode
+    ;; (outline-minor-mode 1)
+    )
+
+  (add-hook 'terraform-mode-hook 'my-terraform-mode-init))
+
 (use-package yaml-mode
   :ensure t)
 

.emacs.d/jlj-org.el

@@ -62,9 +62,9 @@
     (setq org-outline-path-complete-in-steps nil)         ; Refile in a single go
     (setq org-refile-use-outline-path t)                  ; Show full paths for refiling
     (setq org-agenda-files '("~/dhd/org/"))           ; add files to agenda
-    (find-file-noselect "~/Documents/projects/molly/data/matrix-refile.org")
-    (setq org-agenda-files (list "~/dhd/org"
-				 "~/Documents/projects/molly/data/matrix-refile.org"))
+    ;; (find-file-noselect "~/Documents/projects/molly/data/matrix-refile.org")
+    ;; (setq org-agenda-files (list "~/dhd/org"
+    ;; 				 "~/Documents/projects/molly/data/matrix-refile.org"))
     (with-current-buffer "matrix-refile.org" (auto-revert-mode))
 
 
@@ -72,6 +72,12 @@
     (setq org-directory "~/dhd/org/")                 ; define generic org capture shit
     (setq org-default-notes-file (concat org-directory "/refile-beorg.org"))))
 
+
+;; needed setup for special block extras modes.
+(defun org-special-block-extras-short-names ())
+(setq o--supported-blocks nil)
+(setq org-confirm-elisp-link-function nil)
+
 ;; setup special block extras!
 (use-package org-special-block-extras
   :ensure t
@@ -92,6 +98,7 @@
   ;; ‘org-special-block-extras-defblock’
   (org-special-block-extras-short-names))
 
+
 ;; Set up bullets
 (use-package org-bullets
   :ensure t
@@ -102,11 +109,11 @@
   :ensure t
   :after org)
 
-(use-package org-trello
-  :ensure t
-  :after org
-  :config
-  (custom-set-variables '(org-trello-files '("~/dhd/org/stjohns-trello.org"))))
+;; (use-package org-trello
+;;   :ensure t
+;;   :after org
+;;   :config
+;;   (custom-set-variables '(org-trello-files '("~/dhd/org/stjohns-trello.org"))))
 
 ;; configure the org protocol
 (org-load-modules-maybe t)
@@ -120,6 +127,12 @@
 	 ;; ... more templates here ...
 	 ("b" "Book - capture a book you've read" entry (file+olp "~/dhd/org/webwiki.org" "books")
 	  "* %^{TITLE} \n  :PROPERTIES:\n:AUTHOR: %^{AUTHOR}\n:GENRE: %^{GENRE}\n:FINISHED: %U \n:END:\n " :empty-lines 1 :prepend t)
+	 ("v" "TV - capture a TV show you've finished. Include season in title like (s01)." entry (file+olp "~/dhd/org/webwiki.org" "tv")
+	  "* %^{TITLE} \n  :PROPERTIES:\n:GENRE: %^{GENRE}\n:FINISHED: %U \n:END:\n " :empty-lines 1 :prepend t)
+	 ("m" "Movies - capture a movie you've finished" entry (file+olp "~/dhd/org/webwiki.org" "movies")
+	  "* %^{TITLE} \n  :PROPERTIES:\n:GENRE: %^{GENRE}\n:FINISHED: %U \n:END:\n " :empty-lines 1 :prepend t)
+	 ("g" "Game - capture a game you've finished" entry (file+olp "~/dhd/org/webwiki.org" "games")
+	  "* %^{TITLE} \n  :PROPERTIES:\n:PLATFORM: %^{PLATFORM}\n:TAGS: %^{TAGS}\n:MULTIPLAYER: %^{MULTIPLAYER}\n:FINISHED: %U \n:END:\n " :empty-lines 1 :prepend t)	 
 	 ("c" "Context-include Todo" entry (file "~/dhd/org/refile-beorg.org")
 	  "* TODO %?\n%U \n '%a'" :empty-lines 1 :prepend t)
 	 ("q" "quotes" entry (file+olp "~/dhd/org/webwiki.org" "quotes")