diff --git a/.Xresources b/.Xresources
index 1e662eb..e703e86 100644
--- a/.Xresources
+++ b/.Xresources
@@ -70,44 +70,117 @@ URxvt*depth: 32
 ! Palenight Xresources palette
 !! COLORS
 
-! special
-URxvt*foreground:   #bbc5ff
-URxvt*background:   [95]#282a36
-URxvt*cursorColor:  #bbc5ff
+!!URxvt*foreground:   #bbc5ff
+!!URxvt*background:   [95]#282a36
+!!URxvt*cursorColor:  #bbc5ff
+!!
+!!XTerm*foreground: #bbc5ff
+!!XTerm*background: #282a36
+!!XTerm*cursorColor: #bbc5ff
+!!
+!!! black
+!!*.color0:       #101010  !! originally #292d3e
+!!*.color8:       #434758
+!!
+!!! red
+!!*.color1:       #f07178
+!!*.color9:       #ff8b92
+!!
+!!! green
+!!*.color2:       #c3e88d
+!!*.color10:      #ddffa7
+!!
+!!! yellow
+!!*.color3:       #ffcb6b
+!!*.color11:      #ffe585
+!!
+!!! blue
+!!*.color4:       #82aaff
+!!*.color12:      #9cc4ff
+!!
+!!! magenta
+!!*.color5:       #c792ea
+!!*.color13:      #e1acff
+!!
+!!! cyan
+!!*.color6:       #89ddff
+!!*.color14:      #a3f7ff
+!!
+!!! white
+!!*.color7:       #d0d0d0
+!!*.color15:      #ffffff
+!!! special
+!!*.foreground:   #bbc2cf
+!!*.background:   #282c34
+!!*.cursorColor:  #bbc2cf
+!!
+!!! black
+!!*.color0:       #1c1f24
+!!*.color8:       #5b6268
+!!
+!!! red
+!!*.color1:       #ff6c6b
+!!*.color9:       #da8548
+!!
+!!! green
+!!*.color2:       #98be65
+!!*.color10:      #4db5bd
+!!
+!!! yellow
+!!*.color3:       #da8548
+!!*.color11:      #ecbe7b
+!!
+!!! blue
+!!*.color4:       #51afef
+!!*.color12:      #2257a0
+!!
+!!! magenta
+!!*.color5:       #c678dd
+!!*.color13:      #a9a1e1
+!!
+!!! cyan
+!!*.color6:       #5699af
+!!*.color14:      #46d9ff
+!!
+!!! white
+!!*.color7:       #202328
+!!*.color15:      #dfdfdf
+!!
 
-XTerm*foreground: #bbc5ff
-XTerm*background: #282a36
-XTerm*cursorColor: #bbc5ff
+
+! special
+*.foreground:   #bbc2cf
+*.background:   #282c34
+*.cursorColor:  #bbc2cf
 
 ! black
-*.color0:       #101010  !! originally #292d3e
-*.color8:       #434758
+*.color0:       #1c1f24
+*.color8:       #5b6268
 
 ! red
-*.color1:       #f07178
-*.color9:       #ff8b92
+*.color1:       #ff6c6b
+*.color9:       #da8548
 
 ! green
-*.color2:       #c3e88d
-*.color10:      #ddffa7
+*.color2:       #98be65
+*.color10:      #4db5bd
 
 ! yellow
-*.color3:       #ffcb6b
-*.color11:      #ffe585
+*.color3:       #da8548
+*.color11:      #ecbe7b
 
 ! blue
-*.color4:       #82aaff
-*.color12:      #9cc4ff
+*.color4:       #51afef
+*.color12:      #3071db
 
 ! magenta
-*.color5:       #c792ea
-*.color13:      #e1acff
+*.color5:       #c678dd
+*.color13:      #a9a1e1
 
 ! cyan
-*.color6:       #89ddff
-*.color14:      #a3f7ff
+*.color6:       #5699af
+*.color14:      #46d9ff
 
 ! white
-*.color7:       #d0d0d0
-*.color15:      #ffffff
-
+*.color7:       #202328
+*.color15:      #dfdfdf
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index de79cc1..e91f5ef 100755
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -117,7 +117,7 @@ font:
     # family: UbuntuMono Nerd Font
     # family: Monofur Nerd Font
     # family: TerminessTTF Nerd Font
-    family: Mononoki Nerd Font
+    family: SauceCodePro Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Regular
@@ -136,7 +136,7 @@ font:
     # family: UbuntuMono Nerd Font
     # family: Monofur Nerd Font
     # family: TerminessTTF Nerd Font
-    family: Mononoki Nerd Font
+    family: SauceCodePro Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Bold
@@ -155,7 +155,7 @@ font:
     # family: UbuntuMono Nerd Font
     # family: Monofuritalic Nerd Font Mono
     # family: TerminessTTF Nerd Font
-    family: Mononoki Nerd Font
+    family: SauceCodePro Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Italic
@@ -174,7 +174,7 @@ font:
     # family: UbuntuMono Nerd Font
     # family: Monofuritalic Nerd Font Mono
     # family: TerminessTTF Nerd Font
-    family: Mononoki Nerd Font
+    family: SauceCodePro Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Bold Italic
@@ -185,7 +185,7 @@ font:
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
   offset:
-    x: 1
+    x: 0
     y: 1
 
   # Glyph offset determines the locations of the glyphs within their cells with
@@ -212,14 +212,14 @@ font:
   #use_thin_strokes: true
 
 # If `true`, bold text is drawn using the bright color variants.
-#draw_bold_text_with_bright_colors: true
+draw_bold_text_with_bright_colors: true
 
 # Colors (Tomorrow Night Bright)
 colors:
   # Default colors
   primary:
-    background: '0x292d3e'
-    foreground: '0xbbc5ff'
+    background: '0x282c34'
+    foreground: '0xbbc2cf'
 
     # Bright and dim foreground colors
     #
@@ -243,30 +243,30 @@ colors:
   # background is unset, selection color will be the inverse of the cell colors.
   # If only text is unset the cell text color will remain the same.
   selection:
-    text: '0x292d3e'
-    background: '0xbbc5ff'
+    text: '0xbbc2cf'
+    background: '0x282c34'
 
   # Normal colors
   normal:
-    black:   '0x292d3e'
-    red:     '0xf07178'
-    green:   '0xc3e88d'
-    yellow:  '0xffcb6b'
-    blue:    '0x82aaff'
-    magenta: '0xc792ea'
-    cyan:    '0x89ddff'
-    white:   '0xd0d0d0'
+    black:   '0x1c1f24'
+    red:     '0xff6c6b'
+    green:   '0x98be65'
+    yellow:  '0xda8548'
+    blue:    '0x51afef'
+    magenta: '0xc678dd'
+    cyan:    '0x5699af'
+    white:   '0x202328'
 
   # Bright colors
   bright:
-    black:   '0x434758'
-    red:     '0xff8b92'
-    green:   '0xddffa7'
-    yellow:  '0xffe585'
-    blue:    '0x9cc4ff'
-    magenta: '0xe1acff'
-    cyan:    '0xa3f7ff'
-    white:   '0xffffff'
+    black:   '0x5b6268'
+    red:     '0xda8548'
+    green:   '0x4db5bd'
+    yellow:  '0xecbe7b'
+    blue:    '0x3071db'   # This is 2257a0 in Doom Emacs but I lightened it.
+    magenta: '0xa9a1e1'
+    cyan:    '0x46d9ff'
+    white:   '0xdfdfdf'
 
   # Dim colors
   #
diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml
index e6e51a5..6a21085 100755
--- a/.config/openbox/rc.xml
+++ b/.config/openbox/rc.xml
@@ -42,7 +42,7 @@
                   'Active' - where the active window is -->
   </placement>
   <theme>
-    <name>Adapta-Nokto</name>
+    <name>dt-dark-theme</name>
     <titleLayout>CSIML</titleLayout>
     <!--
       available characters are NDSLIMC, each can occur at most once.
diff --git a/.config/stumpwm/config b/.config/stumpwm/config
index 475bee9..1b197e5 100755
--- a/.config/stumpwm/config
+++ b/.config/stumpwm/config
@@ -10,7 +10,6 @@
 
 (in-package :stumpwm)
 
-
 ;;; Startup Programs
 ;;; Set Background
 (run-shell-command "nitrogen --restore")
@@ -49,14 +48,14 @@
  stumpwm:*normal-border-width* 1
  )
 (stumpwm:set-focus-color "#7799CC")
-(stumpwm:grename "Alpha")
-(stumpwm:gnewbg "Beta")
-(stumpwm:gnewbg "Tau")
-(stumpwm:gnewbg "Pi")
-(stumpwm:gnewbg "Zeta")
-(stumpwm:gnewbg "Teta")
-(stumpwm:gnewbg "Phi")
-(stumpwm:gnewbg "Rho")
+(stumpwm:grename "One")
+(stumpwm:gnewbg "Two")
+(stumpwm:gnewbg "Three")
+(stumpwm:gnewbg "Four")
+(stumpwm:gnewbg "Five")
+(stumpwm:gnewbg "Six")
+(stumpwm:gnewbg "Seven")
+(stumpwm:gnewbg "Eight")
 (stumpwm:toggle-mode-line (stumpwm:current-screen) (stumpwm:current-head))
 
 ;; change the prefix key to something else
@@ -106,7 +105,7 @@
 (define-key *root-map* (kbd "i") "imdb")
 
 ;; Message window font
-(set-font "-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-14")
+(set-font "-xos4-terminus-medium-r-normal--13-140-72-72-c-80-iso8859-14")
 
 ;;; Define window placement policy...
 
diff --git a/.config/xmobar/xmobarrc0 b/.config/xmobar/xmobarrc0
index 039d114..c12c890 100755
--- a/.config/xmobar/xmobarrc0
+++ b/.config/xmobar/xmobarrc0
@@ -7,8 +7,8 @@ Config { font    = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=t
                            , "xft:Mononoki Nerd Font:pixelsize=16:antialias=true:hinting=true"
                            , "xft:FontAwesome:pixelsize=13"
                            ]
-       , bgColor = "#292d3e"
-       , fgColor = "#f07178"
+       , bgColor = "#282c34"
+       , fgColor = "#ff6c6b"
        , position = Static { xpos = 0 , ypos = 0, width = 1920, height = 24 }
        , lowerOnStart = True
        , hideOnStart = False
@@ -37,5 +37,5 @@ Config { font    = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=t
                     ]
        , sepChar = "%"
        , alignSep = "}{"
-       , template = " <action=`xdotool key control+alt+g`><icon=haskell_20.xpm/> </action><fc=#666666>  |</fc> %UnsafeStdinReader% }{ <fc=#666666><fn=2>|</fn> </fc><fc=#b3afc2><fn=1></fn>  %uname% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#FFB86C> %cpu% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#FF5555> %memory% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#82AAFF> %disku% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#c3e88d> %enp6s0% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#e1acff><fn=1></fn>  %pacupdate% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#8BE9FD> %date%  </fc>"
+       , template = " <action=`xdotool key control+alt+g`><icon=haskell_20.xpm/> </action><fc=#666666>  |</fc> %UnsafeStdinReader% }{ <fc=#666666><fn=2>|</fn> </fc><fc=#b3afc2><fn=1></fn>  %uname% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#ecbe7b> %cpu% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#ff6c6b> %memory% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#51afef> %disku% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#98be65> %enp6s0% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#c678dd><fn=1></fn>  %pacupdate% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#46d9ff> %date%  </fc>"
        }
diff --git a/.config/xmobar/xmobarrc1 b/.config/xmobar/xmobarrc1
index 4e57daf..0620ff0 100755
--- a/.config/xmobar/xmobarrc1
+++ b/.config/xmobar/xmobarrc1
@@ -7,8 +7,8 @@ Config { font    = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=t
                            , "xft:Mononoki Nerd Font:pixelsize=16:antialias=true:hinting=true"
                            , "xft:FontAwesome:pixelsize=13"
                            ]
-       , bgColor = "#292d3e"
-       , fgColor = "#f07178"
+       , bgColor = "#282c34"
+       , fgColor = "#ff6c6b"
        , position = Static { xpos = 3840 , ypos = 0, width = 1920, height = 24 }
        , lowerOnStart = True
        , hideOnStart = False
@@ -37,5 +37,5 @@ Config { font    = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=t
                     ]
        , sepChar = "%"
        , alignSep = "}{"
-       , template = " <action=`xdotool key control+alt+g`><icon=haskell_20.xpm/> </action><fc=#666666>  |</fc> %UnsafeStdinReader% }{ <fc=#666666><fn=2>|</fn> </fc><fc=#b3afc2><fn=1></fn>  %uname% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#FFB86C> %cpu% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#FF5555> %memory% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#82AAFF> %disku% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#c3e88d> %enp6s0% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#e1acff><fn=1></fn>  %pacupdate% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#8BE9FD> %date%  </fc>"
+       , template = " <action=`xdotool key control+alt+g`><icon=haskell_20.xpm/> </action><fc=#666666>  |</fc> %UnsafeStdinReader% }{ <fc=#666666><fn=2>|</fn> </fc><fc=#b3afc2><fn=1></fn>  %uname% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#ecbe7b> %cpu% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#ff6c6b> %memory% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#51afef> %disku% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#98be65> %enp6s0% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#c678dd><fn=1></fn>  %pacupdate% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#46d9ff> %date%  </fc>"
        }
diff --git a/.config/xmobar/xmobarrc2 b/.config/xmobar/xmobarrc2
index ab3fb20..ee88fd2 100755
--- a/.config/xmobar/xmobarrc2
+++ b/.config/xmobar/xmobarrc2
@@ -3,12 +3,12 @@
 -- you can find weather location codes here: http://weather.noaa.gov/index.html
 
 Config { font    = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=true"
-       , additionalFonts = [ "xft:Mononoki Nerd Font:pixelsize=11:antialias=true:hinting=true"
-                           , "xft:Mononoki Nerd Font:pixelsize=16:antialias=true:hinting=true"
+       , additionalFonts = [ "xft:SauceCodePro Nerd Font:pixelsize=11:antialias=true:hinting=true"
+                           , "xft:SauceCodePro Nerd Font:pixelsize=16:antialias=true:hinting=true"
                            , "xft:FontAwesome:pixelsize=13"
                            ]
-       , bgColor = "#292d3e"
-       , fgColor = "#f07178"
+       , bgColor = "#282c34"
+       , fgColor = "#ff6c6b"
        , position = Static { xpos = 1920 , ypos = 0, width = 1920, height = 24 }
        , lowerOnStart = True
        , hideOnStart = False
@@ -39,5 +39,5 @@ Config { font    = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=t
                     ]
        , sepChar = "%"
        , alignSep = "}{"
-       , template = " <action=`xdotool key control+alt+g`><icon=haskell_20.xpm/> </action><fc=#666666>  |</fc> %UnsafeStdinReader% }{ <fc=#666666><fn=2>|</fn> </fc><fc=#b3afc2><fn=1></fn>  %uname% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#FFB86C> %cpu% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#FF5555> %memory% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#82AAFF> %disku% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#c3e88d> %enp6s0% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#e1acff><fn=1></fn>  %pacupdate% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#8BE9FD> %date% </fc><fc=#666666><fn=2>|</fn></fc>%trayerpad%"
+       , template = " <action=`xdotool key control+alt+g`><icon=haskell_20.xpm/> </action><fc=#666666>  |</fc> %UnsafeStdinReader% }{ <fc=#666666><fn=2>|</fn> </fc><fc=#b3afc2><fn=1></fn>  %uname% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#ecbe7b> %cpu% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#ff6c6b> %memory% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#51afef> %disku% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#98be65> %enp6s0% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#c678dd><fn=1></fn>  %pacupdate% </fc><fc=#666666> <fn=2>|</fn></fc> <fc=#46d9ff> %date% </fc><fc=#666666><fn=2>|</fn></fc>%trayerpad%"
        }
diff --git a/.doom.d/config.el b/.doom.d/config.el
index 535f540..bd17666 100644
--- a/.doom.d/config.el
+++ b/.doom.d/config.el
@@ -1,11 +1,19 @@
-(setq doom-font (font-spec :family "Mononoki Nerd Font" :size 15)
-       doom-variable-pitch-font (font-spec :family "Mononoki Nerd Font" :size 15))
+(setq doom-font (font-spec :family "SauceCodePro Nerd Font" :size 15)
+      doom-variable-pitch-font (font-spec :family "SauceCodePro Nerd Font" :size 15)
+      doom-big-font (font-spec :family "SauceCodePro Nerd Font" :size 24)
+)
 
-(setq doom-theme 'doom-palenight)
+(setq doom-theme 'doom-one)
 
-(setq org-directory "~/Documents/org/")
-(require 'org-bullets)
-(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+(after! org
+  (setq org-directory "~/Documents/org/")
+  (setq org-agenda-files '("~/Documents/org/agenda.org"))
+  ;;(setq org-log-done 'time)
+  (setq org-log-done 'note)
+  (setq org-todo-keywords '((sequence "TODO(t)" "PROJ(p)" "VIDEO(v)" "WAIT(w)" "|" "DONE(d)" "CANCELLED(c)" )))
+  (require 'org-bullets)
+  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+)
 
 (setq display-line-numbers-type t)
 (global-set-key "\C-x\ t" 'toggle-truncate-lines)
@@ -68,9 +76,9 @@
    smtpmail-smtp-server "smtp.1and1.com"
    smtpmail-smtp-service 587)
 
-(use-package mastodon
-  :ensure t)
-(setq mastodon-instance-url "https://mastodon.technology/")
+(after! mastodon
+  (setq mastodon-instance-url "https://mastodon.technology/")
+)
 
 (setq md4rd-subs-active '(archlinux commandline DistroTube DoomEmacs emacs freesoftware lbry linux linux4noobs linuxmasterrace linnuxquestions orgmode qutebrowser suckless Ubuntu unixporn UsabilityPorn vim xmonad))
 
diff --git a/.doom.d/config.org b/.doom.d/config.org
index f31b2f4..eb45070 100644
--- a/.doom.d/config.org
+++ b/.doom.d/config.org
@@ -11,24 +11,30 @@ are the three important ones:
 + `doom-big-font' -- used for `doom-big-font-mode'; use this for
   presentations or streaming.
 
-They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
-font string. You generally only need these two:
-
 #+BEGIN_SRC emacs-lisp
-(setq doom-font (font-spec :family "Mononoki Nerd Font" :size 15)
-       doom-variable-pitch-font (font-spec :family "Mononoki Nerd Font" :size 15))
+(setq doom-font (font-spec :family "SauceCodePro Nerd Font" :size 15)
+      doom-variable-pitch-font (font-spec :family "SauceCodePro Nerd Font" :size 15)
+      doom-big-font (font-spec :family "SauceCodePro Nerd Font" :size 24)
+)
 #+END_SRC
 
 ** DOOM THEME
 #+BEGIN_SRC emacs-lisp
-(setq doom-theme 'doom-palenight)
+(setq doom-theme 'doom-one)
 #+END_SRC
 
 ** ORG MODE
+Note that I wrapped everything in (after! org). Without this, my settings might be evaluated too early, which will result in my settings being overwritten by Doom's defaults.
 #+BEGIN_SRC emacs-lisp
-(setq org-directory "~/Documents/org/")
-(require 'org-bullets)
-(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+(after! org
+  (setq org-directory "~/Documents/org/")
+  (setq org-agenda-files '("~/Documents/org/agenda.org"))
+  ;;(setq org-log-done 'time)
+  (setq org-log-done 'note)
+  (setq org-todo-keywords '((sequence "TODO(t)" "PROJ(p)" "VIDEO(v)" "WAIT(w)" "|" "DONE(d)" "CANCELLED(c)" )))
+  (require 'org-bullets)
+  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+)
 #+END_SRC
 
 ** LINE SETTINGS
@@ -123,10 +129,11 @@ Image previews in dired
 #+END_SRC
 
 ** MASTODON CLIENT (mastodon)
+Note that I wrapped my settings with (after! mastodon). Without this, my settings will be overwritten by the default settings for this module, which is "mastodon.social".
 #+BEGIN_SRC emacs-lisp
-(use-package mastodon
-  :ensure t)
-(setq mastodon-instance-url "https://mastodon.technology/")
+(after! mastodon
+  (setq mastodon-instance-url "https://mastodon.technology/")
+)
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp
diff --git a/.doom.d/packages.el b/.doom.d/packages.el
index 16da630..764e6b3 100644
--- a/.doom.d/packages.el
+++ b/.doom.d/packages.el
@@ -48,7 +48,7 @@
 ;(unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;(unpin! t)
-(package! exwm)
+(package! evil-tutor)
 (package! emms)
 (package! emojify)
 (package! elfeed)
diff --git a/.emacs.d/bin/doom b/.emacs.d/bin/doom
index fee5c1b..d0dd4e0 100755
--- a/.emacs.d/bin/doom
+++ b/.emacs.d/bin/doom
@@ -1,127 +1,131 @@
 #!/usr/bin/env sh
-:; ( echo "$EMACS" | grep -q "term" ) && EMACS=emacs || EMACS=${EMACS:-emacs} # -*-emacs-lisp-*-
-:; command -v $EMACS >/dev/null || { >&2 echo "Can't find emacs in your PATH"; exit 1; }
-:; _VERSION=$($EMACS --version | head -n1)
-:; case "$_VERSION" in *\ 2[0-5].[0-9]) echo "Detected Emacs $_VERSION"; echo "Doom only supports Emacs 26.1 and newer"; echo; exit 2 ;; esac
-:; _DOOMBASE="${EMACSDIR:-$(dirname "$0")/..}"
-:; _DOOMPOST="$_DOOMBASE/.local/.doom.sh"
-:; rm -f "$_DOOMPOST"
-:; $EMACS --no-site-file --script "$0" -- "$@"
-:; CODE=$?
-:; [ -x "$_DOOMPOST" ] && PATH="$_DOOMBASE/bin:$PATH" "$_DOOMPOST" "$0" "$@"
-:; exit $CODE
+:; set -e # -*- mode: emacs-lisp; lexical-binding: t -*-
+:; case "$EMACS" in *term*) EMACS=emacs ;; *) EMACS="${EMACS:-emacs}" ;; esac
+:; $EMACS --version >/dev/null 2>&1 || { >&2 echo "Can't find emacs in your PATH"; exit 1; }
+:; $EMACS --no-site-file --script "$0" -- "$@" || __DOOMCODE=$?
+:; [ "${__DOOMCODE:-0}" -eq 128 ] && { "`$EMACS -Q --batch --eval '(princ temporary-file-directory)'`/doom.sh" "$0" "$@" && true; __DOOMCODE=$?; }
+:; exit $__DOOMCODE
 
-;; CLI ops tend to eat a lot of memory. To speed it up, stave off the GC, but
-;; not to `most-positive-fixnum' like we do in init.el; that's too high -- we
-;; don't want to intentionally leak memory.
+;; The garbage collector isn't important during CLI ops. A higher threshold
+;; makes it 15-30% faster, but set it too high and we risk spiralling memory
+;; usage in longer sessions.
 (setq gc-cons-threshold 134217728)   ; 128mb
 
-(let* ((loaddir (file-name-directory (file-truename load-file-name)))
-       (emacsdir (getenv "EMACSDIR"))
-       (user-emacs-directory
-        (abbreviate-file-name
-         (if emacsdir
-             (file-name-as-directory emacsdir)
-           (expand-file-name "../" loaddir)))))
+;; Prioritize non-byte-compiled source files in non-interactive sessions to
+;; prevent loading stale byte-code.
+(setq load-prefer-newer t)
 
-  ;;
-  (load (expand-file-name "core/core.el" user-emacs-directory) nil t)
+;; Ensure Doom runs out of this file's parent directory, where Doom is
+;; presumably installed. EMACSDIR is set in the shell script preamble earlier in
+;; this file.
+(setq user-emacs-directory
+      (if (getenv "EMACSDIR")
+          (file-name-as-directory (expand-file-name (getenv "EMACSDIR")))
+        (expand-file-name
+         "../" (file-name-directory (file-truename load-file-name)))))
 
-  ;; HACK Load `cl' and site files manually so we can stop them from polluting
-  ;;      CLI logs with deprecation and file load messages.
-  (quiet! (when (> emacs-major-version 26)
-            (require 'cl))
-          (load "site-start" t t))
+;; Handle some potential issues early
+(when (version< emacs-version "26.1")
+  (error (concat "Detected Emacs %s (at %s).\n\n"
+                 "Doom only supports Emacs 26.1 and newer. 27.1 is highly recommended. A guide\n"
+                 "to install a newer version of Emacs can be found at:\n\n  "
+                 (cond ((eq system-type 'darwin)
+                        "https://github.com/hlissner/doom-emacs/blob/develop/docs/getting_started.org#on-macos")
+                       ((memq system-type '(cygwin windows-nt ms-dos))
+                        "https://github.com/hlissner/doom-emacs/blob/develop/docs/getting_started.org#on-windows")
+                       ("https://github.com/hlissner/doom-emacs/blob/develop/docs/getting_started.org#on-linux"))
+                 "Aborting...")
+         emacs-version
+         (car command-line-args)))
 
-  (doom-log "Initializing Doom CLI")
-  (require 'core-cli)
+(unless (file-exists-p (expand-file-name "core/core.el" user-emacs-directory))
+  (error (concat "Couldn't find Doom Emacs in %S.\n\n"
+                 "This is likely because this script (or its parent directory) is a symlink.\n"
+                 "If you must use a symlink, you'll need to specify an EMACSDIR so Doom knows\n"
+                 "where to find itself. e.g.\n\n    "
+                 (if (string-match-p "/fish$" (getenv "SHELL"))
+                     "env EMACSDIR=~/.emacs.d doom"
+                   "EMACSDIR=~/.emacs.d doom sync")
+                 "\n\n"
+                 "Aborting...")
+         (abbreviate-file-name (file-truename user-emacs-directory))
+         (abbreviate-file-name load-file-name)))
 
-  (defcli! :main
-      ((help-p   ["-h" "--help"]    "Same as help command")
-       (debug-p  ["-d" "--debug"]   "Turns on doom-debug-p (and debug-on-error)")
-       (yes-p    ["-y" "--yes"]     "Auto-accept all confirmation prompts")
-       &optional command &rest args)
-    "A command line interface for managing Doom Emacs.
+(when (and (equal (user-real-uid) 0)
+           (not (file-in-directory-p user-emacs-directory "/root")))
+  (error (concat "This script is running as root. This likely wasn't intentional and\n"
+                 "will cause file permissions errors later if this Doom install is\n"
+                 "ever used on a non-root account.\n\n"
+                 "Aborting...")))
 
-Includes package management, diagnostics, unit tests, and byte-compilation.
+;; Load the heart of the beast and its CLI processing library
+(load (expand-file-name "core/core.el" user-emacs-directory) nil t)
+(require 'core-cli)
 
-This tool also makes it trivial to launch Emacs out of a different folder or
-with a different private module."
-    :bare t
-    (when debug-p
-      (setenv "DEBUG" "1")
-      (setq doom-debug-p t)
-      (print! (info "Debug mode on")))
-    (when yes-p
-      (setenv "YES" "1")
-      (setq doom-auto-accept t)
-      (print! (info "Auto-yes on")))
-    (when help-p
-      (when command
-        (push command args))
-      (setq command "help"))
+;; Use our own home-grown debugger to display and log errors + backtraces.
+;; Control over its formatting is important, because Emacs produces
+;; difficult-to-read debug information otherwise. By making its errors more
+;; presentable (and storing them somewhere users can access later) we go a long
+;; way toward making it easier for users to write better bug reports.
+(setq debugger #'doom-cli--debugger
+      debug-on-error t
+      debug-ignored-errors nil)
 
-    (when (equal (user-real-uid) 0)
-      (print!
-       (concat "WARNING: This script is running as root. This likely wasn't intentional, and\n"
-               "is unnecessary to use this script. This will cause file permissions errors\n"
-               "later if you use this Doom installation on a non-root account.\n"))
-      (unless (or doom-auto-accept (y-or-n-p "Continue anyway?"))
-        (user-error "Aborted")))
+;; HACK Load `cl' and site files manually to prevent polluting logs and stdout
+;;      with deprecation and/or file load messages.
+(quiet! (if EMACS27+ (require 'cl))
+        (load "site-start" t t))
 
-    ;; Load any the user's private init.el or any cli.el files in modules. This
-    ;; gives the user (and modules) an opportunity to define their own CLI
-    ;; commands, or to customize the CLI to better suit them.
-    (load! doom-module-init-file doom-private-dir t)
-    (maphash (doom-module-loader doom-cli-file) doom-modules)
-    (load! doom-cli-file doom-private-dir t)
-    (run-hooks 'doom-cli-pre-hook)
-
-    (let (print-level print-gensym print-length)
-      (condition-case e
-          (if (null command)
-              (doom-cli-execute "help")
-            (let ((start-time (current-time)))
-              (and (doom-cli-execute command args)
-                   (progn (run-hooks 'doom-cli-post-hook) t)
-                   (print! (success "Finished! (%.4fs)")
-                           (float-time
-                            (time-subtract (current-time)
-                                           start-time))))))
-        (user-error
-         (print! (error "%s\n") (error-message-string e))
-         (print! (yellow "See 'doom help %s' for documentation on this command.") (car args))
-         (error "")) ; Ensure non-zero exit code
-        ((debug error)
-         (print! (error "There was an unexpected error:"))
-         (print-group!
-          (print! "%s %s" (bold "Type:") (car e))
-          (print! (bold "Message:"))
-          (print-group!
-           (print! "%s" (get (car e) 'error-message)))
-          (print! (bold "Data:"))
-          (print-group!
-           (if (cdr e)
-               (dolist (item (cdr e))
-                 (print! "%S" item))
-             (print! "n/a")))
-          (when (and (bound-and-true-p straight-process-buffer)
-                     (string-match-p (regexp-quote straight-process-buffer)
-                                     (error-message-string e)))
-            (print! (bold "Straight output:"))
-            (print-group! (print! "%s" (straight--process-get-output)))))
-         (unless debug-on-error
-           (terpri)
-           (print!
-            (concat "Run the command again with the -d (or --debug) switch to enable debug\n"
-                    "mode and (hopefully) generate a backtrace from this error:\n"
-                    "\n  %s\n\n"
-                    "If you file a bug report, please include it!")
-            (string-join (append (list (file-name-nondirectory load-file-name) "-d" command)
-                                 args)
-                         " "))
-           ;; Ensure non-zero exit code
-           (error ""))))))
-
-  (doom-cli-execute :main (cdr (member "--" argv)))
-  (setq argv nil))
+(kill-emacs
+ (pcase
+     (catch 'exit
+       ;; Process the arguments passed to this script. `doom-cli-execute' should
+       ;; return a boolean, integer (error code) or throw an 'exit event, which
+       ;; we handle specially.
+       (apply #'doom-cli-execute :doom (cdr (member "--" argv))))
+   ;; Any non-zero integer is treated as an error code.
+   ((and (pred integerp) code) code)
+   ;; If, instead, we were given a list or string, copy these as shell script
+   ;; commands to a temp script file which this script will execute after this
+   ;; session finishes. Also accepts special keywords, like `:restart', to rerun
+   ;; the current command.
+   ((and (or (pred consp)
+             (pred stringp)
+             (pred keywordp))
+         command)
+    (let ((script (expand-file-name "doom.sh" temporary-file-directory))
+          (coding-system-for-write 'utf-8-unix)
+          (coding-system-for-read  'utf-8-unix))
+      (with-temp-file script
+        (insert "#!/usr/bin/env sh\n"
+                "_postscript() {\n"
+                "  rm -f " (shell-quote-argument script) "\n  "
+                (cond ((eq command :restart)
+                       "$@")
+                      ((stringp command)
+                       command)
+                      ((string-join
+                        (if (listp (car-safe command))
+                            (cl-loop for line in (doom-enlist command)
+                                     collect (mapconcat #'shell-quote-argument (remq nil line) " "))
+                          (list (mapconcat #'shell-quote-argument (remq nil command) " ")))
+                        "\n  ")))
+                "\n}\n"
+                (save-match-data
+                  (cl-loop for env
+                           in (cl-set-difference process-environment
+                                                 doom--initial-process-environment
+                                                 :test #'equal)
+                           if (string-match "^\\([a-zA-Z0-9_]+\\)=\\(.+\\)$" env)
+                           concat (format "%s=%s \\\n"
+                                          (match-string 1 env)
+                                          (shell-quote-argument (match-string 2 env)))))
+                (format "PATH=\"%s%s$PATH\" \\\n" (concat doom-emacs-dir "bin/") path-separator)
+                "_postscript $@\n"))
+      (set-file-modes script #o700))
+    ;; Error code 128 is special: it means run the post-script after this
+    ;; session ends.
+    128)
+   ;; Anything else (e.g. booleans) is treated as a successful run. Yes, a `nil'
+   ;; indicates a successful run too!
+   (_ 0)))
diff --git a/.emacs.d/bin/org-capture b/.emacs.d/bin/org-capture
index 1f338c6..f298b5b 100755
--- a/.emacs.d/bin/org-capture
+++ b/.emacs.d/bin/org-capture
@@ -30,6 +30,9 @@ shift $((OPTIND-1))
 
 [ -t 0 ] && str="$*" || str=$(cat)
 
+# Fix incompatible terminals that cause odd 'not a valid terminal' errors
+[ $TERM = "alacritty" ] && export TERM=xterm-256color
+
 if [ $daemon ]; then
   emacsclient -a "" \
     -c -F '((name . "doom-capture") (width . 70) (height . 25) (transient . t))' \
diff --git a/.emacs.d/core/autoload/buffers.el b/.emacs.d/core/autoload/buffers.el
index c6b7159..7e46082 100644
--- a/.emacs.d/core/autoload/buffers.el
+++ b/.emacs.d/core/autoload/buffers.el
@@ -179,9 +179,11 @@ If DERIVED-P, test with `derived-mode-p', otherwise use `eq'."
 ;;;###autoload
 (defun doom-visible-buffers (&optional buffer-list)
   "Return a list of visible buffers (i.e. not buried)."
-  (if buffer-list
-      (cl-remove-if-not #'get-buffer-window buffer-list)
-    (delete-dups (mapcar #'window-buffer (window-list)))))
+  (let ((buffers (delete-dups (mapcar #'window-buffer (window-list)))))
+    (if buffer-list
+        (cl-delete-if (lambda (b) (memq b buffer-list))
+                      buffers)
+      (delete-dups buffers))))
 
 ;;;###autoload
 (defun doom-buried-buffers (&optional buffer-list)
diff --git a/.emacs.d/core/autoload/config.el b/.emacs.d/core/autoload/config.el
index 0df9785..1e643cf 100644
--- a/.emacs.d/core/autoload/config.el
+++ b/.emacs.d/core/autoload/config.el
@@ -98,7 +98,7 @@ Runs `doom-reload-hook' afterwards."
 
 ;;;###autoload
 (defun doom/reload-autoloads ()
-  "Reload only `doom-autoload-file' and `doom-package-autoload-file'.
+  "Reload only `doom-autoloads-file' and `doom-package-autoload-file'.
 
 This is much faster and safer than `doom/reload', but not as comprehensive. This
 reloads your package and module visibility, but does not install new packages or
diff --git a/.emacs.d/core/autoload/debug.el b/.emacs.d/core/autoload/debug.el
index 1d74faa..cd4c27f 100644
--- a/.emacs.d/core/autoload/debug.el
+++ b/.emacs.d/core/autoload/debug.el
@@ -5,26 +5,62 @@
 
 ;;;###autoload
 (defvar doom-debug-variables
-  '(doom-debug-p
-    init-file-debug
-    debug-on-error
+  '(debug-on-error
+    doom-debug-p
     garbage-collection-messages
-    use-package-verbose
-    jka-compr-verbose
-    lsp-log-io
     gcmh-verbose
-    magit-refresh-verbose
-    url-debug)
-  "A list of variable to toggle on `doom-debug-mode'.")
+    init-file-debug
+    jka-compr-verbose
+    url-debug
+    use-package-verbose)
+  "A list of variable to toggle on `doom-debug-mode'.
+
+Each entry can be a variable symbol or a cons cell whose CAR is the variable
+symbol and CDR is the value to set it to when `doom-debug-mode' is activated.")
+
+(defvar doom--debug-vars-old-values nil)
+(defvar doom--debug-vars-undefined nil)
+
+(defun doom--watch-debug-vars-h (&rest _)
+  (when-let (bound-vars (cl-remove-if-not #'boundp doom--debug-vars-undefined))
+    (doom-log "New variables available: %s" bound-vars)
+    (let ((message-log-max nil))
+      (doom-debug-mode -1)
+      (doom-debug-mode +1))))
 
 ;;;###autoload
 (define-minor-mode doom-debug-mode
   "Toggle `debug-on-error' and `doom-debug-p' for verbose logging."
   :init-value nil
   :global t
-  (let ((value doom-debug-mode))
-    (mapc (doom-rpartial #'set value) doom-debug-variables)
-    (message "Debug mode %s" (if value "on" "off"))))
+  (let ((enabled doom-debug-mode))
+    (setq doom--debug-vars-undefined nil)
+    (dolist (var doom-debug-variables)
+      (cond ((listp var)
+             (cl-destructuring-bind (var . val) var
+               (if (not (boundp var))
+                   (add-to-list 'doom--debug-vars-undefined var)
+                 (set-default
+                  var (if (not enabled)
+                          (alist-get var doom--debug-vars-old-values)
+                        (setf (alist-get var doom--debug-vars-old-values)
+                              (symbol-value var))
+                        val)))))
+            ((if (boundp var)
+                 (set-default var enabled)
+               (add-to-list 'doom--debug-vars-undefined var)))))
+    (when (fboundp 'explain-pause-mode)
+      (explain-pause-mode enabled))
+    ;; Watch for changes in `doom-debug-variables', or when packages load (and
+    ;; potentially define one of `doom-debug-variables'), in case some of them
+    ;; aren't defined when `doom-debug-mode' is first loaded.
+    (cond (enabled
+           (add-variable-watcher 'doom-debug-variables #'doom--watch-debug-vars-h)
+           (add-hook 'after-load-functions #'doom--watch-debug-vars-h))
+          (t
+           (remove-variable-watcher 'doom-debug-variables #'doom--watch-debug-vars-h)
+           (remove-hook 'after-load-functions #'doom--watch-debug-vars-h)))
+    (message "Debug mode %s" (if enabled "on" "off"))))
 
 
 ;;
@@ -68,35 +104,44 @@
 ready to be pasted in a bug report on github."
   (require 'vc-git)
   (require 'core-packages)
-  (let ((default-directory doom-emacs-dir)
-        (doom-modules (doom-module-list)))
-    (letf! (defun sh (&rest args) (cdr (apply #'doom-call-process args)))
-      `((emacs
-         (version . ,emacs-version)
-         (features ,@system-configuration-features)
-         (build . ,(format-time-string "%b %d, %Y" emacs-build-time))
-         (buildopts ,system-configuration-options)
-         (windowsys . ,(if doom-interactive-p window-system 'batch))
-         (daemonp . ,(cond ((daemonp) 'daemon)
-                           ((and (require 'server)
-                                 (server-running-p))
-                            'server-running))))
-        (doom
-         (version . ,doom-version)
-         (build . ,(sh "git" "log" "-1" "--format=%D %h %ci"))
-         (dir . ,(abbreviate-file-name (file-truename doom-private-dir))))
-        (system
-         (type . ,system-type)
+  (let ((default-directory doom-emacs-dir))
+    (letf! ((defun sh (&rest args) (cdr (apply #'doom-call-process args)))
+            (defun abbrev-path (path)
+              (replace-regexp-in-string
+               (regexp-quote (user-login-name)) "$USER"
+               (abbreviate-file-name path))))
+      `((system
+         (type   . ,system-type)
          (config . ,system-configuration)
-         (shell . ,shell-file-name)
-         (uname . ,(if IS-WINDOWS
-                       "n/a"
-                     (sh "uname" "-msrv")))
-         (path . ,(mapcar #'abbreviate-file-name exec-path)))
-        (config
-         (envfile
-          . ,(cond ((file-exists-p doom-env-file) 'envvar-file)
-                   ((featurep 'exec-path-from-shell) 'exec-path-from-shell)))
+         (shell  . ,(abbrev-path shell-file-name))
+         (uname  . ,(if IS-WINDOWS "n/a" (sh "uname" "-msrv")))
+         (path   . ,(mapcar #'abbrev-path exec-path)))
+        (emacs
+         (dir       . ,(abbrev-path (file-truename doom-emacs-dir)))
+         (version   . ,emacs-version)
+         (build     . ,(format-time-string "%b %d, %Y" emacs-build-time))
+         (buildopts . ,system-configuration-options)
+         (features  . ,system-configuration-features)
+         (traits . ,(delq
+                     nil (list (if (not doom-interactive-p) 'batch)
+                               (if (daemonp) 'daemon)
+                               (if (and (require 'server)
+                                        (server-running-p))
+                                   'server-running)
+                               (if (boundp 'chemacs-profiles-path)
+                                   'chemacs)
+                               (if (file-exists-p doom-env-file)
+                                   'envvar-file)
+                               (if (featurep 'exec-path-from-shell)
+                                   'exec-path-from-shell)
+                               (if (file-symlink-p user-emacs-directory)
+                                   'symlinked-emacsdir)
+                               (if (file-symlink-p doom-private-dir)
+                                   'symlinked-doomdir)))))
+        (doom
+         (dir     . ,(abbrev-path (file-truename doom-private-dir)))
+         (version . ,doom-version)
+         (build   . ,(sh "git" "log" "-1" "--format=%D %h %ci"))
          (elc-files
           . ,(length (doom-files-in `(,@doom-modules-dirs
                                       ,doom-core-dir
@@ -110,10 +155,18 @@ ready to be pasted in a bug report on github."
                          do (setq cat (car key))
                          and collect cat
                          collect
-                         (let ((flags (doom-module-get cat (cdr key) :flags)))
-                           (if flags
-                               `(,(cdr key) ,@flags)
-                             (cdr key))))
+                         (let* ((flags (doom-module-get cat (cdr key) :flags))
+                                (path  (doom-module-get cat (cdr key) :path))
+                                (module (append (cond ((null path)
+                                                       (list '&nopath))
+                                                      ((file-in-directory-p path doom-private-dir)
+                                                       (list '&user)))
+                                                (if flags
+                                                    `(,(cdr key) ,@flags)
+                                                  (list (cdr key))))))
+                           (if (= (length module) 1)
+                               (car module)
+                             module)))
                 '("n/a")))
          (packages
           ,@(or (condition-case e
@@ -150,16 +203,10 @@ ready to be pasted in a bug report on github."
   "Display the current version of Doom & Emacs, including the current Doom
 branch and commit."
   (interactive)
-  (require 'vc-git)
   (let ((default-directory doom-core-dir))
-    (print! "Doom v%s (%s)\nEmacs v%s\nBranch: %s\nBuild date: %s"
+    (print! "Doom v%s (%s)"
             doom-version
-            (or (vc-git-working-revision doom-core-dir)
-                "n/a")
-            emacs-version
-            (or (vc-git--symbolic-ref doom-core-dir)
-                "n/a")
-            (or (cdr (doom-call-process "git" "log" "-1" "--format=%ci"))
+            (or (cdr (doom-call-process "git" "log" "-1" "--format=%D %h %ci"))
                 "n/a"))))
 
 ;;;###autoload
@@ -190,7 +237,7 @@ markdown and copies it to your clipboard, ready to be pasted into bug reports!"
         (insert "<details>\n\n```\n")
         (dolist (group info)
           (insert! "%-8s%-10s %s\n"
-                   ((car group)
+                   ((upcase (symbol-name (car group)))
                     (caadr group)
                     (cdadr group)))
           (dolist (spec (cddr group))
diff --git a/.emacs.d/core/autoload/help.el b/.emacs.d/core/autoload/help.el
index 75b5b07..146db99 100644
--- a/.emacs.d/core/autoload/help.el
+++ b/.emacs.d/core/autoload/help.el
@@ -11,12 +11,9 @@
     (csharp-mode     :lang csharp)
     (clojure-mode    :lang clojure)
     (clojurescript-mode :lang clojure)
-    (graphql-mode    :lang data)
-    (toml-mode       :lang data)
-    (json-mode       :lang data)
-    (yaml-mode       :lang data)
+    (json-mode       :lang json)
+    (yaml-mode       :lang yaml)
     (csv-mode        :lang data)
-    (dhall-mode      :lang data)
     (erlang-mode     :lang erlang)
     (elixir-mode     :lang elixir)
     (elm-mode        :lang elm)
@@ -193,7 +190,7 @@ selection of all minor-modes, active or not."
          "troubleshooting.org"
          "tutorials.org"
          "faq.org")
-   2 t initial-input
+   3 t initial-input
    (mapcar (lambda (x)
              (setcar x (concat "Doom Modules > " (car x)))
              x)
diff --git a/.emacs.d/core/autoload/text.el b/.emacs.d/core/autoload/text.el
index 79c924f..f3f7f6a 100644
--- a/.emacs.d/core/autoload/text.el
+++ b/.emacs.d/core/autoload/text.el
@@ -106,10 +106,11 @@ in some cases."
         (thing
          (thing-at-point thing t))
         ((require 'xref nil t)
-         ;; Eglot defines a dummy for `xref-find-backend', so we need a special
-         ;; case to avoid xref when using eglot. See
-         ;; https://github.com/joaotavora/eglot/issues/503
-         (if (eq (xref-find-backend) 'eglot)
+         ;; Eglot, nox (a fork of eglot), and elpy implementations for
+         ;; `xref-backend-identifier-at-point' betray the documented purpose of
+         ;; the interface. Eglot/nox return a hardcoded string and elpy prepends
+         ;; the line number to the symbol.
+         (if (memq (xref-find-backend) '(eglot elpy nox))
              (thing-at-point 'symbol t)
            ;; A little smarter than using `symbol-at-point', though in most
            ;; cases, xref ends up using `symbol-at-point' anyway.
diff --git a/.emacs.d/core/autoload/ui.el b/.emacs.d/core/autoload/ui.el
index 5690544..5c27d7f 100644
--- a/.emacs.d/core/autoload/ui.el
+++ b/.emacs.d/core/autoload/ui.el
@@ -113,48 +113,77 @@ See `display-line-numbers' for what these values mean."
         (delete-frame))
     (save-buffers-kill-emacs)))
 
-(defvar doom--maximize-last-wconf nil)
-;;;###autoload
-(defun doom/window-maximize-buffer ()
-  "Close other windows to focus on this one. Activate again to undo this. If the
-window changes before then, the undo expires.
 
-Alternatively, use `doom/window-enlargen'."
-  (interactive)
-  (setq doom--maximize-last-wconf
-        (if (and (null (cdr (cl-remove-if #'window-dedicated-p (window-list))))
-                 doom--maximize-last-wconf)
-            (ignore (set-window-configuration doom--maximize-last-wconf))
-          (when (and (bound-and-true-p +popup-mode)
-                     (+popup-window-p))
-            (user-error "Cannot maximize a popup, use `+popup/raise' first or use `doom/window-enlargen' instead"))
-          (prog1 (current-window-configuration)
-            (delete-other-windows)))))
+(defun doom--enlargened-forget-last-wconf-h ()
+  (set-frame-parameter nil 'doom--maximize-last-wconf nil)
+  (set-frame-parameter nil 'doom--enlargen-last-wconf nil)
+  (remove-hook 'doom-switch-window-hook #'doom--enlargened-forget-last-wconf-h))
 
-(defvar doom--enlargen-last-wconf nil)
 ;;;###autoload
-(defun doom/window-enlargen ()
+(defun doom/window-maximize-buffer (&optional arg)
+  "Close other windows to focus on this one.
+
+Activate again to undo this. If prefix ARG is non-nil, don't restore the last
+window configuration and re-maximize the current window. Alternatively, use
+`doom/window-enlargen'."
+  (interactive "P")
+  (let ((param 'doom--maximize-last-wconf))
+    (cl-destructuring-bind (window . wconf)
+        (or (frame-parameter nil param)
+            (cons nil nil))
+      (set-frame-parameter
+       nil param
+       (if (and (equal window (selected-window))
+                (not arg)
+                (null (cdr (cl-remove-if #'window-dedicated-p (window-list))))
+                wconf)
+           (ignore
+            (let ((source-window (selected-window)))
+              (set-window-configuration wconf)
+              (when (window-live-p source-window)
+                (select-window source-window))))
+         (when (and (bound-and-true-p +popup-mode)
+                    (+popup-window-p))
+           (user-error "Cannot maximize a popup, use `+popup/raise' first or use `doom/window-enlargen' instead"))
+         (prog1 (cons (selected-window) (or wconf (current-window-configuration)))
+           (delete-other-windows)
+           (add-hook 'doom-switch-window-hook #'doom--enlargened-forget-last-wconf-h)))))))
+
+;;;###autoload
+(defun doom/window-enlargen (&optional arg)
   "Enlargen the current window to focus on this one. Does not close other
 windows (unlike `doom/window-maximize-buffer'). Activate again to undo."
-  (interactive)
-  (setq doom--enlargen-last-wconf
-        (if doom--enlargen-last-wconf
-            (ignore (set-window-configuration doom--enlargen-last-wconf))
-          (prog1 (current-window-configuration)
-            (let* ((window (selected-window))
-                   (dedicated-p (window-dedicated-p window))
-                   (preserved-p (window-parameter window 'window-preserved-size))
-                   (ignore-window-parameters t))
-              (unwind-protect
-                  (progn
-                    (when dedicated-p
-                      (set-window-dedicated-p window nil))
-                    (when preserved-p
-                      (set-window-parameter window 'window-preserved-size nil))
-                    (maximize-window window))
-                (set-window-dedicated-p window dedicated-p)
-                (when preserved-p
-                  (set-window-parameter window 'window-preserved-size preserved-p))))))))
+  (interactive "P")
+  (let ((param 'doom--enlargen-last-wconf))
+    (cl-destructuring-bind (window . wconf)
+        (or (frame-parameter nil param)
+            (cons nil nil))
+      (set-frame-parameter
+       nil param
+       (if (and (equal window (selected-window))
+                (not arg)
+                wconf)
+           (ignore
+            (let ((source-window (selected-window)))
+              (set-window-configuration wconf)
+              (when (window-live-p source-window)
+                (select-window source-window))))
+         (prog1 (cons (selected-window) (or wconf (current-window-configuration)))
+           (let* ((window (selected-window))
+                  (dedicated-p (window-dedicated-p window))
+                  (preserved-p (window-parameter window 'window-preserved-size))
+                  (ignore-window-parameters t))
+             (unwind-protect
+                 (progn
+                   (when dedicated-p
+                     (set-window-dedicated-p window nil))
+                   (when preserved-p
+                     (set-window-parameter window 'window-preserved-size nil))
+                   (maximize-window window))
+               (set-window-dedicated-p window dedicated-p)
+               (when preserved-p
+                 (set-window-parameter window 'window-preserved-size preserved-p))
+               (add-hook 'doom-switch-window-hook #'doom--enlargened-forget-last-wconf-h)))))))))
 
 ;;;###autoload
 (defun doom/window-maximize-horizontally ()
diff --git a/.emacs.d/core/cli/autoloads.el b/.emacs.d/core/cli/autoloads.el
index 51a85f2..c471b01 100644
--- a/.emacs.d/core/cli/autoloads.el
+++ b/.emacs.d/core/cli/autoloads.el
@@ -14,7 +14,7 @@ one wants that.")
     auto-mode-alist
     interpreter-mode-alist
     Info-directory-list)
-  "A list of variables to be cached in `doom-autoload-file'.")
+  "A list of variables to be cached in `doom-autoloads-file'.")
 
 (defvar doom-autoloads-files ()
   "A list of additional files or file globs to scan for autoloads.")
@@ -26,7 +26,7 @@ one wants that.")
 (defun doom-autoloads-reload (&optional file)
   "Regenerates Doom's autoloads and writes them to FILE."
   (unless file
-    (setq file doom-autoload-file))
+    (setq file doom-autoloads-file))
   (print! (start "(Re)generating autoloads file..."))
   (print-group!
    (cl-check-type file string)
diff --git a/.emacs.d/core/cli/doctor.el b/.emacs.d/core/cli/doctor.el
index b5422cc..e7e3fc4 100644
--- a/.emacs.d/core/cli/doctor.el
+++ b/.emacs.d/core/cli/doctor.el
@@ -59,6 +59,16 @@ in."
               "typically installed. If you're seeing a vanilla Emacs splash screen, this "
               "may explain why. If you use Chemacs, you may ignore this warning."))
 
+  (when EMACS27+
+    (print! (start "Checking for great Emacs features..."))
+    (unless (and (functionp 'json-serialize)
+                 (string-match-p "\\_<JSON\\_>" system-configuration-features))
+      (warn! "Emacs was not built with native JSON support")
+      (explain! "Users will see a substantial performance gain by building Emacs with "
+                "jansson support (i.e. a native JSON library), particularly LSP users. "
+                "You must install a prebuilt Emacs binary with this included, or compile "
+                "Emacs with the --with-json option.")))
+
   (print! (start "Checking for private config conflicts..."))
   (let ((xdg-dir (concat (or (getenv "XDG_CONFIG_HOME")
                              "~/.config")
diff --git a/.emacs.d/core/cli/env.el b/.emacs.d/core/cli/env.el
index 3856ba7..f8dabde 100644
--- a/.emacs.d/core/cli/env.el
+++ b/.emacs.d/core/cli/env.el
@@ -61,11 +61,14 @@ Why this over exec-path-from-shell?
 ;; Helpers
 
 (defvar doom-env-blacklist
-  '("^DBUS_SESSION_BUS_ADDRESS$"
-    "^GPG_AGENT_INFO$" "^\\(SSH\\|GPG\\)_TTY$"
-    "^SSH_\\(AUTH_SOCK\\|AGENT_PID\\)$"
-    "^HOME$" "^PWD$" "^PS1$" "^R?PROMPT$" "^TERM$"
-    ;; Doom envvars
+  '(;; State that may be problematic if overwritten
+    "^HOME$" "^\\(OLD\\)?PWD$" "^SHLVL$" "^PS1$" "^R?PROMPT$" "^TERM$" "^USER$"
+    ;; X server or services' variables
+    "^DISPLAY$" "^DBUS_SESSION_BUS_ADDRESS$"
+    ;; ssh and gpg variables (likely to become stale)
+    "^SSH_\\(AUTH_SOCK\\|AGENT_PID\\)$" "^\\(SSH\\|GPG\\)_TTY$"
+    "^GPG_AGENT_INFO$"
+    ;; Internal Doom envvars
     "^DEBUG$" "^INSECURE$" "^YES$" "^__")
   "Environment variables to not save in `doom-env-file'.
 
diff --git a/.emacs.d/core/cli/help.el b/.emacs.d/core/cli/help.el
index 39e136b..11bc2e7 100644
--- a/.emacs.d/core/cli/help.el
+++ b/.emacs.d/core/cli/help.el
@@ -74,7 +74,7 @@
   :bare t
   (if command
       (doom--cli-print (doom-cli-get (intern command)))
-    (doom--cli-print (doom-cli-get :main))
+    (doom--cli-print (doom-cli-get :doom))
     (terpri)
     (print! (bold "Commands:"))
     (print-group!
diff --git a/.emacs.d/core/cli/packages.el b/.emacs.d/core/cli/packages.el
index 0b5e927..90debf0 100644
--- a/.emacs.d/core/cli/packages.el
+++ b/.emacs.d/core/cli/packages.el
@@ -126,8 +126,14 @@ list remains lean."
       (doom-log "%s is newer than %s" file elc-file)
       t)))
 
+;; DEPRECATED Remove later
+(defun doom--comp-output-filename (file)
+  (if (fboundp 'comp-output-filename)
+      (comp-output-filename file)
+    (comp-el-to-eln-filename file)))
+
 (defun doom--eln-file-outdated-p (file)
-  (when-let* ((eln-file (comp-output-filename file))
+  (when-let* ((eln-file (doom--comp-output-filename file))
               (error-file (concat eln-file ".error")))
     (push eln-file doom--expected-eln-files)
     (cond ((file-exists-p eln-file)
@@ -144,7 +150,7 @@ list remains lean."
 
 (defun doom--native-compile-done-h (file)
   (when-let* ((file)
-              (eln-file (comp-output-filename file))
+              (eln-file (doom--comp-output-filename file))
               (error-file (concat eln-file ".error")))
     (if (file-exists-p eln-file)
         (doom-log "Compiled %s" eln-file)
@@ -484,8 +490,9 @@ If ELPA-P, include packages installed with package.el (M-x package-install)."
              (and (or repos-p regraft-repos-p)
                   (straight--directory-files (straight--repos-dir) nil nil 'sort))))
         (list (when builds-p
-                (seq-remove (doom-rpartial #'gethash straight--profile-cache)
-                            (straight--directory-files (straight--build-dir) nil nil 'sort)))
+                (seq-filter #'file-directory-p
+                            (seq-remove (doom-rpartial #'gethash straight--profile-cache)
+                                        (straight--directory-files (straight--build-dir) nil nil 'sort))))
               (when repos-p
                 (seq-remove (doom-rpartial #'straight--checkhash straight--repo-cache)
                             rdirs))
diff --git a/.emacs.d/core/cli/upgrade.el b/.emacs.d/core/cli/upgrade.el
index a9a2782..d267684 100644
--- a/.emacs.d/core/cli/upgrade.el
+++ b/.emacs.d/core/cli/upgrade.el
@@ -17,16 +17,17 @@ following shell commands:
   (let ((doom-auto-discard force-p))
     (cond
      (packages-only-p
-      (doom-cli-execute "sync" '("-u"))
+      (doom-cli-execute "sync" "-u")
       (print! (success "Finished upgrading Doom Emacs")))
 
      ((doom-cli-upgrade doom-auto-accept doom-auto-discard)
       ;; Reload Doom's CLI & libraries, in case there were any upstream changes.
       ;; Major changes will still break, however
       (print! (info "Reloading Doom Emacs"))
-      (doom-cli-execute-after "doom" "upgrade" "-p" (if force-p "-f")))
+      (throw 'exit (list "doom" "upgrade" "-p" (if force-p "-f"))))
 
-     ((print! "Doom is up-to-date!")))))
+     ((print! "Doom is up-to-date!")
+      (doom-cli-execute "sync" "-u")))))
 
 
 ;;
@@ -92,7 +93,7 @@ following shell commands:
 
                ((equal this-rev new-rev)
                 (print! (success "Doom is already up-to-date!"))
-                t)
+                nil)
 
                ((print! (info "A new version of Doom Emacs is available!\n\n  Old revision: %s (%s)\n  New revision: %s (%s)\n"
                               (substring this-rev 0 10)
diff --git a/.emacs.d/core/core-cli.el b/.emacs.d/core/core-cli.el
index 05ce9b4..7587284 100644
--- a/.emacs.d/core/core-cli.el
+++ b/.emacs.d/core/core-cli.el
@@ -1,13 +1,12 @@
-;;; -*- lexical-binding: t; no-byte-compile: t; -*-
-
-(require 'seq)
+;;; core/core-cli.el --- -*- lexical-binding: t; no-byte-compile: t; -*-
 
 (load! "autoload/process")
 (load! "autoload/plist")
 (load! "autoload/files")
 (load! "autoload/output")
+(require 'seq)
 
-;; Create all our core directories to quell file errors
+;; Create all our core directories to quell file errors.
 (mapc (doom-rpartial #'make-directory 'parents)
       (list doom-local-dir
             doom-etc-dir
@@ -21,6 +20,9 @@
 ;; Don't generate superfluous files when writing temp buffers
 (setq make-backup-files nil)
 
+;; Stop user configuration from interfering with Doom
+(setq enable-dir-local-variables nil)
+
 
 ;;
 ;;; Variables
@@ -40,10 +42,26 @@ These are loaded when a Doom's CLI starts up. There users and modules can define
 additional CLI commands, or reconfigure existing ones to better suit their
 purpose.")
 
+(defvar doom-cli-log-file (concat doom-local-dir "doom.log")
+  "File to write the extended output to.")
+
+(defvar doom-cli-log-error-file (concat doom-local-dir "doom.error.log")
+  "File to write the last backtrace to.")
+
 (defvar doom--cli-commands (make-hash-table :test 'equal))
 (defvar doom--cli-groups (make-hash-table :test 'equal))
 (defvar doom--cli-group nil)
 
+(define-error 'doom-cli-error "There was an unexpected error" 'doom-error)
+(define-error 'doom-cli-command-not-found-error "Could not find that command" 'doom-cli-error)
+(define-error 'doom-cli-wrong-number-of-arguments-error "Wrong number of CLI arguments" 'doom-cli-error)
+(define-error 'doom-cli-unrecognized-option-error "Not a recognized option" 'doom-cli-error)
+(define-error 'doom-cli-deprecated-error "Command is deprecated" 'doom-cli-error)
+
+
+;;
+;;; CLI library
+
 (cl-defstruct
     (doom-cli
      (:constructor nil)
@@ -159,7 +177,7 @@ purpose.")
   "Return non-nil if CLI is an internal (non-public) command."
   (string-prefix-p ":" (doom-cli-name cli)))
 
-(defun doom-cli-execute (command &optional args)
+(defun doom-cli-execute (command &rest args)
   "Execute COMMAND (string) with ARGS (list of strings).
 
 Executes a cli defined with `defcli!' with the name or alias specified by
@@ -169,24 +187,6 @@ COMMAND, and passes ARGS to it."
                (doom--cli-process cli (remq nil args)))
     (user-error "Couldn't find any %S command" command)))
 
-(defun doom-cli-execute-after (&rest args)
-  "Execute shell command ARGS after this CLI session quits.
-
-This is particularly useful when the capabilities of Emacs' batch terminal are
-insufficient (like opening an instance of Emacs, or reloading Doom after a 'doom
-upgrade')."
-  (let ((post-script (concat doom-local-dir ".doom.sh")))
-    (with-temp-file post-script
-      (insert "#!/usr/bin/env sh\n"
-              "rm -f " (prin1-to-string post-script) "\n"
-              "exec " (mapconcat #'shell-quote-argument (remq nil args) " ")
-              "\n"))
-    (let* ((current-mode (file-modes post-script))
-           (add-mode (logand ?\111 (default-file-modes))))
-      (or (/= (logand ?\111 current-mode) 0)
-          (zerop add-mode)
-          (set-file-modes post-script (logior current-mode add-mode))))))
-
 (defmacro defcli! (name speclist &optional docstring &rest body)
   "Defines a CLI command.
 
@@ -247,6 +247,65 @@ BODY will be run when this dispatcher is called."
      ,@body))
 
 
+;;
+;;; Debugger
+
+(cl-defun doom-cli--debugger (error data)
+  (cl-incf num-nonmacro-input-events)
+  (cl-destructuring-bind (backtrace &optional type data . _)
+      (cons (doom-cli--backtrace) data)
+    (cond
+     ((and (bound-and-true-p straight-process-buffer)
+           (stringp data)
+           (string-match-p (regexp-quote straight-process-buffer)
+                           data))
+      (print! (error "There was an unexpected package error"))
+      (print-group!
+       (print! "%s" (string-trim-right (straight--process-get-output)))))
+     ((print! (error "There was an unexpected error"))
+      (print-group!
+       (print! "%s %s" (bold "Message:") (get type 'error-message))
+       (print! "%s %S" (bold "Data:") (cons type data))
+       (when backtrace
+         (print! (bold "Backtrace:"))
+         (print-group!
+          (dolist (frame (seq-take backtrace 10))
+            (print!
+             "%0.74s" (replace-regexp-in-string
+                       "[\n\r]" "\\\\n" (format "%S" frame)))))))))
+    (when backtrace
+      (with-temp-file doom-cli-log-error-file
+        (insert "# -*- lisp-interaction -*-\n")
+        (insert "# vim: set ft=lisp:\n")
+        (let ((standard-output (current-buffer))
+              (print-quoted t)
+              (print-escape-newlines t)
+              (print-escape-control-characters t)
+              (print-level nil)
+              (print-circle nil))
+          (mapc #'print (cons (list type data) backtrace)))
+        (print! (warn "Extended backtrace logged to %s")
+                (relpath doom-cli-log-error-file)))))
+  (throw 'exit 255))
+
+(defun doom-cli--backtrace ()
+  (let* ((n 0)
+         (frame (backtrace-frame n))
+         (frame-list nil)
+         (in-program-stack nil))
+    (while frame
+      (when in-program-stack
+        (push (cdr frame) frame-list))
+      (when (eq (elt frame 1) 'doom-cli--debugger)
+        (setq in-program-stack t))
+      (when (and (eq (elt frame 1) 'doom-cli-execute)
+                 (eq (elt frame 2) :doom))
+        (setq in-program-stack nil))
+      (setq n (1+ n)
+            frame (backtrace-frame n)))
+    (reverse frame-list)))
+
+
 ;;
 ;;; straight.el hacks
 
@@ -366,52 +425,102 @@ everywhere we use it (and internally)."
           interactive)))
 
 
+;;
+;;; Entry point
+
+(defcli! :doom
+    ((help-p        ["-h" "--help"]  "Same as help command")
+     (auto-accept-p ["-y" "--yes"]   "Auto-accept all confirmation prompts")
+     (debug-p       ["-d" "--debug"] "Enables on verbose output")
+     (doomdir       ["--doomdir"  dir] "Use the private module at DIR (e.g. ~/.doom.d)")
+     (localdir      ["--localdir" dir] "Use DIR as your local storage directory")
+     &optional command
+     &rest args)
+  "A command line interface for managing Doom Emacs.
+
+Includes package management, diagnostics, unit tests, and byte-compilation.
+
+This tool also makes it trivial to launch Emacs out of a different folder or
+with a different private module."
+  (condition-case e
+      (with-output-to! doom-cli-log-file
+        (catch 'exit
+          (when (and (not (getenv "__DOOMRESTART"))
+                     (or doomdir
+                         localdir
+                         debug-p
+                         auto-accept-p))
+            (when doomdir
+              (setenv "DOOMDIR" (file-name-as-directory doomdir))
+              (print! (info "DOOMDIR=%s") localdir))
+            (when localdir
+              (setenv "DOOMLOCALDIR" (file-name-as-directory localdir))
+              (print! (info "DOOMLOCALDIR=%s") localdir))
+            (when debug-p
+              (setenv "DEBUG" "1")
+              (print! (info "DEBUG=1")))
+            (when auto-accept-p
+              (setenv "YES" auto-accept-p)
+              (print! (info "Confirmations auto-accept enabled")))
+            (throw 'exit "__DOOMRESTART=1 $@"))
+          ;; TODO Rotate logs out, instead of overwriting them?
+          (delete-file doom-cli-log-file)
+          (delete-file doom-cli-log-error-file)
+          (when help-p
+            (when command
+              (push command args))
+            (setq command "help"))
+          (if (null command)
+              (doom-cli-execute "help")
+            (let ((start-time (current-time)))
+              (run-hooks 'doom-cli-pre-hook)
+              (when (apply #'doom-cli-execute command args)
+                (run-hooks 'doom-cli-post-hook)
+                (print! (success "Finished in %.4fs")
+                        (float-time (time-subtract (current-time) start-time))))))))
+    ;; TODO Not implemented yet
+    (doom-cli-command-not-found-error
+     (print! (error "Command 'doom %s' not recognized") (string-join (cdr e) " "))
+     (print! "\nDid you mean one of these commands?")
+     (apply #'doom-cli-execute "help" "--similar" (string-join (cdr e) " "))
+     2)
+    ;; TODO Not implemented yet
+    (doom-cli-wrong-number-of-arguments-error
+     (cl-destructuring-bind (route opt arg n d) (cdr e)
+       (print! (error "doom %s: %S requires %d arguments, but %d given\n")
+               (mapconcat #'symbol-name route " ") arg n d)
+       (print-group!
+        (apply #'doom-cli-execute "help" (mapcar #'symbol-name route))))
+     3)
+    ;; TODO Not implemented yet
+    (doom-cli-unrecognized-option-error
+     (let ((option (cadr e)))
+       (print! (error "Unrecognized option: %S") option)
+       (when (string-match "^--[^=]+=\\(.+\\)$" option)
+         (print! "The %S syntax isn't supported. Use '%s %s' instead."
+                 option (car (split-string option "="))
+                 (match-string 1 option))))
+     4)
+    ;; TODO Not implemented yet
+    (doom-cli-deprecated-error
+     (cl-destructuring-bind (route . commands) (cdr e)
+       (print! (warn "The 'doom %s' command was removed and replaced with:\n")
+               (mapconcat #'symbol-name route " "))
+       (print-group!
+        (dolist (command commands)
+          (print! (info "%s") command))))
+     5)
+    (user-error
+     (print! (warn "%s") (cadr e))
+     1)))
+
+
 ;;
 ;;; CLI Commands
 
 (load! "cli/help")
 (load! "cli/install")
-
-(defcli! (refresh re) ()
-  "Deprecated for 'doom sync'"
-  :hidden t
-  (user-error "'doom refresh' has been replaced with 'doom sync'. Use that instead"))
-
-(defcli! (sync s)
-    ((inhibit-envvar-p ["-e"] "Don't regenerate the envvar file")
-     (inhibit-elc-p    ["-c"] "Don't recompile config")
-     (update-p         ["-u"] "Update installed packages after syncing")
-     (prune-p          ["-p" "--prune"] "Purge orphaned package repos & regraft them"))
-  "Synchronize your config with Doom Emacs.
-
-This is the equivalent of running autoremove, install, autoloads, then
-recompile. Run this whenever you:
-
-  1. Modify your `doom!' block,
-  2. Add or remove `package!' blocks to your config,
-  3. Add or remove autoloaded functions in module autoloaded files.
-  4. Update Doom outside of Doom (e.g. with git)
-
-It will ensure that unneeded packages are removed, all needed packages are
-installed, autoloads files are up-to-date and no byte-compiled files have gone
-stale."
-  (print! (start "Synchronizing your config with Doom Emacs..."))
-  (print-group!
-   (delete-file doom-autoload-file)
-   (when (and (not inhibit-envvar-p)
-              (file-exists-p doom-env-file))
-     (doom-cli-reload-env-file 'force))
-   (run-hooks 'doom-sync-pre-hook)
-   (doom-cli-packages-install)
-   (doom-cli-packages-build)
-   (when update-p
-     (doom-cli-packages-update))
-   (doom-cli-packages-purge prune-p 'builds-p prune-p prune-p)
-   (run-hooks 'doom-sync-post-hook)
-   (when (doom-autoloads-reload)
-     (print! (info "Restart Emacs or use 'M-x doom/reload' for changes to take effect")))
-   t))
-
+(load! "cli/sync")
 (load! "cli/env")
 (load! "cli/upgrade")
 (load! "cli/packages")
@@ -427,12 +536,10 @@ stale."
   ;; (load! "cli/test")
   )
 
-
 (defcligroup! "Compilation"
   "For compiling Doom and your config"
   (load! "cli/byte-compile"))
 
-
 (defcligroup! "Utilities"
   "Conveniences for interacting with Doom externally"
   (defcli! run (&rest args)
@@ -446,8 +553,16 @@ All arguments are passed on to Emacs.
 WARNING: this command exists for convenience and testing. Doom will suffer
 additional overhead by being started this way. For the best performance, it is
 best to run Doom out of ~/.emacs.d and ~/.doom.d."
-    (apply #'doom-cli-execute-after invocation-name args)
-    nil))
+    (throw 'exit (cons invocation-name args))))
+
+
+;;
+;;; Bootstrap
+
+(doom-log "Initializing Doom CLI")
+(load! doom-module-init-file doom-private-dir t)
+(maphash (doom-module-loader doom-cli-file) doom-modules)
+(load! doom-cli-file doom-private-dir t)
 
 (provide 'core-cli)
 ;;; core-cli.el ends here
diff --git a/.emacs.d/core/core-editor.el b/.emacs.d/core/core-editor.el
index 195a1d3..e036de6 100644
--- a/.emacs.d/core/core-editor.el
+++ b/.emacs.d/core/core-editor.el
@@ -114,6 +114,10 @@ possible."
 (setq-default indent-tabs-mode nil
               tab-width 4)
 
+;; Only indent the line when at BOL or in a line's indentation. Anywhere else,
+;; insert literal indentation.
+(setq-default tab-always-indent nil)
+
 ;; Make `tabify' and `untabify' only affect indentation. Not tabs/spaces in the
 ;; middle of a line.
 (setq tabify-regexp "^\t* [ \t]+")
@@ -189,17 +193,23 @@ possible."
         ;; Only prompts for confirmation when buffer is unsaved.
         revert-without-query (list "."))
 
-  ;; Instead of `auto-revert-mode' or `global-auto-revert-mode', we lazily auto
-  ;; revert; when we save a file or switch buffers/windows (or focus on Emacs).
+  ;; `auto-revert-mode' and `global-auto-revert-mode' would, normally, abuse the
+  ;; heck out of inotify handles _or_ aggresively poll your buffer list every X
+  ;; seconds. Too many inotify handles can grind Emacs to a halt if you preform
+  ;; expensive or batch processes on files outside of Emacs (e.g. their mtime
+  ;; changes), and polling your buffer list is terribly inefficient as your
+  ;; buffer list grows into the tens or hundreds.
   ;;
-  ;; Autorevert normally abuses the heck out of inotify handles which can grind
-  ;; Emacs to a halt if you do expensive IO (outside of Emacs) on the files you
-  ;; have open (like compression). The only alternative is aggressive polling,
-  ;; which is unreliable and expensive with a lot of buffers open.
+  ;; So Doom uses a different strategy: we lazily auto revert buffers when the
+  ;; user a) saves a file, b) switches to a buffer (or its window), or c) you
+  ;; focus Emacs (after using another program). This way, Emacs only ever has to
+  ;; operate on, at minimum, a single buffer and, at maximum, X buffers, where X
+  ;; is the number of open windows (which is rarely, if ever, over 10).
   (defun doom-auto-revert-buffer-h ()
     "Auto revert current buffer, if necessary."
     (unless (or auto-revert-mode (active-minibuffer-window))
-      (auto-revert-handler)))
+      (let ((auto-revert-mode t))
+        (auto-revert-handler))))
 
   (defun doom-auto-revert-buffers-h ()
     "Auto revert stale buffers in visible windows, if necessary."
@@ -220,9 +230,15 @@ possible."
         (file-truename file)
       file))
   (setq recentf-filename-handlers
-        '(substring-no-properties    ; strip out lingering text properties
-          doom--recent-file-truename ; resolve symlinks of local files
-          abbreviate-file-name)      ; replace $HOME with ~
+        '(;; Text properties inflate the size of recentf's files, and there is
+          ;; no purpose in persisting them, so we strip them out.
+          substring-no-properties
+          ;; Resolve symlinks of local files. Otherwise we get duplicate
+          ;; entries opening symlinks.
+          doom--recent-file-truename
+          ;; Replace $HOME with ~, which is more portable, and reduces how much
+          ;; horizontal space the recentf listing uses to list recent files.
+          abbreviate-file-name)
         recentf-save-file (concat doom-cache-dir "recentf")
         recentf-auto-cleanup 'never
         recentf-max-menu-items 0
@@ -309,7 +325,6 @@ files, so we replace calls to `pp' with the much faster `prin1'."
 
 (use-package! better-jumper
   :hook (doom-first-input . better-jumper-mode)
-  :hook (better-jumper-post-jump . recenter)
   :commands doom-set-jump-a doom-set-jump-maybe-a doom-set-jump-h
   :preface
   ;; REVIEW Suppress byte-compiler warning spawning a *Compile-Log* buffer at
diff --git a/.emacs.d/core/core-keybinds.el b/.emacs.d/core/core-keybinds.el
index d17a313..55f9ae7 100644
--- a/.emacs.d/core/core-keybinds.el
+++ b/.emacs.d/core/core-keybinds.el
@@ -27,8 +27,11 @@ and Emacs states, and for non-evil users.")
 ;;; Keybind settings
 
 (cond (IS-MAC
-       (setq mac-command-modifier 'super
-             mac-option-modifier  'meta))
+       (setq mac-command-modifier     'super
+             mac-option-modifier      'meta
+             ns-command-modifier      'super
+             ns-option-modifier       'meta
+             ns-right-option-modifier 'none))
       (IS-WINDOWS
        (setq w32-lwindow-modifier 'super
              w32-rwindow-modifier 'super)))
diff --git a/.emacs.d/core/core-lib.el b/.emacs.d/core/core-lib.el
index 2781276..1cea6ce 100644
--- a/.emacs.d/core/core-lib.el
+++ b/.emacs.d/core/core-lib.el
@@ -220,19 +220,19 @@ writes to `standard-output'."
                    (funcall write-region start end filename append visit lockname mustbenew)))
            ,@forms))))
 
-(defmacro if! (cond then &rest body)
+(defmacro eval-if! (cond then &rest body)
   "Expands to THEN if COND is non-nil, to BODY otherwise.
-COND is checked at compile/expansion time, allowing BODY to be omitted
-entirely when the elisp is byte-compiled. Use this for forms that contain
-expensive macros that could safely be removed at compile time."
+COND is checked at compile/expansion time, allowing BODY to be omitted entirely
+when the elisp is byte-compiled. Use this for forms that contain expensive
+macros that could safely be removed at compile time."
   (declare (indent 2))
   (if (eval cond)
       then
     (macroexp-progn body)))
 
-(defmacro when! (cond &rest body)
+(defmacro eval-when! (cond &rest body)
   "Expands to BODY if CONDITION is non-nil at compile/expansion time.
-See `if!' for details on this macro's purpose."
+See `eval-if!' for details on this macro's purpose."
   (declare (indent 1))
   (when (eval cond)
     (macroexp-progn body)))
@@ -639,7 +639,7 @@ testing advice (when combined with `rotate-text').
 ;;
 ;;; Backports
 
-(when! (version< emacs-version "27.0.90")
+(eval-when! (version< emacs-version "27.0.90")
   ;; DEPRECATED Backported from Emacs 27
   (defmacro setq-local (&rest pairs)
     "Make variables in PAIRS buffer-local and assign them the corresponding values.
diff --git a/.emacs.d/core/core-modules.el b/.emacs.d/core/core-modules.el
index 7ac3b4a..d0e601b 100644
--- a/.emacs.d/core/core-modules.el
+++ b/.emacs.d/core/core-modules.el
@@ -39,7 +39,8 @@ run before `doom-init-modules-hook'. Relevant to `doom-module-init-file'.")
               (vterm            (:term vterm))
               (password-store   (:tools pass))
               (flycheck         (:checkers syntax))
-              (flyspell         (:checkers spell)))
+              (flyspell         (:checkers spell))
+              (macos            (:os macos)))
     (:emacs   (electric-indent  (:emacs electric))
               (hideshow         (:editor fold))
               (eshell           (:term eshell))
@@ -47,7 +48,8 @@ run before `doom-init-modules-hook'. Relevant to `doom-module-init-file'.")
     (:ui      (doom-modeline    (:ui modeline))
               (fci              (:ui fill-column))
               (evil-goggles     (:ui ophints))
-              (tabbar           (:ui tabs)))
+              (tabbar           (:ui tabs))
+              (pretty-code      (:ui ligatures)))
     (:app     (email            (:email mu4e))
               (notmuch          (:email notmuch)))
     (:lang    (perl             (:lang raku))))
@@ -441,7 +443,7 @@ otherwise, MODULES is a multiple-property list (a plist where each key can have
 multiple, linear values).
 
 The bootstrap process involves making sure the essential directories exist, core
-packages are installed, `doom-autoload-file' is loaded, `doom-packages-file'
+packages are installed, `doom-autoloads-file' is loaded, `doom-packages-file'
 cache exists (and is loaded) and, finally, loads your private init.el (which
 should contain your `doom!' block).
 
diff --git a/.emacs.d/core/core-packages.el b/.emacs.d/core/core-packages.el
index 284ac0b..0e0b1e9 100644
--- a/.emacs.d/core/core-packages.el
+++ b/.emacs.d/core/core-packages.el
@@ -97,9 +97,11 @@ uses a straight or package.el command directly).")
       ;; we don't have to deal with them at all.
       autoload-compute-prefixes nil
       ;; We handle it ourselves
-      straight-fix-org nil
-      ;; HACK Disable native-compilation for some troublesome files
-      comp-deferred-compilation-black-list '("/evil-collection-vterm\\.el$"))
+      straight-fix-org nil)
+
+(with-eval-after-load 'straight
+  ;; `let-alist' is built into Emacs 26 and onwards
+  (add-to-list 'straight-built-in-pseudo-packages 'let-alist))
 
 (defadvice! doom--read-pinned-packages-a (orig-fn &rest args)
   "Read `:pin's in `doom-packages' on top of straight's lockfiles."
@@ -126,7 +128,8 @@ uses a straight or package.el command directly).")
        ((null pin)
         (funcall call "git" "clone" "--origin" "origin" repo-url repo-dir
                  "--depth" (number-to-string straight-vc-git-default-clone-depth)
-                 "--branch" straight-repository-branch))
+                 "--branch" straight-repository-branch
+                 "--single-branch" "--no-tags"))
        ((integerp straight-vc-git-default-clone-depth)
         (make-directory repo-dir t)
         (let ((default-directory repo-dir))
@@ -134,7 +137,8 @@ uses a straight or package.el command directly).")
           (funcall call "git" "checkout" "-b" straight-repository-branch)
           (funcall call "git" "remote" "add" "origin" repo-url)
           (funcall call "git" "fetch" "origin" pin
-                   "--depth" (number-to-string straight-vc-git-default-clone-depth))
+                   "--depth" (number-to-string straight-vc-git-default-clone-depth)
+                   "--no-tags")
           (funcall call "git" "checkout" "--detach" pin)))))
     (require 'straight (concat repo-dir "/straight.el"))
     (doom-log "Initializing recipes")
@@ -184,10 +188,20 @@ processed."
         (error "Failed to read any packages"))
     (dolist (package doom-packages)
       (cl-destructuring-bind
-          (name &key recipe disable ignore &allow-other-keys) package
+          (name &key recipe disable ignore shadow &allow-other-keys) package
         (unless ignore
           (if disable
               (cl-pushnew name doom-disabled-packages)
+            (when shadow
+              (straight-override-recipe (cons shadow '(:local-repo nil)))
+              (let ((site-load-path (copy-sequence doom--initial-load-path))
+                    lib)
+                (while (setq
+                        lib (locate-library (concat (symbol-name shadow) ".el")
+                                            nil site-load-path))
+                  (let ((lib (directory-file-name (file-name-directory lib))))
+                    (setq site-load-path (delete lib site-load-path)
+                          load-path (delete lib load-path))))))
             (when recipe
               (straight-override-recipe (cons name recipe)))
             (straight-register-package name)))))))
@@ -327,6 +341,7 @@ installed."
 If ALL-P, gather packages unconditionally across all modules, including disabled
 ones."
   (let ((packages-file (concat doom-packages-file ".el"))
+        doom-disabled-packages
         doom-packages)
     (doom--read-packages
      (doom-path doom-core-dir packages-file) all-p 'noerror)
@@ -338,10 +353,12 @@ ones."
                   (doom-files-in doom-modules-dir
                                  :depth 2
                                  :match "/packages\\.el$"))
-          ;; We load the private packages file twice to ensure disabled packages
-          ;; are seen ASAP, and a second time to ensure privately overridden
-          ;; packages are properly overwritten.
-          (doom--read-packages private-packages nil 'noerror)
+          ;; We load the private packages file twice to populate
+          ;; `doom-disabled-packages' disabled packages are seen ASAP, and a
+          ;; second time to ensure privately overridden packages are properly
+          ;; overwritten.
+          (let (doom-packages)
+            (doom--read-packages private-packages nil 'noerror))
           (cl-loop for key being the hash-keys of doom-modules
                    for path = (doom-module-path (car key) (cdr key) packages-file)
                    for doom--current-module = key
@@ -382,7 +399,7 @@ ones."
 ;;; Module package macros
 
 (cl-defmacro package!
-    (name &rest plist &key built-in recipe ignore _type _pin _disable)
+    (name &rest plist &key built-in recipe ignore _type _pin _disable _shadow)
   "Declares a package and how to install it (if applicable).
 
 This macro is declarative and does not load nor install packages. It is used to
@@ -419,6 +436,10 @@ Accepts the following properties:
    inform help commands like `doom/help-packages' that this is a built-in
    package. If set to 'prefer, the package will not be installed if it is
    already provided by Emacs.
+ :shadow PACKAGE
+   Informs Doom that this package is shadowing a built-in PACKAGE; the original
+   package will be removed from `load-path' to mitigate conflicts, and this new
+   package will satisfy any dependencies on PACKAGE in the future.
 
 Returns t if package is successfully registered, and nil if it was disabled
 elsewhere."
@@ -453,7 +474,7 @@ elsewhere."
          (when-let (recipe (plist-get plist :recipe))
            (cl-destructuring-bind
                (&key local-repo _files _flavor
-                     _no-build _no-byte-compile _no-autoloads
+                     _no-build _no-byte-compile _no-native-compile _no-autoloads
                      _type _repo _host _branch _remote _nonrecursive _fork _depth)
                recipe
              ;; Expand :local-repo from current directory
@@ -469,9 +490,10 @@ elsewhere."
         (signal 'doom-package-error
                 (cons ,(symbol-name name)
                       (error-message-string e)))))
-     ;; This is the only side-effect of this macro!
+     ;; These are the only side-effects of this macro!
      (setf (alist-get name doom-packages) plist)
-     (unless (plist-get plist :disable)
+     (if (plist-get plist :disable)
+         (add-to-list 'doom-disabled-packages name)
        (with-no-warnings
          (cons name plist)))))
 
diff --git a/.emacs.d/core/core-ui.el b/.emacs.d/core/core-ui.el
index 169c9b2..95cfb64 100644
--- a/.emacs.d/core/core-ui.el
+++ b/.emacs.d/core/core-ui.el
@@ -200,11 +200,6 @@ or if the current buffer is read-only or not file-visiting."
 ;; Remove hscroll-margin in shells, otherwise it causes jumpiness
 (setq-hook! '(eshell-mode-hook term-mode-hook) hscroll-margin 0)
 
-(when IS-MAC
-  ;; sane trackpad/mouse scroll settings
-  (setq mac-redisplay-dont-reset-vscroll t
-        mac-mouse-wheel-smooth-scroll nil))
-
 
 ;;
 ;;; Cursor
@@ -307,33 +302,6 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
       tool-bar-mode nil
       scroll-bar-mode nil)
 
-(when! IS-MAC
-  ;; Curse Lion and its sudden but inevitable fullscreen mode!
-  ;; NOTE Meaningless to railwaycat's emacs-mac build
-  (setq ns-use-native-fullscreen nil)
-
-  ;; Visit files opened outside of Emacs in existing frame, not a new one
-  (setq ns-pop-up-frames nil)
-
-  ;; Sets `ns-transparent-titlebar' and `ns-appearance' frame parameters so
-  ;; window borders will match the enabled theme.
-  (and (or (daemonp)
-           (display-graphic-p))
-       (require 'ns-auto-titlebar nil t)
-       (ns-auto-titlebar-mode +1))
-
-  ;; HACK On MacOS, disabling the menu bar makes MacOS treat Emacs as a
-  ;;      non-application window -- which means it doesn't automatically capture
-  ;;      focus when it is started, among other things. We enable menu-bar-lines
-  ;;      there, but we still want it disabled in terminal frames because there
-  ;;      it activates an ugly menu bar.
-  (add-hook! '(window-setup-hook after-make-frame-functions)
-    (defun doom-init-menu-bar-in-gui-frames-h (&optional frame)
-      "Re-enable menu-bar-lines in GUI frames."
-      (when-let (frame (or frame (selected-frame)))
-        (when (display-graphic-p frame)
-          (set-frame-parameter frame 'menu-bar-lines 1))))))
-
 ;; The native border "consumes" a pixel of the fringe on righter-most splits,
 ;; `window-divider' does not. Available since Emacs 25.1.
 (setq window-divider-default-places t
@@ -630,7 +598,7 @@ behavior). Do not set this directly, this is let-bound in `doom-init-theme-h'.")
         (run-hooks 'doom-load-theme-hook))
       result)))
 
-(when! (not EMACS27+)
+(eval-when! (not EMACS27+)
   ;; DEPRECATED `doom--load-theme-a' handles this for us after the theme is
   ;;            loaded, but this only works on Emacs 27+. Disabling old themes
   ;;            must be done *before* the theme is loaded in Emacs 26.
diff --git a/.emacs.d/core/core.el b/.emacs.d/core/core.el
index 9fcaff2..6ac54ac 100644
--- a/.emacs.d/core/core.el
+++ b/.emacs.d/core/core.el
@@ -127,7 +127,7 @@ Use this for files that change often, like cache files. Must end with a slash.")
 Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar;
 whichever is found first. Must end in a slash.")
 
-(defconst doom-autoload-file (concat doom-local-dir "autoloads.el")
+(defconst doom-autoloads-file (concat doom-local-dir "autoloads.el")
   "Where `doom-reload-core-autoloads' stores its core autoloads.
 
 This file is responsible for informing Emacs where to find all of Doom's
@@ -270,6 +270,26 @@ config.el instead."
     (apply orig-fn args)))
 
 
+;;
+;;; Native Compilation support (http://akrl.sdf.org/gccemacs.html)
+
+;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged
+;; when upgrading Doom).
+(when (boundp 'comp-eln-load-path)
+  (add-to-list 'comp-eln-load-path (concat doom-cache-dir "eln/")))
+
+(after! comp
+  ;; HACK `comp-eln-load-path' isn't fully respected yet, because native
+  ;;      compilation occurs in another emacs process that isn't seeded with our
+  ;;      value for `comp-eln-load-path', so we inject it ourselves:
+  (setq comp-async-env-modifier-form
+        `(progn
+           ,comp-async-env-modifier-form
+           (setq comp-eln-load-path ',(bound-and-true-p comp-eln-load-path))))
+  ;; HACK Disable native-compilation for some troublesome packages
+  (add-to-list 'comp-deferred-compilation-black-list "/evil-collection-vterm\\.el\\'"))
+
+
 ;;
 ;;; Optimizations
 
@@ -303,8 +323,9 @@ config.el instead."
 (setq ffap-machine-p-known 'reject)
 
 ;; Font compacting can be terribly expensive, especially for rendering icon
-;; fonts on Windows. Whether it has a notable affect on Linux and Mac hasn't
-;; been determined, but we inhibit it there anyway.
+;; fonts on Windows. Whether disabling it has a notable affect on Linux and Mac
+;; hasn't been determined, but we inhibit it there anyway. This increases memory
+;; usage, however!
 (setq inhibit-compacting-font-caches t)
 
 ;; Performance on Windows is considerably worse than elsewhere. We'll need
@@ -319,10 +340,6 @@ config.el instead."
 (unless IS-MAC   (setq command-line-ns-option-alist nil))
 (unless IS-LINUX (setq command-line-x-option-alist nil))
 
-;; Delete files to trash on macOS, as an extra layer of precaution against
-;; accidentally deleting wanted files.
-(setq delete-by-moving-to-trash IS-MAC)
-
 ;; Adopt a sneaky garbage collection strategy of waiting until idle time to
 ;; collect; staving off the collector while the user is working.
 (setq gcmh-idle-delay 5
@@ -330,8 +347,10 @@ config.el instead."
       gcmh-verbose doom-debug-p)
 
 ;; HACK `tty-run-terminal-initialization' is *tremendously* slow for some
-;;      reason. Disabling it completely could have many side-effects, so we
-;;      defer it until later, at which time it (somehow) runs very quickly.
+;;      reason; inexplicably doubling startup time for terminal Emacs. Keeping
+;;      it disabled will have nasty side-effects, so we simply delay it until
+;;      later in the startup process and, for some reason, it runs much faster
+;;      when it does.
 (unless (daemonp)
   (advice-add #'tty-run-terminal-initialization :override #'ignore)
   (add-hook! 'window-setup-hook
@@ -346,12 +365,12 @@ config.el instead."
 ;; File+dir local variables are initialized after the major mode and its hooks
 ;; have run. If you want hook functions to be aware of these customizations, add
 ;; them to MODE-local-vars-hook instead.
-(defvar doom--inhibit-local-var-hooks nil)
+(defvar doom-inhibit-local-var-hooks nil)
 
 (defun doom-run-local-var-hooks-h ()
   "Run MODE-local-vars-hook after local variables are initialized."
-  (unless doom--inhibit-local-var-hooks
-    (set (make-local-variable 'doom--inhibit-local-var-hooks) t)
+  (unless doom-inhibit-local-var-hooks
+    (set (make-local-variable 'doom-inhibit-local-var-hooks) t)
     (run-hook-wrapped (intern-soft (format "%s-local-vars-hook" major-mode))
                       #'doom-try-run-hook)))
 
@@ -473,7 +492,7 @@ If RETURN-P, return the message as a string instead of displaying it."
   "Bootstrap Doom, if it hasn't already (or if FORCE-P is non-nil).
 
 The bootstrap process ensures that everything Doom needs to run is set up;
-essential directories exist, core packages are installed, `doom-autoload-file'
+essential directories exist, core packages are installed, `doom-autoloads-file'
 is loaded (failing if it isn't), that all the needed hooks are in place, and
 that `core-packages' will load when `package' or `straight' is used.
 
@@ -505,7 +524,7 @@ to least)."
                   load-path doom--initial-load-path
                   process-environment doom--initial-process-environment)
 
-    ;; Doom caches a lot of information in `doom-autoload-file'. Module and
+    ;; Doom caches a lot of information in `doom-autoloads-file'. Module and
     ;; package autoloads, autodefs like `set-company-backend!', and variables
     ;; like `doom-modules', `doom-disabled-packages', `load-path',
     ;; `auto-mode-alist', and `Info-directory-list'. etc. Compiling them into
@@ -514,18 +533,18 @@ to least)."
         ;; Avoid `file-name-sans-extension' for premature optimization reasons.
         ;; `string-remove-suffix' is cheaper because it performs no file sanity
         ;; checks; just plain ol' string manipulation.
-        (load (string-remove-suffix ".el" doom-autoload-file)
+        (load (string-remove-suffix ".el" doom-autoloads-file)
               nil 'nomessage)
       (file-missing
        ;; If the autoloads file fails to load then the user forgot to sync, or
        ;; aborted a doom command midway!
-       (if (equal (nth 3 e) doom-autoload-file)
+       (if (equal (nth 3 e) doom-autoloads-file)
            (signal 'doom-error
                    (list "Doom is in an incomplete state"
-                         "run 'bin/doom sync' on the command line to repair it"))
+                         "run 'doom sync' on the command line to repair it"))
          ;; Otherwise, something inside the autoloads file is triggering this
          ;; error; forward it!
-         (apply #'doom-autoload-error e))))
+         (signal 'doom-autoload-error e))))
 
     ;; Load shell environment, optionally generated from 'doom env'. No need
     ;; to do so if we're in terminal Emacs, where Emacs correctly inherits
diff --git a/.emacs.d/core/packages.el b/.emacs.d/core/packages.el
index f646c17..55f99d2 100644
--- a/.emacs.d/core/packages.el
+++ b/.emacs.d/core/packages.el
@@ -4,6 +4,10 @@
 ;; core.el
 (package! auto-minor-mode :pin "17cfa1b54800fdef2975c0c0531dad34846a5065")
 (package! gcmh :pin "b1bde5089169a74f62033d027e06e98cbeedd43f")
+(package! explain-pause-mode
+  :recipe (:host github
+           :repo "lastquestion/explain-pause-mode")
+  :pin "2356c8c3639cbeeb9751744dbe737267849b4b51")
 
 ;; core-packages.el
 (package! straight
@@ -14,15 +18,15 @@
             :local-repo "straight.el"
             :files ("straight*.el")
             :no-build t)
-  :pin "fc077dda27dc603c6a287d9cffe0bf0ba5018d66")
+  :pin "0c7c7571349b628d87acde474a754f05e86ca876")
 
 ;; core-modules.el
 (package! use-package
   :type 'core
-  :pin "7d925367ef0857d513d62eab4cb57b7436b9ffe9")
+  :pin "4fb1f9a68f1e7e7d614652afc017a6652fd029f1")
 
 ;; core-ui.el
-(package! all-the-icons :pin "ed8e44de4fa601309d2bba902c3b37cb73e4daa0")
+(package! all-the-icons :pin "8c0228053dd6693d926970d89270094be52b0f75")
 (package! hide-mode-line :pin "88888825b5b27b300683e662fa3be88d954b1cea")
 (package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307")
 (package! rainbow-delimiters :pin "5125f4e47604ad36c3eb4706310fcafac729ca8c")
@@ -32,8 +36,6 @@
 (package! better-jumper :pin "6d240032ca213ccb3347e25f26c29b6822bf03a7")
 (package! dtrt-indent :pin "50c440c80e0d15303d8ab543bce4c56e9c2bf407")
 (package! helpful :pin "c0662aa07266fe204f4e6d72ccaa6af089400556")
-(when IS-MAC
-  (package! ns-auto-titlebar :pin "1efc30d38509647b417f05587fd7003457719256"))
 (package! pcre2el :pin "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d")
 (package! smartparens :pin "555626a43f9bb1985aa9a0eb675f2b88b29702c8")
 (package! so-long
@@ -50,8 +52,8 @@
   :pin "2bb49d3ee7d2cba133bc7e9cdac416cd1c5e4fe0")
 
 ;; core-projects.el
-(package! projectile :pin "bbcf781d3fddb8e00d0dc10eb68bc2528fb409b3")
+(package! projectile :pin "46d2010c6a6cccfc4be72317f10ea99fd041ab54")
 
 ;; core-keybinds.el
 (package! general :pin "a0b17d207badf462311b2eef7c065b884462cb7c")
-(package! which-key :pin "3642c11d5ef9be3c6fb9edb8fd5ec3c370abd889")
+(package! which-key :pin "e48e190a75a0c176e1deac218b891e77792d6921")
diff --git a/.emacs.d/core/test/test-core.el b/.emacs.d/core/test/test-core.el
index 09d5b3f..e94768f 100644
--- a/.emacs.d/core/test/test-core.el
+++ b/.emacs.d/core/test/test-core.el
@@ -28,7 +28,7 @@
           (spy-on 'doom-initialize-packages :and-return-value t))
 
         (it "initializes packages if core autoload file doesn't exist"
-          (let ((doom-autoload-file "doesnotexist"))
+          (let ((doom-autoloads-file "doesnotexist"))
             (expect (doom-initialize nil 'noerror))
           (expect 'doom-initialize-packages :to-have-been-called))
 
@@ -51,12 +51,12 @@
         (it "loads autoloads files"
           (ignore-errors (doom-initialize nil 'noerror))
           (expect 'doom-load-autoloads-file
-                  :to-have-been-called-with doom-autoload-file)
+                  :to-have-been-called-with doom-autoloads-file)
           (expect 'doom-load-autoloads-file
                   :to-have-been-called-with doom-package-autoload-file))
 
         (it "throws doom-autoload-error when autoload files don't exist"
-          (let ((doom-autoload-file "doesnotexist")
+          (let ((doom-autoloads-file "doesnotexist")
                 (doom-package-autoload-file "doesnotexist"))
             (expect (doom-initialize) :to-throw 'doom-autoload-error)))))
 
@@ -72,26 +72,26 @@
         (expect 'require :to-have-been-called-with 'core-editor))))
 
   (describe "doom-load-autoloads-file"
-    :var (doom-autoload-file doom-alt-autoload-file result)
+    :var (doom-autoloads-file doom-alt-autoload-file result)
     (before-each
-      (setq doom-autoload-file (make-temp-file "doom-autoload" nil ".el"))
-      (with-temp-file doom-autoload-file)
-      (byte-compile-file doom-autoload-file))
+      (setq doom-autoloads-file (make-temp-file "doom-autoload" nil ".el"))
+      (with-temp-file doom-autoloads-file)
+      (byte-compile-file doom-autoloads-file))
     (after-each
-      (delete-file doom-autoload-file)
-      (delete-file (byte-compile-dest-file doom-autoload-file)))
+      (delete-file doom-autoloads-file)
+      (delete-file (byte-compile-dest-file doom-autoloads-file)))
 
     (it "loads the byte-compiled autoloads file if available"
-      (doom-load-autoloads-file doom-autoload-file)
+      (doom-load-autoloads-file doom-autoloads-file)
       (expect (caar load-history) :to-equal-file
-              (byte-compile-dest-file doom-autoload-file))
+              (byte-compile-dest-file doom-autoloads-file))
 
-      (delete-file (byte-compile-dest-file doom-autoload-file))
-      (doom-load-autoloads-file doom-autoload-file)
-      (expect (caar load-history) :to-equal-file doom-autoload-file))
+      (delete-file (byte-compile-dest-file doom-autoloads-file))
+      (doom-load-autoloads-file doom-autoloads-file)
+      (expect (caar load-history) :to-equal-file doom-autoloads-file))
 
     (it "returns non-nil if successful"
-      (expect (doom-load-autoloads-file doom-autoload-file)))
+      (expect (doom-load-autoloads-file doom-autoloads-file)))
 
     (it "returns nil on failure or error, non-fatally"
       (expect (doom-load-autoloads-file "/does/not/exist") :to-be nil)))
diff --git a/.emacs.d/docs/api.org b/.emacs.d/docs/api.org
index 2d1ec8b..68375bd 100644
--- a/.emacs.d/docs/api.org
+++ b/.emacs.d/docs/api.org
@@ -152,7 +152,7 @@ It is integrated into Helpful, in Doom.
 
 *** custom-theme-set-faces!
 #+BEGIN_SRC elisp :eval no
-(custom-theme-set-faces! 'doom-one-theme
+(custom-theme-set-faces! 'doom-one
  '(outline-1 :weight normal)
  '(outline-2 :weight normal)
  '(outline-3 :weight normal)
diff --git a/.emacs.d/docs/faq.org b/.emacs.d/docs/faq.org
index 903d091..c6db28c 100644
--- a/.emacs.d/docs/faq.org
+++ b/.emacs.d/docs/faq.org
@@ -479,10 +479,10 @@ lines (200 characters+) and we've got ourselves a really poor experience. And
 that's before we factor in plugins and poorly optimized major modes.
 
 There is an unfortunate but necessary adjustment of expectations new users must
-undergo, when they adopt Emacs. Doom has inherited this curse. It's raison
-d'etre is to improve the situation, but I can only go so far, especially if you
-choose to enable all the most expensive features. You will unavoidable find
-cases where Emacs *is just slow*.
+undergo, when they adopt Emacs. Doom has inherited this curse. Its raison d'etre
+is to improve the situation, but I can only go so far, especially if you choose
+to enable all the most expensive features. You will unavoidably find cases where
+Emacs *is just slow*.
 
 What can you do about it?
 
@@ -492,7 +492,7 @@ What can you do about it?
    but can be a bit of a hassle to set up. There are packages available for
    [[https://aur.archlinux.org/packages/emacs-native-comp-git/][Arch Linux]], [[https://github.com/flatwhatson/guix-channel][Guix]] and [[https://github.com/nix-community/emacs-overlay][Nix users]]. [[https://www.emacswiki.org/emacs/GccEmacs][More information available on EmacsWiki]].
 3. Disable some of Doom's slowest modules. The biggest offenders tend to be:
-   =:ui tabs=, =:ui indent-guides=, =:ui pretty-code=, =:ui word-wrap= and =:ui
+   =:ui tabs=, =:ui indent-guides=, =:ui ligatures=, =:editor word-wrap= and =:ui
    vc-gutter=.
 4. Turn off line numbers ~(setq display-line-numbers-type nil)~. It's known to
    slow down scrolling, in particular.
@@ -1213,7 +1213,7 @@ Here are a few common causes for random crashes:
 
   Or disable the =:ui doom-dashboard= & =:tools magit= modules (see [[https://github.com/hlissner/doom-emacs/issues/1170][#1170]]).
 + Ligatures and some fonts can cause Emacs to crash. You may want to try a
-  different font, or disable the =:ui pretty-code= module.
+  different font, or disable the =:ui ligatures module.
 
 ** Can't load my theme; ~unable to find theme file for X~ errors
 This means Emacs can't find the X-theme.el file for the theme you want to load.
diff --git a/.emacs.d/docs/getting_started.org b/.emacs.d/docs/getting_started.org
index df50981..7b513ec 100644
--- a/.emacs.d/docs/getting_started.org
+++ b/.emacs.d/docs/getting_started.org
@@ -52,8 +52,6 @@ us know!
     - [[#disabling-packages][Disabling packages]]
     - [[#changing-a-recipe-for-a-included-package][Changing a recipe for a included package]]
     - [[#usingloading-local-packages][Using/loading local packages]]
-      - [[#adjust-your-load-path][Adjust your ~load-path~]]
-      - [[#local-repo][:local-repo]]
   - [[#configuring-doom][Configuring Doom]]
     - [[#configuring-packages][Configuring packages]]
     - [[#reloading-your-config][Reloading your config]]
@@ -155,8 +153,7 @@ pacman -S git emacs ripgrep
 pacman -S fd
 #+END_SRC
 
-The above installs Emacs 26.3 (at the time of writing). To acquire Emacs 27
-[[https://aur.archlinux.org/packages/emacs27-git/][emacs27-git]] is available on the AUR.
+The above installs Emacs 27 (at the time of writing).
 
 **** NixOS
 On NixOS Emacs 26.3 can be installed via ~nix-env -Ai nixos.emacs~, or
@@ -248,8 +245,6 @@ to least recommended for Doom (based on compatibility).
   ln -s /usr/local/opt/emacs-plus/Emacs.app /Applications/Emacs.app
   #+END_SRC
 
-  Replace =emacs-plus= with =emacs-plus@27= to install Emacs 27.x instead.
-
 - [[https://bitbucket.org/mituharu/emacs-mac/overview][emacs-mac]] is another acceptable option. It offers slightly better integration
   with macOS, native emojis and better childframe support. However, at the time
   of writing, it [[https://github.com/railwaycat/homebrew-emacsmacport/issues/52][lacks multi-tty support]] (which impacts daemon usage):
@@ -917,40 +912,42 @@ changes.
 #+end_quote
 
 *** Using/loading local packages
-Say you have a local elisp package that you are developing, and want to
-"install" it for live testing. You have two options:
-
-**** Adjust your ~load-path~
-Emacs searches for packages in your ~load-path~. Add the path to your package
-and Emacs will find it when it tries to load it. e.g.
-
+Say you are developing an Emacs package locally and want to "install" it for
+live testing. To do this specify a ~:local-repo~ in that package's recipe:
 #+BEGIN_SRC elisp
-(add-load-path! "lisp/package")
+(package! my-package
+  :recipe (:local-repo "/path/to/my/package"))
+
+;; Relative paths are expanded to ~/.emacs.d/.local/straight/repos/{local-repo}
+;; or ~/.doom.d/{local-repo} -- the first that is found.
+(package! my-package
+  :recipe (:local-repo "my/package"))  ; looks for ~/.doom.d/my/package/my-package.el
+
+(package! my-package
+  :recipe (:local-repo "/path/to/my/package"
+
+           ;; By default, the package manager grabs all *.el files at the root
+           ;; of the project and nothing else. To include other files, or
+           ;; accommodate unconventional project structures, specify what :files
+           ;; you want:
+           :files ("*.el" "src/lisp/*.el")
+
+           ;; With ':no-byte-compile t' you can avoid having to run 'doom sync'
+           ;; every time you change the package.
+           :no-byte-compile t))
+#+END_SRC
+
+Alternatively, add the package's location to Emacs' ~load-path~. Do this if you
+don't need/care for autoload cookies or byte-compilation:
+#+BEGIN_SRC elisp
+;; Doom has modified `use-package's `:load-path' to expand relative paths from
+;; your DOOMDIR. e.g. ~/.doom.d/lisp/package
+(use-package my-package
+  :load-path "lisp/package")
 
 ;; or
 
-(use-package my-package
-  :load-path "/path/to/my/package")
-#+END_SRC
-
-**** :local-repo
-Alternatively, you can specify a ~:local-repo~ in a ~package!~'s ~:recipe~
-declaration:
-
-#+BEGIN_SRC elisp
-(package! my-package :recipe (:local-repo "/path/to/my/package"))
-
-;; Don't forget to use :files to include files in an unconventional project structure:
-(package! my-package
-  :recipe (:local-repo "/path/to/my/package"
-           :files ("*.el" "src/lisp/*.el")))
-
-;; It is recommended you use ':no-byte-compile t' as well, so you don't have to
-;; run `doom build -r` every time you make a change to your package.
-(package! my-package
-  :recipe (:local-repo "/path/to/my/package"
-           :files ("*.el" "src/lisp/*.el")
-           :no-byte-compile t))
+(add-load-path! "lisp/package")
 #+END_SRC
 
 #+begin_quote
diff --git a/.emacs.d/early-init.el b/.emacs.d/early-init.el
index cf31385..91c64e5 100644
--- a/.emacs.d/early-init.el
+++ b/.emacs.d/early-init.el
@@ -26,3 +26,7 @@
 ;; in this file and can conflict with later config (particularly where the
 ;; cursor color is concerned).
 (advice-add #'x-apply-session-resources :override #'ignore)
+
+;; Prevent unwanted runtime builds; packages are compiled ahead-of-time when
+;; they are installed and site files are compiled when gccemacs is installed.
+(setq comp-deferred-compilation nil)
diff --git a/.emacs.d/init.example.el b/.emacs.d/init.example.el
index 0b8f824..2691851 100644
--- a/.emacs.d/init.example.el
+++ b/.emacs.d/init.example.el
@@ -17,6 +17,7 @@
 (doom! :input
        ;;chinese
        ;;japanese
+       ;;layout            ; auie,ctsrnm is the superior home row
 
        :completion
        company           ; the ultimate code completion backend
@@ -33,13 +34,13 @@
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
        ;;indent-guides     ; highlighted indent columns
+       ;;ligatures         ; ligatures and symbols to make your code pretty again
        ;;minimap           ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
        ;;neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
-       ;;pretty-code       ; ligatures or substitute text with pretty symbols
        ;;tabs              ; a tab bar for Emacs
        ;;treemacs          ; a project drawer, like neotree but cooler
        ;;unicode           ; extended unicode support for various languages
@@ -92,7 +93,6 @@
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
        ;;lsp
-       ;;macos             ; MacOS-specific commands
        magit             ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
@@ -105,6 +105,7 @@
        ;;upload            ; map local to remote projects via ssh/ftp
 
        :os
+       (:if IS-MAC macos)  ; improve compatibility with macOS
        ;;tty               ; improve the terminal Emacs experience
 
        :lang
diff --git a/.emacs.d/modules/app/calendar/README.org b/.emacs.d/modules/app/calendar/README.org
index 073e20f..19dc032 100644
--- a/.emacs.d/modules/app/calendar/README.org
+++ b/.emacs.d/modules/app/calendar/README.org
@@ -21,7 +21,7 @@ This module provides no flags.
 ** Packages
 + [[https://github.com/kiwanami/emacs-calfw][calfw]]
 + [[https://github.com/kiwanami/emacs-calfw][calfw-org]]
-+ [[https://github.com/myuhe/org-gcal.el][org-gcal]]
++ [[https://github.com/kidd/org-gcal.el][org-gcal]]
 
 * Configuration
 ** Changing calendar sources
diff --git a/.emacs.d/modules/app/calendar/packages.el b/.emacs.d/modules/app/calendar/packages.el
index 486e2c2..6d1c206 100644
--- a/.emacs.d/modules/app/calendar/packages.el
+++ b/.emacs.d/modules/app/calendar/packages.el
@@ -5,4 +5,4 @@
 (package! calfw-org :pin "03abce97620a4a7f7ec5f911e669da9031ab9088")
 (package! calfw-cal :pin "03abce97620a4a7f7ec5f911e669da9031ab9088")
 (package! calfw-ical :pin "03abce97620a4a7f7ec5f911e669da9031ab9088")
-(package! org-gcal :pin "744505832b34e07b44a5d97d8720b2d7492d7fc9")
+(package! org-gcal :pin "2cad2d8c175975dea42903cd4e3fd8bec423c01a")
diff --git a/.emacs.d/modules/app/irc/packages.el b/.emacs.d/modules/app/irc/packages.el
index 5c83b80..1f1fc67 100644
--- a/.emacs.d/modules/app/irc/packages.el
+++ b/.emacs.d/modules/app/irc/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; app/irc/packages.el
 
-(package! circe :pin "e5bf5f89741a9c43aa406491e94dd8d58c302fb4")
+(package! circe :pin "89aac22259e5d09ae1183e0df163338fe491e9e7")
 (package! circe-notifications :pin "291149ac12877bbd062da993479d3533a26862b0")
diff --git a/.emacs.d/modules/app/rss/packages.el b/.emacs.d/modules/app/rss/packages.el
index 544a39f..27ef2cf 100644
--- a/.emacs.d/modules/app/rss/packages.el
+++ b/.emacs.d/modules/app/rss/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; app/rss/packages.el
 
-(package! elfeed :pin "d0405e63863e54a01200740a6717ac875eceabc1")
+(package! elfeed :pin "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d")
 (package! elfeed-org :pin "77b6bbf222487809813de260447d31c4c59902c9")
diff --git a/.emacs.d/modules/app/twitter/packages.el b/.emacs.d/modules/app/twitter/packages.el
index 8ad7dd8..ecffa6d 100644
--- a/.emacs.d/modules/app/twitter/packages.el
+++ b/.emacs.d/modules/app/twitter/packages.el
@@ -2,4 +2,4 @@
 ;;; app/twitter/packages.el
 
 (package! twittering-mode :pin "114891e8fdb4f06b1326a6cf795e49c205cf9e29")
-(package! avy :pin "509471bad0e8094b8639729ec39ca141fae7d4bd")
+(package! avy :pin "bbf1e7339eba06784dfe86643bb0fbddf5bb0342")
diff --git a/.emacs.d/modules/completion/company/packages.el b/.emacs.d/modules/completion/company/packages.el
index 82e7d26..dd5dc45 100644
--- a/.emacs.d/modules/completion/company/packages.el
+++ b/.emacs.d/modules/completion/company/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/company/packages.el
 
-(package! company :pin "5eb7d868c2a13bbfb14060b79d69f0d59f6a5f60")
+(package! company :pin "4462e7d399c3d2e1ea1f5d018f4537f1f3d5acfc")
 (package! company-dict :pin "cd7b8394f6014c57897f65d335d6b2bd65dab1f4")
 (when (featurep! +childframe)
-  (package! company-box :pin "889d723786df2de27d248c9965149d04af44273a"))
+  (package! company-box :pin "d8f71fde7a3301a62f9f6f627aa51610a294f4df"))
diff --git a/.emacs.d/modules/completion/helm/packages.el b/.emacs.d/modules/completion/helm/packages.el
index 53620e0..7a7f638 100644
--- a/.emacs.d/modules/completion/helm/packages.el
+++ b/.emacs.d/modules/completion/helm/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/helm/packages.el
 
-(package! helm :pin "5d224cb889aea8f090c82c5ae572b8db276bcf80")
+(package! helm :pin "d2fbf66ea727f27cdf867b2bd6d6f7c706f99192")
 (package! helm-rg :pin "ee0a3c09da0c843715344919400ab0a0190cc9dc")
 (package! helm-c-yasnippet :pin "89cc8561e7e57e9d1070ee3641df019c7f49c5dd")
 (package! helm-company :pin "6eb5c2d730a60e394e005b47c1db018697094dde")
@@ -13,7 +13,7 @@
 (when (featurep! +fuzzy)
   (package! helm-flx :pin "6640fac5cb16bee73c95b8ed1248a4e5e113690e"))
 (when (featurep! +childframe)
-  (package! posframe :pin "922e4d239f7a083213d856de67a9686a091b1e27"))
+  (package! posframe :pin "7b92a54e588889a74d36d51167e067676db7be8a"))
 (when (featurep! :lang org)
   (package! helm-org :pin "b7a18dfc17e8b933956d61d68c435eee03a96c24"))
 (package! helm-descbinds :pin "b72515982396b6e336ad7beb6767e95a80fca192")
diff --git a/.emacs.d/modules/completion/ivy/README.org b/.emacs.d/modules/completion/ivy/README.org
index ea15995..af5acd1 100644
--- a/.emacs.d/modules/completion/ivy/README.org
+++ b/.emacs.d/modules/completion/ivy/README.org
@@ -19,7 +19,7 @@
   - [[#in-buffer-searching][In-buffer searching]]
   - [[#ivy-integration-for-various-completing-commands][Ivy integration for various completing commands]]
     - [[#general][General]]
-    - [[#jump-to-files-buffers-or-projects][Jump to files, buffers or projects)]]
+    - [[#jump-to-files-buffers-or-projects][Jump to files, buffers or projects]]
     - [[#search][Search]]
 - [[#configuration][Configuration]]
   - [[#enable-fuzzynon-fuzzy-search-for-specific-commands][Enable fuzzy/non-fuzzy search for specific commands]]
@@ -164,7 +164,7 @@ A wgrep buffer can be opened from swiper with =C-c C-e=.
 | =M-x=, =SPC := | Smarter, smex-powered M-x |
 | =SPC '=        | Resume last ivy session   |
 
-*** Jump to files, buffers or projects)
+*** Jump to files, buffers or projects
 | Keybind              | Description                           |
 |----------------------+---------------------------------------|
 | =SPC RET=            | Find bookmark                         |
diff --git a/.emacs.d/modules/completion/ivy/config.el b/.emacs.d/modules/completion/ivy/config.el
index 2536a35..785a0fe 100644
--- a/.emacs.d/modules/completion/ivy/config.el
+++ b/.emacs.d/modules/completion/ivy/config.el
@@ -46,6 +46,11 @@ results buffer.")
     [remap persp-switch-to-buffer]        #'+ivy/switch-workspace-buffer
     [remap evil-show-jumps]               #'+ivy/jump-list)
   :config
+  ;; The default sorter is much to slow and the default for `ivy-sort-max-size'
+  ;; is way too big (30,000). Turn it down so big repos affect project
+  ;; navigation less.
+  (setq ivy-sort-max-size 7500)
+
   ;; Counsel changes a lot of ivy's state at startup; to control for that, we
   ;; need to load it as early as possible. Some packages (like `ivy-prescient')
   ;; require this.
@@ -220,7 +225,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
              (listp counsel-rg-base-command)
              (member "--path-separator" counsel-rg-base-command))
     (setf (cadr (member "--path-separator" counsel-rg-base-command))
-          "//"))
+          "/"))
 
   ;; Integrate with `helpful'
   (setq counsel-describe-function-function #'helpful-callable
@@ -376,9 +381,11 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
           '(literal regexp initialism)))
   :config
   (setq ivy-prescient-sort-commands
-        '(:not swiper swiper-isearch ivy-switch-buffer counsel-grep
-               counsel-git-grep counsel-ag counsel-rg counsel-imenu
-               counsel-yank-pop counsel-recentf counsel-buffer-or-recentf)
+        '(:not swiper swiper-isearch ivy-switch-buffer
+          lsp-ivy-workspace-symbol ivy-resume ivy--restore-session
+          counsel-grep counsel-git-grep counsel-rg counsel-ag
+          counsel-ack counsel-fzf counsel-pt counsel-imenu
+          counsel-yank-pop counsel-recentf counsel-buffer-or-recentf)
         ivy-prescient-retain-classic-highlighting t)
   (defun +ivy-prescient-non-fuzzy (str)
     (let ((prescient-filter-method '(literal regexp)))
diff --git a/.emacs.d/modules/completion/ivy/packages.el b/.emacs.d/modules/completion/ivy/packages.el
index 42d00d7..ec4a388 100644
--- a/.emacs.d/modules/completion/ivy/packages.el
+++ b/.emacs.d/modules/completion/ivy/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/ivy/packages.el
 
-(package! swiper :pin "c6b60d34ac37bf4d91a25f16d22e528f85e06938")
+(package! swiper :pin "9bb68419f1088ee4d8f2b76f84995fa02bceeed3")
 (package! ivy)
 (package! ivy-hydra)
 (package! counsel)
@@ -12,7 +12,7 @@
 (package! wgrep :pin "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f")
 
 (if (featurep! +prescient)
-    (package! ivy-prescient :pin "b11d79b10df12c58edc3487371c2c47dfb9b50e6")
+    (package! ivy-prescient :pin "cc289ba3b0d89f251267ca2b669d01b3afecc530")
   (when (featurep! +fuzzy)
     (package! flx :pin "17f5c9cb2af18aa6f52910ff4a5a63591261ced5")))
 
diff --git a/.emacs.d/modules/config/default/+emacs-bindings.el b/.emacs.d/modules/config/default/+emacs-bindings.el
index d239d67..2c12192 100644
--- a/.emacs.d/modules/config/default/+emacs-bindings.el
+++ b/.emacs.d/modules/config/default/+emacs-bindings.el
@@ -47,8 +47,7 @@
         :desc "LSP Code actions"                      "a"   #'lsp-execute-code-action
         :desc "LSP Organize imports"                  "o"   #'lsp-organize-imports
         :desc "LSP Rename"                            "r"   #'lsp-rename
-        (:after lsp-mode
-         :desc "LSP"                                   "l"   lsp-command-map)
+        :desc "LSP"                                   "l"   #'+default/lsp-command-map
         (:when (featurep! :completion ivy)
          :desc "Jump to symbol in current workspace" "j"   #'lsp-ivy-workspace-symbol
          :desc "Jump to symbol in any workspace"     "J"   #'lsp-ivy-global-workspace-symbol)
@@ -119,6 +118,7 @@
        :desc "Search project"               "p" #'+default/search-project
        :desc "Search other project"         "P" #'+default/search-other-project
        :desc "Search buffer"                "s" #'+default/search-buffer
+       :desc "Search buffer for thing at point" "S" #'swiper-isearch-thing-at-point
        :desc "Dictionary"                   "t" #'+lookup/dictionary-definition
        :desc "Thesaurus"                    "T" #'+lookup/synonyms)
 
@@ -204,7 +204,7 @@
        (:when (featurep! :term eshell)
         :desc "Toggle eshell popup"           "e" #'+eshell/toggle
         :desc "Open eshell here"              "E" #'+eshell/here)
-       (:when (featurep! :tools macos)
+       (:when (featurep! :os macos)
         :desc "Reveal in Finder"           "o" #'+macos/reveal-in-finder
         :desc "Reveal project in Finder"   "O" #'+macos/reveal-project-in-finder
         :desc "Send to Transmit"           "u" #'+macos/send-to-transmit
@@ -279,8 +279,10 @@
        (:when (featurep! :lang org +present)
         :desc "org-tree-slide mode"        "p" #'org-tree-slide-mode)
        :desc "Read-only mode"               "r" #'read-only-mode
-       (:when (featurep! :checkers spell)
-        :desc "Flyspell"                   "s" #'flyspell-mode)
+       (:when (and (featurep! :checkers spell) (not (featurep! :checkers spell +flyspell)))
+        :desc "Spell checker"              "s" #'spell-fu-mode)
+       (:when (featurep! :checkers spell +flyspell)
+        :desc "Spell checker"              "s" #'flyspell-mode)
        (:when (featurep! :lang org +pomodoro)
         :desc "Pomodoro timer"             "t" #'org-pomodoro)
        (:when (featurep! :ui zen)
diff --git a/.emacs.d/modules/config/default/+evil-bindings.el b/.emacs.d/modules/config/default/+evil-bindings.el
index 319e4b3..c96659d 100644
--- a/.emacs.d/modules/config/default/+evil-bindings.el
+++ b/.emacs.d/modules/config/default/+evil-bindings.el
@@ -132,11 +132,7 @@
          "C-j"     #'company-select-next-or-abort
          "C-k"     #'company-select-previous-or-abort
          "C-s"     (cmd! (company-search-abort) (company-filter-candidates))
-         [escape]  #'company-search-abort))
-       ;; TAB auto-completion in term buffers
-       (:after comint :map comint-mode-map
-        "TAB" #'company-complete
-        [tab] #'company-complete))
+         [escape]  #'company-search-abort)))
 
       (:when (featurep! :completion ivy)
        (:after ivy
@@ -341,37 +337,36 @@
       ;;; <leader> c --- code
       (:prefix-map ("c" . "code")
        (:when (and (featurep! :tools lsp) (not (featurep! :tools lsp +eglot)))
-          :desc "LSP Execute code action" "a" #'lsp-execute-code-action
-          :desc "LSP Organize imports" "o" #'lsp-organize-imports
-          (:when (featurep! :completion ivy)
-            :desc "Jump to symbol in current workspace" "j"   #'lsp-ivy-workspace-symbol
-            :desc "Jump to symbol in any workspace"     "J"   #'lsp-ivy-global-workspace-symbol)
-          (:when (featurep! :completion helm)
-            :desc "Jump to symbol in current workspace" "j"   #'helm-lsp-workspace-symbol
-            :desc "Jump to symbol in any workspace"     "J"   #'helm-lsp-global-workspace-symbol)
-          :desc "LSP Rename" "r" #'lsp-rename
-         (:after lsp-mode
-           :desc "LSP"                                   "l"   lsp-command-map))
-        (:when (featurep! :tools lsp +eglot)
-          :desc "LSP Execute code action" "a" #'eglot-code-actions
-          :desc "LSP Rename" "r" #'eglot-rename
-          :desc "LSP Find declaration" "j" #'eglot-find-declaration)
-        :desc "Compile"                               "c"   #'compile
-        :desc "Recompile"                             "C"   #'recompile
-        :desc "Jump to definition"                    "d"   #'+lookup/definition
-        :desc "Jump to references"                    "D"   #'+lookup/references
-        :desc "Evaluate buffer/region"                "e"   #'+eval/buffer-or-region
-        :desc "Evaluate & replace region"             "E"   #'+eval:replace-region
-        :desc "Format buffer/region"                  "f"   #'+format/region-or-buffer
-        :desc "Find implementations"                  "i"   #'+lookup/implementations
-        :desc "Jump to documentation"                 "k"   #'+lookup/documentation
-        :desc "Send to repl"                          "s"   #'+eval/send-region-to-repl
-        :desc "Find type definition"                  "t"   #'+lookup/type-definition
-        :desc "Delete trailing whitespace"            "w"   #'delete-trailing-whitespace
-        :desc "Delete trailing newlines"              "W"   #'doom/delete-trailing-newlines
-        :desc "List errors"                           "x"   #'flymake-show-diagnostics-buffer
-        (:when (featurep! :checkers syntax)
-          :desc "List errors"                         "x"   #'flycheck-list-errors))
+        :desc "LSP Execute code action" "a" #'lsp-execute-code-action
+        :desc "LSP Organize imports" "o" #'lsp-organize-imports
+        (:when (featurep! :completion ivy)
+         :desc "Jump to symbol in current workspace" "j"   #'lsp-ivy-workspace-symbol
+         :desc "Jump to symbol in any workspace"     "J"   #'lsp-ivy-global-workspace-symbol)
+        (:when (featurep! :completion helm)
+         :desc "Jump to symbol in current workspace" "j"   #'helm-lsp-workspace-symbol
+         :desc "Jump to symbol in any workspace"     "J"   #'helm-lsp-global-workspace-symbol)
+        :desc "LSP"                                  "l"   #'+default/lsp-command-map
+        :desc "LSP Rename"                           "r"   #'lsp-rename)
+       (:when (featurep! :tools lsp +eglot)
+        :desc "LSP Execute code action" "a" #'eglot-code-actions
+        :desc "LSP Rename" "r" #'eglot-rename
+        :desc "LSP Find declaration" "j" #'eglot-find-declaration)
+       :desc "Compile"                               "c"   #'compile
+       :desc "Recompile"                             "C"   #'recompile
+       :desc "Jump to definition"                    "d"   #'+lookup/definition
+       :desc "Jump to references"                    "D"   #'+lookup/references
+       :desc "Evaluate buffer/region"                "e"   #'+eval/buffer-or-region
+       :desc "Evaluate & replace region"             "E"   #'+eval:replace-region
+       :desc "Format buffer/region"                  "f"   #'+format/region-or-buffer
+       :desc "Find implementations"                  "i"   #'+lookup/implementations
+       :desc "Jump to documentation"                 "k"   #'+lookup/documentation
+       :desc "Send to repl"                          "s"   #'+eval/send-region-to-repl
+       :desc "Find type definition"                  "t"   #'+lookup/type-definition
+       :desc "Delete trailing whitespace"            "w"   #'delete-trailing-whitespace
+       :desc "Delete trailing newlines"              "W"   #'doom/delete-trailing-newlines
+       :desc "List errors"                           "x"   #'flymake-show-diagnostics-buffer
+       (:when (featurep! :checkers syntax)
+        :desc "List errors"                         "x"   #'flycheck-list-errors))
 
       ;;; <leader> f --- file
       (:prefix-map ("f" . "file")
@@ -545,7 +540,7 @@
        (:when (featurep! :term eshell)
         :desc "Toggle eshell popup"   "e" #'+eshell/toggle
         :desc "Open eshell here"      "E" #'+eshell/here)
-       (:when (featurep! :tools macos)
+       (:when (featurep! :os macos)
         :desc "Reveal in Finder"           "o" #'+macos/reveal-in-finder
         :desc "Reveal project in Finder"   "O" #'+macos/reveal-project-in-finder
         :desc "Send to Transmit"           "u" #'+macos/send-to-transmit
@@ -645,6 +640,7 @@
        :desc "Search other project"         "P" #'+default/search-other-project
        :desc "Jump to mark"                 "r" #'evil-show-marks
        :desc "Search buffer"                "s" #'+default/search-buffer
+       :desc "Search buffer for thing at point" "S" #'swiper-isearch-thing-at-point
        :desc "Dictionary"                   "t" #'+lookup/dictionary-definition
        :desc "Thesaurus"                    "T" #'+lookup/synonyms)
 
@@ -665,8 +661,10 @@
        (:when (featurep! :lang org +present)
         :desc "org-tree-slide mode"        "p" #'org-tree-slide-mode)
        :desc "Read-only mode"               "r" #'read-only-mode
-       (:when (featurep! :checkers spell)
-        :desc "Flyspell"                   "s" #'flyspell-mode)
+       (:when (and (featurep! :checkers spell) (not (featurep! :checkers spell +flyspell)))
+        :desc "Spell checker"              "s" #'spell-fu-mode)
+       (:when (featurep! :checkers spell +flyspell)
+        :desc "Spell checker"              "s" #'flyspell-mode)
        (:when (featurep! :lang org +pomodoro)
         :desc "Pomodoro timer"             "t" #'org-pomodoro)
        :desc "Soft line wrapping"           "w" #'visual-line-mode
diff --git a/.emacs.d/modules/config/default/config.el b/.emacs.d/modules/config/default/config.el
index c83b5f1..37035a3 100644
--- a/.emacs.d/modules/config/default/config.el
+++ b/.emacs.d/modules/config/default/config.el
@@ -15,7 +15,7 @@
                    ivy-switch-buffer-map))
                 ((featurep! :completion helm)
                  '(helm-map
-                   helm-ag-map
+                   helm-rg-map
                    helm-read-file-map))))
   "A list of all the keymaps used for the minibuffer.")
 
diff --git a/.emacs.d/modules/config/literate/autoload.el b/.emacs.d/modules/config/literate/autoload.el
index 4ebba45..c1e5bc8 100644
--- a/.emacs.d/modules/config/literate/autoload.el
+++ b/.emacs.d/modules/config/literate/autoload.el
@@ -12,64 +12,68 @@ byte-compiled from.")
 (defvar org-mode-hook)
 (defvar org-inhibit-startup)
 
+;;;###autoload (add-hook 'org-mode-hook #'+literate-enable-recompile-h)
 
 ;;;###autoload
 (defun +literate-tangle-h ()
   "Tangles `+literate-config-file' if it has changed."
-  (print! (start "Compiling your literate config..."))
-  (print-group!
-   (let* ((default-directory doom-private-dir)
-          (org  (expand-file-name +literate-config-file))
-          (dest (concat (file-name-sans-extension +literate-config-file) ".el")))
-     (and (require 'ox)
-          (require 'ob-tangle)
-          (letf! (;; Operate on a copy because `org-babel-tangle' has
-                  ;; side-effects we need to undo immediately as not to
-                  ;; overwrite the user's config; it's bad ettiquite.
-                  (backup (make-temp-file (concat (file-name-nondirectory org) ".")))
-                  ;; A hack to prevent ob-tangle from operating relative to the
-                  ;; backup file and thus tangling to the wrong destinations.
-                  (defun org-babel-tangle-single-block (&rest args)
-                    (let* ((spec (apply org-babel-tangle-single-block args))
-                           (file (nth 1 spec))
-                           (file (if (file-equal-p file backup) org file))
-                           (file (if org-babel-tangle-use-relative-file-links
-                                     (file-relative-name file)
-                                   file)))
-                      (setf (nth 1 spec) file)
-                      spec))
-                  ;; Ensure output conforms to the formatting of all doom CLIs
-                  (defun message (msg &rest args)
-                    (when msg
-                      (print! (info "%s") (apply #'format msg args)))))
-            (unwind-protect
-                (with-temp-file backup
-                  (insert-file-contents org)
-                  (let ((buffer-file-name backup)
-                        ;; Prevent unwanted entries in recentf, or formatters, or
-                        ;; anything that could be on these hooks, really. Nothing
-                        ;; else should be touching these files (particularly in
-                        ;; interactive sessions).
-                        (write-file-functions nil)
-                        (before-save-hook nil)
-                        (after-save-hook nil)
-                        ;; Prevent infinite recursion due to recompile-on-save
-                        ;; hooks later, and speed up `org-mode' init.
-                        (org-mode-hook nil)
-                        (org-inhibit-startup t))
-                    (org-mode)
-                    (with-silent-modifications
-                      ;; Tangling won't ordinarily expand #+INCLUDE directives,
-                      ;; so I do it myself.
-                      (org-export-expand-include-keyword)
-                      (org-babel-tangle nil dest))))
-              (ignore-errors (delete-file backup)))
-            ;; Write an empty file to serve as our mtime cache
-            (with-temp-file +literate-config-cache-file)
-            t)))))
+  (and (not (getenv "__NOTANGLE"))
+       (require 'ox nil t)
+       (require 'ob-tangle nil t)
+       (letf! ((default-directory doom-private-dir)
+               (target +literate-config-file)
+               (cache +literate-config-cache-file)
+               (dest (expand-file-name (concat (file-name-base target) ".el")))
+               ;; Operate on a copy because `org-babel-tangle' has
+               ;; side-effects we need to undo immediately as not to
+               ;; overwrite the user's config; it's bad ettiquite.
+               (backup (make-temp-file (concat (file-name-nondirectory target) ".")))
 
-;;;###autoload
-(add-hook 'org-mode-hook #'+literate-enable-recompile-h)
+               ;; HACK A hack to prevent ob-tangle from operating relative to
+               ;;      the backup file and thus tangling to the wrong
+               ;;      destinations.
+               (defun org-babel-tangle-single-block (&rest args)
+                 (let* ((spec (apply org-babel-tangle-single-block args))
+                        (file (nth 1 spec))
+                        (file (if (file-equal-p file backup) target file))
+                        (file (if org-babel-tangle-use-relative-file-links
+                                  (file-relative-name file)
+                                file)))
+                   (setf (nth 1 spec) file)
+                   spec))
+               ;; Ensure output conforms to the formatting of all doom CLIs
+               (defun message (msg &rest args)
+                 (when msg
+                   (print! (info "%s") (apply #'format msg args)))))
+         (print! (start "Compiling your literate config..."))
+         (print-group!
+          (unwind-protect
+              (with-temp-file backup
+                (insert-file-contents target)
+                (let ((buffer-file-name backup)
+                      ;; Prevent unwanted entries in recentf, or formatters, or
+                      ;; anything that could be on these hooks, really. Nothing
+                      ;; else should be touching these files (particularly in
+                      ;; interactive sessions).
+                      (write-file-functions nil)
+                      (before-save-hook nil)
+                      (after-save-hook nil)
+                      ;; Prevent infinite recursion due to recompile-on-save
+                      ;; hooks later, and speed up `org-mode' init.
+                      (org-mode-hook nil)
+                      (org-inhibit-startup t))
+                  (org-mode)
+                  (with-silent-modifications
+                    ;; Tangling won't ordinarily expand #+INCLUDE directives,
+                    ;; so I do it myself.
+                    (org-export-expand-include-keyword)
+                    (org-babel-tangle nil dest))))
+            (ignore-errors (delete-file backup)))
+          ;; Write an empty file to serve as our mtime cache
+          (with-temp-file cache)
+          (if doom-interactive-p t
+            (message "Restarting..." )
+            (throw 'exit "__NOTANGLE=1 $@"))))))
 
 ;;;###autoload
 (defalias '+literate/reload #'doom/reload)
@@ -85,5 +89,6 @@ byte-compiled from.")
 
 We assume any org file in `doom-private-dir' is connected to your literate
 config, and should trigger a recompile if changed."
-  (when (file-in-directory-p buffer-file-name doom-private-dir)
-    (+literate-tangle-h)))
+  (and (file-in-directory-p
+        buffer-file-name (file-name-directory +literate-config-file))
+       (+literate-tangle-h)))
diff --git a/.emacs.d/modules/editor/evil/autoload/advice.el b/.emacs.d/modules/editor/evil/autoload/advice.el
index bdf2ce8..51d0d3a 100644
--- a/.emacs.d/modules/editor/evil/autoload/advice.el
+++ b/.emacs.d/modules/editor/evil/autoload/advice.el
@@ -176,6 +176,29 @@ more information on modifiers."
     (balance-windows (window-parent)))
   (if file (evil-edit file)))
 
+;;;###autoload (autoload '+evil-join-a "editor/evil/autoload/advice" nil nil)
+(evil-define-operator +evil-join-a (beg end)
+  "Join the selected lines.
+
+This advice improves on `evil-join' by removing comment delimiters when joining
+commented lines, by using `fill-region-as-paragraph'.
+
+From https://github.com/emacs-evil/evil/issues/606"
+  :motion evil-line
+  (let* ((count (count-lines beg end))
+         (count (if (> count 1) (1- count) count))
+         (fixup-mark (make-marker)))
+    (dotimes (var count)
+      (if (and (bolp) (eolp))
+          (join-line 1)
+        (let* ((end (line-beginning-position 3))
+               (fill-column (1+ (- end beg))))
+          (set-marker fixup-mark (line-end-position))
+          (fill-region-as-paragraph beg end nil t)
+          (goto-char fixup-mark)
+          (fixup-whitespace))))
+    (set-marker fixup-mark nil)))
+
 ;;;###autoload
 (defun +evil--fix-dabbrev-in-minibuffer-h ()
   "Make `try-expand-dabbrev' from `hippie-expand' work in minibuffer. See
diff --git a/.emacs.d/modules/editor/evil/config.el b/.emacs.d/modules/editor/evil/config.el
index 836380b..41b8af2 100644
--- a/.emacs.d/modules/editor/evil/config.el
+++ b/.emacs.d/modules/editor/evil/config.el
@@ -155,6 +155,17 @@ directives. By default, this only recognizes C directives.")
       (run-at-time 0.1 nil #'helpful-key key-sequence)
       (abort-recursive-edit)))
 
+  ;; Make J (evil-join) remove comment delimiters when joining lines.
+  (advice-add #'evil-join :override #'+evil-join-a)
+
+  ;; Prevent gw (`evil-fill') and gq (`evil-fill-and-move') from squeezing
+  ;; spaces. It doesn't in vim, so it shouldn't in evil.
+  (defadvice! +evil--no-squeeze-on-fill-a (orig-fn &rest args)
+    :around '(evil-fill evil-fill-and-move)
+    (letf! (defun fill-region (from to &optional justify nosqueeze to-eop)
+             (funcall fill-region from to justify t to-eop))
+      (apply orig-fn args)))
+
   ;; Make ESC (from normal mode) the universal escaper. See `doom-escape-hook'.
   (advice-add #'evil-force-normal-state :after #'+evil-escape-a)
 
@@ -373,16 +384,18 @@ directives. By default, this only recognizes C directives.")
 ;;; Keybinds
 
 ;; Keybinds that have no Emacs+evil analogues (i.e. don't exist):
-;;   zq - mark word at point as good word
-;;   zw - mark word at point as bad
 ;;   zu{q,w} - undo last marking
-;; Keybinds that evil define:
-;;   z= - correct flyspell word at point
-;;   ]s - jump to previous spelling error
-;;   [s - jump to next spelling error
 
 (map! :v  "@"     #'+evil:apply-macro
 
+      ;; implement dictionary keybinds
+      ;; evil already defines 'z=' to `ispell-word' = correct word at point
+      (:when (featurep! :checkers spell)
+       :n  "zq"   #'+spell/add-word
+       :n  "zw"   #'+spell/remove-word
+       :m  "[s"   #'+spell/previous-error
+       :m  "]s"   #'+spell/next-error)
+
       ;; ported from vim-unimpaired
       :n  "] SPC" #'+evil/insert-newline-below
       :n  "[ SPC" #'+evil/insert-newline-above
diff --git a/.emacs.d/modules/editor/evil/packages.el b/.emacs.d/modules/editor/evil/packages.el
index 01583f6..89efbe1 100644
--- a/.emacs.d/modules/editor/evil/packages.el
+++ b/.emacs.d/modules/editor/evil/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/evil/packages.el
 
-(package! evil :pin "2bc6ca3587502fde67b93e411e329fc8224c916a")
+(package! evil :pin "1e7aa5bfbd86feff0ed5982e487070352d326b90")
 (package! evil-args :pin "758ad5ae54ad34202064fec192c88151c08cb387")
 (package! evil-easymotion :pin "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9")
 (package! evil-embrace :pin "4379adea032b25e359d01a36301b4a5afdd0d1b7")
@@ -33,4 +33,4 @@
     (package! neotree)
     (autoload 'neotree-make-executor "neotree" nil nil 'macro))
 
-  (package! evil-collection :pin "3e62b6b1312f7907081be41a032aaacffa732fef"))
+  (package! evil-collection :pin "c136589d9584e5d01a4b3f2e4cf8ac5f5a23be63"))
diff --git a/.emacs.d/modules/editor/file-templates/packages.el b/.emacs.d/modules/editor/file-templates/packages.el
index 2a16ccb..247da6b 100644
--- a/.emacs.d/modules/editor/file-templates/packages.el
+++ b/.emacs.d/modules/editor/file-templates/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/file-templates/packages.el
 
-(package! yasnippet :pin "5b1217ab085fab4abeb1118dccb260691b446703")
+(package! yasnippet :pin "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
diff --git a/.emacs.d/modules/editor/fold/packages.el b/.emacs.d/modules/editor/fold/packages.el
index de5af2d..683da21 100644
--- a/.emacs.d/modules/editor/fold/packages.el
+++ b/.emacs.d/modules/editor/fold/packages.el
@@ -3,6 +3,6 @@
 
 (package! hideshow :built-in t)
 
-(package! vimish-fold :pin "63685239655a151181b9152e45478dad587f86f2")
+(package! vimish-fold :pin "9d12e39f01da517565666e09a2e32e01aed24a90")
 (when (featurep! :editor evil)
   (package! evil-vimish-fold :pin "b6e0e6b91b8cd047e80debef1a536d9d49eef31a"))
diff --git a/.emacs.d/modules/editor/god/packages.el b/.emacs.d/modules/editor/god/packages.el
index edfcc10..0902cd2 100644
--- a/.emacs.d/modules/editor/god/packages.el
+++ b/.emacs.d/modules/editor/god/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/god/packages.el
 
-(package! god-mode :pin "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7")
+(package! god-mode :pin "ad2e6745294843462f78768b5a1cd3b0d3563951")
diff --git a/.emacs.d/modules/editor/lispy/config.el b/.emacs.d/modules/editor/lispy/config.el
index 70af34b..e935158 100644
--- a/.emacs.d/modules/editor/lispy/config.el
+++ b/.emacs.d/modules/editor/lispy/config.el
@@ -22,7 +22,7 @@
         '((operators normal)
           c-w
           (prettify insert)
-          (atom-movement normal visual)
+          (atom-movement t)
           slurp/barf-lispy
           additional
           additional-insert))
diff --git a/.emacs.d/modules/editor/lispy/packages.el b/.emacs.d/modules/editor/lispy/packages.el
index 7f343c5..affac7e 100644
--- a/.emacs.d/modules/editor/lispy/packages.el
+++ b/.emacs.d/modules/editor/lispy/packages.el
@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/lispyville/packages.el
 
-(package! lispy :pin "cdaa9c70ca39a880163cbbce924bb46cc56b9fa4")
+(package! lispy :pin "0a9dcfdfbc20cadbb9cb29b224dc64b8efdd7b70")
 (when (featurep! :editor evil)
-  (package! lispyville :pin "25a70126ea807653e0a8c512d4128c90ed673d7a"))
+  (package! lispyville :pin "0f13f26cd6aa71f9fd852186ad4a00c4294661cd"))
diff --git a/.emacs.d/modules/editor/objed/packages.el b/.emacs.d/modules/editor/objed/packages.el
index 5b49d2f..2714acf 100644
--- a/.emacs.d/modules/editor/objed/packages.el
+++ b/.emacs.d/modules/editor/objed/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/objed/packages.el
 
-(package! objed :pin "e89d8dae3b2d4331a4455d2a7b203500537d184d")
+(package! objed :pin "dea5a64a4da32e8947fe5b45de569e293aaa8a96")
diff --git a/.emacs.d/modules/editor/snippets/config.el b/.emacs.d/modules/editor/snippets/config.el
index f0d8107..c16f73f 100644
--- a/.emacs.d/modules/editor/snippets/config.el
+++ b/.emacs.d/modules/editor/snippets/config.el
@@ -33,6 +33,8 @@
              #'yas-minor-mode-on)
 
   :config
+  (add-to-list 'doom-debug-variables '(yas-verbosity . 3))
+
   ;; Allow private snippets in DOOMDIR/snippets
   (add-to-list 'yas-snippet-dirs '+snippets-dir)
 
diff --git a/.emacs.d/modules/editor/snippets/packages.el b/.emacs.d/modules/editor/snippets/packages.el
index 7f74772..8f900a8 100644
--- a/.emacs.d/modules/editor/snippets/packages.el
+++ b/.emacs.d/modules/editor/snippets/packages.el
@@ -7,4 +7,4 @@
   :recipe (:host github
            :repo "hlissner/doom-snippets"
            :files ("*.el" "*"))
-  :pin "21b7c8d37224768091a34a6c3ede68d52d03fb18")
+  :pin "60c57d66d2afd1798bff5023a54ab155f311746a")
diff --git a/.emacs.d/modules/editor/word-wrap/packages.el b/.emacs.d/modules/editor/word-wrap/packages.el
index 1e31f22..abcf975 100644
--- a/.emacs.d/modules/editor/word-wrap/packages.el
+++ b/.emacs.d/modules/editor/word-wrap/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/word-wrap/packages.el
 
-(package! adaptive-wrap :pin "1810c0ee8d827dd502ddeaae5bd759d4811fcbce")
+(package! adaptive-wrap :pin "319db649fb083db3ad07b4c71ee6c9429497043b")
diff --git a/.emacs.d/modules/emacs/dired/config.el b/.emacs.d/modules/emacs/dired/config.el
index 039898a..7b06534 100644
--- a/.emacs.d/modules/emacs/dired/config.el
+++ b/.emacs.d/modules/emacs/dired/config.el
@@ -168,11 +168,18 @@ we have to clean it up ourselves."
   (global-set-key [remap find-dired] #'fd-dired)
   (set-popup-rule! "^\\*F\\(?:d\\|ind\\)\\*$" :ignore t))
 
+(use-package! dired-aux
+  :defer t
+  :config
+  (setq dired-create-destination-dirs 'ask
+        dired-vc-rename-file t))
 
 ;;;###package dired-git-info
 (map! :after dired
       :map (dired-mode-map ranger-mode-map)
       :ng ")" #'dired-git-info-mode)
+(setq dgi-commit-message-format "%h %cs %s"
+      dgi-auto-hide-details-p nil)
 (after! wdired
   ;; Temporarily disable `dired-git-info-mode' when entering wdired, due to
   ;; reported incompatibilities.
diff --git a/.emacs.d/modules/emacs/dired/packages.el b/.emacs.d/modules/emacs/dired/packages.el
index 50d1146..e99d35c 100644
--- a/.emacs.d/modules/emacs/dired/packages.el
+++ b/.emacs.d/modules/emacs/dired/packages.el
@@ -1,12 +1,12 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; emacs/dired/packages.el
 
-(package! diredfl :pin "83567d00affce66a4e501563eddd0bd436ac48d0")
+(package! diredfl :pin "cd052dfef602fe79d8dfbcf9f06e6da74412218b")
 (package! dired-git-info :pin "b47f2b0c3a6cb9b7a62a4ee2605a492e512d40a9")
 (package! diff-hl :pin "2281a89a3ddc6616073da6f190dda08d23b18ba6")
 (package! dired-rsync :pin "bfd5c155be1cb6b71c83e5f41116c81b6532b6d5")
 (when (featurep! +ranger)
-  (package! ranger :pin "d7c18370981c9e585bc0fb78f7e55033457ca643"))
+  (package! ranger :pin "caf75f0060e503af078c7e5bb50d9aaa508e6f3e"))
 (when (featurep! +icons)
   (package! all-the-icons-dired :pin "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5"))
 (package! fd-dired :pin "5622041068d5fa2f299dbc8aa91fece0ba260086")
diff --git a/.emacs.d/modules/emacs/ibuffer/packages.el b/.emacs.d/modules/emacs/ibuffer/packages.el
index a43d06d..9139d0e 100644
--- a/.emacs.d/modules/emacs/ibuffer/packages.el
+++ b/.emacs.d/modules/emacs/ibuffer/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; emacs/ibuffer/packages.el
 
-(package! ibuffer-projectile :pin "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf")
-(package! ibuffer-vc :pin "1249c1e30cf11badfe032ac3b1058f24ba510ace")
+(package! ibuffer-projectile :pin "ecbe482804a217b1471593f6c7a8b3d64f3cdc47")
+(package! ibuffer-vc :pin "5fa6aea09bc67f71ea743302d609f459967b1e81")
diff --git a/.emacs.d/modules/emacs/vc/packages.el b/.emacs.d/modules/emacs/vc/packages.el
index 3859341..9295852 100644
--- a/.emacs.d/modules/emacs/vc/packages.el
+++ b/.emacs.d/modules/emacs/vc/packages.el
@@ -6,7 +6,7 @@
 (package! smerge-mode :built-in t)
 
 (package! browse-at-remote :pin "6aecae4b5d202e582425fc8aa2c9c2b6a4779f25")
-(package! git-commit :pin "d459e528f46423f1976e5fa415e64f8f7162b473")
-(package! git-timemachine :pin "391eb61050de321101e631fcf373fc70ec6e7700")
+(package! git-commit :pin "321214c3a2dd10fdf672ba96bd00703a51094bbe")
+(package! git-timemachine :pin "8d675750e921a047707fcdc36d84f8439b19a907")
 (package! gitconfig-mode :pin "55468314a5f6b77d2c96be62c7005ac94545e217")
 (package! gitignore-mode :pin "55468314a5f6b77d2c96be62c7005ac94545e217")
diff --git a/.emacs.d/modules/email/mu4e/README.org b/.emacs.d/modules/email/mu4e/README.org
index 1e363a2..4fa5413 100644
--- a/.emacs.d/modules/email/mu4e/README.org
+++ b/.emacs.d/modules/email/mu4e/README.org
@@ -100,7 +100,7 @@ sudo apt-get install isync  # mbsync
 # or
 sudo apt-get install offlineimap
 # then
-sudo apt-get install maildir-utils # mu
+sudo apt-get install maildir-utils mu4e # mu and mu4e respectivly
 #+END_SRC
 * TODO Features
 
@@ -173,6 +173,26 @@ Then configure Emacs to use your email address:
 ** =No such file or directory, mu4e=
 You will get =No such file or directory, mu4e= errors if you don't run ~doom
 sync~ after installing =mu= through your package manager.
+
+Some times the the ~mu~ package does not include ~mu4e~ (*cough Ubuntu*).
+if that's the case you will need to [[https://github.com/djcb/mu][install]] it and add it to your ~load-path~
+you can do that by...
+#+BEGIN_SRC emacs-lisp :tangle no
+(add-to-list 'load-path "your/path/to/mu4e")
+;; if you installed it using your package manager
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
+;; if you built from source
+(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e")
+#+END_SRC
+
+If you have completely lost your install then you can use this handy command!
+
+#+BEGIN_SRC  shell
+find / -type d -iname '*mu4e*'
+# I reccomend rerouting all of the error to /dev/null
+find / -type d -iname '*mu4e*' 2> /dev/null
+#+END_SRC
+
 ** ~(void-function org-time-add)~ error on Gentoo
 Gentoo users will see this error because [[https://gitweb.gentoo.org/repo/gentoo.git/tree/net-mail/mu/files/70mu-gentoo.el#n2][the =net-mail/mu= package eagerly loads
 =mu4e= (which pulls in =org=) much too early]]; before Emacs reads =~/.emacs.d=.
diff --git a/.emacs.d/modules/email/notmuch/packages.el b/.emacs.d/modules/email/notmuch/packages.el
index 63a955c..79b1a3e 100644
--- a/.emacs.d/modules/email/notmuch/packages.el
+++ b/.emacs.d/modules/email/notmuch/packages.el
@@ -1,8 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; email/notmuch/packages.el
 
-(package! notmuch :pin "ad9c2e91a012920bebfe70bc472d44678abc3259")
-(package! org-mime :pin "9f8444603806e6baa94b2b67a23aab0ea52fef97")
+(package! notmuch :pin "8776faf6d5118e8152ecfacf94accf35ccebf1d2")
+(package! org-mime :pin "9bb6351b25c62835c7881fc64096028eb8ef83ef")
 (when (featurep! :completion ivy)
   (package! counsel-notmuch :pin "a4a1562935e4180c42524c51609d1283e9be0688"))
 (when (featurep! :completion helm)
diff --git a/.emacs.d/modules/email/wanderlust/packages.el b/.emacs.d/modules/email/wanderlust/packages.el
index 1188d30..056985f 100644
--- a/.emacs.d/modules/email/wanderlust/packages.el
+++ b/.emacs.d/modules/email/wanderlust/packages.el
@@ -6,6 +6,6 @@
 ;;      branches which straight cannot detect without our help.
 (package! apel :recipe (:branch "apel-wl") :pin "d146ddbf8818e81d3577d5eee7825d377bec0c73")
 (package! flim :recipe (:branch "flim-1_14-wl") :pin "f303f2f6c124bc8635add96d3326a2209749437b")
-(package! semi :recipe (:branch "semi-1_14-wl") :pin "57a948c5f07e57e78ab3c0e6fd76ffcd591bb4ac")
+(package! semi :recipe (:branch "semi-1_14-wl") :pin "10897f024fd9282c73385d24514cc4b57fe193db")
 
 (package! wanderlust :pin "7af0d582cd48a37469e0606ea35887740d78c8b5")
diff --git a/.emacs.d/modules/input/japanese/packages.el b/.emacs.d/modules/input/japanese/packages.el
index d542573..64c7dfd 100644
--- a/.emacs.d/modules/input/japanese/packages.el
+++ b/.emacs.d/modules/input/japanese/packages.el
@@ -3,5 +3,5 @@
 
 (package! migemo :pin "f42832c8ac462ecbec9a16eb781194f876fba64a")
 (package! avy-migemo :pin "922a6dd82c0bfa316b0fbb56a9d4dd4ffa5707e7")
-(package! ddskk :pin "fe7f82ba568dc653431bf824a764993aa86a7aa3")
+(package! ddskk :pin "275a831be77573470309a78967734d2b6d10f218")
 (package! pangu-spacing :pin "f92898949ba3bf991fd229416f3bbb54e9c6c223")
diff --git a/.emacs.d/modules/lang/agda/packages.el b/.emacs.d/modules/lang/agda/packages.el
index 3a34498..c6caeb7 100644
--- a/.emacs.d/modules/lang/agda/packages.el
+++ b/.emacs.d/modules/lang/agda/packages.el
@@ -6,11 +6,11 @@
     :recipe (:host github :repo "agda/agda"
              :files ("src/data/emacs-mode/agda-input.el")
              :nonrecursive t)
-    :pin "8eb0d01811a663cf2b27b482b3b18690adfa094b")
+    :pin "36738c13e2e85f1029083e974cdcff6927d48980")
 
   (package! agda2-mode
     :recipe (:host github :repo "agda/agda"
              :files ("src/data/emacs-mode/*.el"
                      (:exclude "agda-input.el"))
              :nonrecursive t)
-    :pin "8eb0d01811a663cf2b27b482b3b18690adfa094b"))
+    :pin "36738c13e2e85f1029083e974cdcff6927d48980"))
diff --git a/.emacs.d/modules/lang/cc/README.org b/.emacs.d/modules/lang/cc/README.org
index b563ae6..f7442e3 100644
--- a/.emacs.d/modules/lang/cc/README.org
+++ b/.emacs.d/modules/lang/cc/README.org
@@ -8,8 +8,9 @@
   - [[#module-flags][Module Flags]]
   - [[#plugins][Plugins]]
 - [[#prerequisites][Prerequisites]]
+  - [[#lsp-servers][LSP servers]]
   - [[#irony-server][irony-server]]
-    - [[#macos][MacOS]]
+    - [[#macos][macOS]]
     - [[#arch-linux][Arch Linux]]
     - [[#opensuse][openSUSE]]
   - [[#rtags][rtags]]
@@ -56,18 +57,36 @@ This module adds support for the C-family of languages: C, C++, and Objective-C.
   + [[https://github.com/Andersbakken/rtags][helm-rtags]]
 
 * Prerequisites
-This module requires
+This module's requirements change depending on how you use it.
 
-+ irony-server
-+ rtags
++ If =+lsp= is enabled, you need one of *clangd v9+* or *ccls*.
++ If =+lsp= is *not* enabled, you need *irony-server* and *rtags*.
++ Other features in this module depend on:
+  + (optional) glslangValidator, for GLSL completion in ~glsl-mode~
+  + (optional) cmake, for code completion in ~cmake-mode~
++ You will need a C/C++ compiler, like =gcc= or =clang=.
+
+** LSP servers
+=lsp-mode= and =eglot= support a few LSP servers, but =clangd= and =ccls= are
+recommended.
+
++ clangd (must be v9 or newer) :: Clangd is included with =llvm= which should be
+  available through your OS' package manager.
+  - Debian/Ubuntu: ~sudo apt-get install clangd-9~
+  - macOS: ~brew install llvm~
+  - Windows: install from [[https://releases.llvm.org/download.html][LLVM download page]]
+  - clangd is available on some Linux distros from a =clang-tools= package, if
+    you'd like to avoid the full =llvm=.
++ ccls :: Available in many OS' package managers as =ccls=. Otherwise, there are
+  alternative install methods listed [[https://github.com/MaskRay/ccls/wiki/Install][in the project's wiki]].
 
 ** irony-server
 Irony powers the code completion, eldoc and syntax checking systems.
 
 After installing its dependencies, run ~M-x irony-install-server~ in Emacs.
 
-*** MacOS
-Due to linking issues, MacOS users must compile irony-server manually:
+*** macOS
+Due to linking issues, macOS users must compile irony-server manually:
 
 #+BEGIN_SRC sh
 brew install cmake
@@ -118,12 +137,11 @@ rc -J $PROJECT_ROOT  # loads PROJECT_ROOT's compile_commands.json
 ** Project compile settings
 By default, a set of default compile settings are defined in
 ~+cc-default-compiler-options~ for C, C++ and Objective C. Irony, rtags and
-flycheck will fall back to these.
+flycheck will fall back to these. *This variable does nothing for LSP users.*
 
-To make these tools aware of project specific build settings, you need a JSON
-[[https://sarcasm.github.io/notes/dev/compilation-database.html#ninja][compilation database]] present (i.e. a ~compile_commands.json~ file).
-
-There are [[https://sarcasm.github.io/notes/dev/compilation-database.html][many ways to generate one]]. I use [[http://www.cmake.org/][CMake]] or [[https://github.com/rizsotto/Bear][bear]]:
+For a more universal solution: both LSP servers and irony will recognize a
+[[https://sarcasm.github.io/notes/dev/compilation-database.html#ninja][compilation database]] (a ~compile_commands.json~ file). There are [[https://sarcasm.github.io/notes/dev/compilation-database.html][many ways to
+generate one]]. Here is an example using [[http://www.cmake.org/][CMake]] and [[https://github.com/rizsotto/Bear][bear]]:
 
 #+BEGIN_SRC sh
 # For CMake projects
diff --git a/.emacs.d/modules/lang/cc/autoload.el b/.emacs.d/modules/lang/cc/autoload.el
index fb2362f..e368241 100644
--- a/.emacs.d/modules/lang/cc/autoload.el
+++ b/.emacs.d/modules/lang/cc/autoload.el
@@ -108,7 +108,12 @@ simpler."
       (rtags-call-rc :silent t "-J" (or (doom-project-root) default-directory))))
   ;; then irony
   (when (and (featurep 'irony) irony-mode)
-    (+cc-init-irony-compile-options-h)))
+    (+cc-init-irony-compile-options-h))
+  ;; Otherwise, LSP
+  (when (bound-and-true-p lsp-mode)
+    (lsp-workspace-restart))
+  (when (bound-and-true-p eglot-managed-mode)
+    (eglot-reconnect)))
 
 ;;;###autoload
 (defun +cc/imenu ()
diff --git a/.emacs.d/modules/lang/cc/config.el b/.emacs.d/modules/lang/cc/config.el
index 8284347..825f04c 100644
--- a/.emacs.d/modules/lang/cc/config.el
+++ b/.emacs.d/modules/lang/cc/config.el
@@ -51,7 +51,7 @@ This is ignored by ccls.")
   (set-rotate-patterns! 'c++-mode
     :symbols '(("public" "protected" "private")
                ("class" "struct")))
-  (set-pretty-symbols! '(c-mode c++-mode)
+  (set-ligatures! '(c-mode c++-mode)
     ;; Functional
     ;; :def "void "
     ;; Types
@@ -247,13 +247,13 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
                      `((:ccls . ((:clang . ,(list :extraArgs ["-isystem/Library/Developer/CommandLineTools/usr/include/c++/v1"
                                                               "-isystem/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"
                                                               "-isystem/usr/local/include"]
-                                                  :resourceDir (string-trim (shell-command-to-string "clang -print-resource-dir"))))))))))))
-
+                                                  :resourceDir (cdr (doom-call-process "clang" "-print-resource-dir"))))))))))))
 
 
 (use-package! ccls
-  :when (and (featurep! +lsp) (not (featurep! :tools lsp +eglot)))
-  :after lsp
+  :when (featurep! +lsp)
+  :unless (featurep! :tools lsp +eglot)
+  :after lsp-mode
   :init
   (after! projectile
     (add-to-list 'projectile-globally-ignored-directories ".ccls-cache")
@@ -265,4 +265,4 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
           `(:clang ,(list :extraArgs ["-isystem/Library/Developer/CommandLineTools/usr/include/c++/v1"
                                       "-isystem/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"
                                       "-isystem/usr/local/include"]
-                          :resourceDir (string-trim (shell-command-to-string "clang -print-resource-dir")))))))
+                          :resourceDir (cdr (doom-call-process "clang" "-print-resource-dir")))))))
diff --git a/.emacs.d/modules/lang/cc/packages.el b/.emacs.d/modules/lang/cc/packages.el
index 468675a..fa8933f 100644
--- a/.emacs.d/modules/lang/cc/packages.el
+++ b/.emacs.d/modules/lang/cc/packages.el
@@ -3,7 +3,7 @@
 
 (package! cmake-mode
   :recipe (:host github :repo "emacsmirror/cmake-mode" :files (:defaults "*"))
-  :pin "bfe85bc009c4778b44e246d5c27d0f888f0bfc0c")
+  :pin "e58c41145a879f0314b2821eada7fd0dc898b6b6")
 (package! cuda-mode :pin "9ae9eacfdba3559b5456342d0d03296290df8ff5")
 (package! demangle-mode :pin "697c1dbde93f164eac7ea0dc530d7e8b799272d6")
 (package! disaster :pin "10a785facc60d89d78e0d5177985ab1af1741bb4")
@@ -19,15 +19,15 @@
 (if (featurep! +lsp)
     (unless (featurep! :tools lsp +eglot)
       ;; ccls package is necessary only for lsp-mode.
-      (package! ccls :pin "b8e2f4d9b5bed5b5e8b387ac8e43eff723120b80"))
-  (when (package! irony :pin "5f75fc0c9274f4622470e2324e2f4457087aa643")
+      (package! ccls :pin "675a5704c14a27931e835a431beea3631d92e8e6"))
+  (when (package! irony :pin "1e1aabaa686a08767ab33e5cd43ce8f0ebf8d020")
     (package! irony-eldoc :pin "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978")
     (when (featurep! :checkers syntax)
       (package! flycheck-irony :pin "42dbecd4a865cabeb301193bb4d660e26ae3befe"))
     (when (featurep! :completion company)
       (package! company-irony :pin "b44711dfce445610c1ffaec4951c6ff3882b216a")
       (package! company-irony-c-headers :pin "72c386aeb079fb261d9ec02e39211272f76bbd97")))
-  (when (package! rtags :pin "080cb0e6b025b5d3d40fe9f7aecc791c0ea53f36")
+  (when (package! rtags :pin "b57b36039f6411f23009c4ec0315ca5a7adb6824")
     (when (featurep! :completion ivy)
       (package! ivy-rtags))
     (when (featurep! :completion helm)
diff --git a/.emacs.d/modules/lang/clojure/packages.el b/.emacs.d/modules/lang/clojure/packages.el
index de82202..e54f732 100644
--- a/.emacs.d/modules/lang/clojure/packages.el
+++ b/.emacs.d/modules/lang/clojure/packages.el
@@ -1,8 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/clojure/packages.el
 
-(package! clojure-mode :pin "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a")
-(package! cider :pin "9e117c2ff34b7a63eee87c8bfa93a800bb94add5")
+(package! clojure-mode :pin "84ed16c5ddb6561620886485e20669d0c81f88a1")
+(package! cider :pin "a89b694cc3cec0294d84bf9dbe1163ad2373e8db")
 (package! clj-refactor :pin "97095682580bbc5bfebcbc5349f03f5bd7121c96")
 
 (when (featurep! :checkers syntax)
diff --git a/.emacs.d/modules/lang/common-lisp/packages.el b/.emacs.d/modules/lang/common-lisp/packages.el
index 455b1d9..828edbb 100644
--- a/.emacs.d/modules/lang/common-lisp/packages.el
+++ b/.emacs.d/modules/lang/common-lisp/packages.el
@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/common-lisp/packages.el
 
-(package! sly :pin "becf7b72ec6ef1a8165ec796425e143282838a66")
-(package! sly-macrostep :pin "5113e4e926cd752b1d0bcc1508b3ebad5def5fad")
-(package! sly-repl-ansi-color :pin "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048")
+(when (package! sly :pin "34239bc5954ef41a4db49144925290dc794a6c4d")
+  (package! sly-macrostep :pin "5113e4e926cd752b1d0bcc1508b3ebad5def5fad")
+  (package! sly-repl-ansi-color :pin "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048"))
diff --git a/.emacs.d/modules/lang/coq/packages.el b/.emacs.d/modules/lang/coq/packages.el
index 9e082cf..061be85 100644
--- a/.emacs.d/modules/lang/coq/packages.el
+++ b/.emacs.d/modules/lang/coq/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/coq/packages.el
 
-(package! proof-general :pin "0f0bb2c00fb7b20fd187cb92d4d2c3f84c4c5987")
-(package! company-coq :pin "7ec80586fa23e2d8caa3f26ad223c803df8abb0f")
+(package! proof-general :pin "03e427a8f19485e12b2f95387ed3e0bff7cc944c")
+(package! company-coq :pin "b096cb528de1e0bb31cc1059d0bd698b98a6cc6a")
diff --git a/.emacs.d/modules/lang/elixir/config.el b/.emacs.d/modules/lang/elixir/config.el
index 565e60c..34bb0ab 100644
--- a/.emacs.d/modules/lang/elixir/config.el
+++ b/.emacs.d/modules/lang/elixir/config.el
@@ -14,7 +14,7 @@
   ;; a subset of them (defined below).
   (provide 'smartparens-elixir)
   :config
-  (set-pretty-symbols! 'elixir-mode
+  (set-ligatures! 'elixir-mode
     ;; Functional
     :def "def"
     :lambda "fn"
diff --git a/.emacs.d/modules/lang/elixir/packages.el b/.emacs.d/modules/lang/elixir/packages.el
index 8d8686e..b4d091b 100644
--- a/.emacs.d/modules/lang/elixir/packages.el
+++ b/.emacs.d/modules/lang/elixir/packages.el
@@ -2,7 +2,7 @@
 ;;; lang/elixir/packages.el
 
 ;; +elixir.el
-(package! elixir-mode :pin "02a3922711b7dc6a25895df6d2bf00360fda45cc")
+(package! elixir-mode :pin "01b332495d3f44addeb236428041c4ffa0c2ca3b")
 (package! alchemist :pin "6f99367511ae209f8fe2c990779764bbb4ccb6ed")
 (when (featurep! :checkers syntax)
   (package! flycheck-credo :pin "e88f11ead53805c361ec7706e44c3dfee1daa19f"))
diff --git a/.emacs.d/modules/lang/elm/config.el b/.emacs.d/modules/lang/elm/config.el
index 504adbc..6d2f400 100644
--- a/.emacs.d/modules/lang/elm/config.el
+++ b/.emacs.d/modules/lang/elm/config.el
@@ -6,7 +6,7 @@
     (set-company-backend! 'elm-mode 'company-elm))
  
   (set-repl-handler! 'elm-mode #'run-elm-interactive)
-  (set-pretty-symbols! 'elm-mode
+  (set-ligatures! 'elm-mode
     :null "null"
     :true "true" :false "false"
     :int "Int" :str "String"
diff --git a/.emacs.d/modules/lang/elm/packages.el b/.emacs.d/modules/lang/elm/packages.el
index 220ae8b..8a6c9cf 100644
--- a/.emacs.d/modules/lang/elm/packages.el
+++ b/.emacs.d/modules/lang/elm/packages.el
@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/elm/packages.el
 
-(package! elm-mode :pin "7782be0814")
+(package! elm-mode :pin "363da4b47c9de1ff091a8caf95fccc34188d59a3")
 (when (featurep! :checkers syntax)
-  (package! flycheck-elm :pin "1b60050efd"))
+  (package! flycheck-elm :pin "1b60050efd4729bfba548f3e5adbcb58436667cb"))
diff --git a/.emacs.d/modules/lang/emacs-lisp/config.el b/.emacs.d/modules/lang/emacs-lisp/config.el
index dcbc77d..1a97e1c 100644
--- a/.emacs.d/modules/lang/emacs-lisp/config.el
+++ b/.emacs.d/modules/lang/emacs-lisp/config.el
@@ -33,7 +33,7 @@ employed so that flycheck still does *some* helpful linting.")
     :definition    #'+emacs-lisp-lookup-definition
     :documentation #'+emacs-lisp-lookup-documentation)
   (set-docsets! '(emacs-lisp-mode lisp-interaction-mode) "Emacs Lisp")
-  (set-pretty-symbols! 'emacs-lisp-mode :lambda "lambda")
+  (set-ligatures! 'emacs-lisp-mode :lambda "lambda")
   (set-rotate-patterns! 'emacs-lisp-mode
     :symbols '(("t" "nil")
                ("let" "let*")
diff --git a/.emacs.d/modules/lang/emacs-lisp/packages.el b/.emacs.d/modules/lang/emacs-lisp/packages.el
index d6ee4e6..1a20000 100644
--- a/.emacs.d/modules/lang/emacs-lisp/packages.el
+++ b/.emacs.d/modules/lang/emacs-lisp/packages.el
@@ -10,9 +10,9 @@
 (package! macrostep :pin "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267")
 (package! overseer :pin "02d49f582e80e36b4334c9187801c5ecfb027789")
 (package! elisp-def :pin "da1f76391ac0d277e3c5758203e0150f6bae0beb")
-(package! elisp-demos :pin "4cd55a30d5dbd8d36a0e6f87261c4fef17fc6db0")
+(package! elisp-demos :pin "8c9748134f7c017ae1536dbd0b76434afb52e64d")
 (when (featurep! :checkers syntax)
   (package! flycheck-cask :pin "3457ae553c4feaf8168008f063d78fdde8fb5f94"))
 
 ;; Libraries
-(package! buttercup :pin "e71a40f1ffef4847df28c9d4ad7edc1e360ee52a")
+(package! buttercup :pin "0e5eae0766a33b5c8997e1477e3914d5c8ba3d29")
diff --git a/.emacs.d/modules/lang/erlang/packages.el b/.emacs.d/modules/lang/erlang/packages.el
index 35612b7..862a159 100644
--- a/.emacs.d/modules/lang/erlang/packages.el
+++ b/.emacs.d/modules/lang/erlang/packages.el
@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
-;;; private/erlang/packages.el
+;;; lang/erlang/packages.el
 
-(package! erlang :pin "3065fbf434")
+(package! erlang :pin "d9bc7858e985143a433953ba286422511b466a0c")
 (when (featurep! :checkers syntax)
-  (package! flycheck-rebar3 :pin "3cca1268c5"))
+  (package! flycheck-rebar3 :pin "3cca1268c54643204b5bae52e3f0bf5bc921018c"))
 (unless (featurep! +lsp)
   (when (featurep! :completion company)
-    (package! company-erlang :pin "bc0524a16f")))
+    (package! company-erlang :pin "bc0524a16f17b66c7397690e4ca0e004f09ea6c5")))
diff --git a/.emacs.d/modules/lang/ess/config.el b/.emacs.d/modules/lang/ess/config.el
index f68dd01..5665589 100644
--- a/.emacs.d/modules/lang/ess/config.el
+++ b/.emacs.d/modules/lang/ess/config.el
@@ -32,6 +32,9 @@
   (set-eval-handler! 'ess-help-mode #'ess-eval-region-and-go)
   (set-eval-handler! 'ess-r-help-mode #'ess-eval-region-and-go)
 
+  (set-company-backend! 'ess-r-mode
+    '(company-R-args company-R-objects company-dabbrev-code :separate))
+
   (setq-hook! 'ess-r-mode-hook
     ;; HACK Fix #2233: Doom continues comments on RET, but ess-r-mode doesn't
     ;;      have a sane `comment-line-break-function', so...
diff --git a/.emacs.d/modules/lang/ess/packages.el b/.emacs.d/modules/lang/ess/packages.el
index 6a8bbde..98da135 100644
--- a/.emacs.d/modules/lang/ess/packages.el
+++ b/.emacs.d/modules/lang/ess/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/ess/packages.el
 
-(package! ess :pin "964bf64d8bb3c6dd710cd8f2259921099a50456a")
+(package! ess :pin "1baf8bf1403fe5956a25475b03be0d8f02b3f3ca")
 (package! ess-R-data-view :pin "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9")
 (package! polymode :pin "3284ff10017d280ba82f27dc20fe5223b0df709c")
 (package! poly-R :pin "51ffeb6ec45dd44eafa4d22ad2d6150cc4b248fc")
diff --git a/.emacs.d/modules/lang/factor/packages.el b/.emacs.d/modules/lang/factor/packages.el
index d2936c6..8ad9aae 100644
--- a/.emacs.d/modules/lang/factor/packages.el
+++ b/.emacs.d/modules/lang/factor/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/factor/packages.el
 
-(package! fuel :pin "497d6491e6")
+(package! fuel :pin "3fdb0325ca2a6d80e4111af43b1b166808022020")
diff --git a/.emacs.d/modules/lang/faust/packages.el b/.emacs.d/modules/lang/faust/packages.el
index 10572a3..60c373b 100644
--- a/.emacs.d/modules/lang/faust/packages.el
+++ b/.emacs.d/modules/lang/faust/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/faust/packages.el
 
-(package! faustine :pin "07a3896311")
+(package! faustine :pin "07a38963111518f86123802f9d477be0d4689a3f")
diff --git a/.emacs.d/modules/lang/fsharp/packages.el b/.emacs.d/modules/lang/fsharp/packages.el
index e57e0b0..4346d24 100644
--- a/.emacs.d/modules/lang/fsharp/packages.el
+++ b/.emacs.d/modules/lang/fsharp/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/fsharp/packages.el
 
-(package! fsharp-mode :pin "8c86e38b93")
+(package! fsharp-mode :pin "3e41fe1391b64eefa66a8a02fce27a12a04e1e01")
diff --git a/.emacs.d/modules/lang/haskell/+lsp.el b/.emacs.d/modules/lang/haskell/+lsp.el
index 4b9009e..da53d1f 100644
--- a/.emacs.d/modules/lang/haskell/+lsp.el
+++ b/.emacs.d/modules/lang/haskell/+lsp.el
@@ -1,7 +1,7 @@
 ;;; lang/haskell/+lsp.el -*- lexical-binding: t; -*-
 
 (use-package! lsp-haskell
-  :after lsp-clients
+  :after lsp-mode
   :preface (add-hook 'haskell-mode-local-vars-hook #'lsp!)
   :config
   (when IS-MAC
diff --git a/.emacs.d/modules/lang/haskell/packages.el b/.emacs.d/modules/lang/haskell/packages.el
index fee0c3a..8d2b45d 100644
--- a/.emacs.d/modules/lang/haskell/packages.el
+++ b/.emacs.d/modules/lang/haskell/packages.el
@@ -4,7 +4,7 @@
 (package! haskell-mode :pin "41683c0e634bb3f54eac8747919a82132e1714fe")
 
 (when (featurep! +dante)
-  (package! dante :pin "7411904bfbde25cdb986e001ec682593dcb7c5e3")
+  (package! dante :pin "c516bc9e8f09e0f928de9a93e82acfb382636f5c")
   (package! attrap :pin "4cf3e4a16255997e7c3c39682a72866a0a37dd4b"))
 (when (or (and (featurep! +lsp)
                (not (featurep! :tools lsp +eglot)))
diff --git a/.emacs.d/modules/lang/hy/packages.el b/.emacs.d/modules/lang/hy/packages.el
index 5fd2ae1..2ea7c36 100644
--- a/.emacs.d/modules/lang/hy/packages.el
+++ b/.emacs.d/modules/lang/hy/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/hy/packages.el
 
-(package! hy-mode :pin "e2d5fecdae")
+(package! hy-mode :pin "55e84cadbdb63427a8d531992df3990414a26688")
diff --git a/.emacs.d/modules/lang/idris/packages.el b/.emacs.d/modules/lang/idris/packages.el
index 1e1a343..7627d75 100644
--- a/.emacs.d/modules/lang/idris/packages.el
+++ b/.emacs.d/modules/lang/idris/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/idris/packages.el
 
-(package! idris-mode :pin "acc8835449")
+(package! idris-mode :pin "b77eadd8ac2048d5c882b4464bd9673e45dd6a59")
diff --git a/.emacs.d/modules/lang/java/+lsp.el b/.emacs.d/modules/lang/java/+lsp.el
index 2fbaff0..df19dca 100644
--- a/.emacs.d/modules/lang/java/+lsp.el
+++ b/.emacs.d/modules/lang/java/+lsp.el
@@ -2,20 +2,25 @@
 ;;;###if (featurep! +lsp)
 
 (use-package! lsp-java
-  :after lsp-clients
+  :after lsp-mode
   :preface
   (setq lsp-java-workspace-dir (concat doom-etc-dir "java-workspace"))
   (add-hook 'java-mode-local-vars-hook #'lsp!)
-  (map! :when (featurep! :tools debugger +lsp)
-        :after cc-mode ; where `java-mode' is defined
+  :config
+  (when (featurep! :tools debugger +lsp)
+    (setq lsp-jt-root (concat lsp-java-server-install-dir "java-test/server/")
+          dap-java-test-runner (concat lsp-java-server-install-dir "test-runner/junit-platform-console-standalone.jar"))))
+
+
+(use-package! dap-java
+  :when (featurep! :tools debugger +lsp)
+  :commands dap-java-run-test-class dap-java-debug-test-class
+  :init
+  (map! :after cc-mode ; where `java-mode' is defined
         :map java-mode-map
         :localleader
         (:prefix ("t" . "Test")
          :desc "Run test class or method"   "t" #'+java/run-test
          :desc "Run all tests in class"     "a" #'dap-java-run-test-class
          :desc "Debug test class or method" "d" #'+java/debug-test
-         :desc "Debug all tests in class"   "D" #'dap-java-debug-test-class))
-  :config
-  (when (featurep! :tools debugger +lsp)
-    (setq lsp-jt-root (concat lsp-java-server-install-dir "java-test/server/")
-          dap-java-test-runner (concat lsp-java-server-install-dir "test-runner/junit-platform-console-standalone.jar"))))
+         :desc "Debug all tests in class"   "D" #'dap-java-debug-test-class)))
diff --git a/.emacs.d/modules/lang/java/packages.el b/.emacs.d/modules/lang/java/packages.el
index 92864c7..630fdd7 100644
--- a/.emacs.d/modules/lang/java/packages.el
+++ b/.emacs.d/modules/lang/java/packages.el
@@ -2,10 +2,10 @@
 ;;; lang/java/packages.el
 
 (package! android-mode :pin "d5332e339a1f5e30559a53feffb8442ca79265d6")
-(package! groovy-mode :pin "cafdd98e06a3bbff213f3ccb163de2c42d412b66")
+(package! groovy-mode :pin "26da902d1158c0312628d57578109be54eca2415")
 
 (when (featurep! +meghanada)
-  (package! meghanada :pin "e119c7b3271281d60892b80a0cc6488503baf38f"))
+  (package! meghanada :pin "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2"))
 
 (when (featurep! +eclim)
   (package! eclim :pin "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100")
@@ -13,4 +13,4 @@
     (package! company-emacs-eclim :pin "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100")))
 
 (when (featurep! +lsp)
-  (package! lsp-java :pin "811760ad89a29939c28f47d0925f58d9eeea9fa3"))
+  (package! lsp-java :pin "260016236fa0520b5b6ec7f51ca2086288524cba"))
diff --git a/.emacs.d/modules/lang/javascript/config.el b/.emacs.d/modules/lang/javascript/config.el
index 1f7532e..e1cbc4f 100644
--- a/.emacs.d/modules/lang/javascript/config.el
+++ b/.emacs.d/modules/lang/javascript/config.el
@@ -7,7 +7,7 @@
     "MarionetteJS" "MomentJS" "NodeJS" "PrototypeJS" "React" "RequireJS"
     "SailsJS" "UnderscoreJS" "VueJS" "ZeptoJS")
 
-  (set-pretty-symbols! '(js2-mode rjsx-mode web-mode)
+  (set-ligatures! '(js2-mode rjsx-mode web-mode)
     ;; Functional
     :def "function"
     :lambda "() =>"
@@ -95,7 +95,7 @@
   :config
   (set-electric! 'typescript-mode
     :chars '(?\} ?\)) :words '("||" "&&"))
-  (set-pretty-symbols! 'typescript-mode
+  (set-ligatures! 'typescript-mode
     ;; Functional
     :def "function"
     :lambda "() =>"
@@ -190,8 +190,7 @@ to tide."
   (set-company-backend! 'tide-mode 'company-tide)
   ;; navigation
   (set-lookup-handlers! 'tide-mode :async t
-    :definition #'tide-jump-to-definition
-    :references #'tide-references
+    :xref-backend #'xref-tide-xref-backend
     :documentation #'tide-documentation-at-point)
   (set-popup-rule! "^\\*tide-documentation" :quit t)
   ;; resolve to `doom-project-root' if `tide-project-root' fails
diff --git a/.emacs.d/modules/lang/javascript/packages.el b/.emacs.d/modules/lang/javascript/packages.el
index 50b6bd6..aec912c 100644
--- a/.emacs.d/modules/lang/javascript/packages.el
+++ b/.emacs.d/modules/lang/javascript/packages.el
@@ -3,9 +3,9 @@
 
 ;; Major modes
 (package! coffee-mode :pin "35a41c7d8233eac0b267d9593e67fb8b6235e134")
-(package! js2-mode :pin "5049e543b52099e6ea3e9bc915fc023d5a9b2644")
+(package! js2-mode :pin "40aab27581279d0fdbfeb9afeb85f39d401a927f")
 (package! rjsx-mode :pin "0061587a06cdc2579a8d0e90863498d96bf982d8")
-(package! typescript-mode :pin "0fc729787007b5111f3584034af0f3ef2389098f")
+(package! typescript-mode :pin "42a60e5c881082db2ec2c541a5c154308c4863e6")
 
 ;; Tools
 (package! js2-refactor :pin "d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28")
@@ -17,6 +17,6 @@
 (package! skewer-mode :pin "e5bed351939c92a1f788f78398583c2f83f1bb3c")
 
 ;; Programming environment
-(package! tide :pin "13e7af77b6867ffca6eecc5b3b3b5e315518f49c")
+(package! tide :pin "fa617f54629dc53a3182251dd8076c9e7ac9effa")
 (when (featurep! :tools lookup)
   (package! xref-js2 :pin "6f1ed5dae0c2485416196a51f2fa92f32e4b8262"))
diff --git a/.emacs.d/modules/lang/julia/config.el b/.emacs.d/modules/lang/julia/config.el
index b9190ec..dd0edaf 100644
--- a/.emacs.d/modules/lang/julia/config.el
+++ b/.emacs.d/modules/lang/julia/config.el
@@ -12,20 +12,30 @@
      mode
      `((,(let ((OR "\\|"))
            (concat "\\("  ; stolen `matlab.el' operators first
-                   "[<>!]=?" OR
+                   ;; `:` defines a symbol in Julia and must not be highlighted
+                   ;; as an operator. The only operators that start with `:` are
+                   ;; `:<` and `::`. This must be defined before `<`.
+                   "[:<]:" OR
+                   "[<>]=?" OR
                    "\\.[/*^']" OR
+                   "===" OR
                    "==" OR
                    "=>" OR
                    "\\<xor\\>" OR
                    "[-+*\\/^&|$]=?" OR  ; this has to come before next (updating operators)
-                   "[-!^&|*+\\/~:]" OR
+                   "[-^&|*+\\/~]" OR
+                   ;; Julia variables and names can have `!`. Thus, `!` must be
+                   ;; highlighted as a single operator only in some
+                   ;; circumstances. However, full support can only be
+                   ;; implemented by a full parser. Thus, here, we will handle
+                   ;; only the simple cases.
+                   "[[:space:]]!=?=?" OR "^!=?=?" OR
+                   ;; The other math operators that starts with `!`.
                    ;; more extra julia operators follow
                    "[%$]" OR
                    ;; bitwise operators
                    ">>>" OR ">>" OR "<<" OR
                    ">>>=" OR ">>" OR "<<" OR
-                   ;; comparison
-                   "[<>!]=?" OR
                    "\\)"))
         1 font-lock-type-face)))))
 
@@ -57,7 +67,7 @@
 
 (use-package! lsp-julia
   :when (featurep! +lsp)
-  :after lsp-clients
+  :after lsp-mode
   :preface
   (setq lsp-julia-default-environment "~/.julia/environments/v1.0")
   (when (featurep! +lsp)
diff --git a/.emacs.d/modules/lang/julia/packages.el b/.emacs.d/modules/lang/julia/packages.el
index 1c6ad1e..922c275 100644
--- a/.emacs.d/modules/lang/julia/packages.el
+++ b/.emacs.d/modules/lang/julia/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/julia/packages.el
 
-(package! julia-mode :pin "1c122f1dff")
-(package! julia-repl :pin "5fa04de4e7")
+(package! julia-mode :pin "b5f5983d2b232c8bba4c5eff75cccdb787c19d98")
+(package! julia-repl :pin "d073acb6339e99edf77833f82277afd9a076f16a")
diff --git a/.emacs.d/modules/lang/kotlin/packages.el b/.emacs.d/modules/lang/kotlin/packages.el
index 3c3d5f2..b265b3e 100644
--- a/.emacs.d/modules/lang/kotlin/packages.el
+++ b/.emacs.d/modules/lang/kotlin/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/kotlin/packages.el
 
-(package! kotlin-mode :pin "ab61099682")
+(package! kotlin-mode :pin "8e6dd578f2b3d77ac33b6384d2bfe1b1f6799a1a")
 
 (when (featurep! :checkers syntax)
-  (package! flycheck-kotlin :pin "5104ee9a3f"))
+  (package! flycheck-kotlin :pin "5104ee9a3fdb7f0a0a3d3bcfd8dd3c45a9929310"))
diff --git a/.emacs.d/modules/lang/latex/README.org b/.emacs.d/modules/lang/latex/README.org
index 1baa4a3..07e2598 100644
--- a/.emacs.d/modules/lang/latex/README.org
+++ b/.emacs.d/modules/lang/latex/README.org
@@ -41,6 +41,7 @@ Provide a helping hand when working with LaTeX documents.
 ** Plugins
 + [[http://www.gnu.org/software/auctex/][auctex]]
 + [[http://elpa.gnu.org/packages/adaptive-wrap.html][adaptive-wrap]]
++ [[https://github.com/iyefrat/evil-tex][evil-tex]] (when =:editor evil +everywhere=)
 + [[https://github.com/jsinglet/latex-preview-pane][latex-preview-pane]]
 + [[https://github.com/tom-tan/auctex-latexmk][auctex-latexmk]]*
 + [[https://github.com/alexeyr/company-auctex][company-auctex]]*
diff --git a/.emacs.d/modules/lang/latex/config.el b/.emacs.d/modules/lang/latex/config.el
index 55abf3d..5634cbf 100644
--- a/.emacs.d/modules/lang/latex/config.el
+++ b/.emacs.d/modules/lang/latex/config.el
@@ -205,6 +205,11 @@ Math faces should stay fixed by the mixed-pitch blacklist, this is mostly for
   (auctex-latexmk-setup))
 
 
+(use-package! evil-tex
+  :when (featurep! :editor evil +everywhere)
+  :hook (LaTeX-mode . evil-tex-mode))
+
+
 (use-package! company-auctex
   :when (featurep! :completion company)
   :defer t
diff --git a/.emacs.d/modules/lang/latex/packages.el b/.emacs.d/modules/lang/latex/packages.el
index a1590c0..0d2264f 100644
--- a/.emacs.d/modules/lang/latex/packages.el
+++ b/.emacs.d/modules/lang/latex/packages.el
@@ -1,9 +1,11 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/latex/packages.el
 
-(package! auctex :pin "6abf890a485b2ff734d8f87f38393f9b8f6bbbf6")
-(package! adaptive-wrap :pin "1810c0ee8d827dd502ddeaae5bd759d4811fcbce")
+(package! auctex :pin "59e251c4c82d878e605a13aec3752e544a99f21a")
+(package! adaptive-wrap :pin "319db649fb083db3ad07b4c71ee6c9429497043b")
 (package! latex-preview-pane :pin "5297668a89996b50b2b62f99cba01cc544dbed2e")
+(when (featurep! :editor evil +everywhere)
+  (package! evil-tex :pin "06234c9ea4a7ffac91f7b4f3fd683014bb8137af"))
 
 ;; Optional module features:
 
diff --git a/.emacs.d/modules/lang/lean/packages.el b/.emacs.d/modules/lang/lean/packages.el
index cbf1107..0045cdf 100644
--- a/.emacs.d/modules/lang/lean/packages.el
+++ b/.emacs.d/modules/lang/lean/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/lean/packages.el
 
-(package! lean-mode :pin "65b55b1711")
+(package! lean-mode :pin "6b4377686128d5c2fb55d8fe61b92a9991d40fbd")
 
 (when (featurep! :completion company)
-  (package! company-lean :pin "65b55b1711"))
+  (package! company-lean :pin "6b4377686128d5c2fb55d8fe61b92a9991d40fbd"))
diff --git a/.emacs.d/modules/lang/ledger/packages.el b/.emacs.d/modules/lang/ledger/packages.el
index bafbbc8..238f1e2 100644
--- a/.emacs.d/modules/lang/ledger/packages.el
+++ b/.emacs.d/modules/lang/ledger/packages.el
@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/ledger/packages.el
 
-(package! ledger-mode :pin "7d78645479")
+(package! ledger-mode :pin "805507fd6c14839be4efc7aee2017f9c03e36834")
 
 (when (featurep! :editor evil)
-  (package! evil-ledger :pin "7a9f9f5d39"))
+  (package! evil-ledger :pin "7a9f9f5d39c42fffdba8004f8982642351f2b233"))
 
 (when (featurep! :checkers syntax)
-  (package! flycheck-ledger :pin "628e25ba66"))
+  (package! flycheck-ledger :pin "628e25ba66604946085571652a94a54f4d1ad96f"))
diff --git a/.emacs.d/modules/lang/markdown/config.el b/.emacs.d/modules/lang/markdown/config.el
index d82e396..414a683 100644
--- a/.emacs.d/modules/lang/markdown/config.el
+++ b/.emacs.d/modules/lang/markdown/config.el
@@ -63,6 +63,10 @@ capture, the end position, and the output buffer.")
   (sp-local-pair '(markdown-mode gfm-mode) "`" "`"
                  :unless '(:add sp-point-before-word-p sp-point-before-same-p))
 
+  ;; Highly rust blocks correctly
+  (when (featurep! :lang rust)
+    (add-to-list 'markdown-code-lang-modes '("rust" . rustic-mode)))
+
   ;; Don't trigger autofill in code blocks (see `auto-fill-mode')
   (setq-hook! 'markdown-mode-hook
     fill-nobreak-predicate (cons #'markdown-code-block-at-point-p
diff --git a/.emacs.d/modules/lang/markdown/packages.el b/.emacs.d/modules/lang/markdown/packages.el
index b2e5ee7..baf5dc5 100644
--- a/.emacs.d/modules/lang/markdown/packages.el
+++ b/.emacs.d/modules/lang/markdown/packages.el
@@ -1,12 +1,12 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/markdown/packages.el
 
-(package! markdown-mode :pin "fa9fa20e3236006c2cf278209356f60cc4175120")
+(package! markdown-mode :pin "ef2cb4d94af68908a4963afa492afba876725128")
 (package! markdown-toc :pin "9565eeaa1d26bc0ab83eb65bd30470888f724044")
-(package! edit-indirect :pin "935ded353b9ed3da67bc61abf245c21b58d88864")
+(package! edit-indirect :pin "bdc8f542fe8430ba55f9a24a7910639d4c434422")
 
 (when (featurep! +grip)
-  (package! grip-mode :pin "52768a0187f8ce9b42010dc45bbc432551aeccee"))
+  (package! grip-mode :pin "281ada2c93bac7043c6f665fac065a17d4247bdc"))
 
 (when (featurep! :editor evil +everywhere)
   (package! evil-markdown
diff --git a/.emacs.d/modules/lang/nim/config.el b/.emacs.d/modules/lang/nim/config.el
index fbf1692..1c2fd98 100644
--- a/.emacs.d/modules/lang/nim/config.el
+++ b/.emacs.d/modules/lang/nim/config.el
@@ -1,6 +1,8 @@
 ;;; lang/nim/config.el -*- lexical-binding: t; -*-
 
-(after! nim-mode
+(use-package! nim-mode
+  :defer t
+  :init
   (add-hook! 'nim-mode-hook
     (defun +nim-init-nimsuggest-mode-h ()
       "Conditionally load `nimsuggest-mode', instead of clumsily erroring out if
@@ -19,9 +21,16 @@ windows."
       :filter-return #'nimsuggest--get-temp-file-name
       (replace-regexp-in-string "[꞉* |<>\"?*]" "" path)))
 
+  :config
+  (set-lookup-handlers! '(nim-mode nimsuggest-mode)
+    :definition #'+nimsuggest-find-definition
+    :documentation #'nimsuggest-show-doc)
+
   (map! :localleader
         :map nim-mode-map
-        "b" #'nim-compile))
+        "b" #'nim-compile
+        "h" #'nimsuggest-show-doc
+        "d" #'nimsuggest-find-definition))
 
 
 (use-package! flycheck-nim
diff --git a/.emacs.d/modules/lang/nim/packages.el b/.emacs.d/modules/lang/nim/packages.el
index 31e63f8..c67ba9e 100644
--- a/.emacs.d/modules/lang/nim/packages.el
+++ b/.emacs.d/modules/lang/nim/packages.el
@@ -3,7 +3,7 @@
 
 ;;; requires nim nimsuggest nimble
 
-(package! nim-mode :pin "16a245e497")
+(package! nim-mode :pin "16a245e4974d21a6e9e7163e7fbfb50a0bd89f99")
 
 (when (featurep! :checkers syntax)
-  (package! flycheck-nim :pin "ddfade5100"))
+  (package! flycheck-nim :pin "ddfade51001571c2399f78bcc509e0aa8eb752a4"))
diff --git a/.emacs.d/modules/lang/nix/autoload.el b/.emacs.d/modules/lang/nix/autoload.el
index 69abe89..cf34540 100644
--- a/.emacs.d/modules/lang/nix/autoload.el
+++ b/.emacs.d/modules/lang/nix/autoload.el
@@ -5,6 +5,13 @@
    (nixos-options-doc-buffer
     (nixos-options-get-documentation-for-option candidate))))
 
+;;;###autoload
+(defun +nix/open-repl ()
+  "Open a nix repl."
+  (interactive)
+  (nix-repl-show)
+  (current-buffer))
+
 ;;;###autoload
 (defun +nix/lookup-option (&optional initial-input)
   "Look up documentation on a nix option."
diff --git a/.emacs.d/modules/lang/nix/config.el b/.emacs.d/modules/lang/nix/config.el
index 02d5ef0..43dd95f 100644
--- a/.emacs.d/modules/lang/nix/config.el
+++ b/.emacs.d/modules/lang/nix/config.el
@@ -4,6 +4,7 @@
   :interpreter ("\\(?:cached-\\)?nix-shell" . +nix-shell-init-mode)
   :mode "\\.nix\\'"
   :config
+  (set-repl-handler! 'nix-mode #'+nix/open-repl)
   (set-company-backend! 'nix-mode 'company-nixos-options)
   (set-lookup-handlers! 'nix-mode
     :documentation '(+nix/lookup-option :async t))
diff --git a/.emacs.d/modules/lang/nix/packages.el b/.emacs.d/modules/lang/nix/packages.el
index 6ea2e4e..732987c 100644
--- a/.emacs.d/modules/lang/nix/packages.el
+++ b/.emacs.d/modules/lang/nix/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/nix/packages.el
 
-(package! nix-mode :pin "a00b3f776de65b5af7571976a73213ca2a5c683e")
+(package! nix-mode :pin "0cf1ea1e0ed330b59f47056d927797e625ba8f53")
 (package! nix-update :pin "fc6c39c2da3fcfa62f4796816c084a6389c8b6e7")
 
 (when (featurep! :completion company)
diff --git a/.emacs.d/modules/lang/ocaml/README.org b/.emacs.d/modules/lang/ocaml/README.org
index ac89cab..e9d1b07 100644
--- a/.emacs.d/modules/lang/ocaml/README.org
+++ b/.emacs.d/modules/lang/ocaml/README.org
@@ -87,7 +87,7 @@ tools.
   | =utop-eval-region=           | =SPC c e= | evaluate selected region in =utop=                        |
 
 ** Hacks
-+ =set-pretty-symbols!= is called with the full tuareg prettify symbol list, this
++ =set-ligatures!= is called with the full tuareg prettify symbol list, this
   can cause columns to change as certain keywords are shortened (e.g. =fun=
   becomes \lambda.
 + =tuareg-opam-update-env= is called the first time =tuareg= is loaded
diff --git a/.emacs.d/modules/lang/ocaml/config.el b/.emacs.d/modules/lang/ocaml/config.el
index 490e4eb..60c19ad 100644
--- a/.emacs.d/modules/lang/ocaml/config.el
+++ b/.emacs.d/modules/lang/ocaml/config.el
@@ -10,7 +10,7 @@
 
 (after! tuareg
   ;; tuareg-mode has the prettify symbols itself
-  (set-pretty-symbols! 'tuareg-mode :alist
+  (set-ligatures! 'tuareg-mode :alist
     (append tuareg-prettify-symbols-basic-alist
             tuareg-prettify-symbols-extra-alist))
   ;; harmless if `prettify-symbols-mode' isn't active
@@ -20,10 +20,6 @@
   (setq tuareg-opam-insinuate t)
   (tuareg-opam-update-env (tuareg-opam-current-compiler))
 
-  ;; Spell-check comments
-  (when (featurep! :checkers spell)
-    (add-hook 'tuareg-mode-local-vars-hook #'flyspell-prog-mode))
-
   (setq-hook! 'tuareg-mode-hook
     comment-line-break-function #'+ocaml/comment-indent-new-line)
 
diff --git a/.emacs.d/modules/lang/ocaml/packages.el b/.emacs.d/modules/lang/ocaml/packages.el
index b8fdbd1..922d94b 100644
--- a/.emacs.d/modules/lang/ocaml/packages.el
+++ b/.emacs.d/modules/lang/ocaml/packages.el
@@ -17,8 +17,8 @@
 (when (featurep! :editor format)
   (package! ocamlformat
     :recipe (:host github :repo "ocaml-ppx/ocamlformat" :files ("emacs/*.el"))
-    :pin "27a49cc289dc99cfbe32e90aafc8d9e3cb32a059"))
+    :pin "cd0eaa8bbb7df431276cf65741c53eaa913f7807"))
 
 (package! dune
   :recipe (:host github :repo "ocaml/dune" :files ("editor-integration/emacs/*.el"))
-  :pin "66cfb3a2fb5a507f8c58e0ca516bfa20ca14d544")
+  :pin "daea74e5366c8571af8674860a733b0c9e1eaf81")
diff --git a/.emacs.d/modules/lang/org/README.org b/.emacs.d/modules/lang/org/README.org
index 78e862b..3df5d7b 100644
--- a/.emacs.d/modules/lang/org/README.org
+++ b/.emacs.d/modules/lang/org/README.org
@@ -69,7 +69,7 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
 + =+pandoc= Enables pandoc integration into the Org exporter.
 + =+pomodoro= Enables a pomodoro timer for clocking time on tasks.
 + =+present= Enables integration with reveal.js, beamer and org-tree-slide, so
-  Emacs can be used for presentations.
+  Emacs can be used for presentations. It automatically downloads [[https://github.com/hakimel/reveal.js][reveal.js]].
 + =+pretty= Enables pretty unicode symbols for bullets and priorities, and
   better syntax highlighting for latex. Keep in mind: this can be expensive. If
   org becomes too slow, it'd be wise to disable this flag.
diff --git a/.emacs.d/modules/lang/org/autoload/org.el b/.emacs.d/modules/lang/org/autoload/org.el
index 004d658..b92e833 100644
--- a/.emacs.d/modules/lang/org/autoload/org.el
+++ b/.emacs.d/modules/lang/org/autoload/org.el
@@ -186,8 +186,7 @@ If on a:
                  'done))))
        ;; Update any metadata or inline previews in this subtree
        (org-update-checkbox-count)
-       (let (org-hierarchical-todo-statistics)
-         (org-update-parent-todo-statistics))
+       (org-update-parent-todo-statistics)
        (when (and (fboundp 'toc-org-insert-toc)
                   (member "TOC" (org-get-tags)))
          (toc-org-insert-toc)
@@ -411,13 +410,6 @@ Made for `org-tab-first-hook' in evil-mode."
          (call-interactively #'tab-to-tab-stop)
          t)))
 
-;;;###autoload
-(defun +org-update-cookies-h ()
-  "Update statistics cookies/todo statistics in headlines."
-  (when (and buffer-file-name (file-exists-p buffer-file-name))
-    (let (org-hierarchical-todo-statistics)
-      (org-update-parent-todo-statistics))))
-
 ;;;###autoload
 (defun +org-yas-expand-maybe-h ()
   "Expand a yasnippet snippet, if trigger exists at point or region is active.
@@ -492,5 +484,5 @@ All my (performant) foldings needs are met between this and `org-show-subtree'
 (defun +org-enable-auto-update-cookies-h ()
   "Update statistics cookies when saving or exiting insert mode (`evil-mode')."
   (when (bound-and-true-p evil-local-mode)
-    (add-hook 'evil-insert-state-exit-hook #'+org-update-cookies-h nil t))
-  (add-hook 'before-save-hook #'+org-update-cookies-h nil t))
+    (add-hook 'evil-insert-state-exit-hook #'org-update-parent-todo-statistics nil t))
+  (add-hook 'before-save-hook #'org-update-parent-todo-statistics nil t))
diff --git a/.emacs.d/modules/lang/org/config.el b/.emacs.d/modules/lang/org/config.el
index aeab0eb..2d6bbf6 100644
--- a/.emacs.d/modules/lang/org/config.el
+++ b/.emacs.d/modules/lang/org/config.el
@@ -109,6 +109,8 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
         org-hide-leading-stars t
         org-image-actual-width nil
         org-imenu-depth 8
+        ;; Sub-lists should have different bullets
+        org-list-demote-modify-bullet '(("+" . "-") ("-" . "+") ("*" . "+") ("1." . "a."))
         org-priority-faces
         '((?A . error)
           (?B . warning)
@@ -181,7 +183,7 @@ This forces it to read the background before rendering."
   ;; Automatic indent detection in org files is meaningless
   (add-to-list 'doom-detect-indentation-excluded-modes 'org-mode)
 
-  (set-pretty-symbols! 'org-mode
+  (set-ligatures! 'org-mode
     :name "#+NAME:"
     :name "#+name:"
     :src_block "#+BEGIN_SRC"
@@ -224,11 +226,13 @@ This forces it to read the background before rendering."
            (if (and (eq org-src-window-setup 'switch-invisibly)
                     (functionp initialize))
                ;; org-babel-do-in-edit-buffer is used to execute quick, one-off
-               ;; logic in the context of another major mode. Initializing this
-               ;; major mode can be terribly expensive (particular its mode
-               ;; hooks), so we inhibit them.
+               ;; logic in the context of another major mode, but initializing a
+               ;; major mode with expensive hooks can be terribly expensive.
+               ;; Since Doom adds its most expensive hooks to
+               ;; MAJOR-MODE-local-vars-hook, we can savely inhibit those.
                (lambda ()
-                 (quiet! (delay-mode-hooks (funcall initialize))))
+                 (let ((doom-inhibit-local-var-hooks t))
+                   (funcall initialize)))
              initialize)
            args))
 
@@ -560,6 +564,7 @@ eldoc string."
     ;;      'python' src blocks.
     ;; TODO Should be reported upstream!
     (puthash "org" #'ignore org-eldoc-local-functions-cache)
+    (puthash "plantuml" #'ignore org-eldoc-local-functions-cache)
     (puthash "python" #'python-eldoc-function org-eldoc-local-functions-cache))
 
   (defun +org--restart-mode-h ()
@@ -594,7 +599,10 @@ buffers."
   (defadvice! +org--exclude-agenda-buffers-from-recentf-a (orig-fn file)
     "Prevent temporarily opened agenda buffers from polluting recentf."
     :around #'org-get-agenda-file-buffer
-    (let ((recentf-exclude (list (lambda (_file) t))))
+    (let ((recentf-exclude (list (lambda (_file) t)))
+          (doom-large-file-p t)
+          find-file-hook
+          org-mode-hook)
       (funcall orig-fn file)))
 
   ;; HACK With https://code.orgmode.org/bzg/org-mode/commit/48da60f4, inline
@@ -680,6 +688,7 @@ between the two."
         "q" #'org-set-tags-command
         "t" #'org-todo
         "T" #'org-todo-list
+        "x" #'org-toggle-checkbox
         (:prefix ("a" . "attachments")
          "a" #'org-attach
          "d" #'org-attach-delete-one
@@ -696,7 +705,8 @@ between the two."
          "S" #'org-attach-sync
          (:when (featurep! +dragndrop)
           "c" #'org-download-screenshot
-          "y" #'org-download-yank))
+          "p" #'org-download-clipboard
+          "P" #'org-download-yank))
         (:prefix ("b" . "tables")
          "-" #'org-table-insert-hline
          "a" #'org-table-align
@@ -953,6 +963,7 @@ compelling reason, so..."
   (defvar evil-org-special-o/O '(table-row))
   (defvar evil-org-use-additional-insert t)
   :config
+  (add-hook 'evil-org-mode-hook #'evil-normalize-keymaps)
   (evil-org-set-key-theme)
   (add-hook! 'org-tab-first-hook :append
              ;; Only fold the current tree, rather than recursively
diff --git a/.emacs.d/modules/lang/org/contrib/dragndrop.el b/.emacs.d/modules/lang/org/contrib/dragndrop.el
index 7b932ed..a410cb2 100644
--- a/.emacs.d/modules/lang/org/contrib/dragndrop.el
+++ b/.emacs.d/modules/lang/org/contrib/dragndrop.el
@@ -6,6 +6,7 @@
   org-download-dnd
   org-download-yank
   org-download-screenshot
+  org-download-clipboard
   org-download-dnd-base64
   :init
   ;; HACK We add these manually so that org-download is truly lazy-loaded
diff --git a/.emacs.d/modules/lang/org/contrib/journal.el b/.emacs.d/modules/lang/org/contrib/journal.el
index f8e8de4..518afff 100644
--- a/.emacs.d/modules/lang/org/contrib/journal.el
+++ b/.emacs.d/modules/lang/org/contrib/journal.el
@@ -12,11 +12,11 @@
   (add-to-list 'magic-mode-alist '(+org-journal-p . org-journal-mode))
 
   (defun +org-journal-p ()
+    "Wrapper around `org-journal-is-journal' to lazy load `org-journal'."
     (when-let (buffer-file-name (buffer-file-name (buffer-base-buffer)))
       (if (or (featurep 'org-journal)
               (and (file-in-directory-p
                     buffer-file-name (expand-file-name org-journal-dir org-directory))
-                   (delq! '+org-journal-p magic-mode-alist 'assq)
                    (require 'org-journal nil t)))
           (org-journal-is-journal))))
 
diff --git a/.emacs.d/modules/lang/org/contrib/present.el b/.emacs.d/modules/lang/org/contrib/present.el
index bbd5e56..ef47ba1 100644
--- a/.emacs.d/modules/lang/org/contrib/present.el
+++ b/.emacs.d/modules/lang/org/contrib/present.el
@@ -13,9 +13,9 @@
 
 (use-package! org-re-reveal
   :after ox
-  :init
-  (setq org-re-reveal-root "https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.9.2"
-        org-re-reveal-revealjs-version "3.8"))
+  :config
+  (setq org-re-reveal-root (expand-file-name "../../" (locate-library "dist/reveal.js" t))
+        org-re-reveal-revealjs-version "4"))
 
 
 (use-package! org-tree-slide
diff --git a/.emacs.d/modules/lang/org/packages.el b/.emacs.d/modules/lang/org/packages.el
index b7e00a7..3193ac3 100644
--- a/.emacs.d/modules/lang/org/packages.el
+++ b/.emacs.d/modules/lang/org/packages.el
@@ -1,12 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/org/packages.el
 
-;; Prevent built-in Org from playing into the byte-compilation of
-;; `org-plus-contrib'.
-(when-let (orglib (locate-library "org" nil doom--initial-load-path))
-  (setq load-path (delete (substring (file-name-directory orglib) 0 -1)
-                          load-path)))
-
 ;; HACK A necessary hack because org requires a compilation step after being
 ;;      cloned, and during that compilation a org-version.el is generated with
 ;;      these two functions, which return the output of a 'git describe ...'
@@ -27,13 +21,14 @@
   :recipe (:host github
            :repo "emacs-straight/org-mode"
            :files ("*.el" "lisp/*.el" "contrib/lisp/*.el"))
-  :pin "a1e5bee5cb9c34ceb8226597605a49638bee7cec")
-;; ...And prevent other packages from pulling org; org-plus-contrib satisfies
-;; the dependency already: https://github.com/raxod502/straight.el/issues/352
-(package! org :recipe (:local-repo nil))
+  :pin "220f2b0d93a6927eb673978c0042a1d4673e86aa"
+  ;; Prevents built-in Org from sneaking into the byte-compilation of
+  ;; `org-plus-contrib', and inform other packages that `org-mode' satisfies the
+  ;; `org' dependency: https://github.com/raxod502/straight.el/issues/352
+  :shadow 'org)
 
 (package! avy)
-(package! htmlize :pin "86f22f211e9230857197c42a9823d3f05381deed")
+(package! htmlize :pin "49205105898ba8993b5253beec55d8bddd820a70")
 (package! org-yt
   :recipe (:host github :repo "TobiasZawada/org-yt")
   :pin "40cc1ac76d741055cbefa13860d9f070a7ade001")
@@ -52,33 +47,37 @@
 (when (featurep! +brain)
   (package! org-brain :pin "671db0e08b91c7d2637d765a7afca8b2561275c8"))
 (when (featurep! +dragndrop)
-  (package! org-download :pin "768716b6fcc814b06360b99ad70bce44c0eb4a32"))
+  (package! org-download :pin "67b3c744f94cf0bf50f7052ce428e95af5a6ff3f"))
 (when (featurep! +gnuplot)
   (package! gnuplot :pin "f0001c30010b2899e36d7d89046322467e923088")
   (package! gnuplot-mode :pin "601f6392986f0cba332c87678d31ae0d0a496ce7"))
 (when (featurep! +ipython) ; DEPRECATED
   (package! ob-ipython :pin "7147455230841744fb5b95dcbe03320313a77124"))
 (when (featurep! +jupyter)
-  (package! jupyter :pin "785edbbff65abb0c929dc2fbd8b8305c77fd529e"))
+  (package! jupyter :pin "360cae2c70ab28c7a7848c0c56473d984f0243e5"))
 (when (featurep! +journal)
-  (package! org-journal :pin "a6378dc484ed8df7d2d2f05ac70bd9196aa6f4c0"))
+  (package! org-journal :pin "a2728e25b854af21cea8e8d313714c993eb1c848"))
 (when (featurep! +noter)
   (package! org-noter :pin "9ead81d42dd4dd5074782d239b2efddf9b8b7b3d"))
 (when (featurep! +pomodoro)
   (package! org-pomodoro :pin "aa07c11318f91219336197e62c47bc7a3d090479"))
 (when (featurep! +pretty)
-  (package! org-superstar :pin "17481852c1bd09afea877635a3185261fc19fd64")
+  (package! org-superstar :pin "94f35c20f8b84a63defa145e3e6ae735fa33dd5d")
   (package! org-fancy-priorities :pin "819bb993b71e7253cefef7047306ab4e0f9d0a86"))
 (when (featurep! +present)
   (package! centered-window
     :recipe (:host github :repo "anler/centered-window-mode")
     :pin "f50859941ab5c7cbeaee410f2d38716252b552ac")
   (package! org-tree-slide :pin "7126a4365072a32898f169ead8fb59265dabc605")
-  (package! org-re-reveal :pin "c548e239898e97e700f7c1d3f34a148ccbedb820"))
+  (package! org-re-reveal :pin "7fe39d5d03ccc75d2811445d25cbbb473b53de76")
+  (package! revealjs
+    :recipe (:host github :repo "hakimel/reveal.js"
+             :files ("css" "dist" "js" "plugin"))
+    :pin "15815efe05ca69c35ce66cfdbf93316e1db66ecb"))
 (when (featurep! +roam)
-  (package! org-roam :pin "0aa0a7c05a78e9b29881570604c24381b658fe2a")
+  (package! org-roam :pin "c33867e6bc282ff0a69d4ef4a020db82604039bb")
   (when (featurep! :completion company)
-    (package! company-org-roam :pin "5d7ccd944519ae1d03f5e17ddfe33dcd8a0cc71e")))
+    (package! company-org-roam :pin "1132663bd68022aa7ea005ff53c7c7571890769d")))
 
 ;;; Babel
 (package! ob-async :pin "80a30b96a007d419ece12c976a81804ede340311")
@@ -107,4 +106,4 @@
     :recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t)
     :pin "75b849e9561c4a6022babf6eaf0e037310ded7c1"))
 (when (featurep! :lang rst)
-  (package! ox-rst :pin "9158bfd18096c559e0a225ae62ab683f1c98a547"))
+  (package! ox-rst :pin "99fa790da55b57a3f2e9aa187493ba434a64250e"))
diff --git a/.emacs.d/modules/lang/php/config.el b/.emacs.d/modules/lang/php/config.el
index a13b7dc..aaacd08 100644
--- a/.emacs.d/modules/lang/php/config.el
+++ b/.emacs.d/modules/lang/php/config.el
@@ -21,7 +21,7 @@
   (set-repl-handler! 'php-mode #'php-boris)
   (set-lookup-handlers! 'php-mode :documentation #'php-search-documentation)
   (set-formatter! 'php-mode #'php-cs-fixer-fix)
-  (set-pretty-symbols! 'php-mode
+  (set-ligatures! 'php-mode
     ;; Functional
     :lambda "function()"
     :def "function"
diff --git a/.emacs.d/modules/lang/php/packages.el b/.emacs.d/modules/lang/php/packages.el
index a6e4e20..ac714f9 100644
--- a/.emacs.d/modules/lang/php/packages.el
+++ b/.emacs.d/modules/lang/php/packages.el
@@ -5,7 +5,7 @@
 (package! php-extras
   :recipe (:host github :repo "arnested/php-extras")
   :pin "81ebd7c1a8c8d02b2775d4cdbf73653feb608a7c")
-(package! php-mode :pin "4345dfd81fc6da9b7ac123377902b42f5b7b3e0d")
+(package! php-mode :pin "f4c7c6995dadcdc6da5fefadfd362f8418b2eec1")
 (package! php-refactor-mode :pin "7a794b0618df2882b1bd586fdd698dba0bc5130d")
 (package! phpunit :pin "fe6bc91c3bd8b329c6d26ad883a025f06b5121ee")
 
@@ -23,4 +23,4 @@
   (package! php-cs-fixer :pin "95eace9bc0ace128d5166e303c76df2b778c4ddb"))
 
 ;; For building php-extras
-(package! async :pin "86aef2c38e7d35e8509b7feeee3e989d825eba91")
+(package! async :pin "36a10151e70e956e2f766ed9e65f4a9cfc8479b2")
diff --git a/.emacs.d/modules/lang/plantuml/packages.el b/.emacs.d/modules/lang/plantuml/packages.el
index 129f2b5..d1879b3 100644
--- a/.emacs.d/modules/lang/plantuml/packages.el
+++ b/.emacs.d/modules/lang/plantuml/packages.el
@@ -1,8 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/plantuml/packages.el
 
-(package! plantuml-mode :pin "ea45a13707")
+(package! plantuml-mode :pin "5889166b6cfe94a37532ea27fc8de13be2ebfd02")
 (when (featurep! :checkers syntax)
-  (package! flycheck-plantuml :pin "183be89e1d"))
+  (package! flycheck-plantuml :pin "183be89e1dbba0b38237dd198dff600e0790309d"))
 
 ;; ob-plantuml is provided by org-plus-contrib
diff --git a/.emacs.d/modules/lang/python/autoload/python.el b/.emacs.d/modules/lang/python/autoload/python.el
index 052db2a..01016ba 100644
--- a/.emacs.d/modules/lang/python/autoload/python.el
+++ b/.emacs.d/modules/lang/python/autoload/python.el
@@ -1,5 +1,25 @@
 ;;; lang/python/autoload/python.el -*- lexical-binding: t; -*-
 
+;;;###autoload
+(defun +python-executable-find (exe)
+  "Resolve the path to the EXE executable.
+Tries to be aware of your active conda/pipenv/virtualenv environment, before
+falling back on searching your PATH."
+  (if (file-name-absolute-p exe)
+      (and (file-executable-p exe)
+           exe)
+    (let ((exe-root (format "bin/%s" exe)))
+      (cond ((when python-shell-virtualenv-root
+               (let ((bin (expand-file-name exe-root python-shell-virtualenv-root)))
+                 (if (file-exists-p bin) bin))))
+            ((when (require 'conda nil t)
+               (let ((bin (expand-file-name (concat conda-env-current-name "/" exe-root)
+                                            (conda-env-default-location))))
+                 (if (file-executable-p bin) bin))))
+            ((when-let (bin (projectile-locate-dominating-file default-directory "bin/python"))
+               (setq-local doom-modeline-python-executable (expand-file-name "bin/python" bin))))
+            ((executable-find exe))))))
+
 ;;;###autoload
 (defun +python/open-repl ()
   "Open the Python REPL."
@@ -25,8 +45,11 @@
   "Open an IPython REPL."
   (interactive)
   (require 'python)
-  (let ((python-shell-interpreter (or (+python-executable-find "ipython") "ipython"))
-        (python-shell-interpreter-args (string-join +python-ipython-repl-args " ")))
+  (let ((python-shell-interpreter
+         (or (+python-executable-find (car +python-ipython-command))
+             "ipython"))
+        (python-shell-interpreter-args
+         (string-join (cdr +python-ipython-command) " ")))
     (+python/open-repl)))
 
 ;;;###autoload
@@ -35,28 +58,13 @@
   (interactive)
   (require 'python)
   (add-to-list 'python-shell-completion-native-disabled-interpreters "jupyter")
-  (let ((python-shell-interpreter (or (+python-executable-find "jupyter") "jupyter"))
-        (python-shell-interpreter-args (format "console %s" (string-join +python-jupyter-repl-args " "))))
+  (let ((python-shell-interpreter
+         (or (+python-executable-find (car +python-jupyter-command))
+             "jupyter"))
+        (python-shell-interpreter-args
+         (string-join (cdr +python-jupyter-command) " ")))
     (+python/open-repl)))
 
-;;;###autoload
-(defun +python-executable-find (exe)
-  "TODO"
-  (if (file-name-absolute-p exe)
-      (and (file-executable-p exe)
-           exe)
-    (let ((exe-root (format "bin/%s" exe)))
-      (cond ((when python-shell-virtualenv-root
-               (let ((bin (expand-file-name exe-root python-shell-virtualenv-root)))
-                 (if (file-exists-p bin) bin))))
-            ((when (require 'conda nil t)
-               (let ((bin (expand-file-name (concat conda-env-current-name "/" exe-root)
-                                            (conda-env-default-location))))
-                 (if (file-executable-p bin) bin))))
-            ((when-let (bin (projectile-locate-dominating-file default-directory "bin/python"))
-               (setq-local doom-modeline-python-executable (expand-file-name "bin/python" bin))))
-            ((executable-find exe))))))
-
 ;;;###autoload
 (defun +python/optimize-imports ()
   "organize imports"
diff --git a/.emacs.d/modules/lang/python/config.el b/.emacs.d/modules/lang/python/config.el
index 95f351a..1254041 100644
--- a/.emacs.d/modules/lang/python/config.el
+++ b/.emacs.d/modules/lang/python/config.el
@@ -1,12 +1,10 @@
 ;;; lang/python/config.el -*- lexical-binding: t; -*-
 
-(defvar +python-ipython-repl-args '("-i" "--simple-prompt" "--no-color-info")
-  "CLI arguments to initialize ipython with when `+python/open-ipython-repl' is
-called.")
+(defvar +python-ipython-command '("ipython" "-i" "--simple-prompt" "--no-color-info")
+  "Command to initialize the ipython REPL for `+python/open-ipython-repl'.")
 
-(defvar +python-jupyter-repl-args '("--simple-prompt")
-  "CLI arguments to initialize 'jupiter console %s' with when
-`+python/open-ipython-repl' is called.")
+(defvar +python-jupyter-command '("jupyter" "console" "--simple-prompt")
+  "Command to initialize the jupyter REPL for `+python/open-jupyter-repl'.")
 
 (after! projectile
   (pushnew! projectile-project-root-files "setup.py" "requirements.txt"))
@@ -31,7 +29,7 @@ called.")
   (set-repl-handler! 'python-mode #'+python/open-repl :persist t)
   (set-docsets! 'python-mode "Python 3" "NumPy" "SciPy")
 
-  (set-pretty-symbols! 'python-mode
+  (set-ligatures! 'python-mode
     ;; Functional
     :def "def"
     :lambda "lambda"
@@ -247,7 +245,7 @@ called.")
   (pyenv-mode +1)
   (when (executable-find "pyenv")
     (add-to-list 'exec-path (expand-file-name "shims" (or (getenv "PYENV_ROOT") "~/.pyenv"))))
-  (add-hook 'python-mode-hook #'+python-pyenv-mode-set-auto-h)
+  (add-hook 'python-mode-local-vars-hook #'+python-pyenv-mode-set-auto-h)
   (add-hook 'doom-switch-buffer-hook #'+python-pyenv-mode-set-auto-h))
 
 
@@ -311,16 +309,16 @@ called.")
 ;;
 ;;; LSP
 
-(when! (and (featurep! +lsp)
-            (not (featurep! :tools lsp +eglot)))
+(eval-when! (and (featurep! +lsp)
+                 (not (featurep! :tools lsp +eglot)))
 
   (use-package! lsp-python-ms
     :unless (featurep! +pyright)
-    :after lsp-clients
+    :after lsp-mode
     :preface
     (after! python
       (setq lsp-python-ms-python-executable-cmd python-shell-interpreter)))
 
   (use-package! lsp-pyright
     :when (featurep! +pyright)
-    :after lsp-clients))
+    :after lsp-mode))
diff --git a/.emacs.d/modules/lang/python/packages.el b/.emacs.d/modules/lang/python/packages.el
index 4b79c48..8ec454b 100644
--- a/.emacs.d/modules/lang/python/packages.el
+++ b/.emacs.d/modules/lang/python/packages.el
@@ -4,7 +4,7 @@
 ;; Major modes
 (package! pip-requirements :pin "216cd1690f80cc965d4ae47b8753fc185f778ff6")
 (when (featurep! +cython)
-  (package! cython-mode :pin "0208bf2b71f478779491bf4a63a6b61de3d7269e")
+  (package! cython-mode :pin "fcfd16c7467c31f255287a73f36cf66b32bc096c")
   (when (featurep! :checkers syntax)
     (package! flycheck-cython :pin "ecc4454d35ab5317ab66a04406f36f0c1dbc0b76")))
 
@@ -12,11 +12,8 @@
 (when (featurep! +lsp)
   (unless (featurep! :tools lsp +eglot)
     (if (featurep! +pyright)
-        (package! lsp-pyright
-          ;; REVIEW Remove this when added to melpa
-          :recipe (:host github :repo "emacs-lsp/lsp-pyright")
-          :pin "3cf2e8fc652e35270b1b39aeecc990d4a97de91f")
-      (package! lsp-python-ms :pin "7a502e6c09456cbe8b5f6c64883c79f5ce08e5a9"))))
+        (package! lsp-pyright :pin "9603dda12afaae9c82608c7d3762f98b24b8563f")
+      (package! lsp-python-ms :pin "a884a9a4eb1a3acd3d70c776aec5e968bbdc1731"))))
 
 ;; Programming environment
 (package! anaconda-mode :pin "73266a48fa964d44268c3f3478597e553b9843f1")
@@ -29,7 +26,7 @@
 (when (featurep! +pyenv)
   (package! pyenv-mode :pin "d191037fe62ed8d4fee5888845da3e2c386d8e89"))
 (when (featurep! +conda)
-  (package! conda :pin "9d0213020ff170b17e11b35cad40ac9a8bf30f4c"))
+  (package! conda :pin "9f7eea16e9ad3eb34fe3d1cbd9d6162b8046c2f8"))
 (when (featurep! +poetry)
   (package! poetry :pin "22a76cdcba180b4689a6b45c97669e3c76cd36ed"))
 
@@ -38,7 +35,7 @@
   ;; REVIEW Remove this when emacsmirror/epkgs updates its emacsattic index
   :recipe (:host github :repo "emacsattic/nose")
   :pin "f8528297519eba911696c4e68fa88892de9a7b72")
-(package! python-pytest :pin "6a3b4e560f26b5b8c9dca5699a3573f554592ac9")
+(package! python-pytest :pin "fc056faf2757c42641ed94d36a090e56eb13572f")
 
 ;; Import managements
 (package! pyimport :pin "a6f63cf7ed93f0c0f7c207e6595813966f8852b9")
diff --git a/.emacs.d/modules/lang/qt/packages.el b/.emacs.d/modules/lang/qt/packages.el
index 07f3922..22f01ef 100644
--- a/.emacs.d/modules/lang/qt/packages.el
+++ b/.emacs.d/modules/lang/qt/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/qt/packages.el
 
-(package! qml-mode :pin "6c5f33ba88")
-(package! qt-pro-mode :pin "7a2da323de")
+(package! qml-mode :pin "6c5f33ba88ae010bf201a80ee8095e20a724558c")
+(package! qt-pro-mode :pin "7a2da323de834294b413cbbb3c92f42f54913643")
diff --git a/.emacs.d/modules/lang/racket/config.el b/.emacs.d/modules/lang/racket/config.el
index 124cc43..d360891 100644
--- a/.emacs.d/modules/lang/racket/config.el
+++ b/.emacs.d/modules/lang/racket/config.el
@@ -12,11 +12,11 @@
   :hook (racket-repl-mode . racket-unicode-input-method-enable)
   :config
   (set-repl-handler! 'racket-mode #'+racket/open-repl)
-  (set-lookup-handlers! 'racket-mode
+  (set-lookup-handlers! '(racket-mode racket-repl-mode)
     :definition    #'+racket-lookup-definition
     :documentation #'+racket-lookup-documentation)
   (set-docsets! 'racket-mode "Racket")
-  (set-pretty-symbols! 'racket-mode
+  (set-ligatures! 'racket-mode
     :lambda  "lambda"
     :map     "map"
     :dot     ".")
@@ -41,8 +41,10 @@
     (add-hook 'racket-mode-hook #'racket-smart-open-bracket-mode))
 
   (map! (:map racket-xp-mode-map
-         [remap next-error]     #'racket-xp-next-error
-         [remap previous-error] #'racket-xp-previous-error)
+         [remap racket-doc]              #'racket-xp-documentation
+         [remap racket-visit-definition] #'racket-xp-visit-definition
+         [remap next-error]              #'racket-xp-next-error
+         [remap previous-error]          #'racket-xp-previous-error)
         (:localleader
          :map racket-mode-map
          "a" #'racket-align
@@ -72,4 +74,18 @@
          (:prefix ("s" . "send")
           "d" #'racket-send-definition
           "e" #'racket-send-last-sexp
-          "r" #'racket-send-region))))
+          "r" #'racket-send-region)
+         :map racket-repl-mode-map
+         "l" #'racket-logger
+         "h" #'racket-repl-documentation
+         "y" #'racket-insert-lambda
+         "u" #'racket-backward-up-list
+         (:prefix ("m" . "macros")
+          "d" #'racket-expand-definition
+          "e" #'racket-expand-last-sexp
+          "f" #'racket-expand-file
+          "r" #'racket-expand-region)
+         (:prefix ("g" . "goto")
+          "b" #'racket-unvisit
+          "m" #'racket-visit-module
+          "d" #'racket-repl-visit-definition))))
diff --git a/.emacs.d/modules/lang/racket/packages.el b/.emacs.d/modules/lang/racket/packages.el
index 94c0df0..49e141e 100644
--- a/.emacs.d/modules/lang/racket/packages.el
+++ b/.emacs.d/modules/lang/racket/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/racket/packages.el
 
-(package! racket-mode :pin "29afd2544a2f14bf29f3e542f6177579d0ae581f")
+(package! racket-mode :pin "c55fd70c5e9a371f262486f7d5d8837481388b95")
diff --git a/.emacs.d/modules/lang/rest/packages.el b/.emacs.d/modules/lang/rest/packages.el
index a6f76fd..9a01fce 100644
--- a/.emacs.d/modules/lang/rest/packages.el
+++ b/.emacs.d/modules/lang/rest/packages.el
@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/rest/packages.el
 
-(package! restclient :pin "e8ca809ace")
+(package! restclient :pin "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3")
 (when (featurep! :completion company)
-  (package! company-restclient :pin "e5a3ec54ed"))
+  (package! company-restclient :pin "e5a3ec54edb44776738c13e13e34c85b3085277b"))
diff --git a/.emacs.d/modules/lang/rst/packages.el b/.emacs.d/modules/lang/rst/packages.el
index 3f77f2d..c915f35 100644
--- a/.emacs.d/modules/lang/rst/packages.el
+++ b/.emacs.d/modules/lang/rst/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/rst/packages.el
 
-(package! sphinx-mode :pin "b5ac514e21")
+(package! sphinx-mode :pin "b5ac514e213459dcc57184086f10b5b6be3cecd8")
diff --git a/.emacs.d/modules/lang/ruby/packages.el b/.emacs.d/modules/lang/ruby/packages.el
index 133fa3c..1274b53 100644
--- a/.emacs.d/modules/lang/ruby/packages.el
+++ b/.emacs.d/modules/lang/ruby/packages.el
@@ -6,7 +6,7 @@
 (package! yard-mode :pin "ba74a47463b0320ae152bd42a7dd7aeecd7b5748")
 
 ;; REPL
-(package! inf-ruby :pin "f3c927c1b917a20ce6b2228d480db43171aadd9b")
+(package! inf-ruby :pin "9f0f79ff459c7c417e8931ca020db121e24b45b5")
 (when (featurep! :completion company)
   (package! company-inf-ruby :pin "fe3e4863bc971fbb81edad447efad5795ead1b17"))
 
diff --git a/.emacs.d/modules/lang/rust/README.org b/.emacs.d/modules/lang/rust/README.org
index 4b31c8c..b902012 100644
--- a/.emacs.d/modules/lang/rust/README.org
+++ b/.emacs.d/modules/lang/rust/README.org
@@ -10,9 +10,11 @@
   - [[#hacks][Hacks]]
 - [[#prerequisites][Prerequisites]]
 - [[#features][Features]]
+  - [[#lsp-support-rls-or-rust-analyzer][LSP support (rls or rust-analyzer)]]
+  - [[#format-on-save][Format on save]]
   - [[#keybinds][Keybinds]]
 - [[#configuration][Configuration]]
-  - [[#enable-rust-analyzer][Enable rust-analyzer]]
+  - [[#enable-rls-by-default][Enable RLS by default]]
   - [[#enabling-elgot-support-for-rust][Enabling elgot support for Rust]]
 - [[#troubleshooting][Troubleshooting]]
 
@@ -20,13 +22,14 @@
 This module adds support for the Rust language and integration for its tools,
 e.g. ~cargo~.
 
-+ Code completion (~racer~)
-+ Syntax checking (~flycheck~)
-+ LSP support (for rls and rust-analyzer) (~rustic~)
++ Code completion (=racer= or an LSP server)
++ Syntax checking (=flycheck=)
++ LSP support (for rust-analyzer and rls) (=rustic=)
 + Snippets
 
 ** Module Flags
-+ ~+lsp~ to add support Language server protocol.
++ ~+lsp~ to add support Language server protocol. Will use the first of
+  =rust-analyzer= or =rls= (in that order).
 
 ** Plugins
 + [[https://github.com/brotzeit/rustic][rustic]]
@@ -34,28 +37,38 @@ e.g. ~cargo~.
 
 ** Hacks
 + rustic has been modified /not/ to automatically install lsp-mode or elgot if
-  they're missing. Doom expects you to enable the =:tools lsp= module yourself.
-+ rustic's LSP integration has been disabled in favor of the rls/rust-analyzer
-  support provider by the lsp-mode package.
+  they're missing. Doom expects you to have enabled the =:tools lsp= module
+  yourself.
 
 * Prerequisites
-This module only requires ~rust~, which can be acquired through =rustup=:
+This module requires ~rust~, which can be acquired through =rustup=:
 
 ~curl https://sh.rustup.rs -sSf | sh~
 
-Optionally, this module also uses the following programs:
+Additional requirements depend on the module's configuration:
 
-+ =racer= (if not using LSP): ~cargo +nightly install racer~ (requires rust nightly)
-+ =RLS= or =rust-analyzer= (for LSP users)
-+ =rustfmt= for ~:editor format~: ~rustup component add rustfmt-preview~
-+ The following commands require:
++ If =:editor format= is enabled, you'll need =rustfmt=: ~rustup component add
+  rustfmt-preview~.
++ Users without =+lsp= enabled will need =racer=: ~cargo +nightly install racer~
+  (with requires rust nightly edition).
++ Users with =+lsp= enabled will need:
+  + =rust-analyzer= or =rls=
++ To use The following commands require:
   + ~cargo-process-check~: ~cargo install cargo-check~
   + ~cargo-process-clippy~: ~rustup component add clippy-preview~
 
 * Features
-This module also supports LSP, if you have [[https://github.com/rust-lang/rls][the Rust Language Server]] or
-[[https://github.com/rust-analyzer/rust-analyzer][rust-analyzer]] installed. To enable it, you must enable the =:tools lsp= module
-and the ~+lsp~ flag on this module.
+** LSP support (rls or rust-analyzer)
+This module supports LSP integration. For it to work you'll need:
+
+1. Either [[https://github.com/rust-analyzer/rust-analyzer][rust-analyzer]] or [[https://github.com/rust-lang/rls][the Rust Language Server]] installed (e.g. through your
+   OS package manager).
+2. The =:tools lsp= module enabled.
+3. The ~+lsp~ flag on this module enabled.
+
+** Format on save
+Enable the [[file:../../../modules/editor/format/README.org][:editor format]] module's =+onsave= flag to get formatting on save with
+rustfmt. No additional configuration is necessary.
 
 ** Keybinds
 | Binding             | Description                 |
@@ -73,23 +86,18 @@ and the ~+lsp~ flag on this module.
 | ~<localleader> t t~ | ~run current test~          |
 
 * TODO Configuration
-** Enable rust-analyzer
-You'll need [[https://github.com/rust-analyzer/rust-analyzer][rust-analyzer]] installed on your system, then use the following:
-
-#+BEGIN_SRC elisp
-;; in $DOOMDIR/config.el
-(setq rustic-lsp-server 'rust-analyzer)
-#+END_SRC
-
-** Enabling elgot support for Rust
-Doom doesn't have eglot support (yet), but if you've installed it yourself and
-want rust to use eglot instead of LSP, use the following:
+** Enable RLS by default
+If both =rls= and =rust-analyzer= are present on your system, =rust-analyzer= is
+selected by default. Modify ~rustic-lsp-server~ to change the default:
 
 #+BEGIN_SRC elisp
 ;; in $DOOMDIR/config.el
 (after! rustic
-  (setq rustic-lsp-server 'rust-analyzer ; optional
-        rustic-lsp-client 'eglot))
+  (setq rustic-lsp-server 'rls))
 #+END_SRC
 
+** Enabling elgot support for Rust
+Doom's =:tools lsp= module has an =+eglot= flag. Enable it and this module will
+use eglot instead.
+
 * TODO Troubleshooting
diff --git a/.emacs.d/modules/lang/rust/config.el b/.emacs.d/modules/lang/rust/config.el
index 1b81f31..cb850f6 100644
--- a/.emacs.d/modules/lang/rust/config.el
+++ b/.emacs.d/modules/lang/rust/config.el
@@ -69,7 +69,7 @@
 
 (use-package! racer
   :unless (featurep! +lsp)
-  :hook (rustic-mode . racer-mode)
+  :hook (rustic-mode-local-vars . racer-mode)
   :init
   ;; HACK Fix #2132: `racer' depends on `rust-mode', which tries to modify
   ;;      `auto-mode-alist'. We make extra sure that doesn't stick, especially
diff --git a/.emacs.d/modules/lang/rust/packages.el b/.emacs.d/modules/lang/rust/packages.el
index 70bbbd8..021d6d6 100644
--- a/.emacs.d/modules/lang/rust/packages.el
+++ b/.emacs.d/modules/lang/rust/packages.el
@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/rust/packages.el
 
-(package! rustic :pin "0ec0688c83cdf70be5eaaeacd96b067125fe968e")
+(package! rustic :pin "75b99201bb4e7a0bd990c006896ad7897f284ca2")
 (unless (featurep! +lsp)
   (package! racer :pin "a0bdf778f01e8c4b8a92591447257422ac0b455b"))
diff --git a/.emacs.d/modules/lang/scala/config.el b/.emacs.d/modules/lang/scala/config.el
index 11f3f06..1329f92 100644
--- a/.emacs.d/modules/lang/scala/config.el
+++ b/.emacs.d/modules/lang/scala/config.el
@@ -18,7 +18,7 @@
   (when (featurep! +lsp)
     (add-hook 'scala-mode-local-vars-hook #'lsp!))
 
-  (set-pretty-symbols! 'scala-mode
+  (set-ligatures! 'scala-mode
     ;; Functional
     :def "def"
     :composition  "compose"
diff --git a/.emacs.d/modules/lang/scala/packages.el b/.emacs.d/modules/lang/scala/packages.el
index 97d8b18..97149b8 100644
--- a/.emacs.d/modules/lang/scala/packages.el
+++ b/.emacs.d/modules/lang/scala/packages.el
@@ -1,8 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/scala/packages.el
 
-(package! sbt-mode :pin "633a315ad4")
-(package! scala-mode :pin "46bb948345")
+(package! sbt-mode :pin "4358ed862a1b1ec18ac9699afb4862146669eb79")
+(package! scala-mode :pin "1d08e885b1489313666c7f15a3962432a4f757ee")
 
 (when (featurep! +lsp)
-  (package! lsp-metals :pin "3d4d4b7b14d6f1041f75ddb45f36ca4cf9a6d854"))
+  (package! lsp-metals :pin "039aa72439e3c52cfef4bcde416ba49d88ac0991"))
diff --git a/.emacs.d/modules/lang/scheme/config.el b/.emacs.d/modules/lang/scheme/config.el
index 3438124..41249b7 100644
--- a/.emacs.d/modules/lang/scheme/config.el
+++ b/.emacs.d/modules/lang/scheme/config.el
@@ -10,7 +10,7 @@
   :init
   (setq geiser-active-implementations '(guile chicken mit chibi chez)
         geiser-autodoc-identifier-format "%s → %s"
-        geiser-smart-tab-p t)
+        geiser-repl-current-project-function 'doom-project-root)
   (unless (featurep! :lang racket)
     (push 'racket geiser-active-implementations))
   (after! scheme                        ; built-in
diff --git a/.emacs.d/modules/lang/scheme/packages.el b/.emacs.d/modules/lang/scheme/packages.el
index 52e0e01..8d2a2b4 100644
--- a/.emacs.d/modules/lang/scheme/packages.el
+++ b/.emacs.d/modules/lang/scheme/packages.el
@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/scheme/packages.el
 
-(package! geiser :pin "0c86289d7b2af07e3653364219e00103c8540edf")
+(package! geiser :pin "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2")
 
 (when (featurep! :checkers syntax)
   (package! flycheck-guile
     :recipe (:host github :repo "flatwhatson/flycheck-guile")
-    :pin "f37b6143776d15b3e7907e7621f6f96f8b1aec48"))
+    :pin "2940f1622fa352e7ca95a9e4ad65958c5575da02"))
diff --git a/.emacs.d/modules/lang/sh/config.el b/.emacs.d/modules/lang/sh/config.el
index 04fa821..b6a0b27 100755
--- a/.emacs.d/modules/lang/sh/config.el
+++ b/.emacs.d/modules/lang/sh/config.el
@@ -16,7 +16,7 @@
   :config
   (set-electric! 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))
   (set-repl-handler! 'sh-mode #'+sh/open-repl)
-  (set-pretty-symbols! 'sh-mode
+  (set-ligatures! 'sh-mode
     ;; Functional
     :def "function"
     ;; Types
diff --git a/.emacs.d/modules/lang/solidity/packages.el b/.emacs.d/modules/lang/solidity/packages.el
index 4e62183..f746d0f 100644
--- a/.emacs.d/modules/lang/solidity/packages.el
+++ b/.emacs.d/modules/lang/solidity/packages.el
@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/solidity/packages.el
 
-(package! solidity-mode :pin "022b3159832384a7dcdc2168809e698600826047")
+(package! solidity-mode :pin "d166a86b83907e0cfd64c191e9dfce4b44a9843e")
 (package! company-solidity)
 (package! solidity-flycheck)
diff --git a/.emacs.d/modules/lang/swift/packages.el b/.emacs.d/modules/lang/swift/packages.el
index 186bbb8..a3b4a18 100644
--- a/.emacs.d/modules/lang/swift/packages.el
+++ b/.emacs.d/modules/lang/swift/packages.el
@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/swift/packages.el
 
-(package! swift-mode :pin "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff")
+(package! swift-mode :pin "d266fbd300a1bf1592e1462ead4be093b8b68f98")
 
 (if (featurep! +lsp)
-    (package! lsp-sourcekit :pin "04d75b6a0be5894fea4a55fec0b2ccedf5b3be58")
+    (package! lsp-sourcekit :pin "130f7a8f7a37869515953aa7715b3b969c3d7a0b")
   (when (featurep! :completion company)
     (package! company-sourcekit :pin "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"))
   (when (featurep! :checkers syntax)
diff --git a/.emacs.d/modules/lang/terra/packages.el b/.emacs.d/modules/lang/terra/packages.el
index 57adda3..312816f 100644
--- a/.emacs.d/modules/lang/terra/packages.el
+++ b/.emacs.d/modules/lang/terra/packages.el
@@ -3,7 +3,7 @@
 
 (package! terra-mode
   :recipe (:host github :repo "StanfordLegion/terra-mode")
-  :pin "1e5e82410d")
+  :pin "1e5e82410d60bd0b53fe3e769d9dd36a0d542b71")
 
 (when (featurep! :completion company)
-  (package! company-lua :pin "29f6819de4"))
+  (package! company-lua :pin "29f6819de4d691e5fd0b62893a9f4fbc1c6fcb52"))
diff --git a/.emacs.d/modules/lang/web/autoload/html.el b/.emacs.d/modules/lang/web/autoload/html.el
index bfb1de8..7956eff 100644
--- a/.emacs.d/modules/lang/web/autoload/html.el
+++ b/.emacs.d/modules/lang/web/autoload/html.el
@@ -122,7 +122,9 @@ snippet, or `emmet-expand-yas'/`emmet-expand-line', depending on whether
 `yas-minor-mode' is enabled or not."
   (interactive)
   (call-interactively
-   (cond ((<= (current-column) (current-indentation))
+   (cond ((or (<= (current-column) (current-indentation))
+              (not (eolp))
+              (not (memq (char-after) (list ?\n ?\s ?\t))))
           #'indent-for-tab-command)
          ((bound-and-true-p yas-minor-mode)
           (if (yas--templates-for-key-at-point)
diff --git a/.emacs.d/modules/lang/web/packages.el b/.emacs.d/modules/lang/web/packages.el
index fcf41db..499df9d 100644
--- a/.emacs.d/modules/lang/web/packages.el
+++ b/.emacs.d/modules/lang/web/packages.el
@@ -6,7 +6,7 @@
 (package! haml-mode :pin "bf5b6c11b1206759d2b28af48765e04882dd1fc4")
 (package! pug-mode :pin "685fd3414d89736bf232f5d1a6bed9e0353b98fe")
 (package! slim-mode :pin "3636d18ab1c8b316eea71c4732eb44743e2ded87")
-(when (package! web-mode :pin "a2badd04060f5f458f8f3def81cdaf81cfafb5a7")
+(when (package! web-mode :pin "60ffd878c4371644bd964f00fea38054645e3e47")
   (when (featurep! :completion company)
     (package! company-web :pin "f0cc9187c9c34f72ad71f5649a69c74f996bae9a")))
 
diff --git a/.emacs.d/modules/term/term/packages.el b/.emacs.d/modules/term/term/packages.el
index b55cfc4..71228f2 100644
--- a/.emacs.d/modules/term/term/packages.el
+++ b/.emacs.d/modules/term/term/packages.el
@@ -2,4 +2,4 @@
 ;;; term/term/packages.el
 
 (package! term :built-in t)
-(package! multi-term :pin "7307ddd456db44045206253e5a905d3d8c143d5c")
+(package! multi-term :pin "017c77c550115936860e2ea71b88e585371475d5")
diff --git a/.emacs.d/modules/term/vterm/README.org b/.emacs.d/modules/term/vterm/README.org
index 019fc58..42ae0a1 100644
--- a/.emacs.d/modules/term/vterm/README.org
+++ b/.emacs.d/modules/term/vterm/README.org
@@ -14,7 +14,7 @@
 
 * Description
 This module provides a terminal emulator powered by libvterm. It is still in
-alpha and requires a component be compiled (=vterm-module.sh=).
+alpha and requires a component be compiled (=vterm-module.so=).
 
 The following commands are available to open it:
 
@@ -108,7 +108,7 @@ There are several ways to manually install the module:
    make
    #+END_SRC
 
-3. You can also compile =vterm-module.sh= elsewhere, but the module must be
+3. You can also compile =vterm-module.so= elsewhere, but the module must be
    moved/symlinked to
    =~/.emacs.d/.local/packages/elpa/vterm-<version>/vterm-module.so=
    =vterm-module.so=. Keep in mind that this folder will be deleted whenever the
diff --git a/.emacs.d/modules/term/vterm/config.el b/.emacs.d/modules/term/vterm/config.el
index 98e8bf2..e21b7a6 100644
--- a/.emacs.d/modules/term/vterm/config.el
+++ b/.emacs.d/modules/term/vterm/config.el
@@ -6,18 +6,6 @@
   :preface (setq vterm-install t) ; compile the package when you load vterm
   :hook (vterm-mode . doom-mark-buffer-as-real-h)
   :hook (vterm-mode . hide-mode-line-mode) ; modeline serves no purpose in vterm
-  :preface
-  (when! (fboundp 'native-compile)
-    ;; HACK Fix #3683: `vterm-module-compile' uses `locate-library' to determine
-    ;;      where vterm-module.so should be, but an eln file (for emacsGcc
-    ;;      users) reports a subdirectory that will never contain it; rendering
-    ;;      vterm unable to build itself.
-    ;; REVIEW Remove this when akermu/emacs-libvterm#363 is resolved.
-    (defadvice! +vterm--dont-resolve-to-eln-file-a (orig-fn &rest args)
-      :around #'vterm-module-compile
-      (let ((load-suffixes (remove ".eln" load-suffixes)))
-        (apply orig-fn args))))
-
   :config
   (set-popup-rule! "^vterm" :size 0.25 :vslot -4 :select t :quit nil :ttl 0)
 
diff --git a/.emacs.d/modules/term/vterm/packages.el b/.emacs.d/modules/term/vterm/packages.el
index a88b89e..00a0204 100644
--- a/.emacs.d/modules/term/vterm/packages.el
+++ b/.emacs.d/modules/term/vterm/packages.el
@@ -3,4 +3,4 @@
 
 (package! vterm
   :built-in 'prefer
-  :pin "422ffe029b92c47e4acf0e2ed06cbc83636d7e44")
+  :pin "797357bf65952337627f2d0c594c2fef600aafae")
diff --git a/.emacs.d/modules/tools/ansible/packages.el b/.emacs.d/modules/tools/ansible/packages.el
index b2c31d1..3dcf4b9 100644
--- a/.emacs.d/modules/tools/ansible/packages.el
+++ b/.emacs.d/modules/tools/ansible/packages.el
@@ -4,7 +4,7 @@
 (package! ansible :recipe (:nonrecursive t) :pin "b5ef59406604bc5027f4d816d90e633feef0149c")
 (package! ansible-doc :pin "86083a7bb2ed0468ca64e52076b06441a2f8e9e0")
 (package! jinja2-mode :pin "ecd19a40b7832bb00f0a2244e3b0713d0bf3850d")
-(package! yaml-mode :pin "34648f2502f52f4744d62758fa381fa35db1da49")
+(package! yaml-mode :pin "68fecb5f0dec712a10c8655df6881392a4613617")
 
 (when (featurep! :completion company)
   (package! company-ansible :pin "79dd421b161efa49fbdffad57fa40edb41f484a3"))
diff --git a/.emacs.d/modules/tools/debugger/config.el b/.emacs.d/modules/tools/debugger/config.el
index c9e8705..e745e08 100644
--- a/.emacs.d/modules/tools/debugger/config.el
+++ b/.emacs.d/modules/tools/debugger/config.el
@@ -120,8 +120,31 @@
 
   (dap-mode 1)
 
+  (define-minor-mode +dap-running-session-mode
+    "A mode for adding keybindings to running sessions"
+    nil nil (make-sparse-keymap)
+    (when (bound-and-true-p evil-mode)
+    (evil-normalize-keymaps))  ; if you use evil, this is necessary to update the keymaps
+    ;; The following code adds to the dap-terminated-hook so that this minor
+    ;; mode will be deactivated when the debugger finishes
+    (when +dap-running-session-mode
+      (let ((session-at-creation (dap--cur-active-session-or-die)))
+        (add-hook 'dap-terminated-hook
+                  (lambda (session)
+                    (when (eq session session-at-creation)
+                      (+dap-running-session-mode -1)))))))
+
+  ;; Activate this minor mode when dap is initialized
+  (add-hook 'dap-session-created-hook #'+dap-running-session-mode)
+  ;; Activate this minor mode when hitting a breakpoint in another file
+  (add-hook 'dap-stopped-hook #'+dap-running-session-mode)
+  ;; Activate this minor mode when stepping into code in another file
+  (add-hook 'dap-stack-frame-changed-hook (lambda (session)
+                                            (when (dap--session-running session)
+                                              (+dap-running-session-mode 1))))
+
   (map! :localleader
-        :map dap-mode-map
+        :map +dap-running-session-mode-map
         "d" #'dap-hydra))
 
 
diff --git a/.emacs.d/modules/tools/debugger/packages.el b/.emacs.d/modules/tools/debugger/packages.el
index ea81f3d..24342a8 100644
--- a/.emacs.d/modules/tools/debugger/packages.el
+++ b/.emacs.d/modules/tools/debugger/packages.el
@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/debugger/packages.el
 
-(when (package! realgud :pin "5b0ed08364b1f5e2df2f3f7d5a6e7a2fedb5189a")
+(when (package! realgud :pin "332d13673074bee252ae7819b0898ee7c7895d2e")
   (when (featurep! :lang javascript)
     (package! realgud-trepan-ni :pin "6e38cf838c7b47b5f1353d00901b939ffa36d707")))
 
 (when (featurep! +lsp)
-  (package! dap-mode :pin "85a61630499bb836bdb378fb62ea4ddd4f61a2dd")
-  (package! posframe :pin "6d604a71deb45295f7b6ff3f98e06aeece9888be"))
+  (package! dap-mode :pin "4b185431b2b0cdec86ecfbc679f45d21fbf9fe59")
+  (package! posframe :pin "7b92a54e588889a74d36d51167e067676db7be8a"))
diff --git a/.emacs.d/modules/tools/direnv/README.org b/.emacs.d/modules/tools/direnv/README.org
index 75e5e6a..53b1a79 100644
--- a/.emacs.d/modules/tools/direnv/README.org
+++ b/.emacs.d/modules/tools/direnv/README.org
@@ -34,7 +34,7 @@ direnv and then made available to the current shell.
 This module provides no flags.
 
 ** Plugins
-+ [[https://github.com/wbolster/emacs-direnv][direnv]]
++ [[https://github.com/purcell/envrc][envrc]]
 
 ** Hacks
 + Normally, the direnv environment is updated on ~post-command-hook~. We've
diff --git a/.emacs.d/modules/tools/direnv/config.el b/.emacs.d/modules/tools/direnv/config.el
index 04abdab..f38b755 100644
--- a/.emacs.d/modules/tools/direnv/config.el
+++ b/.emacs.d/modules/tools/direnv/config.el
@@ -5,30 +5,61 @@
     "join_args" "expand_path" "dotenv" "user_rel_path" "find_up" "source_env"
     "watch_file" "source_up" "direnv_load" "MANPATH_add" "load_prefix" "layout"
     "use" "rvm" "use_nix" "use_guix")
-  "TODO")
+  "A list of direnv keywords, which are fontified when in `+direnv-rc-mode'.")
 
 
 ;;
 ;;; Packages
 
-(use-package! direnv
-  :hook (before-hack-local-variables  . direnv--maybe-update-environment)
-  :hook (flycheck-before-syntax-check . direnv--maybe-update-environment)
-  :hook (direnv-envrc-mode . +direnv-envrc-fontify-keywords-h)
+(use-package! envrc
+  :when (executable-find "direnv")
+  :after-call doom-first-file-hook
+  :mode ("\\.envrc\\'" . +direnv-rc-mode)
   :config
-  (add-to-list 'direnv-non-file-modes 'vterm-mode)
+  (add-to-list 'doom-debug-variables 'envrc-debug)
 
-  (defun +direnv-envrc-fontify-keywords-h ()
-    "Fontify special .envrc keywords; it's a good indication of whether or not
-we've typed them correctly."
+  ;; I'm avoiding `global-envrc-mode' intentionally, because it has the
+  ;; potential to run too late in the mode startup process (and after, say,
+  ;; server hooks that may rely on that local direnv environment).
+  (add-hook! 'change-major-mode-after-body-hook
+    (defun +direnv-init-h ()
+      (unless (or envrc-mode
+                  (minibufferp)
+                  (file-remote-p default-directory))
+        (envrc-mode 1))))
+
+  (define-derived-mode +direnv-rc-mode sh-mode "envrc"
+    "Major mode for .envrc files."
+    ;; Fontify .envrc keywords; it's a good indication of whether or not we've
+    ;; typed them correctly, and that we're in the correct major mode.
     (font-lock-add-keywords
      nil `((,(regexp-opt +direnv-keywords 'symbols)
             (0 font-lock-keyword-face)))))
 
   (defadvice! +direnv--fail-gracefully-a (&rest _)
     "Don't try to use direnv if the executable isn't present."
-    :before-while #'direnv-update-directory-environment
+    :before-while #'envrc-mode
     (or (executable-find "direnv")
         (ignore (doom-log "Couldn't find direnv executable"))))
 
-  (direnv-mode +1))
+  ;; HACK envrc-mode only affects the current buffer's environment, which is
+  ;;      generally what we want, except when we're running babel blocks in
+  ;;      org-mode, because there may be state or envvars those blocks need to
+  ;;      read. In order to perpetuate the org buffer's environment into the
+  ;;      execution of the babel block we need to temporarily change the global
+  ;;      environment. Let's hope it runs quickly enough that its effects aren't
+  ;;      felt in other buffers in the meantime!
+  (defvar +direnv--old-environment nil)
+  (defadvice! +direnv-persist-environment-a (orig-fn &rest args)
+    :around #'org-babel-execute-src-block
+    (if +direnv--old-environment
+        (apply orig-fn args)
+      (setq-default +direnv--old-environment
+                    (cons (default-value 'process-environment)
+                          (default-value 'exec-path))
+                    exec-path exec-path
+                    process-environment process-environment)
+      (unwind-protect (apply orig-fn args)
+        (setq-default process-environment (car +direnv--old-environment)
+                      exec-path (cdr +direnv--old-environment)
+                      +direnv--old-environment nil)))))
diff --git a/.emacs.d/modules/tools/direnv/packages.el b/.emacs.d/modules/tools/direnv/packages.el
index 7d43b9c..ea30e39 100644
--- a/.emacs.d/modules/tools/direnv/packages.el
+++ b/.emacs.d/modules/tools/direnv/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/direnv/packages.el
 
-(package! direnv :pin "f5484b0fc33d4e5116612626294efb362ff9ecd4")
+(package! envrc :pin "1dc5aad14d2c27211c7c288d2d9dffeb2e27cb2d")
diff --git a/.emacs.d/modules/tools/docker/packages.el b/.emacs.d/modules/tools/docker/packages.el
index 1225099..b786965 100644
--- a/.emacs.d/modules/tools/docker/packages.el
+++ b/.emacs.d/modules/tools/docker/packages.el
@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/docker/packages.el
 
-(package! docker :pin "d6233bdb9ccaee4da7cdc0ef162bfe4727227142")
+(package! docker :pin "3773112eea3fc99704b5ca50c1e9a3db2cb8e4f3")
 (package! docker-tramp :pin "8e2b671eff7a81af43b76d9dfcf94ddaa8333a23")
 (package! dockerfile-mode :pin "d31f7685ebc5832d957e25070a930aa42984327d")
diff --git a/.emacs.d/modules/tools/editorconfig/packages.el b/.emacs.d/modules/tools/editorconfig/packages.el
index 962d317..1f83b1d 100644
--- a/.emacs.d/modules/tools/editorconfig/packages.el
+++ b/.emacs.d/modules/tools/editorconfig/packages.el
@@ -3,4 +3,4 @@
 
 (package! editorconfig
   :recipe (:nonrecursive t)
-  :pin "9a73ff743b9fe820301ea9b5c5c7804bfc967324")
+  :pin "9bc1343ce8bd2cc84bf04b58a053b7ec700244c0")
diff --git a/.emacs.d/modules/tools/ein/packages.el b/.emacs.d/modules/tools/ein/packages.el
index 34cce3c..2d92983 100644
--- a/.emacs.d/modules/tools/ein/packages.el
+++ b/.emacs.d/modules/tools/ein/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/ein/packages.el
 
-(package! ein :pin "ccbed30c991623d56a310d02c76f03d571e90e82")
+(package! ein :pin "99a4718f50538a439a2a3f2011d1aa97246e259b")
diff --git a/.emacs.d/modules/tools/lookup/packages.el b/.emacs.d/modules/tools/lookup/packages.el
index 3d02b2a..90b4686 100644
--- a/.emacs.d/modules/tools/lookup/packages.el
+++ b/.emacs.d/modules/tools/lookup/packages.el
@@ -8,7 +8,7 @@
   (package! helm))
 
 ;;
-(package! dumb-jump :pin "b81573184c97fbc6181d0a4fe408caa23c0d621b")
+(package! dumb-jump :pin "0d74b2f2aa834b602e91d99e9cb23197a389f042")
 (when (featurep! :completion ivy)
   (package! ivy-xref :pin "3d4c35fe2b243d948d8fe02a1f0d76a249d63de9"))
 (when (featurep! :completion helm)
diff --git a/.emacs.d/modules/tools/lsp/README.org b/.emacs.d/modules/tools/lsp/README.org
index a027e1a..3fcd9ea 100644
--- a/.emacs.d/modules/tools/lsp/README.org
+++ b/.emacs.d/modules/tools/lsp/README.org
@@ -11,8 +11,11 @@
 - [[#prerequisites][Prerequisites]]
 - [[#features][Features]]
   - [[#lsp-powered-project-search][LSP-powered project search]]
+  - [[#differences-between-eglot-and-lsp-mode][Differences between eglot and lsp-mode]]
 - [[#configuration][Configuration]]
 - [[#troubleshooting][Troubleshooting]]
+  - [[#my-language-server-is-not-found][My language server is not found]]
+  - [[#lspeglot-is-not-started-automatically-in-my-buffer][LSP/Eglot is not started automatically in my buffer]]
 
 * Description
 This module integrates [[https://langserver.org/][language servers]] into Doom Emacs. They provide features
@@ -93,6 +96,7 @@ active, LSP is used to search a symbol indexed by the LSP server :
 |-----------+-------------------------------------|
 | =SPC c j= | Jump to symbol in current workspace |
 | =SPC c J= | Jump to symbol in any workspace     |
+
 ** Differences between eglot and lsp-mode
 Entering the debate about which one to use would be useless. Doom provides an
 easy way to switch out lsp client implementations so you can test for yourself
@@ -108,6 +112,7 @@ closer integration with "more basic" emacs packages (=eldoc=, =xref=, ...).
 ** My language server is not found
 Check the entry in the [[../../../docs/faq.org][FAQ]] about "Doom can't find my executables/doesn't inherit
 the correct ~PATH~"
+
 ** LSP/Eglot is not started automatically in my buffer
 Make sure that you added the =+lsp= flag to the language you're using too in
 your init.el :
diff --git a/.emacs.d/modules/tools/lsp/config.el b/.emacs.d/modules/tools/lsp/config.el
index 3d26aa1..0750b39 100644
--- a/.emacs.d/modules/tools/lsp/config.el
+++ b/.emacs.d/modules/tools/lsp/config.el
@@ -5,7 +5,26 @@
 workspace buffer is closed.
 
 This delay prevents premature server shutdown when a user still intends on
-working on that project after closing the last buffer.")
+working on that project after closing the last buffer, or when programmatically
+killing and opening many LSP/eglot-powered buffers.")
+
+
+;;
+;;; Common
+
+(defun +lsp-init-optimizations-h ()
+  "Deploys universal optimizations for `lsp-mode' and `eglot'."
+  (when (or (bound-and-true-p eglot--managed-mode)
+            (bound-and-true-p lsp-mode))
+    ;; `read-process-output-max' is only available on recent development
+    ;; builds of Emacs 27 and above.
+    (setq-local read-process-output-max (* 1024 1024))
+    ;; REVIEW LSP causes a lot of allocations, with or without Emacs 27+'s
+    ;;        native JSON library, so we up the GC threshold to stave off
+    ;;        GC-induced slowdowns/freezes. Doom uses `gcmh' to enforce its GC
+    ;;        strategy, so we modify its variables rather than
+    ;;        `gc-cons-threshold' directly.
+    (setq-local gcmh-high-cons-threshold (* 2 (default-value 'gcmh-high-cons-threshold)))))
 
 
 ;;
diff --git a/.emacs.d/modules/tools/lsp/packages.el b/.emacs.d/modules/tools/lsp/packages.el
index 7f606c3..c7274c2 100644
--- a/.emacs.d/modules/tools/lsp/packages.el
+++ b/.emacs.d/modules/tools/lsp/packages.el
@@ -3,11 +3,11 @@
 
 (if (featurep! +eglot)
     (progn
-      (package! eglot :pin "fb6b17e86eddc22b9ec81f52718fad6bcbb53668")
+      (package! eglot :pin "5f873d288e1c5434c1640bef03555ed056cb0d35")
       (package! project :pin "da0333a697b18f0a863c1b1523d2fc7991b31174"))
-  (package! lsp-mode :pin "edb81194f0974643861a24d1bbc386dd53554748")
-  (package! lsp-ui :pin "1f3e9700395f4fae024ca45ca64c8d70e99b39d2")
+  (package! lsp-mode :pin "4145a70ce1d4bfb2463606ba34c5965080b080d9")
+  (package! lsp-ui :pin "c39ae3713f95a2d86e11fd1f77e89a671d08d18a")
   (when (featurep! :completion ivy)
     (package! lsp-ivy :pin "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d"))
   (when (featurep! :completion helm)
-    (package! helm-lsp :pin "5c960e7800dc8f4432f3a1466a637d484b87dc35")))
+    (package! helm-lsp :pin "4263c967267b0579956b3b12ef32878a9ea80d97")))
diff --git a/.emacs.d/modules/tools/macos/autoload.el b/.emacs.d/modules/tools/macos/autoload.el
deleted file mode 100644
index 6aa1f00..0000000
--- a/.emacs.d/modules/tools/macos/autoload.el
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; tools/macos/autoload.el -*- lexical-binding: t; -*-
-
-;;;###autoload
-(setq locate-command "mdfind")
-
-;;;###autoload
-(defun +macos-open-with (&optional app-name path)
-  "Send PATH to APP-NAME on OSX."
-  (interactive)
-  (let* ((path (expand-file-name
-                (replace-regexp-in-string
-                 "'" "\\'"
-                 (or path (if (derived-mode-p 'dired-mode)
-                              (dired-get-file-for-visit)
-                            (buffer-file-name)))
-                 nil t)))
-         (command (format "open %s"
-                          (if app-name
-                              (format "-a %s '%s'" (shell-quote-argument app-name) path)
-                            (format "'%s'" path)))))
-    (message "Running: %s" command)
-    (shell-command command)))
-
-;;;###autoload
-(defmacro +macos--open-with (id &optional app dir)
-  `(defun ,(intern (format "+macos/%s" id)) ()
-     (interactive)
-     (+macos-open-with ,app ,dir)))
-
-;;;###autoload (autoload '+macos/open-in-default-program "tools/macos/autoload" nil t)
-(+macos--open-with open-in-default-program)
-
-;;;###autoload (autoload '+macos/reveal-in-finder "tools/macos/autoload" nil t)
-(+macos--open-with reveal-in-finder "Finder" default-directory)
-
-;;;###autoload (autoload '+macos/reveal-project-in-finder "tools/macos/autoload" nil t)
-(+macos--open-with reveal-project-in-finder "Finder"
-                   (or (doom-project-root) default-directory))
-
-;;;###autoload (autoload '+macos/send-to-transmit "tools/macos/autoload" nil t)
-(+macos--open-with send-to-transmit "Transmit")
-
-;;;###autoload (autoload '+macos/send-cwd-to-transmit "tools/macos/autoload" nil t)
-(+macos--open-with send-cwd-to-transmit "Transmit" default-directory)
-
-;;;###autoload (autoload '+macos/send-to-launchbar "tools/macos/autoload" nil t)
-(+macos--open-with send-to-launchbar "LaunchBar")
-
-;;;###autoload (autoload '+macos/send-project-to-launchbar "tools/macos/autoload" nil t)
-(+macos--open-with send-project-to-launchbar "LaunchBar"
-                   (or (doom-project-root) default-directory))
-
-;;;###autoload (autoload '+macos/open-in-iterm "tools/macos/autoload" nil t)
-(+macos--open-with open-in-iterm "iTerm" default-directory)
diff --git a/.emacs.d/modules/tools/magit/autoload.el b/.emacs.d/modules/tools/magit/autoload.el
index e23b888..85c8d7e 100644
--- a/.emacs.d/modules/tools/magit/autoload.el
+++ b/.emacs.d/modules/tools/magit/autoload.el
@@ -6,7 +6,7 @@
 ;;      support symlinks as unix knows them, so `magit-version' can't resolve
 ;;      its own repo's path.
 ;;;###autoload
-(when! IS-WINDOWS
+(eval-when! IS-WINDOWS
   (defadvice! +magit--ignore-version-a (&optional print-dest)
     :override #'magit-version
     (when print-dest
@@ -63,18 +63,26 @@
 This differs from `display-buffer-in-direction' in one way: it will try to use a
 window that already exists in that direction. It will split otherwise."
   (let ((direction (or (alist-get 'direction alist)
-                       +magit-open-windows-in-direction)))
+                       +magit-open-windows-in-direction))
+        (origin-window (selected-window)))
     (if-let (window (window-in-direction direction))
         (select-window window)
-      (if-let (window (window-in-direction
-                       (pcase direction
-                         (`right 'left)
-                         (`left 'right)
-                         ((or `up `above) 'down)
-                         ((or `down `below) 'up))))
+      (if-let (window (and (not (one-window-p))
+                           (window-in-direction
+                            (pcase direction
+                              (`right 'left)
+                              (`left 'right)
+                              ((or `up `above) 'down)
+                              ((or `down `below) 'up)))))
           (select-window window)
-        (split-window-horizontally)))
-    (switch-to-buffer buffer)
+        (let ((window (split-window nil nil direction)))
+          (when (memq direction '(right down below))
+            (select-window window))
+          (display-buffer-record-window 'reuse window buffer)
+          (set-window-buffer window buffer)
+          (set-window-parameter window 'quit-restore (list 'window 'window origin-window buffer))
+          (set-window-prev-buffers window nil))))
+    (switch-to-buffer buffer t t)
     (selected-window)))
 
 
diff --git a/.emacs.d/modules/tools/magit/config.el b/.emacs.d/modules/tools/magit/config.el
index d5eb0ec..fac4acf 100644
--- a/.emacs.d/modules/tools/magit/config.el
+++ b/.emacs.d/modules/tools/magit/config.el
@@ -18,12 +18,17 @@ For example, diffs and log buffers. Accepts `left', `right', `up', and `down'.")
         transient-values-file  (concat doom-etc-dir "transient/values")
         transient-history-file (concat doom-etc-dir "transient/history"))
   :config
+  (add-to-list 'doom-debug-variables 'magit-refresh-verbose)
+
   (setq transient-default-level 5
         magit-diff-refine-hunk t ; show granular diffs in selected hunk
         ;; Don't autosave repo buffers. This is too magical, and saving can
         ;; trigger a bunch of unwanted side-effects, like save hooks and
-        ;; formatters. Trust us to know what we're doing.
-        magit-save-repository-buffers nil)
+        ;; formatters. Trust the user to know what they're doing.
+        magit-save-repository-buffers nil
+        ;; Don't display parent/related refs in commit buffers; they are rarely
+        ;; helpful and only add to runtime costs.
+        magit-revision-insert-related-refs nil)
   (add-hook 'magit-process-mode-hook #'goto-address-mode)
 
   (defadvice! +magit-revert-repo-buffers-deferred-a (&rest _)
@@ -75,7 +80,8 @@ For example, diffs and log buffers. Accepts `left', `right', `up', and `down'.")
   ;; 2. The status screen isn't buried when viewing diffs or logs from the
   ;;    status screen.
   (setq transient-display-buffer-action '(display-buffer-below-selected)
-        magit-display-buffer-function #'+magit-display-buffer-fn)
+        magit-display-buffer-function #'+magit-display-buffer-fn
+        magit-bury-buffer-function #'magit-mode-quit-window)
   (set-popup-rule! "^\\(?:\\*magit\\|magit:\\| \\*transient\\*\\)" :ignore t)
   (add-hook 'magit-popup-mode-hook #'hide-mode-line-mode)
 
@@ -97,7 +103,17 @@ For example, diffs and log buffers. Accepts `left', `right', `up', and `down'.")
   (define-key magit-status-mode-map [remap magit-mode-bury-buffer] #'+magit/quit)
 
   ;; Close transient with ESC
-  (define-key transient-map [escape] #'transient-quit-one))
+  (define-key transient-map [escape] #'transient-quit-one)
+
+  ;; An optimization that particularly affects macOS and Windows users: by
+  ;; resolving `magit-git-executable' Emacs does less work to find the
+  ;; executable in your PATH, which is great because it is called so frequently.
+  ;; However, absolute paths will break magit in TRAMP/remote projects if the
+  ;; git executable isn't in the exact same location.
+  (add-hook! 'magit-status-mode-hook
+    (defun +magit-optimize-process-calls-h ()
+      (when-let (path (executable-find magit-git-executable))
+        (setq-local magit-git-executable path)))))
 
 
 (use-package! forge
diff --git a/.emacs.d/modules/tools/magit/packages.el b/.emacs.d/modules/tools/magit/packages.el
index a4d1b32..8c66daf 100644
--- a/.emacs.d/modules/tools/magit/packages.el
+++ b/.emacs.d/modules/tools/magit/packages.el
@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/magit/packages.el
 
-(when (package! magit :pin "798aff56457aef4d1896db8129ab56d08ae12066")
+(when (package! magit :pin "321214c3a2dd10fdf672ba96bd00703a51094bbe")
   (when (featurep! +forge)
-    (package! forge :pin "2c487465d0b78ffe34252b47fcc06e27039330c4"))
+    (package! forge :pin "feee7e2fce3f87f7aa113c5edcb1896127ee9d12"))
   (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b")
   (package! magit-todos :pin "a0e5d1f3c7dfcb4f18c1b0d57f1746a4872df5c6")
   (package! github-review :pin "fab440aeae4fbf6a8192fd11795052e9eb5d27d1")
diff --git a/.emacs.d/modules/tools/pass/packages.el b/.emacs.d/modules/tools/pass/packages.el
index 6f9dea0..4f8853e 100644
--- a/.emacs.d/modules/tools/pass/packages.el
+++ b/.emacs.d/modules/tools/pass/packages.el
@@ -2,7 +2,7 @@
 ;;; tools/pass/packages.el
 
 (package! pass :pin "919d8e3826d556433ab67d4ee21a509d209d1baa")
-(package! password-store :pin "07b169ec32ad6961ed8625a0b932a663abcb01d2")
+(package! password-store :pin "06f499994071bb6131244218b25d637103afe1d5")
 (package! password-store-otp :pin "04998c8578a060ab4a4e8f46f2ee0aafad4ab4d5")
 
 ;; an older version of `auto-source-pass' is built into Emacs 26+, so we must
diff --git a/.emacs.d/modules/tools/pdf/packages.el b/.emacs.d/modules/tools/pdf/packages.el
index b2ea212..0a1a514 100644
--- a/.emacs.d/modules/tools/pdf/packages.el
+++ b/.emacs.d/modules/tools/pdf/packages.el
@@ -1,4 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/pdf/packages.el
 
-(package! pdf-tools :pin "c510442ab89c8a9e9881230eeb364f4663f59e76")
+(package! pdf-tools
+  ;; REVIEW waiting on politza/pdf-tools#588
+  :recipe (:host github
+           :repo "flatwhatson/pdf-tools"
+           :branch "fix-macros")
+  :pin "eb6d40663069f2b7e6b52e907eeaa4e37375feb6")
diff --git a/.emacs.d/modules/tools/rgb/packages.el b/.emacs.d/modules/tools/rgb/packages.el
index d916da6..e3a6cd9 100644
--- a/.emacs.d/modules/tools/rgb/packages.el
+++ b/.emacs.d/modules/tools/rgb/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/rgb/packages.el
 
-(package! rainbow-mode :pin "f780ddb18c2a73a666d093f606df92058e5601ea")
+(package! rainbow-mode :pin "fdff98b12e62df7a6dbb009321430c90a47bb89b")
 (package! kurecolor :pin "3fc84840cbbd75e646cafa2fd3a00004b55e37ec")
diff --git a/.emacs.d/modules/ui/doom-dashboard/config.el b/.emacs.d/modules/ui/doom-dashboard/config.el
index 8a71a21..112b1b1 100644
--- a/.emacs.d/modules/ui/doom-dashboard/config.el
+++ b/.emacs.d/modules/ui/doom-dashboard/config.el
@@ -34,11 +34,12 @@ dashboard reloading is inhibited.")
 
 Possible values:
 
-  'last-project  the `doom-project-root' of the last open buffer
-  'last          the `default-directory' of the last open buffer
-  a FUNCTION     a function run with the `default-directory' of the last
+  'last-project  The `doom-project-root' of the last open buffer. Falls back
+                 to `default-directory' if not in a project.
+  'last          The `default-directory' of the last open buffer
+  a FUNCTION     A function run with the `default-directory' of the last
                  open buffer, that returns a directory path
-  a STRING       a fixed path
+  a STRING       A fixed path
   nil            `default-directory' will never change")
 
 (defvar +doom-dashboard-menu-sections
@@ -369,9 +370,8 @@ controlled by `+doom-dashboard-pwd-policy'."
           ((null lastcwd)
            default-directory)
           ((eq policy 'last-project)
-           (let ((cwd default-directory))
-             (or (doom-project-root lastcwd)
-                 cwd)))
+           (or (doom-project-root lastcwd)
+               lastcwd))
           ((eq policy 'last)
            lastcwd)
           ((warn "`+doom-dashboard-pwd-policy' has an invalid value of '%s'"
diff --git a/.emacs.d/modules/ui/doom-quit/README.org b/.emacs.d/modules/ui/doom-quit/README.org
index 18f2383..03a93c1 100644
--- a/.emacs.d/modules/ui/doom-quit/README.org
+++ b/.emacs.d/modules/ui/doom-quit/README.org
@@ -3,6 +3,37 @@
 #+SINCE:   v2.0
 #+STARTUP: inlineimages
 
+* Table of Contents :TOC_3:noexport:
+- [[#description][Description]]
+  - [[#module-flags][Module Flags]]
+  - [[#plugins][Plugins]]
+- [[#prerequisites][Prerequisites]]
+- [[#features][Features]]
+- [[#configurations][Configurations]]
+- [[#troubleshooting][Troubleshooting]]
+
+* Description
 A silly module that prompts you with messages when you try to quit, like DOOM
 did. Some quotes are from Doom's quit-message list. Others are random, nerdy
-references that no decent human being has any business recognizing.
+references that no decent human being has any business recognising.
+** Module Flags
+This module provides no flags
+** Plugins
+This module uses no Plugins
+* Prerequisites
+This module provides no prerequisite
+* Features
+This module only works when you run individual Emacs instances and not the
+daemon.
+* Configurations
+ you can configure the messages by adding to the variable ~+doom-quit-messages~
+ #+BEGIN_SRC emacs-lisp
+(setq +doom-quit-messages '(;;from doom 2
+                            "Don't go now, there's a dimensional shambler waiting at the dos prompt!"
+                            "Get outta here and go back to your boring programs."
+                            "If I were your boss, I'd deathmatch ya in a minute!"
+                            "Look, bud. You leave now and you forfeit your body count!"
+                            "You're lucky I don't smack you for thinking about leaving."))
+ #+END_SRC
+* Troubleshooting
+If you have any issues with this module do let me know
diff --git a/.emacs.d/modules/ui/doom/config.el b/.emacs.d/modules/ui/doom/config.el
index 49ecfee..9805743 100644
--- a/.emacs.d/modules/ui/doom/config.el
+++ b/.emacs.d/modules/ui/doom/config.el
@@ -35,13 +35,6 @@
           (when solaire-global-mode
             (solaire-global-mode -1))))))
 
-  (add-hook! 'solaire-global-mode-hook :append
-    (defun +doom-solaire-swap-bg-faces-maybe-h ()
-      (and (bound-and-true-p solaire-global-mode)
-           (symbolp doom-theme)
-           (string-prefix-p "doom-" (symbol-name doom-theme))
-           (solaire-mode-swap-bg))))
-
   ;; DEPRECATED No longer needed in Emacs 27+
   (unless EMACS27+
     ;; HACK On Emacs <=26, when point is on the last (or second to last) line
diff --git a/.emacs.d/modules/ui/doom/packages.el b/.emacs.d/modules/ui/doom/packages.el
index da393dd..7d74eb6 100644
--- a/.emacs.d/modules/ui/doom/packages.el
+++ b/.emacs.d/modules/ui/doom/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/doom/packages.el
 
-(package! doom-themes :pin "2c71a9fe4edcdcd8844e60c6cddc5faf954dfc72")
-(package! solaire-mode :pin "d3e8f9e1e3109a93a39602deac6a21be497f7f16")
+(package! doom-themes :pin "24023de3c80c9f3afc3d012762d1ef0f8dbd326e")
+(package! solaire-mode :pin "cd63b675140232f399e7733d7ce95a0b931b1058")
diff --git a/.emacs.d/modules/ui/fill-column/packages.el b/.emacs.d/modules/ui/fill-column/packages.el
index 75c23a2..83e03b7 100644
--- a/.emacs.d/modules/ui/fill-column/packages.el
+++ b/.emacs.d/modules/ui/fill-column/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/fill-column/packages.el
 
-(package! hl-fill-column :pin "43cb3c35a92c912b7205b8a36f1ad0ec0a5b4a22")
+(package! hl-fill-column :pin "5782a91ba0182c4e562fa0db6379ff9dd472856b")
diff --git a/.emacs.d/modules/ui/hl-todo/README.org b/.emacs.d/modules/ui/hl-todo/README.org
index d8af7eb..1898ce0 100644
--- a/.emacs.d/modules/ui/hl-todo/README.org
+++ b/.emacs.d/modules/ui/hl-todo/README.org
@@ -1,13 +1,83 @@
 #+TITLE: :ui hl-todo
+#+DATE:    February 19, 2017
+#+SINCE:   v1.3
+#+STARTUP: inlineimages
 
-This module adds syntax highlighting for TODO/FIXME/NOTE tags in programming major-modes.
+* Table of Contents :TOC_3:noexport:
+- [[#description][Description]]
+  - [[#module-flags][Module Flags]]
+  - [[#plugins][Plugins]]
+- [[#prerequisites][Prerequisites]]
+- [[#features][Features]]
+  - [[#making-items][Making Items]]
+  - [[#keybindings][Keybindings]]
+  - [[#adding-items][Adding items.]]
+- [[#configuration][Configuration]]
+- [[#troubleshooting][Troubleshooting]]
 
-What keywords are highlighted (and their color) can be customized through ~hl-todo-keyword-faces~.
+* Description
+This module adds syntax highlighting for TODO/FIXME/NOTE tags in programming
+major-modes.
 
+** Module Flags
+This module provides no flags
+
+** Plugins
++ [[https://github.com/tarius/hl-todo][hl-todo]]
+ 
+* Prerequisites
+This module has no prerequisites
+
+* Features
+
+** Making Items
+You can make a TODO item by simply writing
++ =TODO=
+  For things that need to be done, just not today.
++ =HACK=
+  For tidbits that are unconventional and not intended uses of the
+  constituent parts, and may break in a future update.
++ =FIXME=
+  For problems that will become bigger problems later if not fixed ASAP.
++ =REVIEW=
+  for things that were done hastily and/or hasn't been thoroughly
+  tested. it may not even be necessary!
++ =NOTE=
+  For especially important gotchas with a given implementation,
+  directed at another user other than the author.
++ =DEPRECATED=
+  For things that just gotta go and will soon be gone.
++ =BUG=
+  For a known bug that needs a workaround
++ =XXX=
+  For warning about a problematic or misguiding code
+
+** Keybindings
+| keybind   | description                      |
+|-----------+----------------------------------|
+| =]t=      | go to next TODO item             |
+| =[t=      | go to previous TODO item         |
+| =SPC p t= | show all TODO items in a project |
+| =SPC s p= | search project for a string      |
+| =SPC s b= | search buffer for string         |
+
+** TODO Adding items.
+The way you would add a TODO item is to use a snippet but these have not been
+made. you can make them yourself by adding the snippet to
+=$DOOMDIR/snippets/MAJOR-MODE/name-of-snippet=. you will find more info on how
+to make them [[https://github.com/hlissner/doom-snippets][here]]
+
+* Configuration
+To add your own ITEMS you would need to configure them using
+~hl-todo-keyword-faces~
 #+BEGIN_SRC emacs-lisp
 ;; the default
-(setq hl-todo-keyword-faces
-      `(("TODO"  . ,(face-foreground 'warning))
-        ("FIXME" . ,(face-foreground 'error))
-        ("NOTE"  . ,(face-foreground 'success))))
+(after! hl-todo
+  (setq hl-todo-keyword-faces
+        `(
+          ("FOO"  . ,(face-foreground "MY COLOUR HEX CODE"))
+          ("BAR" . ,(face-foreground 'my-colour-var)))))
 #+END_SRC
+
+* TODO Troubleshooting
+If you have any problems with this module do get in touch!
diff --git a/.emacs.d/modules/ui/hl-todo/packages.el b/.emacs.d/modules/ui/hl-todo/packages.el
index d83551c..299a469 100644
--- a/.emacs.d/modules/ui/hl-todo/packages.el
+++ b/.emacs.d/modules/ui/hl-todo/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/hl-todo/packages.el
 
-(package! hl-todo :pin "3bba4591c54951d2abab113ec5e58a6319808ca9")
+(package! hl-todo :pin "0598b98f63b623c1778cbd2e2f60b774b7a311b9")
diff --git a/.emacs.d/modules/ui/hydra/README.org b/.emacs.d/modules/ui/hydra/README.org
index de852a1..3100b09 100644
--- a/.emacs.d/modules/ui/hydra/README.org
+++ b/.emacs.d/modules/ui/hydra/README.org
@@ -24,7 +24,7 @@ This module provides no flags.
 + [[https://github.com/abo-abo/hydra][hydra]]
 
 * Prerequisites
-This module has no prereqisites.
+This module has no prerequisites.
 
 * Configuration
 Configuring this module is only setting bindings to the provided hydra, or
diff --git a/.emacs.d/modules/ui/hydra/packages.el b/.emacs.d/modules/ui/hydra/packages.el
index 95319a9..4a7b37f 100644
--- a/.emacs.d/modules/ui/hydra/packages.el
+++ b/.emacs.d/modules/ui/hydra/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/hydra/packages.el
 
-(package! hydra :pin "87873d788891029d9e44fa5458321d6a05849b94")
+(package! hydra :pin "112e689f75b59398d8eca79ac6562dca12b8a959")
diff --git a/.emacs.d/modules/ui/indent-guides/packages.el b/.emacs.d/modules/ui/indent-guides/packages.el
index dab8cc8..0810515 100644
--- a/.emacs.d/modules/ui/indent-guides/packages.el
+++ b/.emacs.d/modules/ui/indent-guides/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/indent-guides/packages.el
 
-(package! highlight-indent-guides :pin "1b12c7b440ff988c7237936187c1375ac4ddc7f4")
+(package! highlight-indent-guides :pin "a4f771418e4eed1f3f7879a43af28cf97747d41c")
diff --git a/.emacs.d/modules/ui/modeline/+light.el b/.emacs.d/modules/ui/modeline/+light.el
index 3026291..83d2ef6 100644
--- a/.emacs.d/modules/ui/modeline/+light.el
+++ b/.emacs.d/modules/ui/modeline/+light.el
@@ -152,13 +152,13 @@ LHS and RHS will accept."
         (lambda (&rest _) (set-modeline! name))))
 
 (defmacro def-modeline-var! (name body &optional docstring &rest plist)
-  "TODO"
+  "Define a modeline segment variable."
   (unless (stringp docstring)
     (push docstring plist)
     (setq docstring nil))
   `(progn
-     (,(if (plist-get plist :local) 'defvar-local 'defvar)
-      ,name ,body ,docstring)
+     (defconst ,name ,body ,docstring)
+     ,@(if (plist-get plist :local) `((make-variable-buffer-local ',name)))
      (put ',name 'risky-local-variable t)))
 
 
@@ -352,20 +352,40 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
 
 
 ;;; `+modeline-buffer-identification'
+(defvar-local +modeline--buffer-id-cache nil)
+
+;; REVIEW Generating the buffer's file name can be relatively expensive.
+;;        Compounded with how often the modeline updates this can add up, so
+;;        we cache it ahead of time.
+(add-hook! '(change-major-mode-after-body-hook
+             ;; In case the user saves the file to a new location
+             after-save-hook
+             ;; ...or makes external changes then returns to Emacs
+             focus-in-hook
+             ;; ...or when we change the current project!
+             projectile-after-switch-project-hook
+             ;; ...when the visited file changes (e.g. it's renamed)
+             after-set-visited-file-name-hook
+             ;; ...when the underlying file changes
+             after-revert-hook)
+  (defun +modeline--generate-buffer-id-cache-h ()
+    (when after-init-time
+      (setq +modeline--buffer-id-cache
+            (let ((file-name (buffer-file-name (buffer-base-buffer))))
+              (unless (or (null default-directory)
+                          (null file-name)
+                          (file-remote-p file-name))
+                (when-let (project-root (doom-project-root))
+                  (file-relative-name (or buffer-file-truename (file-truename file-name))
+                                      (concat project-root "..")))))))))
+
 (def-modeline-var! +modeline-buffer-identification ; slightly more informative buffer id
   '((:eval
      (propertize
-      (let ((buffer-file-name (buffer-file-name (buffer-base-buffer))))
-        (or (when (and (not (file-remote-p buffer-file-name)) buffer-file-name)
-              (if-let (project (doom-project-root buffer-file-name))
-                  (let ((filename (or buffer-file-truename (file-truename buffer-file-name))))
-                    (file-relative-name filename (concat project "..")))))
-            "%b"))
-      'face (cond ((buffer-modified-p)
-                   '(error bold mode-line-buffer-id))
-                  ((+modeline-active)
-                   'mode-line-buffer-id))
-      'help-echo buffer-file-name))
+      (or +modeline--buffer-id-cache "%b")
+      'face (cond ((buffer-modified-p) '(error bold mode-line-buffer-id))
+                  ((+modeline-active)  'mode-line-buffer-id))
+      'help-echo (or +modeline--buffer-id-cache (buffer-name))))
     (buffer-read-only (:propertize " RO" face warning))))
 
 
@@ -400,9 +420,9 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
                                                     warning
                                                     info))))
                (+modeline-format-icon "check" "" 'success)))
-            (`running     (+modeline-format-icon "access_time" "*" 'font-lock-comment-face "Running..."))
+            (`running     (+modeline-format-icon "access_time" "*" 'mode-line-inactive "Running..."))
             (`errored     (+modeline-format-icon "sim_card_alert" "!" 'error "Errored!"))
-            (`interrupted (+modeline-format-icon "pause" "!" 'font-lock-comment-face "Interrupted"))
+            (`interrupted (+modeline-format-icon "pause" "!" 'mode-line-inactive "Interrupted"))
             (`suspicious  (+modeline-format-icon "priority_high" "!" 'error "Suspicious"))))))
 
 
@@ -517,28 +537,6 @@ lines are selected, or the NxM dimensions of a block selection.")
 ;; TODO (def-modeline! helm ...)
 
 
-;;
-;;; Bootstrap
-
-(size-indication-mode +1) ; filesize in modeline
-
-(setq-default
- mode-line-format
- '(""
-   +modeline-bar
-   +modeline-format-left
-   (:eval
-    (propertize
-     " "
-     'display
-     `((space :align-to (- (+ right right-fringe right-margin)
-                           ,(string-width
-                             (format-mode-line '("" +modeline-format-right))))))))
-   +modeline-format-right))
-(with-current-buffer "*Messages*"
-  (setq mode-line-format (default-value 'mode-line-format)))
-
-
 ;; Other modes
 (set-modeline! :main 'default)
 (set-modeline-hook! '+doom-dashboard-mode-hook 'project)
@@ -553,3 +551,34 @@ lines are selected, or the NxM dimensions of a block selection.")
     (if (eq major-mode 'magit-status-mode)
         (set-modeline! 'project)
       (hide-mode-line-mode +1))))
+
+
+;;
+;;; Bootstrap
+
+(defvar +modeline--old-format (default-value 'mode-line-format))
+
+(define-minor-mode +modeline-mode
+  "TODO"
+  :init-value nil
+  :global nil
+  (cond
+   (+modeline-mode
+    (setq mode-line-format
+          (cons
+           "" '(+modeline-bar
+                +modeline-format-left
+                (:eval
+                 (propertize
+                  " "
+                  'display
+                  `((space :align-to (- (+ right right-fringe right-margin)
+                                        ,(string-width
+                                          (format-mode-line '("" +modeline-format-right))))))))
+                +modeline-format-right))))
+   ((setq mode-line-format +modeline--old-format))))
+
+(define-global-minor-mode +modeline-global-mode +modeline-mode +modeline-mode)
+
+(add-hook '+modeline-global-mode-hook #'size-indication-mode)
+(add-hook 'doom-init-ui-hook #'+modeline-global-mode)
diff --git a/.emacs.d/modules/ui/modeline/config.el b/.emacs.d/modules/ui/modeline/config.el
index 1314f97..8ef94a3 100644
--- a/.emacs.d/modules/ui/modeline/config.el
+++ b/.emacs.d/modules/ui/modeline/config.el
@@ -4,15 +4,6 @@
   (load! "+light"))
 
 
-(defvar +modeline--redisplayed-p nil)
-(defadvice! modeline-recalculate-height-a (&optional _force &rest _ignored)
-  "Ensure that window resizing functions take modeline height into account."
-  :before '(fit-window-to-buffer resize-temp-buffer-window)
-  (unless +modeline--redisplayed-p
-    (setq-local +modeline--redisplayed-p t)
-    (redisplay t)))
-
-
 (use-package! doom-modeline
   :unless (featurep! +light)
   :hook (after-init . doom-modeline-mode)
diff --git a/.emacs.d/modules/ui/modeline/packages.el b/.emacs.d/modules/ui/modeline/packages.el
index 19684f4..fb6cc0d 100644
--- a/.emacs.d/modules/ui/modeline/packages.el
+++ b/.emacs.d/modules/ui/modeline/packages.el
@@ -2,7 +2,7 @@
 ;;; ui/modeline/packages.el
 
 (unless (featurep! +light)
-  (package! doom-modeline :pin "881e099fe02e3dd5ad66c51156fcdcc60e093a9b"))
+  (package! doom-modeline :pin "ffbaaee832f1c97ff608bc4959b408997d959b7d"))
 (package! anzu :pin "7b8688c84d6032300d0c415182c7c1ad6cb7f819")
 (when (featurep! :editor evil)
   (package! evil-anzu :pin "d3f6ed4773b48767bd5f4708c7f083336a8a8a86"))
diff --git a/.emacs.d/modules/ui/nav-flash/README.org b/.emacs.d/modules/ui/nav-flash/README.org
index 105c1d1..b8a23ff 100644
--- a/.emacs.d/modules/ui/nav-flash/README.org
+++ b/.emacs.d/modules/ui/nav-flash/README.org
@@ -25,7 +25,7 @@ This module has no dependencies.
 
 * Configuration
 By default, ~nav-flash~ will be triggered whenever ~recenter~ is called or an
-entry is added to the jump-list (maanaged by better-jumper).
+entry is added to the jump-list (managed by better-jumper).
 
 ~recenter~ is called after many hooks and commands, such as:
 
diff --git a/.emacs.d/modules/ui/nav-flash/autoload.el b/.emacs.d/modules/ui/nav-flash/autoload.el
index d129f25..61521bd 100644
--- a/.emacs.d/modules/ui/nav-flash/autoload.el
+++ b/.emacs.d/modules/ui/nav-flash/autoload.el
@@ -14,11 +14,12 @@ jumping to another part of the file)."
 
 ;;;###autoload
 (defun +nav-flash-blink-cursor-maybe (&rest _)
-  "Like `+nav-flash-blink-cursor', but no-ops if in special-mode or term-mode,
-or triggered from one of `+nav-flash-exclude-commands'."
+  "Like `+nav-flash-blink-cursor', but no-ops if in special-mode, term-mode,
+vterm-mode, or triggered from one of `+nav-flash-exclude-commands'."
   (unless (or (memq this-command +nav-flash-exclude-commands)
               (bound-and-true-p so-long-minor-mode)
-              (derived-mode-p 'so-long-mode 'special-mode 'term-mode)
+              (derived-mode-p 'so-long-mode 'special-mode 'term-mode
+                              'vterm-mode)
               (and (equal (point-marker) (car +nav-flash--last-point))
                    (equal (selected-window) (cdr +nav-flash--last-point))))
     (+nav-flash-blink-cursor)
diff --git a/.emacs.d/modules/ui/pretty-code/+fira.el b/.emacs.d/modules/ui/pretty-code/+fira.el
deleted file mode 100644
index b92f30f..0000000
--- a/.emacs.d/modules/ui/pretty-code/+fira.el
+++ /dev/null
@@ -1,127 +0,0 @@
-;;; ui/pretty-code/+fira.el -*- lexical-binding: t; -*-
-
-(defvar +pretty-code-fira-code-font-name "Fira Code Symbol"
-  "Name of the fira code ligature font.")
-
-(defvar +pretty-code-fira-code-font-ligatures
-  '(("www"    . #Xe100)
-    ("**"     . #Xe101)
-    ("***"    . #Xe102)
-    ("**/"    . #Xe103)
-    ("*>"     . #Xe104)
-    ("*/"     . #Xe105)
-    ("\\\\"   . #Xe106)
-    ("\\\\\\" . #Xe107)
-    ("{-"     . #Xe108)
-    ("[]"     . #Xe109)
-    ("::"     . #Xe10a)
-    (":::"    . #Xe10b)
-    (":="     . #Xe10c)
-    ("!!"     . #Xe10d)
-    ("!="     . #Xe10e)
-    ("!=="    . #Xe10f)
-    ("-}"     . #Xe110)
-    ("--"     . #Xe111)
-    ("---"    . #Xe112)
-    ("-->"    . #Xe113)
-    ("->"     . #Xe114)
-    ("->>"    . #Xe115)
-    ("-<"     . #Xe116)
-    ("-<<"    . #Xe117)
-    ("-~"     . #Xe118)
-    ("#{"     . #Xe119)
-    ("#["     . #Xe11a)
-    ("##"     . #Xe11b)
-    ("###"    . #Xe11c)
-    ("####"   . #Xe11d)
-    ("#("     . #Xe11e)
-    ("#?"     . #Xe11f)
-    ("#_"     . #Xe120)
-    ("#_("    . #Xe121)
-    (".-"     . #Xe122)
-    (".="     . #Xe123)
-    (".."     . #Xe124)
-    ("..<"    . #Xe125)
-    ("..."    . #Xe126)
-    ("?="     . #Xe127)
-    ("??"     . #Xe128)
-    (";;"     . #Xe129)
-    ("/*"     . #Xe12a)
-    ("/**"    . #Xe12b)
-    ("/="     . #Xe12c)
-    ("/=="    . #Xe12d)
-    ("/>"     . #Xe12e)
-    ("//"     . #Xe12f)
-    ("///"    . #Xe130)
-    ("&&"     . #Xe131)
-    ("||"     . #Xe132)
-    ("||="    . #Xe133)
-    ("|="     . #Xe134)
-    ("|>"     . #Xe135)
-    ("^="     . #Xe136)
-    ("$>"     . #Xe137)
-    ("++"     . #Xe138)
-    ("+++"    . #Xe139)
-    ("+>"     . #Xe13a)
-    ("=:="    . #Xe13b)
-    ("=="     . #Xe13c)
-    ("==="    . #Xe13d)
-    ("==>"    . #Xe13e)
-    ("=>"     . #Xe13f)
-    ("=>>"    . #Xe140)
-    ("=<"     . #Xe141)
-    ("=<<"    . #Xe142)
-    ("=/="    . #Xe143)
-    (">-"     . #Xe144)
-    (">="     . #Xe145)
-    (">=>"    . #Xe146)
-    (">>"     . #Xe147)
-    (">>-"    . #Xe148)
-    (">>="    . #Xe149)
-    (">>>"    . #Xe14a)
-    ("<*"     . #Xe14b)
-    ("<*>"    . #Xe14c)
-    ("<|"     . #Xe14d)
-    ("<|>"    . #Xe14e)
-    ("<$"     . #Xe14f)
-    ("<$>"    . #Xe150)
-    ("<!--"   . #Xe151)
-    ("<-"     . #Xe152)
-    ("<--"    . #Xe153)
-    ("<->"    . #Xe154)
-    ("<+"     . #Xe155)
-    ("<+>"    . #Xe156)
-    ("<="     . #Xe157)
-    ("<=="    . #Xe158)
-    ("<=>"    . #Xe159)
-    ("<=<"    . #Xe15a)
-    ("<>"     . #Xe15b)
-    ("<<"     . #Xe15c)
-    ("<<-"    . #Xe15d)
-    ("<<="    . #Xe15e)
-    ("<<<"    . #Xe15f)
-    ("<~"     . #Xe160)
-    ("<~~"    . #Xe161)
-    ("</"     . #Xe162)
-    ("</>"    . #Xe163)
-    ("~@"     . #Xe164)
-    ("~-"     . #Xe165)
-    ("~="     . #Xe166)
-    ("~>"     . #Xe167)
-    ("~~"     . #Xe168)
-    ("~~>"    . #Xe169)
-    ("%%"     . #Xe16a)
-    ("x"      . #Xe16b)
-    (":"      . #Xe16c)
-    ("+"      . #Xe16d)
-    ("+"      . #Xe16e)
-    ("*"      . #Xe16f)))
-
-(defun +pretty-code-setup-fira-ligatures-h ()
-  (set-fontset-font t '(#Xe100 . #Xe16f) +pretty-code-fira-code-font-name nil 'prepend)
-  (setq-default prettify-symbols-alist
-                (append prettify-symbols-alist
-                        (mapcar #'+pretty-code--correct-symbol-bounds
-                                +pretty-code-fira-code-font-ligatures))))
-
-(add-hook 'doom-init-ui-hook #'+pretty-code-setup-fira-ligatures-h)
diff --git a/.emacs.d/modules/ui/pretty-code/+hasklig.el b/.emacs.d/modules/ui/pretty-code/+hasklig.el
deleted file mode 100644
index e9d0407..0000000
--- a/.emacs.d/modules/ui/pretty-code/+hasklig.el
+++ /dev/null
@@ -1,58 +0,0 @@
-;;; ui/pretty-code/+hasklig.el -*- lexical-binding: t; -*-
-
-(defvar +pretty-code-hasklig-font-name "Hasklig"
-  "Name of the hasklig ligature font.")
-
-(defvar +pretty-code-hasklig-font-ligatures
-  '(("&&"   . #Xe100)
-    ("***"  . #Xe101)
-    ("*>"   . #Xe102)
-    ("\\\\" . #Xe103)
-    ("||"   . #Xe104)
-    ("|>"   . #Xe105)
-    ("::"   . #Xe106)
-    ("=="   . #Xe107)
-    ("==="  . #Xe108)
-    ("==>"  . #Xe109)
-    ("=>"   . #Xe10a)
-    ("=<<"  . #Xe10b)
-    ("!!"   . #Xe10c)
-    (">>"   . #Xe10d)
-    (">>="  . #Xe10e)
-    (">>>"  . #Xe10f)
-    (">>-"  . #Xe110)
-    (">-"   . #Xe111)
-    ("->"   . #Xe112)
-    ("-<"   . #Xe113)
-    ("-<<"  . #Xe114)
-    ("<*"   . #Xe115)
-    ("<*>"  . #Xe116)
-    ("<|"   . #Xe117)
-    ("<|>"  . #Xe118)
-    ("<$>"  . #Xe119)
-    ("<>"   . #Xe11a)
-    ("<-"   . #Xe11b)
-    ("<<"   . #Xe11c)
-    ("<<<"  . #Xe11d)
-    ("<+>"  . #Xe11e)
-    (".."   . #Xe11f)
-    ("..."  . #Xe120)
-    ("++"   . #Xe121)
-    ("+++"  . #Xe122)
-    ("/="   . #Xe123)
-    (":::"  . #Xe124)
-    (">=>"  . #Xe125)
-    ("->>"  . #Xe126)
-    ("<=>"  . #Xe127)
-    ("<=<"  . #Xe128)
-    ("<->"  . #Xe129)))
-
-
-(defun +pretty-code-setup-hasklig-ligatures-h ()
-  (set-fontset-font t '(#Xe100 . #Xe129) +pretty-code-hasklig-font-name nil 'prepend)
-  (setq-default prettify-symbols-alist
-                (append prettify-symbols-alist
-                        (mapcar #'+pretty-code--correct-symbol-bounds
-                                +pretty-code-hasklig-font-ligatures))))
-
-(add-hook 'doom-init-ui-hook #'+pretty-code-setup-hasklig-ligatures-h)
diff --git a/.emacs.d/modules/ui/pretty-code/+iosevka.el b/.emacs.d/modules/ui/pretty-code/+iosevka.el
deleted file mode 100644
index 9d52fd8..0000000
--- a/.emacs.d/modules/ui/pretty-code/+iosevka.el
+++ /dev/null
@@ -1,232 +0,0 @@
-;;; ui/pretty-code/+iosevka.el -*- lexical-binding: t; -*-
-
-(defvar +pretty-code-iosevka-font-name "Iosevka"
-  "Name of the iosevka ligature font.")
-
-(defvar +pretty-code-iosevka-font-ligatures
-  '(;; Double-ended hyphen arrows
-    ("<->" . #Xe100)
-    ("<-->" . #Xe101)
-    ("<--->" . #Xe102)
-    ("<---->" . #Xe103)
-    ("<----->" . #Xe104)
-    ;; Double-ended equals arrows
-    ("<=>" . #Xe105)
-    ("<==>" . #Xe106)
-    ("<===>" . #Xe107)
-    ("<====>" . #Xe108)
-    ("<=====>" . #Xe109)
-    ;; Double-ended asterisk operators
-    ("<**>" . #Xe10a)
-    ("<***>" . #Xe10b)
-    ("<****>" . #Xe10c)
-    ("<*****>" . #Xe10d)
-    ;; HTML comments
-    ("<!--" . #Xe10e)
-    ("<!---" . #Xe10f)
-    ;; Three-char ops with discards
-    ("<$" . #Xe110)
-    ("<$>" . #Xe111)
-    ("$>" . #Xe112)
-    ("<." . #Xe113)
-    ("<.>" . #Xe114)
-    (".>" . #Xe115)
-    ("<*" . #Xe116)
-    ("<*>" . #Xe117)
-    ("*>" . #Xe118)
-    ("<\\" . #Xe119)
-    ("<\\>" . #Xe11a)
-    ("\\>" . #Xe11b)
-    ("</" . #Xe11c)
-    ("</>" . #Xe11d)
-    ("/>" . #Xe11e)
-    ("<\"" . #Xe11f)
-    ("<\">" . #Xe120)
-    ("\">" . #Xe121)
-    ("<'" . #Xe122)
-    ("<'>" . #Xe123)
-    ("'>" . #Xe124)
-    ("<^" . #Xe125)
-    ("<^>" . #Xe126)
-    ("^>" . #Xe127)
-    ("<&" . #Xe128)
-    ("<&>" . #Xe129)
-    ("&>" . #Xe12a)
-    ("<%" . #Xe12b)
-    ("<%>" . #Xe12c)
-    ("%>" . #Xe12d)
-    ("<@" . #Xe12e)
-    ("<@>" . #Xe12f)
-    ("@>" . #Xe130)
-    ("<#" . #Xe131)
-    ("<#>" . #Xe132)
-    ("#>" . #Xe133)
-    ("<+" . #Xe134)
-    ("<+>" . #Xe135)
-    ("+>" . #Xe136)
-    ("<-" . #Xe137)
-    ("<->" . #Xe138)
-    ("->" . #Xe139)
-    ("<!" . #Xe13a)
-    ("<!>" . #Xe13b)
-    ("!>" . #Xe13c)
-    ("<?" . #Xe13d)
-    ("<?>" . #Xe13e)
-    ("?>" . #Xe13f)
-    ("<|" . #Xe140)
-    ("<|>" . #Xe141)
-    ("|>" . #Xe142)
-    ("<:" . #Xe143)
-    ("<:>" . #Xe144)
-    (":>" . #Xe145)
-    ;; Colons
-    ("::" . #Xe146)
-    (":::" . #Xe147)
-    ("::::" . #Xe148)
-    ;; Arrow-like operators
-    ("->" . #Xe149)
-    ("->-" . #Xe14a)
-    ("->--" . #Xe14b)
-    ("->>" . #Xe14c)
-    ("->>-" . #Xe14d)
-    ("->>--" . #Xe14e)
-    ("->>>" . #Xe14f)
-    ("->>>-" . #Xe150)
-    ("->>>--" . #Xe151)
-    ("-->" . #Xe152)
-    ("-->-" . #Xe153)
-    ("-->--" . #Xe154)
-    ("-->>" . #Xe155)
-    ("-->>-" . #Xe156)
-    ("-->>--" . #Xe157)
-    ("-->>>" . #Xe158)
-    ("-->>>-" . #Xe159)
-    ("-->>>--" . #Xe15a)
-    (">-" . #Xe15b)
-    (">--" . #Xe15c)
-    (">>-" . #Xe15d)
-    (">>--" . #Xe15e)
-    (">>>-" . #Xe15f)
-    (">>>--" . #Xe160)
-    ("=>" . #Xe161)
-    ("=>=" . #Xe162)
-    ("=>==" . #Xe163)
-    ("=>>" . #Xe164)
-    ("=>>=" . #Xe165)
-    ("=>>==" . #Xe166)
-    ("=>>>" . #Xe167)
-    ("=>>>=" . #Xe168)
-    ("=>>>==" . #Xe169)
-    ("==>" . #Xe16a)
-    ("==>=" . #Xe16b)
-    ("==>==" . #Xe16c)
-    ("==>>" . #Xe16d)
-    ("==>>=" . #Xe16e)
-    ("==>>==" . #Xe16f)
-    ("==>>>" . #Xe170)
-    ("==>>>=" . #Xe171)
-    ("==>>>==" . #Xe172)
-    (">=" . #Xe173)
-    (">==" . #Xe174)
-    (">>=" . #Xe175)
-    (">>==" . #Xe176)
-    (">>>=" . #Xe177)
-    (">>>==" . #Xe178)
-    ("<-" . #Xe179)
-    ("-<-" . #Xe17a)
-    ("--<-" . #Xe17b)
-    ("<<-" . #Xe17c)
-    ("-<<-" . #Xe17d)
-    ("--<<-" . #Xe17e)
-    ("<<<-" . #Xe17f)
-    ("-<<<-" . #Xe180)
-    ("--<<<-" . #Xe181)
-    ("<--" . #Xe182)
-    ("-<--" . #Xe183)
-    ("--<--" . #Xe184)
-    ("<<--" . #Xe185)
-    ("-<<--" . #Xe186)
-    ("--<<--" . #Xe187)
-    ("<<<--" . #Xe188)
-    ("-<<<--" . #Xe189)
-    ("--<<<--" . #Xe18a)
-    ("-<" . #Xe18b)
-    ("--<" . #Xe18c)
-    ("-<<" . #Xe18d)
-    ("--<<" . #Xe18e)
-    ("-<<<" . #Xe18f)
-    ("--<<<" . #Xe190)
-    ("<=" . #Xe191)
-    ("=<=" . #Xe192)
-    ("==<=" . #Xe193)
-    ("<<=" . #Xe194)
-    ("=<<=" . #Xe195)
-    ("==<<=" . #Xe196)
-    ("<<<=" . #Xe197)
-    ("=<<<=" . #Xe198)
-    ("==<<<=" . #Xe199)
-    ("<==" . #Xe19a)
-    ("=<==" . #Xe19b)
-    ("==<==" . #Xe19c)
-    ("<<==" . #Xe19d)
-    ("=<<==" . #Xe19e)
-    ("==<<==" . #Xe19f)
-    ("<<<==" . #Xe1a0)
-    ("=<<<==" . #Xe1a1)
-    ("==<<<==" . #Xe1a2)
-    ("=<" . #Xe1a3)
-    ("==<" . #Xe1a4)
-    ("=<<" . #Xe1a5)
-    ("==<<" . #Xe1a6)
-    ("=<<<" . #Xe1a7)
-    ("==<<<" . #Xe1a8)
-    ;; Monadic operators
-    (">=>" . #Xe1a9)
-    (">->" . #Xe1aa)
-    (">-->" . #Xe1ab)
-    (">==>" . #Xe1ac)
-    ("<=<" . #Xe1ad)
-    ("<-<" . #Xe1ae)
-    ("<--<" . #Xe1af)
-    ("<==<" . #Xe1b0)
-    ;; Composition operators
-    (">>" . #Xe1b1)
-    (">>>" . #Xe1b2)
-    ("<<" . #Xe1b3)
-    ("<<<" . #Xe1b4)
-    ;; Lens operators
-    (":+" . #Xe1b5)
-    (":-" . #Xe1b6)
-    (":=" . #Xe1b7)
-    ("+:" . #Xe1b8)
-    ("-:" . #Xe1b9)
-    ("=:" . #Xe1ba)
-    ("=^" . #Xe1bb)
-    ("=+" . #Xe1bc)
-    ("=-" . #Xe1bd)
-    ("=*" . #Xe1be)
-    ("=/" . #Xe1bf)
-    ("=%" . #Xe1c0)
-    ("^=" . #Xe1c1)
-    ("+=" . #Xe1c2)
-    ("-=" . #Xe1c3)
-    ("*=" . #Xe1c4)
-    ("/=" . #Xe1c5)
-    ("%=" . #Xe1c6)
-    ;; Logical
-    ("/\\" . #Xe1c7)
-    ("\\/" . #Xe1c8)
-    ;; Semigroup/monoid operators
-    ("<>" . #Xe1c9)
-    ("<+" . #Xe1ca)
-    ("<+>" . #Xe1cb)
-    ("+>" . #Xe1cc))
-  "Defines the character mappings for ligatures for Iosevka.")
-
-(defun +pretty-code-setup-iosevka-ligatures-h ()
-  (set-fontset-font t '(#Xe100 . #Xe1cc) +pretty-code-iosevka-font-name nil 'prepend)
-  (setq-default prettify-symbols-alist
-                (append prettify-symbols-alist
-                        +pretty-code-iosevka-font-ligatures)))
-
-(add-hook 'doom-init-ui-hook #'+pretty-code-setup-iosevka-ligatures-h)
diff --git a/.emacs.d/modules/ui/pretty-code/+pragmata-pro.el b/.emacs.d/modules/ui/pretty-code/+pragmata-pro.el
deleted file mode 100644
index 45e7b20..0000000
--- a/.emacs.d/modules/ui/pretty-code/+pragmata-pro.el
+++ /dev/null
@@ -1,259 +0,0 @@
-;;; ui/pretty-code/+pragmata-pro.el -*- lexical-binding: t; -*-
-
-(defvar +pretty-code-pragmata-pro-font-name "PragmataPro"
-  "Name of the Pragmata Pro ligature font.")
-
-(defvar +pretty-code-pragmata-pro-font-ligatures
-  '(("[ERROR]"   . #XE2C0)
-    ("[DEBUG]"   . #XE2C1)
-    ("[INFO]"    . #XE2C2)
-    ("[WARN]"    . #XE2C3)
-    ("[WARNING]" . #XE2C4)
-    ("[ERR]"     . #XE2C5)
-    ("[FATAL]"   . #XE2C6)
-    ("[TRACE]"   . #XE2C7)
-    ("[FIXME]"   . #XE2C8)
-    ("[TODO]"    . #XE2C9)
-    ("[BUG]"     . #XE2CA)
-    ("[NOTE]"    . #XE2CB)
-    ("[HACK]"    . #XE2CC)
-    ("[MARK]"    . #XE2CD)
-    ("# ERROR"   . #XE2F0)
-    ("# DEBUG"   . #XE2F1)
-    ("# INFO"    . #XE2F2)
-    ("# WARN"    . #XE2F3)
-    ("# WARNING" . #XE2F4)
-    ("# ERR"     . #XE2F5)
-    ("# FATAL"   . #XE2F6)
-    ("# TRACE"   . #XE2F7)
-    ("# FIXME"   . #XE2F8)
-    ("# TODO"    . #XE2F9)
-    ("# BUG"     . #XE2FA)
-    ("# NOTE"    . #XE2FB)
-    ("# HACK"    . #XE2FC)
-    ("# MARK"    . #XE2FD)
-    ("// ERROR"  . #XE2E0)
-    ("// DEBUG"  . #XE2E1)
-    ("// INFO"   . #XE2E2)
-    ("// WARN"   . #XE2E3)
-    ("// WARNING". #XE2E4)
-    ("// ERR"    . #XE2E5)
-    ("// FATAL"  . #XE2E6)
-    ("// TRACE"  . #XE2E7)
-    ("// FIXME"  . #XE2E8)
-    ("// TODO"   . #XE2E9)
-    ("// BUG"    . #XE2EA)
-    ("// NOTE"   . #XE2EB)
-    ("// HACK"   . #XE2EC)
-    ("// MARK"   . #XE2ED)
-    ("!!"        . #XE900)
-    ("!="        . #XE901)
-    ("!=="       . #XE902)
-    ("!!!"       . #XE903)
-    ("!≡"        . #XE904)
-    ("!≡≡"       . #XE905)
-    ("!>"        . #XE906)
-    ("!=<"       . #XE907)
-    ("#("        . #XE920)
-    ("#_"        . #XE921)
-    ("#{"        . #XE922)
-    ("#?"        . #XE923)
-    ("#>"        . #XE924)
-    ("##"        . #XE925)
-    ("#_("       . #XE926)
-    ("%="        . #XE930)
-    ("%>"        . #XE931)
-    ("%>%"       . #XE932)
-    ("%<%"       . #XE933)
-    ("&%"        . #XE940)
-    ("&&"        . #XE941)
-    ("&*"        . #XE942)
-    ("&+"        . #XE943)
-    ("&-"        . #XE944)
-    ("&/"        . #XE945)
-    ("&="        . #XE946)
-    ("&&&"       . #XE947)
-    ("&>"        . #XE948)
-    ("$>"        . #XE955)
-    ("***"       . #XE960)
-    ("*="        . #XE961)
-    ("*/"        . #XE962)
-    ("*>"        . #XE963)
-    ("++"        . #XE970)
-    ("+++"       . #XE971)
-    ("+="        . #XE972)
-    ("+>"        . #XE973)
-    ("++="       . #XE974)
-    ("--"        . #XE980)
-    ("-<"        . #XE981)
-    ("-<<"       . #XE982)
-    ("-="        . #XE983)
-    ("->"        . #XE984)
-    ("->>"       . #XE985)
-    ("---"       . #XE986)
-    ("-->"       . #XE987)
-    ("-+-"       . #XE988)
-    ("-\\/"      . #XE989)
-    ("-|>"       . #XE98A)
-    ("-<|"       . #XE98B)
-    (".."        . #XE990)
-    ("..."       . #XE991)
-    ("..<"       . #XE992)
-    (".>"        . #XE993)
-    (".~"        . #XE994)
-    (".="        . #XE995)
-    ("/*"        . #XE9A0)
-    ("//"        . #XE9A1)
-    ("/>"        . #XE9A2)
-    ("/="        . #XE9A3)
-    ("/=="       . #XE9A4)
-    ("///"       . #XE9A5)
-    ("/**"       . #XE9A6)
-    (":::"       . #XE9AF)
-    ("::"        . #XE9B0)
-    (":="        . #XE9B1)
-    (":≡"        . #XE9B2)
-    (":>"        . #XE9B3)
-    (":=>"       . #XE9B4)
-    (":("        . #XE9B5)
-    (":-("       . #XE9B6)
-    (":)"        . #XE9B7)
-    (":-)"       . #XE9B8)
-    (":/"        . #XE9B9)
-    (":\\"       . #XE9BA)
-    (":3"        . #XE9BB)
-    (":D"        . #XE9BC)
-    (":P"        . #XE9BD)
-    (":>:"       . #XE9BE)
-    (":<:"       . #XE9BF)
-    ("<$>"       . #XE9C0)
-    ("<*"        . #XE9C1)
-    ("<*>"       . #XE9C2)
-    ("<+>"       . #XE9C3)
-    ("<-"        . #XE9C4)
-    ("<<"        . #XE9C5)
-    ("<<<"       . #XE9C6)
-    ("<<="       . #XE9C7)
-    ("<="        . #XE9C8)
-    ("<=>"       . #XE9C9)
-    ("<>"        . #XE9CA)
-    ("<|>"       . #XE9CB)
-    ("<<-"       . #XE9CC)
-    ("<|"        . #XE9CD)
-    ("<=<"       . #XE9CE)
-    ("<~"        . #XE9CF)
-    ("<~~"       . #XE9D0)
-    ("<<~"       . #XE9D1)
-    ("<$"        . #XE9D2)
-    ("<+"        . #XE9D3)
-    ("<!>"       . #XE9D4)
-    ("<@>"       . #XE9D5)
-    ("<#>"       . #XE9D6)
-    ("<%>"       . #XE9D7)
-    ("<^>"       . #XE9D8)
-    ("<&>"       . #XE9D9)
-    ("<?>"       . #XE9DA)
-    ("<.>"       . #XE9DB)
-    ("</>"       . #XE9DC)
-    ("<\\>"      . #XE9DD)
-    ("<\">"      . #XE9DE)
-    ("<:>"       . #XE9DF)
-    ("<~>"       . #XE9E0)
-    ("<**>"      . #XE9E1)
-    ("<<^"       . #XE9E2)
-    ("<!"        . #XE9E3)
-    ("<@"        . #XE9E4)
-    ("<#"        . #XE9E5)
-    ("<%"        . #XE9E6)
-    ("<^"        . #XE9E7)
-    ("<&"        . #XE9E8)
-    ("<?"        . #XE9E9)
-    ("<."        . #XE9EA)
-    ("</"        . #XE9EB)
-    ("<\\"       . #XE9EC)
-    ("<\""       . #XE9ED)
-    ("<:"        . #XE9EE)
-    ("<->"       . #XE9EF)
-    ("<!--"      . #XE9F0)
-    ("<--"       . #XE9F1)
-    ("<~<"       . #XE9F2)
-    ("<==>"      . #XE9F3)
-    ("<|-"       . #XE9F4)
-    ("<<|"       . #XE9F5)
-    ("<-<"       . #XE9F7)
-    ("<-->"      . #XE9F8)
-    ("<<=="      . #XE9F9)
-    ("<=="       . #XE9FA)
-    ("=<<"       . #XEA00)
-    ("=="        . #XEA01)
-    ("==="       . #XEA02)
-    ("==>"       . #XEA03)
-    ("=>"        . #XEA04)
-    ("=~"        . #XEA05)
-    ("=>>"       . #XEA06)
-    ("=/="       . #XEA07)
-    ("=~="       . #XEA08)
-    ("==>>"      . #XEA09)
-    ("≡≡"        . #XEA10)
-    ("≡≡≡"       . #XEA11)
-    ("≡:≡"       . #XEA12)
-    (">-"        . #XEA20)
-    (">="        . #XEA21)
-    (">>"        . #XEA22)
-    (">>-"       . #XEA23)
-    (">>="       . #XEA24)
-    (">>>"       . #XEA25)
-    (">=>"       . #XEA26)
-    (">>^"       . #XEA27)
-    (">>|"       . #XEA28)
-    (">!="       . #XEA29)
-    (">->"       . #XEA2A)
-    ("??"        . #XEA40)
-    ("?~"        . #XEA41)
-    ("?="        . #XEA42)
-    ("?>"        . #XEA43)
-    ("???"       . #XEA44)
-    ("?."        . #XEA45)
-    ("^="        . #XEA48)
-    ("^."        . #XEA49)
-    ("^?"        . #XEA4A)
-    ("^.."       . #XEA4B)
-    ("^<<"       . #XEA4C)
-    ("^>>"       . #XEA4D)
-    ("^>"        . #XEA4E)
-    ("\\\\"      . #XEA50)
-    ("\\>"       . #XEA51)
-    ("\\/-"      . #XEA52)
-    ("@>"        . #XEA57)
-    ("|="        . #XEA60)
-    ("||"        . #XEA61)
-    ("|>"        . #XEA62)
-    ("|||"       . #XEA63)
-    ("|+|"       . #XEA64)
-    ("|->"       . #XEA65)
-    ("|-->"      . #XEA66)
-    ("|=>"       . #XEA67)
-    ("|==>"      . #XEA68)
-    ("|>-"       . #XEA69)
-    ("|<<"       . #XEA6A)
-    ("||>"       . #XEA6B)
-    ("|>>"       . #XEA6C)
-    ("|-"        . #XEA6D)
-    ("||-"       . #XEA6E)
-    ("~="        . #XEA70)
-    ("~>"        . #XEA71)
-    ("~~>"       . #XEA72)
-    ("~>>"       . #XEA73)
-    ("[["        . #XEA80)
-    ("]]"        . #XEA81)
-    ("\">"       . #XEA90)
-    ("_|_"       . #XEA97))
-  "Defines the character mappings for ligatures for Pragmata Pro.")
-
-(defun +pretty-code-setup-pragmata-pro-ligatures-h ()
-  (setq-default prettify-symbols-alist
-                (append prettify-symbols-alist
-                        (mapcar #'+pretty-code--correct-symbol-bounds
-                                +pretty-code-pragmata-pro-font-ligatures))))
-
-(add-hook 'doom-init-ui-hook #'+pretty-code-setup-pragmata-pro-ligatures-h)
diff --git a/.emacs.d/modules/ui/pretty-code/config.el b/.emacs.d/modules/ui/pretty-code/config.el
deleted file mode 100644
index dd8886e..0000000
--- a/.emacs.d/modules/ui/pretty-code/config.el
+++ /dev/null
@@ -1,199 +0,0 @@
-;;; ui/pretty-code/config.el -*- lexical-binding: t; -*-
-
-(defvar +pretty-code-symbols
-  '(;; org
-    :name          "»"
-    :src_block     "»"
-    :src_block_end "«"
-    :quote         "“"
-    :quote_end     "”"
-    ;; Functional
-    :lambda        "λ"
-    :def           "ƒ"
-    :composition   "∘"
-    :map           "↦"
-    ;; Types
-    :null          "∅"
-    :true          "𝕋"
-    :false         "𝔽"
-    :int           "ℤ"
-    :float         "ℝ"
-    :str           "𝕊"
-    :bool          "𝔹"
-    :list          "𝕃"
-    ;; Flow
-    :not           "￢"
-    :in            "∈"
-    :not-in        "∉"
-    :and           "∧"
-    :or            "∨"
-    :for           "∀"
-    :some          "∃"
-    :return        "⟼"
-    :yield         "⟻"
-    ;; Other
-    :union         "⋃"
-    :intersect     "∩"
-    :diff          "∖"
-    :tuple         "⨂"
-    :pipe          "" ;; FIXME: find a non-private char
-    :dot           "•")
-  "Options plist for `set-pretty-symbols!'.
-
-This should not contain any symbols from the Unicode Private Area! There is no
-universal way of getting the correct symbol as that area varies from font to
-font.")
-
-(defvar +pretty-code-enabled-modes t
-  "List of major modes in which `prettify-symbols-mode' should be enabled.
-If t, enable it everywhere. If the first element is 'not, enable it in any mode
-besides what is listed.")
-
-(defvar +pretty-code-symbols-alist '((t))
-  "An alist containing a mapping of major modes to its value for
-`prettify-symbols-alist'.")
-
-;;; Automatic font-specific ligatures
-(defvar +prog-ligatures-alist
-  '((?!  . "\\(?:!\\(?:==\\|[!=]\\)\\)")                                      ; (regexp-opt '("!!" "!=" "!=="))
-    (?#  . "\\(?:#\\(?:###?\\|_(\\|[#(:=?[_{]\\)\\)")                         ; (regexp-opt '("##" "###" "####" "#(" "#:" "#=" "#?" "#[" "#_" "#_(" "#{"))
-    (?$  . "\\(?:\\$>>?\\)")                                                  ; (regexp-opt '("$>" "$>>"))
-    (?%  . "\\(?:%%%?\\)")                                                    ; (regexp-opt '("%%" "%%%"))
-    (?&  . "\\(?:&&&?\\)")                                                    ; (regexp-opt '("&&" "&&&"))
-    (?*  . "\\(?:\\*\\(?:\\*[*/]\\|[)*/>]\\)?\\)")                            ; (regexp-opt '("*" "**" "***" "**/" "*/" "*>" "*)"))
-    (?+  . "\\(?:\\+\\(?:\\+\\+\\|[+:>]\\)?\\)")                              ; (regexp-opt '("+" "++" "+++" "+>" "+:"))
-    (?-  . "\\(?:-\\(?:-\\(?:->\\|[>-]\\)\\|<[<-]\\|>[>-]\\|[:<>|}~-]\\)\\)") ; (regexp-opt '("--" "---" "-->" "--->" "->-" "-<" "-<-" "-<<" "->" "->>" "-}" "-~" "-:" "-|"))
-    (?.  . "\\(?:\\.\\(?:\\.[.<]\\|[.=>-]\\)\\)")                             ; (regexp-opt '(".-" ".." "..." "..<" ".=" ".>"))
-    (?/  . "\\(?:/\\(?:\\*\\*\\|//\\|==\\|[*/=>]\\)\\)")                      ; (regexp-opt '("/*" "/**" "//" "///" "/=" "/==" "/>"))
-    (?:  . "\\(?::\\(?:::\\|[+:<=>]\\)?\\)")                                  ; (regexp-opt '(":" "::" ":::" ":=" ":<" ":=" ":>" ":+"))
-    (?\; . ";;")                                                              ; (regexp-opt '(";;"))
-    (?0  . "0\\(?:\\(x[a-fA-F0-9]\\).?\\)") ; Tries to match the x in 0xDEADBEEF
-    ;; (?x . "x") ; Also tries to match the x in 0xDEADBEEF
-    ;; (regexp-opt '("<!--" "<$" "<$>" "<*" "<*>" "<**>" "<+" "<+>" "<-" "<--" "<---" "<->" "<-->" "<--->" "</" "</>" "<<" "<<-" "<<<" "<<=" "<=" "<=<" "<==" "<=>" "<===>" "<>" "<|" "<|>" "<~" "<~~" "<." "<.>" "<..>"))
-    (?<  . "\\(?:<\\(?:!--\\|\\$>\\|\\*\\(?:\\*?>\\)\\|\\+>\\|-\\(?:-\\(?:->\\|[>-]\\)\\|[>-]\\)\\|\\.\\(?:\\.?>\\)\\|/>\\|<[<=-]\\|=\\(?:==>\\|[<=>]\\)\\||>\\|~~\\|[$*+./<=>|~-]\\)\\)")
-    (?=  . "\\(?:=\\(?:/=\\|:=\\|<<\\|=[=>]\\|>>\\|[=>]\\)\\)")               ; (regexp-opt '("=/=" "=:=" "=<<" "==" "===" "==>" "=>" "=>>"))
-    (?>  . "\\(?:>\\(?:->\\|=>\\|>[=>-]\\|[:=>-]\\)\\)")                      ; (regexp-opt '(">-" ">->" ">:" ">=" ">=>" ">>" ">>-" ">>=" ">>>"))
-    (??  . "\\(?:\\?[.:=?]\\)")                                               ; (regexp-opt '("??" "?." "?:" "?="))
-    (?\[ . "\\(?:\\[\\(?:|]\\|[]|]\\)\\)")                                    ; (regexp-opt '("[]" "[|]" "[|"))
-    (?\\ . "\\(?:\\\\\\\\[\\n]?\\)")                                          ; (regexp-opt '("\\\\" "\\\\\\" "\\\\n"))
-    (?^  . "\\(?:\\^==?\\)")                                                  ; (regexp-opt '("^=" "^=="))
-    (?w  . "\\(?:wwww?\\)")                                                   ; (regexp-opt '("www" "wwww"))
-    (?{  . "\\(?:{\\(?:|\\(?:|}\\|[|}]\\)\\|[|-]\\)\\)")                      ; (regexp-opt '("{-" "{|" "{||" "{|}" "{||}"))
-    (?|  . "\\(?:|\\(?:->\\|=>\\||=\\|[]=>|}-]\\)\\)")                        ; (regexp-opt '("|=" "|>" "||" "||=" "|->" "|=>" "|]" "|}" "|-"))
-    (?_  . "\\(?:_\\(?:|?_\\)\\)")                                            ; (regexp-opt '("_|_" "__"))
-    (?\( . "\\(?:(\\*\\)")                                                    ; (regexp-opt '("(*"))
-    (?~  . "\\(?:~\\(?:~>\\|[=>@~-]\\)\\)"))                                  ; (regexp-opt '("~-" "~=" "~>" "~@" "~~" "~~>"))
-  "An alist of all ligatures used by `+prog-ligatures-modes'.
-
-The car is the character ASCII number, cdr is a regex which will call
-`font-shape-gstring' when matched.
-
-Because of the underlying code in :ui pretty-code module, the regex should match
-a string starting with the character contained in car.
-
-This variable is used only if you built Emacs with Harfbuzz on a version >= 28")
-
-(defvar +prog-ligatures-modes '(not org-mode)
-  "List of major modes in which ligatures should be enabled.
-
-If t, enable it everywhere. Fundamental mode, and modes derived from special-mode,
-comint-mode, eshell-mode and term-mode are *still* excluded.
-
-If the first element is 'not, enable it in any mode besides what is listed.
-
-If nil, fallback to the prettify-symbols based replacement (add +font features to pretty-code).")
-
-(defun +pretty-code--correct-symbol-bounds (ligature-alist)
-  "Prepend non-breaking spaces to a ligature.
-
-This way `compose-region' (called by `prettify-symbols-mode') will use the
-correct width of the symbols instead of the width measured by `char-width'."
-  (let ((len (length (car ligature-alist)))
-        (acc (list   (cdr ligature-alist))))
-    (while (> len 1)
-      (setq acc (cons #X00a0 (cons '(Br . Bl) acc))
-            len (1- len)))
-    (cons (car ligature-alist) acc)))
-
-(defun +pretty-code-init-pretty-symbols-h ()
-  "Enable `prettify-symbols-mode'.
-
-If in fundamental-mode, or a mode derived from special, comint, eshell or term
-modes, this function does nothing.
-
-Otherwise it builds `prettify-code-symbols-alist' according to
-`+pretty-code-symbols-alist' for the current major-mode."
-  (unless (or (eq major-mode 'fundamental-mode)
-              (eq (get major-mode 'mode-class) 'special)
-              (derived-mode-p 'comint-mode 'eshell-mode 'term-mode))
-    (when (or (eq +pretty-code-enabled-modes t)
-              (if (eq (car +pretty-code-enabled-modes) 'not)
-                  (not (memq major-mode (cdr +pretty-code-enabled-modes)))
-                (memq major-mode +pretty-code-enabled-modes)))
-      (setq prettify-symbols-alist
-            (append (cdr (assq major-mode +pretty-code-symbols-alist))
-                    (default-value 'prettify-symbols-alist)))
-      (when prettify-symbols-mode
-        (prettify-symbols-mode -1))
-      (prettify-symbols-mode +1))))
-
-(defun +pretty-code-init-ligatures-h ()
-  "Enable ligatures.
-
-If in fundamental-mode, or a mode derived from special, comint, eshell or term
-modes, this function does nothing.
-
-Otherwise it sets the buffer-local composition table to a composition table enhanced with
-`+prog-ligatures-alist' ligatures regexes."
-  (unless (or (eq major-mode 'fundamental-mode)
-              (eq (get major-mode 'mode-class) 'special)
-              (derived-mode-p 'comint-mode 'eshell-mode 'term-mode))
-    (when (or (eq +prog-ligatures-modes t)
-              (if (eq (car +prog-ligatures-modes) 'not)
-                  (not (memq major-mode (cdr +prog-ligatures-modes)))
-                (memq major-mode +prog-ligatures-modes)))
-      (setq-local composition-function-table composition-ligature-table))))
-
-
-;;
-;;; Bootstrap
-
-(add-hook 'after-change-major-mode-hook #'+pretty-code-init-pretty-symbols-h)
-
-;;;###package prettify-symbols
-;; When you get to the right edge, it goes back to how it normally prints
-(setq prettify-symbols-unprettify-at-point 'right-edge)
-
-(cond
- ;; The emacs-mac build of Emacs appear to have built-in support for ligatures,
- ;; using the same composition-function-table method
- ;; https://bitbucket.org/mituharu/emacs-mac/src/26c8fd9920db9d34ae8f78bceaec714230824dac/lisp/term/mac-win.el?at=master#lines-345:805
- ;; so use that instead if this module is enabled.
- ((and IS-MAC (fboundp 'mac-auto-operator-composition-mode))
-  (mac-auto-operator-composition-mode))
-
- ;; Harfbuzz builds do not need font-specific ligature support
- ;; if they are above emacs-27
- ((and EMACS28+
-       (string-match-p "HARFBUZZ" system-configuration-features)
-       +prog-ligatures-modes
-       (require 'composite nil t))
-  (defvar composition-ligature-table (make-char-table nil))
-
-  (dolist (char-regexp +prog-ligatures-alist)
-    (set-char-table-range composition-ligature-table (car char-regexp)
-                          `([,(cdr char-regexp) 0 font-shape-gstring])))
-  (unless doom-reloading-p
-    (set-char-table-parent composition-ligature-table composition-function-table))
-
-  (add-hook 'after-change-major-mode-hook #'+pretty-code-init-ligatures-h))
-
- ;; Font-specific ligature support
- ((featurep! +fira)
-  (load! "+fira"))
- ((featurep! +iosevka)
-  (load! "+iosevka"))
- ((featurep! +hasklig)
-  (load! "+hasklig"))
- ((featurep! +pragmata-pro)
-  (load! "+pragmata-pro")))
diff --git a/.emacs.d/modules/ui/tabs/packages.el b/.emacs.d/modules/ui/tabs/packages.el
index c1bbeb4..1f4d617 100644
--- a/.emacs.d/modules/ui/tabs/packages.el
+++ b/.emacs.d/modules/ui/tabs/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/tabs/packages.el
 
-(package! centaur-tabs :pin "9114ef423e820eee3f9c6cb29e112fc22aee84dd")
+(package! centaur-tabs :pin "7e0332b138f836b9d0b6d2134310f53369598cfd")
diff --git a/.emacs.d/modules/ui/treemacs/config.el b/.emacs.d/modules/ui/treemacs/config.el
index d660c69..3a9c6b9 100644
--- a/.emacs.d/modules/ui/treemacs/config.el
+++ b/.emacs.d/modules/ui/treemacs/config.el
@@ -26,9 +26,16 @@ This must be set before `treemacs' has loaded.")
         treemacs-persist-file (concat doom-cache-dir "treemacs-persist")
         treemacs-last-error-persist-file (concat doom-cache-dir "treemacs-last-error-persist"))
   :config
-  ;; Allow ace-window to target treemacs windows
+  ;; Allow ace-window to target treemacs windows elsewhere
   (after! ace-window
     (delq! 'treemacs-mode aw-ignored-buffers))
+  ;; ...but not from treemacs-visit-node-ace-* commands.
+  (defadvice! +treemacs--ace-window-ignore-treemacs-buffer-a (orig-fn &rest args)
+    :around '(treemacs-visit-node-ace
+              treemacs-visit-node-ace-horizontal-split
+              treemacs-visit-node-ace-vertical-split)
+    (let ((aw-ignored-buffers (cons 'treemacs-mode aw-ignored-buffers)))
+      (apply orig-fn args)))
 
   ;; Don't follow the cursor
   (treemacs-follow-mode -1)
diff --git a/.emacs.d/modules/ui/treemacs/packages.el b/.emacs.d/modules/ui/treemacs/packages.el
index 3bda680..c1f7afb 100644
--- a/.emacs.d/modules/ui/treemacs/packages.el
+++ b/.emacs.d/modules/ui/treemacs/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/treemacs/packages.el
 
-(package! treemacs :pin "644e9402f74dc6100a60fc2b54a2f94ba9bc52e0")
+(package! treemacs :pin "027e03b6fac5c0a870440d27c35d53bbe0215d81")
 ;; These packages have no :pin because they're in the same repo
 (when (featurep! :editor evil +everywhere)
   (package! treemacs-evil))
diff --git a/.emacs.d/modules/ui/unicode/packages.el b/.emacs.d/modules/ui/unicode/packages.el
index cafa4ae..827cffb 100644
--- a/.emacs.d/modules/ui/unicode/packages.el
+++ b/.emacs.d/modules/ui/unicode/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/unicode/packages.el
 
-(package! unicode-fonts :pin "7b88ae84e589f6c8b9386b2fb5a02ff4ccb91169")
+(package! unicode-fonts :pin "e3942fe40b418bfb2dc4e73633e09195437fef01")
diff --git a/.emacs.d/modules/ui/window-select/packages.el b/.emacs.d/modules/ui/window-select/packages.el
index 144908c..42a5e24 100644
--- a/.emacs.d/modules/ui/window-select/packages.el
+++ b/.emacs.d/modules/ui/window-select/packages.el
@@ -3,7 +3,7 @@
 
 (if (featurep! +switch-window)
     (package! switch-window :pin "8710f6304d843365fb59b6efe7e1f729d14e557c")
-  (package! ace-window :pin "7003c88cd9cad58dc35c7cd13ebc61c355fb5be7"))
+  (package! ace-window :pin "c7cb315c14e36fded5ac4096e158497ae974bec9"))
 
 (when (featurep! +numbers)
   (package! winum :pin "c5455e866e8a5f7eab6a7263e2057aff5f1118b9"))
diff --git a/.emacs.d/modules/ui/workspaces/config.el b/.emacs.d/modules/ui/workspaces/config.el
index 170963b..9847788 100644
--- a/.emacs.d/modules/ui/workspaces/config.el
+++ b/.emacs.d/modules/ui/workspaces/config.el
@@ -163,6 +163,7 @@ stored in `persp-save-dir'.")
             ("O" counsel-projectile-switch-project-action "jump to a project buffer or file")
             ("f" counsel-projectile-switch-project-action-find-file "jump to a project file")
             ("d" counsel-projectile-switch-project-action-find-dir "jump to a project directory")
+            ("D" counsel-projectile-switch-project-action-dired "open project in dired")
             ("b" counsel-projectile-switch-project-action-switch-to-buffer "jump to a project buffer")
             ("m" counsel-projectile-switch-project-action-find-file-manually "find file manually from project root")
             ("w" counsel-projectile-switch-project-action-save-all-buffers "save all project buffers")
@@ -195,10 +196,15 @@ stored in `persp-save-dir'.")
       (defun +workspaces-delete-all-posframes-h (&rest _)
         (posframe-delete-all))))
 
-  ;; Fix #1525: Ignore dead buffers in PERSP's buffer list
-  (defun +workspaces-dead-buffer-p (buf)
-    (not (buffer-live-p buf)))
-  (add-hook 'persp-filter-save-buffers-functions #'+workspaces-dead-buffer-p)
+
+  (add-hook! 'persp-filter-save-buffers-functions
+    (defun +workspaces-dead-buffer-p (buf)
+      ;; Fix #1525: Ignore dead buffers in PERSP's buffer list
+      (not (buffer-live-p buf)))
+    (defun +workspaces-remote-buffer-p (buf)
+      ;; And don't save TRAMP buffers; they're super slow to restore
+      (let ((dir (buffer-local-value 'default-directory buf)))
+        (ignore-errors (file-remote-p dir)))))
 
   ;; Otherwise, buffers opened via bookmarks aren't treated as "real" and are
   ;; excluded from the buffer list.
diff --git a/.i3/config b/.i3/config
index 481d6f3..d8141f5 100644
--- a/.i3/config
+++ b/.i3/config
@@ -42,7 +42,7 @@ bindsym $mod+Return exec $myTerm
 bindsym $mod+Shift+c kill
 
 # start program launcher
-bindsym $mod+KP_Insert exec --no-startup-id rofi -show run
+bindsym $mod+Shift+Return exec --no-startup-id rofi -show run
 
 # launch categorized menu
 bindsym $mod+' exec --no-startup-id morc_menu
diff --git a/.xmonad/README.org b/.xmonad/README.org
index 8e557e2..c542b2c 100644
--- a/.xmonad/README.org
+++ b/.xmonad/README.org
@@ -146,7 +146,7 @@ myBorderWidth :: Dimension
 myBorderWidth = 2          -- Sets border width for windows
 
 myNormColor :: String
-myNormColor   = "#292d3e"  -- Border color of normal windows
+myNormColor   = "#282c34"  -- Border color of normal windows
 
 myFocusColor :: String
 myFocusColor  = "#bbc5ff"  -- Border color of focused windows
@@ -168,7 +168,7 @@ myStartupHook = do
           spawnOnce "picom &"
           spawnOnce "nm-applet &"
           spawnOnce "volumeicon &"
-          spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x292d3e --height 22 &"
+          spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x282c34  --height 22 &"
           spawnOnce "/usr/bin/emacs --daemon &"
           -- spawnOnce "kak -d -s mysession &"
           setWMName "LG3D"
@@ -181,11 +181,11 @@ and lets the user select from it with the cursor/hjkl keys or the mouse.
 #+BEGIN_SRC haskell
 myColorizer :: Window -> Bool -> X (String, String)
 myColorizer = colorRangeFromClassName
-                  (0x29,0x2d,0x3e) -- lowest inactive bg
-                  (0x29,0x2d,0x3e) -- highest inactive bg
+                  (0x28,0x2c,0x34) -- lowest inactive bg
+                  (0x28,0x2c,0x34) -- highest inactive bg
                   (0xc7,0x92,0xea) -- active bg
                   (0xc0,0xa7,0x9a) -- inactive fg
-                  (0x29,0x2d,0x3e) -- active fg
+                  (0x28,0x2c,0x34) -- active fg
 
 -- gridSelect menu layout
 mygridConfig :: p -> GSConfig Window
@@ -338,7 +338,7 @@ treeselectAction a = TS.treeselectAction a
                , Node (TS.TSNode "OMG Ubuntu" "Ubuntu news, apps and reviews" (spawn (myBrowser ++ "https://www.omgubuntu.co.uk"))) []
                ]
            , Node (TS.TSNode "+ Window Managers" "window manager documentation" (return ()))
-               [ Node (TS.TSNode "Awesome" "awesomewm documentation" (return ()))
+               [ Node (TS.TSNode "+ Awesome" "awesomewm documentation" (return ()))
                    [ Node (TS.TSNode "Awesome" "Homepage for awesome wm" (spawn (myBrowser ++ "https://awesomewm.org/"))) []
                    , Node (TS.TSNode "Awesome GitHub" "The GutHub page for awesome" (spawn (myBrowser ++ "https://github.com/awesomeWM/awesome"))) []
                    , Node (TS.TSNode "r/awesome" "Subreddit for awesome" (spawn (myBrowser ++ "https://www.reddit.com/r/awesomewm/"))) []
@@ -493,16 +493,16 @@ second-level nodes. SUPER+ALT+KEY are third-level nodes.
   #+BEGIN_SRC haskell
 tsDefaultConfig :: TS.TSConfig a
 tsDefaultConfig = TS.TSConfig { TS.ts_hidechildren = True
-                              , TS.ts_background   = 0xdd292d3e
+                              , TS.ts_background   = 0xdd282c34
                               , TS.ts_font         = myFont
-                              , TS.ts_node         = (0xffd0d0d0, 0xff202331)
-                              , TS.ts_nodealt      = (0xffd0d0d0, 0xff292d3e)
+                              , TS.ts_node         = (0xffd0d0d0, 0xff1c1f24)
+                              , TS.ts_nodealt      = (0xffd0d0d0, 0xff282c34)
                               , TS.ts_highlight    = (0xffffffff, 0xff755999)
                               , TS.ts_extra        = 0xffd0d0d0
                               , TS.ts_node_width   = 200
                               , TS.ts_node_height  = 20
-                              , TS.ts_originX      = 0
-                              , TS.ts_originY      = 0
+                              , TS.ts_originX      = 100
+                              , TS.ts_originY      = 100
                               , TS.ts_indent       = 80
                               , TS.ts_navigate     = myTreeNavigation
                               }
@@ -531,8 +531,8 @@ myTreeNavigation = M.fromList
 dtXPConfig :: XPConfig
 dtXPConfig = def
       { font                = myFont
-      , bgColor             = "#292d3e"
-      , fgColor             = "#d0d0d0"
+      , bgColor             = "#282c34"
+      , fgColor             = "#bbc2cf"
       , bgHLight            = "#c792ea"
       , fgHLight            = "#000000"
       , borderColor         = "#535974"
@@ -750,10 +750,10 @@ tabs     = renamed [Replace "tabs"]
            $ tabbed shrinkText myTabConfig
   where
     myTabConfig = def { fontName            = "xft:Mononoki Nerd Font:regular:pixelsize=11"
-                      , activeColor         = "#292d3e"
+                      , activeColor         = "#282c34"
                       , inactiveColor       = "#3e445e"
-                      , activeBorderColor   = "#292d3e"
-                      , inactiveBorderColor = "#292d3e"
+                      , activeBorderColor   = "#282c34"
+                      , inactiveBorderColor = "#282c34"
                       , activeTextColor     = "#ffffff"
                       , inactiveTextColor   = "#d0d0d0"
                       }
@@ -1034,8 +1034,8 @@ main = do
         , focusedBorderColor = myFocusColor
         , logHook = workspaceHistoryHook <+> myLogHook <+> dynamicLogWithPP xmobarPP
                         { ppOutput = \x -> hPutStrLn xmproc0 x  >> hPutStrLn xmproc1 x  >> hPutStrLn xmproc2 x
-                        , ppCurrent = xmobarColor "#c3e88d" "" . wrap "[" "]" -- Current workspace in xmobar
-                        , ppVisible = xmobarColor "#c3e88d" ""                -- Visible but not current workspace
+                        , ppCurrent = xmobarColor "#98be65" "" . wrap "[" "]" -- Current workspace in xmobar
+                        , ppVisible = xmobarColor "#98be65" ""                -- Visible but not current workspace
                         , ppHidden = xmobarColor "#82AAFF" "" . wrap "*" ""   -- Hidden workspaces in xmobar
                         , ppHiddenNoWindows = xmobarColor "#c792ea" ""        -- Hidden workspaces (no windows)
                         , ppTitle = xmobarColor "#b3afc2" "" . shorten 60     -- Title of active window in xmobar
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 7aa0c7a..66a3624 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -93,7 +93,7 @@ myBorderWidth :: Dimension
 myBorderWidth = 2          -- Sets border width for windows
 
 myNormColor :: String
-myNormColor   = "#292d3e"  -- Border color of normal windows
+myNormColor   = "#282c34"  -- Border color of normal windows
 
 myFocusColor :: String
 myFocusColor  = "#bbc5ff"  -- Border color of focused windows
@@ -110,18 +110,18 @@ myStartupHook = do
           spawnOnce "picom &"
           spawnOnce "nm-applet &"
           spawnOnce "volumeicon &"
-          spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x292d3e --height 22 &"
+          spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x282c34  --height 22 &"
           spawnOnce "/usr/bin/emacs --daemon &"
           -- spawnOnce "kak -d -s mysession &"
           setWMName "LG3D"
 
 myColorizer :: Window -> Bool -> X (String, String)
 myColorizer = colorRangeFromClassName
-                  (0x29,0x2d,0x3e) -- lowest inactive bg
-                  (0x29,0x2d,0x3e) -- highest inactive bg
+                  (0x28,0x2c,0x34) -- lowest inactive bg
+                  (0x28,0x2c,0x34) -- highest inactive bg
                   (0xc7,0x92,0xea) -- active bg
                   (0xc0,0xa7,0x9a) -- inactive fg
-                  (0x29,0x2d,0x3e) -- active fg
+                  (0x28,0x2c,0x34) -- active fg
 
 -- gridSelect menu layout
 mygridConfig :: p -> GSConfig Window
@@ -265,7 +265,7 @@ treeselectAction a = TS.treeselectAction a
                , Node (TS.TSNode "OMG Ubuntu" "Ubuntu news, apps and reviews" (spawn (myBrowser ++ "https://www.omgubuntu.co.uk"))) []
                ]
            , Node (TS.TSNode "+ Window Managers" "window manager documentation" (return ()))
-               [ Node (TS.TSNode "Awesome" "awesomewm documentation" (return ()))
+               [ Node (TS.TSNode "+ Awesome" "awesomewm documentation" (return ()))
                    [ Node (TS.TSNode "Awesome" "Homepage for awesome wm" (spawn (myBrowser ++ "https://awesomewm.org/"))) []
                    , Node (TS.TSNode "Awesome GitHub" "The GutHub page for awesome" (spawn (myBrowser ++ "https://github.com/awesomeWM/awesome"))) []
                    , Node (TS.TSNode "r/awesome" "Subreddit for awesome" (spawn (myBrowser ++ "https://www.reddit.com/r/awesomewm/"))) []
@@ -411,16 +411,16 @@ treeselectAction a = TS.treeselectAction a
 
 tsDefaultConfig :: TS.TSConfig a
 tsDefaultConfig = TS.TSConfig { TS.ts_hidechildren = True
-                              , TS.ts_background   = 0xdd292d3e
+                              , TS.ts_background   = 0xdd282c34
                               , TS.ts_font         = myFont
-                              , TS.ts_node         = (0xffd0d0d0, 0xff202331)
-                              , TS.ts_nodealt      = (0xffd0d0d0, 0xff292d3e)
+                              , TS.ts_node         = (0xffd0d0d0, 0xff1c1f24)
+                              , TS.ts_nodealt      = (0xffd0d0d0, 0xff282c34)
                               , TS.ts_highlight    = (0xffffffff, 0xff755999)
                               , TS.ts_extra        = 0xffd0d0d0
                               , TS.ts_node_width   = 200
                               , TS.ts_node_height  = 20
-                              , TS.ts_originX      = 0
-                              , TS.ts_originY      = 0
+                              , TS.ts_originX      = 100
+                              , TS.ts_originY      = 100
                               , TS.ts_indent       = 80
                               , TS.ts_navigate     = myTreeNavigation
                               }
@@ -444,8 +444,8 @@ myTreeNavigation = M.fromList
 dtXPConfig :: XPConfig
 dtXPConfig = def
       { font                = myFont
-      , bgColor             = "#292d3e"
-      , fgColor             = "#d0d0d0"
+      , bgColor             = "#282c34"
+      , fgColor             = "#bbc2cf"
       , bgHLight            = "#c792ea"
       , fgHLight            = "#000000"
       , borderColor         = "#535974"
@@ -632,10 +632,10 @@ tabs     = renamed [Replace "tabs"]
            $ tabbed shrinkText myTabConfig
   where
     myTabConfig = def { fontName            = "xft:Mononoki Nerd Font:regular:pixelsize=11"
-                      , activeColor         = "#292d3e"
+                      , activeColor         = "#282c34"
                       , inactiveColor       = "#3e445e"
-                      , activeBorderColor   = "#292d3e"
-                      , inactiveBorderColor = "#292d3e"
+                      , activeBorderColor   = "#282c34"
+                      , inactiveBorderColor = "#282c34"
                       , activeTextColor     = "#ffffff"
                       , inactiveTextColor   = "#d0d0d0"
                       }
@@ -858,8 +858,8 @@ main = do
         , focusedBorderColor = myFocusColor
         , logHook = workspaceHistoryHook <+> myLogHook <+> dynamicLogWithPP xmobarPP
                         { ppOutput = \x -> hPutStrLn xmproc0 x  >> hPutStrLn xmproc1 x  >> hPutStrLn xmproc2 x
-                        , ppCurrent = xmobarColor "#c3e88d" "" . wrap "[" "]" -- Current workspace in xmobar
-                        , ppVisible = xmobarColor "#c3e88d" ""                -- Visible but not current workspace
+                        , ppCurrent = xmobarColor "#98be65" "" . wrap "[" "]" -- Current workspace in xmobar
+                        , ppVisible = xmobarColor "#98be65" ""                -- Visible but not current workspace
                         , ppHidden = xmobarColor "#82AAFF" "" . wrap "*" ""   -- Hidden workspaces in xmobar
                         , ppHiddenNoWindows = xmobarColor "#c792ea" ""        -- Hidden workspaces (no windows)
                         , ppTitle = xmobarColor "#b3afc2" "" . shorten 60     -- Title of active window in xmobar