init.org

@@ -300,11 +300,6 @@ Helper function for switching themes.
   (load-theme nemo/dark-theme t))
 #+end_src
 
-** emacs-related
-#+begin_src emacs-lisp
-(setq help-window-select t
-      help-window-keep-selected 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
@@ -465,8 +460,8 @@ Honestly not very happy with this at the moment, but it's kind of hacked togethe
     :prefix-map 'nemo/leader-prefix-map)
   (general-create-definer leader-other-def
     :states '(emacs normal)
-   :prefix-map 'nemo/leader-prefix-map
+    :prefix-map 'nemo/leader-prefix-map
-   :prefix-command 'nemo/leader-prefix-command
+    :prefix-command 'nemo/leader-prefix-command
     :global-prefix nemo/leader-global
     :prefix nemo/leader-evil
     )
@@ -494,7 +489,6 @@ Honestly not very happy with this at the moment, but it's kind of hacked togethe
     "wo" #'delete-other-windows
     "ff" #'find-file
     "fi" #'nemo/edit-init-org
-    "fs" #'save-buffer
     )
   )
 #+end_src
@@ -614,18 +608,6 @@ Evil key-binds, documentation for how this works is [[https://evil.readthedocs.i
  )
 #+end_src
 
-Advice =evil-search-forward= (bound to =/=) to push the current marker onto the xref stack to allow for returning to where I started searching from:
-#+begin_src emacs-lisp
-(defun nemo/evil-search-forward--push-xref
-    (&optional _regex-p _no-recursive-edit)
-  "push current marker to xref stack when forward searching."
-  (xref-push-marker-stack))
-
-(advice-add #'evil-search-forward
-            :before #'nemo/evil-search-forward--push-xref
-            '((name . "evil-search-push-xref")))
-#+end_src
-
 Close =:config=.
 #+begin_src emacs-lisp
   )
@@ -643,7 +625,7 @@ Close =:config=.
 (use-package evil-collection
   :after evil
   :straight t
-  :init (setq evil-collection-key-blacklist '("C-c <tab>" "<SPC>"))
+  :init (setq evil-collection-key-blacklist '("C-c <tab>"))
   :config
   (evil-collection-init))
 #+end_src
@@ -658,16 +640,12 @@ Also use =undo-fu=, which evil can use.
 
 ** Projectile
 #+begin_src emacs-lisp
-(use-package projectile
+  (use-package projectile
-  :straight t
+	:straight t
-  :defer t
+    :defer t
-  :general
+    :config
-  (leader-def
+    (setq projectile-project-search-path '("~/code/"))
-    "p" '(:keymap project-prefix-map :wk "Projectile")
+    (projectile-mode))
-    )
-  :config
-  (setq projectile-project-search-path '("~/code/"))
-  (projectile-mode))
 #+end_src
 
 ** =ripgrep= & Co.
@@ -764,10 +742,10 @@ PDF tools for latex previewing:
   (setq-default pdf-view-display-size 'fit-height)
   (setq pdf-view-continuous t)
   (setq +latex-viewers '(pdf-tools))
-  (leader-major-def
+  (leader-other-def
     :keymaps 'pdf-view-mode-map
-    "g b" #'pdf-history-backward
+    "gb" 'pdf-history-backward
-    "g f" #'pdf-history-forward)
+    "gf" 'pdf-history-forward)
   (general-def :keymaps 'pdf-view-mode-map
     "j" (lambda() (interactive) (pdf-view-scroll-up-or-next-page 20))
     "k" (lambda() (interactive) (pdf-view-scroll-down-or-previous-page 20)))
@@ -787,12 +765,11 @@ Taken from [[https://sophiebos.io/posts/prettifying-emacs-org-mode/][ here]].
   :general-config
   (general-define-key
    :prefix-map 'nemo/org-map
-   "i" '(:ignore t :which-key "Insert..")
    "ih" '("Heading" . org-insert-heading)
    "is" '("Subheading" . org-insert-subheading)
    "ii" '("Item" . org-insert-item)
    "ib" '("Block..". org-insert-structure-template)
-    "il" '("Link" . org-insert-link)
+   "il" '("Link" . org-insert-link)
    )
   (leader-major-def
     :keymaps 'org-mode-map
@@ -1015,12 +992,9 @@ Use the =move-text= package to move the current line or selection up or down wit
 #+begin_src emacs-lisp
 (use-package treemacs
   :straight t
+  :defer t
   ;; hijack projectile prefix because they fit together
-  :general
+  :bind (("C-x p t" . treemacs-select-window))
-  (general-define-key
-   :prefix-map 'project-prefix-map
-   "t" '("Treemacs" . treemacs-select-window)
-   )
   :config
   (setq treemacs-width 25)
   )
@@ -1329,6 +1303,7 @@ Enable =hs-minor-mode= in =prog-mode= to allow for folding away comments and mod
 #+begin_src emacs-lisp
 (use-package smartparens
   :straight t
+  :defer t
   :hook ((prog-mode text-mode markdown-mode) . smartparens-mode)
   :config
   (require 'smartparens-config))
@@ -1369,10 +1344,6 @@ LSP sets it's prefix key to =s-l= by default, which uses the Super key which I u
   :init
   (setq lsp-keymap-prefix "C-l")
   :commands lsp
-  :general-config
-  (leader-def
-    "l" '(:keymap lsp-command-map :wk "LSP")
-    )
   :config
   (setq
    lsp-idle-delay 0.6
@@ -1433,51 +1404,31 @@ hlsl-mode:
   )
 #+end_src
 ** Rust
-[[https://github.com/rust-lang/rust-mode][=rust-mode=]]
+[[https://github.com/rust-lang/rust-mode][rust-mode]]
 #+begin_src emacs-lisp
 (use-package rust-mode
-  :straight t
-  :hook (rust-mode . lsp-mode)
-  :init
-  (setq rust-mode-treesitter-derive t
-        ))
-#+end_src
-
-[[https://github.com/brotzeit/rustic][=rustic-mode=]]
-#+begin_src emacs-lisp
-(use-package rustic
   :straight t
   :defer t
-  :after (rust-mode)
+  :hook (rust-mode . lsp)
+  :init
+  (setq rust-mode-treesitter-derive t)
   :general-config
   (general-define-key
    :prefix-map 'nemo/rust-map
-   "c v" '("Check" . rustic-cargo-check)
+   "c v" '("Check" . rust-check)
-   "c c" '("Compile" . rustic-compile)
+   "c f" #'rust-format-buffer
-   "c b" '("Build" . rustic-cargo-build)
+   "c b" #'rust-compile
-   ;;"c B" '("Build" . rust-cargo-relea)
+   "c B" #'rust-compile-release
-   "c c" '("Clean" . rustic-cargo-clean)
+   "c t" #'rust-test
-   "c x" '("Run" . rustic-cargo-run)
+   "c r" #'rust-run
-   "c f" '("Format Buffer" . rustic-format-buffer)
+   "c l" #'rust-run-clippy
-   "t t" '("Current Test" . rustic-cargo-current-test)
-   "t a" '("Test" . rustic-cargo-test)
-   "c a" '("cargo-add" . rustic-cargo-add)
-   "c r" '("cargo-rm" . rustic-cargo-remove)
-   "c l" '("lint" . rustic-cargo-clippy)
-   "c L" '("lint" . rustic-cargo-clippy-fix)
-   "c n" '("new" . rustic-cargo-new)
-   "c i" '("init" . rustic-cargo-init)
-   "c d" '("Docs" . rustic-cargo-doc)
    )
   (leader-major-def
-    :keymaps 'rustic-mode-map
+    :keymaps 'rust-mode-map
     "m" '(:keymap nemo/rust-map :wk "Cargo")
     )
-  :custom
-  (rustic-analyzer-command '("/usr/bin/rust-analyzer"))
   :config
-  (setq rustic-format-trigger 'on-save)
+  (setq rust-format-on-save t))
-  )
 #+end_src
 
 #+begin_src emacs-lisp
@@ -1486,23 +1437,25 @@ hlsl-mode:
   :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)
+  :config
+  (setq cargo-mode-command-test "test -- --nocapture"))
+#+end_src
+
 ** Debugging
 #+begin_src emacs-lisp
 (use-package dap-mode
   :straight t
-  :after (lsp-mode)
+  :defer t
   :config
-  ;; (require 'dap-cpptools)
+  (require 'dap-cpptools)
-  ;; (dap-cpptools-setup)
+  (dap-cpptools-setup)
-  (require 'dap-gdb-lldb)
+  (dap-auto-configure-mode 1))
-  (dap-register-debug-template "Rust::GDB Run Configuration"
-                               (list :type "gdb"
-                                     :request "launch"
-                                     :name "GDB::Run"
-                                     :gdbpath "rust-gdb"
-                                     :target nil
-                                     :cwd nil))
-  (dap-auto-configure-mode))
 #+end_src
 
 ** Web