[Emacs] Move stuff around

dotfiles/emacs.d/README.org

@@ -1044,20 +1044,6 @@ I keep it around just in case I need it.
 (fset 'extract-and-name-use-package-block
       [?\C-a return ?\C-p ?# ?+ ?E ?N ?D ?_ ?S ?R ?C return ?# ?+ ?B ?E ?G ?I ?N ?_ ?S ?R ?C ?  ?e ?m ?a ?c ?s ?- ?l ?i ?s ?p ?\C-a ?\C-p ?\C-  ?\C-n ?\C-e ?\M-w ?\C-n ?\C-a ?\C-\M-f return ?\C-y ?\C-p ?\C-p ?\C-c ?\' ?\M-< ?\C-s ?u ?s ?e ?- ?p ?a ?c ?k return ?\C-\M-f ?\C-f ?\C-  ?\C-\M-f ?\M-w ?\C-c ?\' ?\C-r ?B ?E ?G ?I ?N return ?\C-a ?\C-p ?\C-e return ?* ?  ?\C-y])
  #+END_SRC
-* Man-mode
-Man page escape sequences aren't properly handled by emacs pager. This function
-fixes that, but for now, it needs to be run manually, since I haven't figured
-out how to detect that a buffer is a man mode buffer.
-#+BEGIN_SRC emacs-lisp
-(use-package man
-  :config
-  (progn
-    (defun imalison:fontify-man-page-buffer ()
-      (interactive)
-      (read-only-mode -1)
-      (Man-fontify-manpage)
-      (read-only-mode +1))))
-#+END_SRC
 * General
 ** User Info
 #+BEGIN_SRC emacs-lisp
@@ -1566,16 +1552,21 @@ custom-set-faces in your custom file.
   (progn
     (setq highlight-indent-guides-method 'fill)))
 #+END_SRC
-** gptel
+** man-mode
-#+begin_src emacs-lisp
+Man page escape sequences aren't properly handled by emacs pager. This function
-(use-package gptel
+fixes that, but for now, it needs to be run manually, since I haven't figured
-  :bind (("C-c g" . gptel-menu))
+out how to detect that a buffer is a man mode buffer.
+#+BEGIN_SRC emacs-lisp
+(use-package man
   :config
   (progn
-    (add-to-list 'gptel-directives '(finish-code . "You are a large language model and a careful programmer. Provide code that completes what is provided and only code as output without any additional text, prompt or note."))
+    (defun imalison:fontify-man-page-buffer ()
-    ;; (setq gptel-model "gpt-4")
+      (interactive)
-    ))
+      (read-only-mode -1)
-#+end_src
+      (Man-fontify-manpage)
+      (read-only-mode +1))))
+#+END_SRC
+
 * helpful
 #+begin_src emacs-lisp
 (use-package helpful
@@ -2258,6 +2249,7 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
   (progn
     (setq auth-sources '("~/.authinfo.gpg"))))
 #+end_src
+
 * Major Modes
 ** Programming
 <<programminglanguages>>
@@ -2287,17 +2279,6 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
 	(unbind-key "C-j" python-mode-map)
 	(add-hook 'python-mode-hook #'imalison:python-mode)))
 #+END_SRC
-**** tree-sitter
-#+begin_src emacs-lisp
-(use-package python-ts-mode
-  :ensure nil
-  :commands python-ts-mode
-  :mode ("\\.py\\'" . python-ts-mode)
-  :if (and (fboundp 'treesit-ready-p) (treesit-ready-p 'python))
-  :init
-  (add-to-list 'treesit-language-source-alist
-               '(python "https://github.com/tree-sitter/tree-sitter-python/"))))
-#+end_src
 *** go
 #+BEGIN_SRC emacs-lisp
 (use-package go-mode
@@ -2771,25 +2752,6 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
   (progn
     (add-hook 'typescript-mode-hook 'lsp-deferred)))
 #+end_src
-**** tree-sitter
-#+begin_src emacs-lisp
-(use-package typescript-ts-mode
-  :disabled t
-  :if (and (fboundp 'treesit-ready-p) (treesit-ready-p 'typescript))
-  :ensure nil
-  :mode ("\\.ts\\'" "\\.tsx\\'")
-  :init
-  (progn
-    (add-to-list 'treesit-language-source-alist
-                 '(typescript . ("https://github.com/tree-sitter/tree-sitter-typescript"
-                                 "master" "typescript/src")))
-    (add-to-list 'treesit-language-source-alist
-                 '(tsx . ("https://github.com/tree-sitter/tree-sitter-typescript"
-                                 "master" "tsx/src"))))
-  :config
-  (progn
-    (add-hook 'typescript-mode-hoook 'lsp-deferred)))
-#+end_src
 *** coffee script
 #+BEGIN_SRC emacs-lisp
 (use-package coffee-mode
@@ -4194,6 +4156,16 @@ crux-reopen-as-root-mode makes it so that any file owned by root will automatica
 (use-package aurel
   :defer t)
 #+END_SRC
+** gptel
+#+begin_src emacs-lisp
+(use-package gptel
+  :bind (("C-c g" . gptel-menu))
+  :config
+  (progn
+    (add-to-list 'gptel-directives '(finish-code . "You are a large language model and a careful programmer. Provide code that completes what is provided and only code as output without any additional text, prompt or note."))
+    ;; (setq gptel-model "gpt-4")
+    ))
+#+end_src
 * Chat
 ** erc
 #+BEGIN_SRC emacs-lisp