diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index 02674c6..dd83dec 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -13,6 +13,7 @@
     fd
 
     pandoc # For org-pandoc
+    texliveFull # for latex conversions
     (aspellWithDicts (
       dicts: with dicts; [
         en
@@ -20,7 +21,6 @@
       ]
     )) # for flyspell
     gnuplot_qt # for plotting graphs
-    languagetool # for grammar
     ledger # for accounting and org-ledger
     gzip # Otherwise random errors occur from the onChange script
   ];
diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el
index 7bb84bf..18d5583 100644
--- a/modules/emacs/doom/config.el
+++ b/modules/emacs/doom/config.el
@@ -101,3 +101,11 @@
 
 ;; Configure elfeed-org
 (setq rmh-elfeed-org-files '("/home/wizardlink/Documents/notes/elfeed.org"))
+
+;; Set CLI options for ox-pandoc when generating PDFs from LaTeX,
+;; ensuring that `latexmk` is used so we have proper citations.
+(use-package ox-pandoc
+  :init
+  (setq org-pandoc-options-for-latex-pdf '((pdf-engine . "latexmk")
+                                           (pdf-engine-opt . "-bibtex")
+                                           (biblatex . t))))
diff --git a/modules/emacs/doom/init.el b/modules/emacs/doom/init.el
index 20ce4a8..fcafad3 100644
--- a/modules/emacs/doom/init.el
+++ b/modules/emacs/doom/init.el
@@ -45,7 +45,7 @@
        ophints           ; highlight the region an operation acts on
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
        ;;tabs              ; a tab bar for Emacs
-       (treemacs +lsp)     ; a project drawer, like neotree but cooler
+       treemacs          ; a project drawer, like neotree but cooler
        unicode           ; extended unicode support for various languages
        (vc-gutter +pretty) ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
@@ -85,7 +85,7 @@
        (spell            ; tasing you for misspelling mispelling
          +aspell
          +flyspell)
-       grammar           ; tasing grammar mistake every you make
+       ;;grammar           ; tasing grammar mistake every you make
 
        :tools
        ;;ansible
diff --git a/modules/neovim/lua/plugins/astrolsp.lua b/modules/neovim/lua/plugins/astrolsp.lua
index f2fc00b..8fe0e4e 100644
--- a/modules/neovim/lua/plugins/astrolsp.lua
+++ b/modules/neovim/lua/plugins/astrolsp.lua
@@ -9,7 +9,9 @@ return {
   ---@param opts AstroLSPOpts
   ---@return AstroLSPOpts
   opts = function(_, opts)
-    local system_flake_path = os.getenv "FLAKE" or os.getenv "NH_FLAKE" or error "FLAKE environment variable must be set."
+    local system_flake_path = os.getenv "FLAKE"
+        or os.getenv "NH_FLAKE"
+        or error "FLAKE environment variable must be set."
     local hostname = vim.fn.hostname()
 
     ---@type AstroLSPOpts