Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

init.el

@@ -446,6 +446,12 @@ vertically."
 (use-package csv-mode
   :mode ("\\.csv\\'" . csv-mode))
 
+(use-package restclient
+  :commands (restclient-mode))
+
+(use-package ob-restclient
+  :after org)
+
 (use-package dired
   :ensure nil
   :straight nil
@@ -527,6 +533,7 @@ vertically."
 
 (use-package org
   :straight t
+  :ensure t
   :config
   (setq org-startup-indented t
         org-edit-src-content-indentation 0
@@ -541,7 +548,8 @@ vertically."
                                '((emacs-lisp . t)
                                  (python . t)
                                  (ditaa . t)
-                                 (shell . t)))
+                                 (shell . t)
+                                 (restclient . t)))
 
   (setq org-ditaa-jar-path "/usr/bin/ditaa")
 
@@ -553,6 +561,7 @@ vertically."
   (add-to-list 'org-structure-template-alist '("yaml" . "src yaml"))
   (add-to-list 'org-structure-template-alist '("yml" . "src yaml"))
   (add-to-list 'org-structure-template-alist '("q" . "quote"))
+  (add-to-list 'org-structure-template-alist '("rc" . "src restclient"))
 
   (setq org-capture-templates
         '(("t" "Personal todo" entry
@@ -728,8 +737,8 @@ vertically."
   (setq org-roam-directory "~/org"
         org-roam-buffer-width 0.25
         org-roam-file-exclude-regexp ".stversion.*\|.stfolder.*\|.*~.*\|.*sync.*"
-           org-roam-db-location "~/.dotemacs/org-roam.db"
-           org-roam-completion-everywhere t
+        org-roam-db-location "~/.dotemacs/org-roam.db"
+        org-roam-completion-everywhere t
         org-roam-capture-templates
         '(("d" "default" plain (function org-roam--capture-get-point)
            "%?"