system changes

2 files changed, 7 insertions, 20 deletions

diff --git a/common/.config/emacs/init.el.org b/common/.config/emacs/init.el.org
index 186d449..c9d35e0 100644
--- a/common/.config/emacs/init.el.org
+++ b/common/.config/emacs/init.el.org
@@ -10,15 +10,11 @@ Force the use of a =custom.el= file instead of appending to =init.el=.
 
 Make Emacs use the correct =PATH= variable as macOS fails to load the =PATH= variable from my login shell.
 #+begin_src emacs-lisp
-  (defun jj/set-exec-path-from-shell-PATH ()
-    "Load the login shell's PATH variable manually because macOS doesn't behave well."
-    (interactive)
-    (let ((path-from-shell (replace-regexp-in-string
-                            "[ \t\n]*$" "" (shell-command-to-string
-                                            "$SHELL --login -c 'echo $PATH'"))))
-      (setenv "PATH" path-from-shell)
-      (setq exec-path (split-string path-from-shell path-separator))))
-  (jj/set-exec-path-from-shell-PATH)
+  (let ((path-from-shell (replace-regexp-in-string
+                          "[ \t\n]*$" "" (shell-command-to-string
+                                          "$SHELL --login -c 'echo $PATH'"))))
+    (setenv "PATH" path-from-shell)
+    (setq exec-path (split-string path-from-shell path-separator)))
 #+end_src
 
 Suppress native compilation warnings and errors. Native compilation seems to be a little broken on macOS and the warnings are just annoying.
@@ -326,16 +322,6 @@ Configure and install =elfeed= to serve as an =rss= feed reader. It stores the f
     (setq rmh-elfeed-org-files (list "~/.config/emacs/feed.org")))
 #+end_src
 
-Set up =deft= for quick notes.
-#+begin_src emacs-lisp
-  (use-package deft
-    :bind
-    ("C-c d" . deft)
-    :config
-    (setq deft-directory "~/notes/"
-          deft-default-extension "org"))
-#+end_src
-
 * Languages
 
 Configure =org-mode=. I use =~/org= as my =org= directory and hide emphasis markers because it's much easier to read that way. I enable =org-crypt= to allow reading and writing encrypted =org= files. I also replace bullets in bulleted lists with nicer looking icons. I configure faces to default to variable-width font, but switching to monospace where it is necessary. Finally, I use =visual-fill-column= to make =org= files display with a relatively narrow window centred in the frame.
diff --git a/macos.local/.flake/system/homebrew.nix.org b/macos.local/.flake/system/homebrew.nix.org
index b020da7..7dbe853 100644
--- a/macos.local/.flake/system/homebrew.nix.org
+++ b/macos.local/.flake/system/homebrew.nix.org
@@ -23,6 +23,7 @@ Set up Homebrew. I disable the quarantine automatically and ensure that the stat
         "homebrew/cask-fonts"
         "homebrew/cask-versions"
         "homebrew/services"
+        "jorgelbg/tap"
         "osx-cross/avr"
       ];
 
@@ -89,7 +90,7 @@ Set up Homebrew. I disable the quarantine automatically and ensure that the stat
         "open-ocd"
         "openjdk"
         "pandoc"
-        "pinentry-mac"
+        "pinentry-touchid"
         "poppler"
         "ripgrep"
         "rsync"