diff --git a/ansible/roles/emacs/files/base.el b/ansible/roles/emacs/files/base.el
index bc10fb4..c26ab0e 100644
--- a/ansible/roles/emacs/files/base.el
+++ b/ansible/roles/emacs/files/base.el
@@ -1,14 +1,9 @@
-(package-initialize)
+(use-package use-package)
+
 (add-to-list 'package-archives
              '("melpa" . "https://melpa.org/packages/")
              )
 
-(when (not package-archive-contents)
-  (package-refresh-contents))
-
-(unless (package-installed-p 'use-package)
-  (package-install 'use-package))
-
 (use-package auto-package-update
    :ensure t
    :config
@@ -32,6 +27,7 @@
  require-final-newline               t
  visible-bell                        nil
  ring-bell-function                  'ignore
+ ;; Write custom variables to an unused file so in-editor changes do not persist.
  custom-file                         "~/.emacs.d/.custom.el"
  ;; http://ergoemacs.org/emacs/emacs_stop_cursor_enter_prompt.html
  minibuffer-prompt-properties
@@ -59,6 +55,8 @@
  use-short-answers                  t
  package-native-compile             t
  delete-selection-mode              t
+ ;; Don't show warnings when compiling elisp to native binaries.
+ native-comp-async-report-warnings-errors 'silent
  )
 
 (defun assert-directory (p)
@@ -69,8 +67,6 @@
 (setq autoload-directory (concat user-emacs-directory (file-name-as-directory "elisp") (file-name-as-directory "autoload")))
 (add-to-list 'load-path (assert-directory autoload-directory))
 
-
-
 ;; Bookmarks
 (setq
  ;; persistent bookmarks
diff --git a/ansible/roles/emacs/files/common-lsp.el b/ansible/roles/emacs/files/common-lsp.el
index 860f25b..9a1e550 100644
--- a/ansible/roles/emacs/files/common-lsp.el
+++ b/ansible/roles/emacs/files/common-lsp.el
@@ -1,4 +1,5 @@
 (use-package eglot
+  :pin gnu
   :commands (eglot eglot-ensure)
   :bind (:map eglot-mode-map
               ;; M-.
diff --git a/ansible/roles/emacs/files/util-tree-sitter.el b/ansible/roles/emacs/files/util-tree-sitter.el
index 2419b2d..630f2b6 100644
--- a/ansible/roles/emacs/files/util-tree-sitter.el
+++ b/ansible/roles/emacs/files/util-tree-sitter.el
@@ -1,7 +1,7 @@
-(use-package tree-sitter
-  :commands (tree-sitter-hl-mode)
-  :config
-  (use-package tree-sitter-langs)
-  )
+;; (use-package tree-sitter
+;;   :commands (tree-sitter-hl-mode)
+;;   :config
+;;   (use-package tree-sitter-langs)
+;;   )
 
 (provide 'util-tree-sitter)