reformatting and straight.el

init.org

@@ -49,10 +49,12 @@ From Sophie's emacs.d:
     ;; Avoid running hooks when tangling.
     (let ((prog-mode-hook nil))
       (org-babel-tangle)
-        (byte-compile-file (concat user-emacs-directory "init.el")))))
+      (byte-compile-file (concat user-emacs-directory "init.el"))
+      )))
 
 (add-hook 'after-save-hook 'tangle-init)
 #+end_src
+
 ** Startup performance
 Usually, I like to run emacs as a daemon and only ever open new emacs clients, but that often doesn't work properly and definitely doesn't work when actively working on an emacs config, so this snippet might be useful.
 #+begin_src emacs-lisp
@@ -117,22 +119,50 @@ Backups / Auto-saves
 Auto-save files:
 #+begin_src emacs-lisp :tangle no
   (use-package auto-save-buffers-enhanced
-    :ensure t
+    :straight t
     :config
     (auto-save-buffers-enhanced t)
     (setq auto-save-buffers-enhanced-exclude-regexps '("init.org")))
 #+end_src
 
 ** Package repositories
+Use =straight=, and it's bootstrapping code:
 #+begin_src emacs-lisp
-  (require 'package)
+(defvar bootstrap-version)
-  (require 'use-package)
+(let ((bootstrap-file
-  (require 'use-package-ensure)
+       (expand-file-name
-  (setq use-package-always-ensure t)
+        "straight/repos/straight.el/bootstrap.el"
+        (or (bound-and-true-p straight-base-dir)
+            user-emacs-directory)))
+      (bootstrap-version 7))
+  (unless (file-exists-p bootstrap-file)
+    (with-current-buffer
+        (url-retrieve-synchronously
+         "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
+         'silent 'inhibit-cookies)
+      (goto-char (point-max))
+      (eval-print-last-sexp)))
+  (load bootstrap-file nil 'nomessage))
+#+end_src
+
+Disable =package.el= in the early init file:
+#+begin_src emacs-lisp :tangle early-init.el
+(setq package-enable-at-startup nil)
+#+end_src
+
+Then, install =use-package= and tell it to always assume =:straight=:
+#+begin_src emacs-lisp
+(straight-use-package 'use-package)
+(setq straight-use-package-by-default t)
+#+end_src
+
+load org early to work around version mismatches:
+#+begin_src emacs-lisp
+(straight-use-package 'org)
 #+end_src
 
 Add package repositories and rank them by priority
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
   (setq package-archives
   	  '(("GNU ELPA"     . "https://elpa.gnu.org/packages/")
   		("MELPA"        . "https://melpa.org/packages/")
@@ -182,7 +212,7 @@ Add package repositories and rank them by priority
 
  #+begin_src emacs-lisp
  (use-package exec-path-from-shell
-   :ensure t
+   :straight t
    :config
    (when (daemonp)
      (exec-path-from-shell-initialize)))
@@ -190,6 +220,7 @@ Add package repositories and rank them by priority
 
  #+begin_src emacs-lisp
  (use-package keychain-environment
+   :straight t
    :defer t
    :config
    (keychain-refresh-environment))
@@ -205,6 +236,7 @@ Keymap:
     :init-value t
     :keymap custom-bindings-map)
 #+end_src
+
 * Visuals
 ** Borders, Frames & Windows
 #+begin_src emacs-lisp
@@ -215,20 +247,21 @@ Keymap:
 (setq-default indicate-empty-lines nil)
 (set-face-attribute 'header-line t :inherit 'default)
 #+end_src
+
 ** Themes
 Light theme for writing
 #+begin_src emacs-lisp
   (use-package gruvbox-theme
-    :ensure t)
+    :straight t)
 #+end_src
 
 [[https://github.com/doomemacs/themes][Doom Themes]] as default theme
 #+begin_src emacs-lisp
   ;; doom needs this somehow
   (use-package all-the-icons
-    :ensure t)
+    :straight t)
   (use-package doom-themes
-    :ensure t
+    :straight t
     :config
     (setq doom-themes-enable-bold t
           doom-themes-enable-italic t)
@@ -260,6 +293,7 @@ Helper function for switching themes.
     (interactive)
     (load-theme nemo/dark-theme t))
 #+end_src
+
 ** Fonts
 Font size [[https://www.gnu.org/software/emacs/manual/html_node/elisp/Face-Attributes.html][(height)]] in emacs works in $\frac{1}{10}$ths of points, so ~110~ is the same as ~11~ points.
 #+begin_src emacs-lisp
@@ -282,9 +316,11 @@ Font size [[https://www.gnu.org/software/emacs/manual/html_node/elisp/Face-Attri
 
 Use nerd-icons and apple emojis
 #+begin_src emacs-lisp
-  (use-package nerd-icons)
+  (use-package nerd-icons
+	:straight t)
 
   (use-package emojify
+	:straight t
     :config
     (when (member "Apple Color Emoji" (font-family-list))
       (set-fontset-font t 'symbol (font-spec :family "Apple Color Emoji") nil 'prepend)))
@@ -293,10 +329,12 @@ Use nerd-icons and apple emojis
 Use both fixed and variable pitched fonts and faces.
 #+begin_src emacs-lisp
   (use-package mixed-pitch
+	:straight t
     :defer t
     :hook ((org-mode . mixed-pitch-mode)
            (LaTeX-mode . mixed-pitch-mode)))
 #+end_src
+
 ** Mode Line
 Honestly not very happy with this at the moment, but it's kind of hacked together based on Sophie's and Amit's modelines.
 #+begin_src emacs-lisp
@@ -392,10 +430,12 @@ Honestly not very happy with this at the moment, but it's kind of hacked togethe
       :inherit 'mode-line-position-face
       :foreground "black" :background "#eab700")
 #+end_src
+
 * Packages
 ** Web Search
 #+begin_src emacs-lisp
   (use-package engine-mode
+	:straight t
     :defer t
     :config
     (defengine duckduckgo
@@ -424,11 +464,13 @@ Honestly not very happy with this at the moment, but it's kind of hacked togethe
     (engine-mode t)
     )
 #+end_src
+
 ** =magit=
 
 try out =diff-hl= for highlighting diffs in magit:
 #+begin_src emacs-lisp
 (use-package diff-hl
+	:straight t
   :config
   (global-diff-hl-mode))
 #+end_src
@@ -436,6 +478,7 @@ try out =diff-hl= for highlighting diffs in magit:
 =magit= is awesome and the number one reason why I use Emacs!
 #+begin_src emacs-lisp
 (use-package magit
+	:straight t
   :defer t
   :config
   (setq magit-mode-quit-window 'magit-restore-window-configuration
@@ -447,6 +490,7 @@ try out =diff-hl= for highlighting diffs in magit:
 #+begin_src emacs-lisp
   (use-package magit-todos
     :after magit
+	:straight t
     :config
     (magit-todos-mode t))
 #+end_src
@@ -454,6 +498,7 @@ try out =diff-hl= for highlighting diffs in magit:
 And forge sounds cool as well.
 #+begin_src emacs-lisp
   (use-package forge
+	:straight t
     :after magit)
 #+end_src
 
@@ -461,22 +506,25 @@ And forge sounds cool as well.
 This is one of those features of Spacemacs that is super useful.
 #+begin_src emacs-lisp
   (use-package which-key
+	:straight t
     :config
     (which-key-mode))
 #+end_src
+
 ** rainbow-delimiters
 raimbow delimiters colours matching delimiters with different colours.
 Used by Spacemacs as well.
 
 #+begin_src emacs-lisp
   (use-package rainbow-delimiters
+	:straight t
     :hook (prog-mode . rainbow-delimiters-mode))
 #+end_src
 
 ** evil
 #+begin_src emacs-lisp
 (use-package evil
-  :ensure t
+  :straight t
   :init
   (setq evil-want-C-u-scroll t)
   (setq evil-want-keybinding nil)
@@ -485,7 +533,7 @@ Used by Spacemacs as well.
   (evil-mode 1)
 #+end_src
 
-Evil key-binds:
+Evil key-binds, documentation for how this works is [[https://evil.readthedocs.io/en/latest/keymaps.html][here]]:
 #+begin_src emacs-lisp
 (evil-global-set-key 'normal (kbd "<SPC>TAB") 'mode-line-other-buffer)
 (evil-define-key 'normal 'global (kbd "<SPC>bb") 'consult-buffer)
@@ -506,13 +554,17 @@ I want to bind =SPC g s= to magit status, just how it is in spacemacs.
 These bindings are somewhat different from spacemacs, which parents the insertion key binds under the major-mode prefix =m=.
 With =TAB= I can cycle headings in org, and with =,,= I can exit the special source block editor.
 #+begin_src emacs-lisp
-(evil-define-key 'normal org-mode-map (kbd "TAB") 'org-cycle)
+(evil-define-key 'normal org-mode-map
-(evil-define-key 'normal 'org-mode-map (kbd ",,") 'org-edit-src-exit)
+  (kbd "TAB") 'org-cycle
-(evil-define-key 'normal 'org-mode-map (kbd "<SPC>ih") 'org-insert-heading)
+  (kbd "RET") 'org-open-at-point
-(evil-define-key 'normal 'org-mode-map (kbd "<SPC>is") 'org-insert-subheading)
+  (kbd ",,") 'org-edit-src-exit
-(evil-define-key 'normal 'org-mode-map (kbd "<SPC>ii") 'org-insert-item)
+  (kbd "<SPC>ih") 'org-insert-heading
-(evil-define-key 'normal 'org-mode-map (kbd "<SPC>ib") 'org-insert-structure-template)
+  (kbd "<SPC>is") 'org-insert-subheading
-(evil-define-key '(normal visual) 'org-mode-map (kbd "<SPC>il") 'org-insert-link)
+  (kbd "<SPC>ii") 'org-insert-item
+  (kbd "<SPC>ib") 'org-insert-structure-template)
+
+(evil-define-key '(normal visual) 'org-mode-map
+  (kbd "<SPC>il") 'org-insert-link)
 #+end_src
 
 Unassociated key-bindings:
@@ -529,6 +581,7 @@ Close =:config=.
 
 #+begin_src emacs-lisp
   (use-package evil-surround
+	:straight t
     :defer t
     :config
     (global-evil-surround-mode 1))
@@ -537,7 +590,7 @@ Close =:config=.
 #+begin_src emacs-lisp
   (use-package evil-collection
     :after evil
-    :ensure t
+    :straight t
     :config
     (evil-collection-init))
 #+end_src
@@ -546,12 +599,14 @@ Close =:config=.
 Also use =undo-fu=, which evil can use.
 #+begin_src emacs-lisp
   (use-package undo-fu
+	:straight t
     :defer t)
 #+end_src
 
 ** Projectile
 #+begin_src emacs-lisp
   (use-package projectile
+	:straight t
     :defer t
     :config
     (setq projectile-project-search-path '("~/code/"))
@@ -561,19 +616,22 @@ Also use =undo-fu=, which evil can use.
 ** =ripgrep= & Co.
 #+begin_src emacs-lisp
   (use-package ripgrep
+	:straight t
     :defer t)
 
   (use-package rg
+	:straight t
     :defer t)
 #+end_src
 
 ** VTerm
 #+begin_src emacs-lisp
   (use-package vterm
-    :ensure t)
+    :straight t)
 #+end_src
+
 * Stuff
-** Minibuffer escape
+** Mini-buffer escape
 #+begin_src emacs-lisp :tangle no
 (setq minibuffer-prompt-properties
 	  '(read-only t
@@ -592,10 +650,12 @@ Also use =undo-fu=, which evil can use.
 
   (global-set-key (kbd "<escape>") 'nemo/abort-minibuffer-if-active)
 #+end_src
+
 * Writing
 ** Olivetti
 #+begin_src emacs-lisp
   (use-package olivetti
+	:straight t
     :defer t
     ; :bind (:map custom-bindings-map ("C-c o" . olivetti-mode))
     :config
@@ -603,9 +663,11 @@ Also use =undo-fu=, which evil can use.
 
   (add-hook 'olivetti-mode-on-hook (lambda () (olivetti-set-width 88)))
 #+end_src
+
 ** Spelling
 #+begin_src emacs-lisp
   (use-package jinx
+	:straight t
     :hook (emacs-startup . global-jinx-mode)
     :bind (("M-$"   . jinx-correct)
            ("C-M-$" . jinx-languages))
@@ -613,33 +675,48 @@ Also use =undo-fu=, which evil can use.
     (evil-define-key 'normal 'global (kbd "<SPC>Ss") 'jinx-correct)
     (setq jinx-languages "en_GB dk_DK de_DE"))
 #+end_src
+
 ** LaTeX
 #+begin_src emacs-lisp
 (use-package auctex
+  :straight t
   :hook
   (LaTeX-mode . turn-on-prettify-symbols-mode)
   (LaTeX-mode . reftex-mode)
-    ; (LaTeX-mode . (lambda () (corfu-mode -1)))
+  ;; (LaTeX-mode . (lambda () (corfu-mode -1)))
-    ; (LaTeX-mode . outline-minor-mode)
+  ;; (LaTeX-mode . outline-minor-mode)
   (LaTeX-mode . olivetti-mode)
-    )
+  :config
+  (setq TeX-view-program-selection '((output-pdf "PDF Tools"))
+        TeX-view-program-list '(("PDF Tools" TeX-pdf-tools-sync-view))
+        TeX-source-correlate-start-server t))
 #+end_src
 
-PDF tools for latex previewing
+PDF tools for latex previewing:
 #+begin_src emacs-lisp
 (use-package pdf-tools
+  :straight t
   :defer t
-    :init (pdf-loader-install))
+  :mode ("\\.pdf\\'" . pdf-view-mode)
+  :config
+  (pdf-loader-install)
+  (setq-default pdf-view-display-size 'fit-height)
+  (setq pdf-view-continuous nil)
+  (setq +latex-viewers '(pdf-tools))
+  (evil-define-key 'motion 'pdf-view-mode
+    "j" 'pdf-view-next-page
+    "k" 'pdf-view-previous-page))
 #+end_src
 
 ** Org
 Taken from [[https://sophiebos.io/posts/prettifying-emacs-org-mode/][ here]].
 #+begin_src emacs-lisp
 (use-package org
+  :straight t
   :defer t
   :hook (org-mode . olivetti-mode)
   :hook (org-mode . variable-pitch-mode)
-    ; I basically always want to be running =visual-line-mode= anyway, but certainly in org-mode.
+  ;; I basically always want to be running =visual-line-mode= anyway, but certainly in org-mode.
   :hook (org-mode . visual-line-mode)
   :hook (org-mode . nemo/prettify-symbols-setup)
   :config
@@ -703,12 +780,13 @@ End =:config=
 Use org-bullets for fancy headline markers
 #+begin_src emacs-lisp :tangle no
 (use-package org-bullets
+  :straight t
   :hook (org-mode . (lambda () (org-bullets-mode 1)))
   :config)
 #+end_src
 
 Use typo-mode in org-mode for en and em dashes:
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
 (require 'typo)
 
 (typo-global-mode 1)
@@ -718,12 +796,14 @@ Use typo-mode in org-mode for en and em dashes:
 Use =org-fragtog= to show embedded LaTeX fragments when in insert mode.
 #+begin_src emacs-lisp
 (use-package org-fragtog
+  :straight t
   :hook (org-mode . org-fragtog-mode))
 #+end_src
 
 Using =org-appear= we can hide emphasis markers for italic, bold, etc. and show when editing the surrounded word.
 #+begin_src emacs-lisp
 (use-package org-appear
+  :straight t
   :commands (org-appear-mode)
   :hook (org-mode . org-appear-mode)
   :config
@@ -735,6 +815,7 @@ Using =org-appear= we can hide emphasis markers for italic, bold, etc. and show
 
 #+begin_src emacs-lisp
 (use-package org-modern
+  :straight t
   :defer t
   :after org
   :hook (org-mode . org-modern-mode))
@@ -797,13 +878,14 @@ prettify symbols for quotes and source blocks in org-mode.
 =svg-tags-mode= for fancy SVG images
 #+begin_src emacs-lisp
 (use-package svg-tag-mode
+  :straight t
   :config
   (setq svg-tag-tags
         '((":TODO:" . ((lambda (tag) (svg-tag-make "TODO"))))))
   )
   #+end_src
 
-* Agenda
+** org-agenda
 #+begin_src emacs-lisp
 (require 'org)
 
@@ -812,6 +894,7 @@ prettify symbols for quotes and source blocks in org-mode.
       org-agenda-remove-tags t)
 
 (use-package org-super-agenda
+  :straight t
   :after org
   :config
   (org-super-agenda-mode))
@@ -825,12 +908,14 @@ prettify symbols for quotes and source blocks in org-mode.
 					        (delete-other-windows)
 					        (olivetti-mode))))
 #+end_src
+
 * Navigation / mini-buffer
 Realistically, I will probably never use 90% of Helm's functionality, so =vertico= should be sufficient.
 ** Move Text
 Use the =move-text= package to move the current line or selection up or down with =M-j= and =M-k=.
 #+begin_src emacs-lisp
 (use-package move-text
+  :straight t
   :defer t
   :bind (("M-j" . move-text-down)
          ("M-k" . move-text-up)))
@@ -839,6 +924,7 @@ Use the =move-text= package to move the current line or selection up or down wit
 ** Treemacs
 #+begin_src emacs-lisp
 (use-package treemacs
+  :straight t
   :defer t
   ;; hijack projectile prefix because they fit together
   :bind (("C-x p t" . treemacs))
@@ -847,23 +933,25 @@ Use the =move-text= package to move the current line or selection up or down wit
 
 (use-package treemacs-evil
   :after (treemacs evil)
-  :ensure t)
+  :straight t)
 
 (use-package treemacs-projectile
   :after (treemacs projectile)
-  :ensure t)
+  :straight t)
 
 (use-package treemacs-icons-dired
   :hook (dired-mode . treemacs-icons-dired-enable-once)
-  :ensure t)
+  :straight t)
 
 (use-package treemacs-magit
   :after (treemacs magit)
-  :ensure t)
+  :straight t)
 #+end_src
+
 ** Vertico
 #+begin_src emacs-lisp
 (use-package vertico
+  :straight t
   :bind (:map minibuffer-local-map
               ("C-h" . backward-kill-sexp))
   :config
@@ -879,6 +967,7 @@ Use the =move-text= package to move the current line or selection up or down wit
 Use =vertico-posframe= to make the =vertico= buffer floating in the centre of the frame.
 #+begin_src emacs-lisp
 (use-package vertico-posframe
+  :straight t
   :config
   (vertico-posframe-mode 1)
   (setq vertico-posframe-height vertico-count
@@ -889,12 +978,15 @@ Use =vertico-posframe= to make the =vertico= buffer floating in the centre of th
           (t posframe))
         ))
 
-(use-package savehist :init (savehist-mode))
+(use-package savehist 
+  :straight t 
+  :init (savehist-mode))
 #+end_src
 
 Use =consult-xref= for =lsp-xref= and =xref-find-references=.
 #+begin_src emacs-lisp
 (use-package consult
+  :straight t
   :bind (:map custom-bindings-map
               ("C-x b" . consult-buffer)
               ("M-g g" . consult-goto-line))
@@ -908,6 +1000,7 @@ Use =consult-xref= for =lsp-xref= and =xref-find-references=.
 [[https://github.com/minad/marginalia][=marginalia=]] adds marginalia into the mini-buffer, for example key-binds in =M-x=
 #+begin_src emacs-lisp
 (use-package marginalia
+  :straight t
   :init
   (marginalia-mode 1))
 #+end_src
@@ -915,6 +1008,7 @@ Use =consult-xref= for =lsp-xref= and =xref-find-references=.
 Auto-completion using =corfu=:
 #+begin_src emacs-lisp
 (use-package corfu
+  :straight t
   :custom
   ;; Enable auto completion
   (corfu-auto t)
@@ -931,6 +1025,15 @@ Auto-completion using =corfu=:
   :init
   (global-corfu-mode))
 
+(use-package corfu-terminal
+  :straight t
+  :defer t
+  :hook (before-make-frame .
+                           (lambda ()
+                             (corfu-terminal-mode
+                              (if (display-graphic-p) -1 +1))))
+  )
+
 (use-package emacs
   :custom
   ;; TODO
@@ -951,9 +1054,36 @@ Auto-completion using =corfu=:
   (setq tab-always-indent 'complete))
 #+end_src
 
+Use =kind-icon= to decorate corfu completion candidates:
+#+begin_src emacs-lisp
+(use-package kind-icon
+  :straight t
+  :after corfu
+  :config
+  (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
+#+end_src
+
+Use =prescient= to sort completion candidates:
+#+begin_src emacs-lisp :tangle no
+(use-package prescient
+  :straight t
+  :after corfu
+  :defer t
+  :config
+  (add-to-list 'prescient-filter-method 'fuzzy))
+
+(use-package corfu-prescient
+  :straight t
+  :after corfu
+  :straight t
+  :config
+  (corfu-prescient-mode 1))
+#+end_src
+
 This package seems to slow down search quite a bit in common buffers like find-file and exectue-extended-comand:
 #+begin_src emacs-lisp :tangle no
 (use-package cape
+  :straight t
   ;; Bind dedicated completion commands
   ;; Alternative prefix keys: C-c p, M-p, M-+, ...
   :bind (("C-c p p"  . completion-at-point) ;; capf
@@ -992,7 +1122,7 @@ This package seems to slow down search quite a bit in common buffers like find-f
 Fuzzy and out-of-order completion matching using =orderless=:
 #+begin_src emacs-lisp
 (use-package orderless
-    :ensure t
+  :straight t
   :config
   (setq completion-styles '(orderless basic partial-completion)
         orderless-matching-styles '(orderless-flex)
@@ -1003,12 +1133,14 @@ Fuzzy and out-of-order completion matching using =orderless=:
 Use =embark= for in-mini-buffer actions:
 #+begin_src emacs-lisp
 (use-package embark
+  :straight t
   :defer t
   :bind (("C-." . embark-act))
   :config
   ())
 
 (use-package embark-consult
+  :straight t
   :defer t
   :hook (embark-collect-mode . consult-preview-at-point-mode))
 #+end_src
@@ -1034,18 +1166,27 @@ Use =embark= for in-mini-buffer actions:
           (lambda ()
             (vertico-posframe-mode 1)))
 #+end_src
+
 * Programming
+Enable =hs-minor-mode= in =prog-mode= to allow for folding away comments and modules/namespaces:
+#+begin_src emacs-lisp
+(add-hook 'prog-mode-hook 'hs-minor-mode)
+#+end_src
+
 ** smart-parens
 #+begin_src emacs-lisp
 (use-package smartparens
+  :straight t
   :defer t
   :hook ((prog-mode text-mode markdown-mode) . smartparens-mode)
   :config
   (require 'smartparens-config))
 #+end_src
+
 ** Company
 #+begin_src emacs-lisp :tangle no
 (use-package company
+  :straight t
   :defer t
   :hook (after-init . company-mode)
   :hook (prog-mode . company-mode)
@@ -1058,6 +1199,7 @@ Use =embark= for in-mini-buffer actions:
 Use =ispell= with company mode for completion in text-modes
 #+begin_src emacs-lisp
 (use-package ispell
+  :straight t
   :defer t
   :config
   (setq ispell-dictionary "en_GB"))
@@ -1066,19 +1208,22 @@ Use =ispell= with company mode for completion in text-modes
 ** Flycheck
 #+begin_src emacs-lisp
 (use-package flycheck
+  :straight t
   :defer t
   :hook (after-init. global-flycheck-mode)
   :config)
 #+end_src
+
 ** Yasnippet
 Auto-completion requires yasnippet for some competions, such as function arguments and parens.
 #+begin_src emacs-lisp
 (use-package yasnippet
+  :straight t
   :defer t
   :hook ((prog-mode text-mode) . yas-minor-mode))
 
 (use-package yasnippet-snippets
-    :ensure t)
+  :straight t)
 #+end_src
 
 ** LSP
@@ -1087,6 +1232,7 @@ Emacs has its own internal LSP client called eglot, but I've never used it and I
 LSP sets it's prefix key to =s-l= by default, which uses the Super key which I use as my Mod key in sway, so I can't use it in emacs.
 #+begin_src emacs-lisp
 (use-package lsp-mode
+  :straight t
   :defer t
   :hook (prog-mode . lsp)
   :hook (lsp-mode . lsp-enable-which-key-integration)
@@ -1111,6 +1257,7 @@ LSP sets it's prefix key to =s-l= by default, which uses the Super key which I u
   )
 
 (use-package lsp-treemacs
+  :straight t
   :commands lsp-treemacs-errors-list)
 
 (use-package lsp-ui
@@ -1133,6 +1280,7 @@ LSP sets it's prefix key to =s-l= by default, which uses the Super key which I u
 [[https://github.com/rust-lang/rust-mode][rust-mode]]
 #+begin_src emacs-lisp
 (use-package rust-mode
+  :straight t
   :defer t
   :hook (rust-mode . lsp)
   :init
@@ -1143,19 +1291,35 @@ LSP sets it's prefix key to =s-l= by default, which uses the Super key which I u
 
 #+begin_src emacs-lisp
 (use-package rust-playground
+  :straight t
   :defer t)
 #+end_src
 
 [[https://github.com/kwrooijen/cargo.el][cargo-mode]]
 #+begin_src emacs-lisp
 (use-package cargo-mode
+  :straight t
   :defer t
-    :hook (rust-mode . cargo-minor-mode))
+  :hook (rust-mode . cargo-minor-mode)
+  :config
+  (setq cargo-mode-command-test "test -- --nocapture"))
+#+end_src
+
+** Debugging
+#+begin_src emacs-lisp
+(use-package dap-mode
+  :straight t
+  :defer t
+  :config
+  (require 'dap-cpptools)
+  (dap-cpptools-setup)
+  (dap-auto-configure-mode 1))
 #+end_src
 
 ** Web
 #+begin_src emacs-lisp
 (use-package web-mode
+  :straight t
   :defer t
   :mode
   (("\\.phtml\\'"      . web-mode)
@@ -1188,6 +1352,7 @@ LSP sets it's prefix key to =s-l= by default, which uses the Super key which I u
 clang-format
 #+begin_src emacs-lisp
 (use-package clang-format
+  :straight t
   :defer t)
 #+end_src