scimax-patch

---
 packages.el   | 66 ++++++++++++++++++++++++++++++++-------------------
 scimax-org.el | 54 +++++++++++++++++++++++++++--------------
 2 files changed, 77 insertions(+), 43 deletions(-)

diff --git a/packages.el b/packages.el
index 6843d1f..3a97f2f 100644
--- a/packages.el
+++ b/packages.el
@@ -14,23 +14,23 @@
 
 ;; * org-mode
 ;; load this first before anything else to avoid mixed installations
-(use-package org-plus-contrib
-  :mode ("\\.org\\'" . org-mode)
-  :init
-  ;; Use the current window for C-c ' source editing
-  (setq org-src-window-setup 'current-window
-	org-support-shift-select t)
-
-  ;; I like to press enter to follow a link. mouse clicks also work.
-  (setq org-return-follows-link t)
-  :bind
-  (("C-c l" . org-store-link)
-   ("C-c L" . org-insert-link-global)
-   ("C-c o" . org-open-at-point-global)
-   ("C-c a" . org-agenda)
-   ("C-c c" . org-capture)
-   ("s-<SPC>" . org-mark-ring-goto)
-   ("H-." . org-time-stamp-inactive)))
+;; (use-package org-plus-contrib
+;;   :mode ("\\.org\\'" . org-mode)
+;;   :init
+;;   ;; Use the current window for C-c ' source editing
+;;   (setq org-src-window-setup 'current-window
+;; 	org-support-shift-select t)
+
+;;   ;; I like to press enter to follow a link. mouse clicks also work.
+;;   (setq org-return-follows-link t)
+;;   :bind
+;;   (("C-c l" . org-store-link)
+;;    ("C-c L" . org-insert-link-global)
+;;    ("C-c o" . org-open-at-point-global)
+;;    ("C-c a" . org-agenda)
+;;    ("C-c c" . org-capture)
+;;    ("s-<SPC>" . org-mark-ring-goto)
+;;    ("H-." . org-time-stamp-inactive)))
 
 ;; [2019-01-07 Mon] This is another package I don't use, and that sometimes is a
 ;; problem on windows installations
@@ -45,7 +45,10 @@
 ;; * Other packages
 (use-package diminish)
 
+;;; For some reason, this has to be installed manually despite applying a patch
 (use-package aggressive-indent
+  :straight t
+  :ensure t
   :config (add-hook 'emacs-lisp-mode-hook #'aggressive-indent-mode))
 
 (use-package auto-complete
@@ -56,9 +59,11 @@
 
 
 ;; May 24, 2017: this seems to be causing emacs 25.2 to be crashing on my linux box.
-(unless (eq system-type 'gnu/linux)
-  (use-package tex
-    :ensure auctex))
+;; (unless (eq system-type 'gnu/linux)
+;;   (use-package tex
+;;     :ensure auctex))
+
+(straight-use-package 'auctex)
 
 ;; [2019-01-07 Mon] This also sometimes causes problems installing scimax,
 ;; especially on Windows.
@@ -78,15 +83,18 @@
   ;; I am not currently using this, and it loads a bunch of files on startup.
   :disabled t)
 
-(use-package button-lock)
+(use-package button-lock
+  :straight t)
 
 ;; Potential for commandline scripts using emacs
 (use-package commander
   :disabled t)
 
-(use-package drag-stuff)
+(use-package drag-stuff
+  :straight t)
 
 (use-package swiper
+  :straight t
   :bind
   ("C-s" . counsel-grep-or-swiper)
   ("H-s" . swiper-all)
@@ -95,6 +103,7 @@
   (ivy-mode))
 
 (use-package counsel
+  :straight t
   :init
   (require 'ivy)
   (setq projectile-completion-system 'ivy)
@@ -165,16 +174,22 @@
     (define-key ivy-minibuffer-map (kbd "<right>") 'ivy-alt-done)
     (define-key ivy-minibuffer-map (kbd "C-d") 'ivy-backward-delete-char)))
 
+
 ;; Provides functions for working on lists
-(use-package dash)
-(use-package dash-functional)
+(use-package dash
+  :straight t)
+
+(use-package dash-functional
+  :straight t)
 
-(use-package dashboard)
+(use-package dashboard
+  :straight t)
 
 (use-package elfeed)
 
 ;; Python editing mode
 (use-package elpy
+  :staight t
   :config
   (elpy-enable))
 
@@ -186,6 +201,7 @@
 ;; https://github.com/amperser/proselint
 ;; pip install proselint
 (use-package flycheck
+  :straight t
   ;; Jun 28 - I like this idea, but sometimes this is too slow.
   :config
   (add-hook 'text-mode-hook #'flycheck-mode)
diff --git a/scimax-org.el b/scimax-org.el
index aa463ce..fdcedc0 100644
--- a/scimax-org.el
+++ b/scimax-org.el
@@ -4,7 +4,8 @@
 
 
 ;;; Code:
-(require 'org)
+(straight-use-package 'org-plus-contrib)
+(straight-use-package 'org)
 (require 'org-inlinetask)
 (require 'org-mouse)
 (require 'org-ref)
@@ -1005,30 +1006,47 @@ Use a prefix arg to get regular RET. "
        nil
        `((fl-noh 0 nil))))))
 
-
 (use-package scimax-org-radio-checkbox
-  :ensure nil
-  :load-path scimax-dir)
-
+  :init (straight-use-package 'org-plus-contrib)
+  :straight (scimax-org-radio-checkbox
+	     :host github :repo "jkitchin/scimax"))
 
 (use-package scimax-org-latex
-  :load-path scimax-dir
-  :ensure nil
-  :config
-  (scimax-toggle-org-latex-fragment-tooltip)
-  (scimax-toggle-latex-fragment-justification)
-  (scimax-toggle-latex-equation-numbering)
-  (scimax-toggle-inject-latex))
-
+  :straight (scimax-org-latex
+	     :host github :repo "jkitchin/scimax"))
 
 (use-package scimax-org-images
-  :ensure nil
-  :load-path scimax-dir)
+  :straight (scimax-org-images
+	     :host github :repo "jkitchin/scimax"))
 
 (use-package scimax-org-src-blocks
-  :ensure nil
-  :load-path scimax-dir
-  :config (scimax-org-toggle-colored-src-blocks))
+  :straight (scimax-org-src-blocks
+	     :host github :repo "jkitchin/scimax")
+  :init (setq scimax-org-toggle-colored-src-blocks 'nil))
+
+;; (use-package scimax-org-radio-checkbox
+;;   :ensure nil
+;;   :straight (scimax-org-radio-checkbox :local-repo "jkitchin/scimax" ))
+
+
+;; (use-package scimax-org-latex
+;;   :load-path scimax-dir
+;;   :ensure nil
+;;   :config
+;;   (scimax-toggle-org-latex-fragment-tooltip)
+;;   (scimax-toggle-latex-fragment-justification)
+;;   (scimax-toggle-latex-equation-numbering)
+;;   (scimax-toggle-inject-latex))
+
+
+;; (use-package scimax-org-images
+;;   :ensure nil
+;;   :load-path scimax-dir)
+
+;; (use-package scimax-org-src-blocks
+;;   :ensure nil
+;;   :load-path scimax-dir
+;;   :config (scimax-org-toggle-colored-src-blocks))
 
 
 (defun scimax-get-file-keyword (KEYWORD)
-- 
2.24.1