Added wireguard tools, org-modern, removed some emacs packages

config/darwin.nix

@@ -13,12 +13,13 @@
     enable = true;
     onActivation.cleanup = "zap";
     brews = [
+      "wireguard-tools"
       "coreutils"
       "watch"
     ];
     casks = [
-      "google-chrome"
       "scroll-reverser"
+      "google-chrome"
       "instantview"
       "nextcloud"
       "tailscale"

dotfiles/.emacs.d/config.org

@@ -425,6 +425,8 @@ When installing Vertico, the documentation mentions a few other packages that ad
 
 #+begin_src emacs-lisp
 (use-package magit
+  :bind (("C-x g" . magit-status)
+         ("C-x C-g" . magit-status))
   :config
   (jm/leader-keys "gc" 'magit-clone))
 #+end_src

dotfiles/.emacs.d/org.org

@@ -18,6 +18,7 @@ This installs the org package and creates a setup function to enable/disable cer
   :config
   (setq jm/inbox-file "~/Nextcloud/org/inbox.org"
         org-ellipsis " ▾"
+        org-pretty-entities t
         org-hide-emphasis-markers t
         org-src-preserve-indentation t
 
@@ -43,33 +44,20 @@ This installs the org package and creates a setup function to enable/disable cer
 
 * Cosmetics
 
-** Org-Bullets
+** Org-Modern
 
-Org-bullets is a package that adds bullets to each heading instead of asterisks. It just makes org files nicer to look at.
+Org-Modern is a package that adds several features to emacs to make it look more /modern/.
 
 #+begin_src emacs-lisp
-;; Org-bullets for better headings
+(use-package org-modern
-(use-package org-bullets
   :after org
-  :hook (org-mode . org-bullets-mode)
+  :hook (org-mode . org-modern-mode)
-  :custom
+  :config
-  (org-bullets-bullet-list '("◉" "○" "●" "○" "●" "○" "●")))
+  (setq org-modern-star 'replace
+        org-modern-replace-stars '("◉" "○" "●" "○" "●" "○" "●")))
 #+end_src
 
-** Add List Dots
+Some examples:
-
-By default lists are started with a hyphen, though this doesn't really match the aesthetic of the rest of the org file. Due to that, I added this line which replaces the hyphen with a dot.
-
-- Bullet point 1
-- Bullet point 2
-- Bullet point 3
-
-#+begin_src emacs-lisp
-;; Replace - lists with a dot
-(font-lock-add-keywords 'org-mode
-                        '(("^ *\\([-]\\) "
-                           (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
-#+end_src
 
 ** Font Changes
 
@@ -102,22 +90,6 @@ Org-faces changes the font size of the headings to make them bigger in the org f
   (set-face-attribute 'line-number-current-line nil :inherit 'fixed-pitch))
 #+end_src
 
-** Visual Fill Column
-
-Visual fill column is a package that allows you to center text and add borders to the sides of an org file. By default org files are displayed completely to the left side of the page like normal text files.
-
-#+begin_src emacs-lisp
-;; Set left-right margins with visual-fill-column
-(defun jm/org-mode-visual-fill ()
-  (setq visual-fill-column-width 160
-        visual-fill-column-center-text t)
-  (visual-fill-column-mode 1))
-
-(use-package visual-fill-column
-  :after org
-  :hook (org-mode . jm/org-mode-visual-fill))
-#+end_src
-
 ** Syntax Highlighting in Latex Exports
 
 By default the syntax highlighting for latex/PDF documents exported with Emacs is pretty lackluster. To improve this, I can install the ~engrave-faces~ package.