Defer configuring ox-tufte until we need it.
This commit is contained in:
		
							parent
							
								
									bc1a7733be
								
							
						
					
					
						commit
						f2d6f3397b
					
				| 
						 | 
					@ -160,12 +160,14 @@ See https://emacs.stackexchange.com/questions/63517/org-mode-evaluate-diff-code-
 | 
				
			||||||
;(add-hook! 'org-mode-hook #'solaire-mode)
 | 
					;(add-hook! 'org-mode-hook #'solaire-mode)
 | 
				
			||||||
;(add-hook 'mixed-pitch-mode-hook #'solaire-mode-reset)
 | 
					;(add-hook 'mixed-pitch-mode-hook #'solaire-mode-reset)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(require 'ox-tufte)
 | 
					(use-package! ox-tufte)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(setq org-html-head ""
 | 
					(after! org
 | 
				
			||||||
      org-html-head-extra "")
 | 
					  (setq org-html-head ""
 | 
				
			||||||
 | 
					        org-html-head-extra ""))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(setq org-html-htmlize-output-type "css")
 | 
					(after! org
 | 
				
			||||||
 | 
					  (setq org-html-htmlize-output-type "css"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(setq +org-capture-frame-parameters '((name . "doom-capture")
 | 
					(setq +org-capture-frame-parameters '((name . "doom-capture")
 | 
				
			||||||
                                      (width . 100)
 | 
					                                      (width . 100)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -941,20 +941,22 @@ Rather than using =org-export-dispatch='s html export, we'll want to use [[https
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Just load the require to setup the dependency.
 | 
					Just load the require to setup the dependency.
 | 
				
			||||||
#+begin_src emacs-lisp :tangle "+orgmode.el" :noweb no-export :comments no
 | 
					#+begin_src emacs-lisp :tangle "+orgmode.el" :noweb no-export :comments no
 | 
				
			||||||
(require 'ox-tufte)
 | 
					(use-package! ox-tufte)
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
By default the =org-export-dispatch=, includes some basic styling. This causes issues with our HTML. We'll need to turn off these.
 | 
					By default the =org-export-dispatch=, includes some basic styling. This causes issues with our HTML. We'll need to turn off these.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#+begin_src emacs-lisp :tangle "+orgmode.el" :noweb no-export :comments no
 | 
					#+begin_src emacs-lisp :tangle "+orgmode.el" :noweb no-export :comments no
 | 
				
			||||||
(setq org-html-head ""
 | 
					(after! org
 | 
				
			||||||
      org-html-head-extra "")
 | 
					  (setq org-html-head ""
 | 
				
			||||||
 | 
					        org-html-head-extra ""))
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
The syntax highlighting for html is done inline in the by default. We don't want to do that; we're using CSS. See the file in [[file:dist/code.css][code.css]] file for more.
 | 
					The syntax highlighting for html is done inline in the by default. We don't want to do that; we're using CSS. See the file in [[file:dist/code.css][code.css]] file for more.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#+begin_src emacs-lisp :tangle "+orgmode.el" :noweb no-export :comments no
 | 
					#+begin_src emacs-lisp :tangle "+orgmode.el" :noweb no-export :comments no
 | 
				
			||||||
(setq org-html-htmlize-output-type "css")
 | 
					(after! org
 | 
				
			||||||
 | 
					  (setq org-html-htmlize-output-type "css"))
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
To use this you will need to include the setup file. This will load the required css & js files. See [[https://orgmode.org/manual/In_002dbuffer-Settings.html][here]] for more.
 | 
					To use this you will need to include the setup file. This will load the required css & js files. See [[https://orgmode.org/manual/In_002dbuffer-Settings.html][here]] for more.
 | 
				
			||||||
| 
						 | 
					@ -973,8 +975,8 @@ The default =+org-capture/open-frame= is a little small. Let's modify the parame
 | 
				
			||||||
                                      (height . 20)
 | 
					                                      (height . 20)
 | 
				
			||||||
                                      (transient . t)
 | 
					                                      (transient . t)
 | 
				
			||||||
                                      ))
 | 
					                                      ))
 | 
				
			||||||
 | 
					 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* GPT
 | 
					* GPT
 | 
				
			||||||
GPT is more useful than I thought. Its incredibly helpful for writing prose which I can struggle with due to mild dysgraphia. We will be using the [[https://github.com/karthink/gptel][karthink/gptel]] package.
 | 
					GPT is more useful than I thought. Its incredibly helpful for writing prose which I can struggle with due to mild dysgraphia. We will be using the [[https://github.com/karthink/gptel][karthink/gptel]] package.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,9 +1,20 @@
 | 
				
			||||||
[user]
 | 
					[user]
 | 
				
			||||||
	email = public@jpatrick.io
 | 
						email = james@greenfiling.com
 | 
				
			||||||
	name = James Patrick
 | 
						name = James Patrick
 | 
				
			||||||
 | 
					  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHbxQtU3f3ASNOSz9uSygKqm8P9DNJ5ITlBKrLE9ilnf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[gpg]
 | 
				
			||||||
 | 
					  format = ssh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[gpg "ssh"]
 | 
				
			||||||
 | 
					  program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[commit]
 | 
				
			||||||
 | 
					  gpgsign = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[core]
 | 
					[core]
 | 
				
			||||||
  editor = vim
 | 
					  editor = vim
 | 
				
			||||||
 | 
						excludesfile = /Users/james/.gitignore_global
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[github]
 | 
					[github]
 | 
				
			||||||
	user = jamesepatrick
 | 
						user = jamesepatrick
 | 
				
			||||||
| 
						 | 
					@ -16,5 +27,12 @@
 | 
				
			||||||
	required = true
 | 
						required = true
 | 
				
			||||||
[init]
 | 
					[init]
 | 
				
			||||||
	defaultBranch = develop
 | 
						defaultBranch = develop
 | 
				
			||||||
[safe]
 | 
					
 | 
				
			||||||
	directory = /opt/build/shared/build
 | 
					[gpg]
 | 
				
			||||||
 | 
					  format = ssh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[commit]
 | 
				
			||||||
 | 
					  gpgsign = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[push]
 | 
				
			||||||
 | 
						autoSetupRemote = true
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -26,7 +26,7 @@ unbind <C-b>
 | 
				
			||||||
bind h tabprev
 | 
					bind h tabprev
 | 
				
			||||||
bind l tabnext
 | 
					bind l tabnext
 | 
				
			||||||
 | 
					
 | 
				
			||||||
js tri.browserBg.runtime.getPlatformInfo().then(os=>{const editorcmd = os.os=="mac" ? "/usr/local/bin/emacsclient" : "emacsclient"; tri.config.set("editorcmd", editorcmd)})
 | 
					set editorcmd "/usr/local/bin/emacsclient"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" Better find.
 | 
					" Better find.
 | 
				
			||||||
unbind <C-f>
 | 
					unbind <C-f>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,3 +19,4 @@ rebases
 | 
				
			||||||
tmux
 | 
					tmux
 | 
				
			||||||
zsh
 | 
					zsh
 | 
				
			||||||
zsh
 | 
					zsh
 | 
				
			||||||
 | 
					sed
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@
 | 
				
			||||||
source ${ZPLUG_HOME}/init.zsh
 | 
					source ${ZPLUG_HOME}/init.zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
zplug "${ZDIR}/modules/bin/", from:local, as:command, use:"*"
 | 
					zplug "${ZDIR}/modules/bin/", from:local, as:command, use:"*"
 | 
				
			||||||
zplug "junegunn/fzf-bin", from:gh-r, as:command, rename-to:fzf
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
zplug "${ZDIR}/modules/alias/", from:local, as:plugin
 | 
					zplug "${ZDIR}/modules/alias/", from:local, as:plugin
 | 
				
			||||||
zplug "${ZDIR}/modules/complete/", from:local, as:plugin, defer:2
 | 
					zplug "${ZDIR}/modules/complete/", from:local, as:plugin, defer:2
 | 
				
			||||||
| 
						 | 
					@ -14,19 +13,15 @@ zplug "${ZDIR}/modules/keybinds/", from:local, as:plugin
 | 
				
			||||||
zplug "hlissner/zsh-autopair", as:plugin, defer:2
 | 
					zplug "hlissner/zsh-autopair", as:plugin, defer:2
 | 
				
			||||||
zplug "junegunn/fzf", use:"shell/*.zsh", defer:2
 | 
					zplug "junegunn/fzf", use:"shell/*.zsh", defer:2
 | 
				
			||||||
zplug "mafredri/zsh-async", as:plugin, defer:2
 | 
					zplug "mafredri/zsh-async", as:plugin, defer:2
 | 
				
			||||||
zplug "zdharma/fast-syntax-highlighting", as:plugin, defer:2
 | 
					zplug "zdharma-continuum/fast-syntax-highlighting", as:plugin, defer:2
 | 
				
			||||||
zplug "zsh-users/zsh-autosuggestions", as:plugin, defer:2
 | 
					zplug "zsh-users/zsh-autosuggestions", as:plugin, defer:2
 | 
				
			||||||
zplug "zsh-users/zsh-completions", as:plugin
 | 
					zplug "zsh-users/zsh-completions", as:plugin
 | 
				
			||||||
zplug "zsh-users/zsh-history-substring-search", as:plugin, defer:2
 | 
					zplug "zsh-users/zsh-history-substring-search", as:plugin, defer:2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if (($+commands[yarn])) ; then
 | 
					 | 
				
			||||||
  zplug "g-plane/zsh-yarn-autocompletions", hook-build:"./zplug.zsh", defer:2
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if [ -n "$SSH_CONNECTION" ] ; then
 | 
					if [ -n "$SSH_CONNECTION" ] ; then
 | 
				
			||||||
  zplug "${ZDIR}/modules/prompt/", from:local, use:uncommon.zsh, as:theme
 | 
					  zplug "${ZDIR}/modules/prompt/", from:local, use:uncommon.zsh, as:theme
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
  zplug "denysdovhan/spaceship-prompt", use:spaceship.zsh, from:github, as:theme
 | 
					  zplug "spaceship-prompt/spaceship-prompt", use:spaceship.zsh, from:github, as:theme
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env_loader zplug
 | 
					env_loader zplug
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user