From f2d6f3397b3271a08f4fb176e70b1c23a0bb9bf0 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Mon, 5 Feb 2024 09:52:49 -0500 Subject: [PATCH] Defer configuring ox-tufte until we need it. --- emacs/+orgmode.el | 10 ++++++---- emacs/config.org | 12 +++++++----- git/gitconfig | 24 +++++++++++++++++++++--- tridactyl/tridactylrc | 2 +- vim/spell/en.utf-8.add | 1 + zsh/zplug | 11 +++-------- 6 files changed, 39 insertions(+), 21 deletions(-) diff --git a/emacs/+orgmode.el b/emacs/+orgmode.el index 62591a6..b88d51c 100644 --- a/emacs/+orgmode.el +++ b/emacs/+orgmode.el @@ -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 'mixed-pitch-mode-hook #'solaire-mode-reset) -(require 'ox-tufte) +(use-package! ox-tufte) -(setq org-html-head "" - org-html-head-extra "") +(after! org + (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") (width . 100) diff --git a/emacs/config.org b/emacs/config.org index 1909daa..05c5b4f 100644 --- a/emacs/config.org +++ b/emacs/config.org @@ -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. #+begin_src emacs-lisp :tangle "+orgmode.el" :noweb no-export :comments no -(require 'ox-tufte) +(use-package! ox-tufte) #+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. #+begin_src emacs-lisp :tangle "+orgmode.el" :noweb no-export :comments no -(setq org-html-head "" - org-html-head-extra "") +(after! org + (setq org-html-head "" + org-html-head-extra "")) #+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. #+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 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) (transient . t) )) - #+end_src + * 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. diff --git a/git/gitconfig b/git/gitconfig index a0087b5..d01697c 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -1,9 +1,20 @@ [user] - email = public@jpatrick.io + email = james@greenfiling.com 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] editor = vim + excludesfile = /Users/james/.gitignore_global [github] user = jamesepatrick @@ -16,5 +27,12 @@ required = true [init] defaultBranch = develop -[safe] - directory = /opt/build/shared/build + +[gpg] + format = ssh + +[commit] + gpgsign = true + +[push] + autoSetupRemote = true diff --git a/tridactyl/tridactylrc b/tridactyl/tridactylrc index 702628f..7590a7f 100644 --- a/tridactyl/tridactylrc +++ b/tridactyl/tridactylrc @@ -26,7 +26,7 @@ unbind bind h tabprev 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. unbind diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add index 0e9f695..4157875 100644 --- a/vim/spell/en.utf-8.add +++ b/vim/spell/en.utf-8.add @@ -19,3 +19,4 @@ rebases tmux zsh zsh +sed diff --git a/zsh/zplug b/zsh/zplug index 875b8e5..8d1ea3e 100755 --- a/zsh/zplug +++ b/zsh/zplug @@ -4,7 +4,6 @@ source ${ZPLUG_HOME}/init.zsh 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/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 "junegunn/fzf", use:"shell/*.zsh", 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-completions", as:plugin +zplug "zsh-users/zsh-completions", as:plugin 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 zplug "${ZDIR}/modules/prompt/", from:local, use:uncommon.zsh, as:theme 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 env_loader zplug