From 0d3c41c5d10b2e95c4f75e6d49629128b1a33ffb Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 21 Sep 2022 11:30:30 -0500
Subject: [PATCH] some tweaks to markdown-mode and pdf-tools

---
 README.org | 14 ++++++--------
 init.el    | 52 +++++-----------------------------------------------
 2 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/README.org b/README.org
index 8defb09c..f0bb92ef 100644
--- a/README.org
+++ b/README.org
@@ -356,7 +356,7 @@ Let's use =no-littering= in order to stop emacs from filling all our folders wit
 
 ** Ligatures
 Here let's try to add ligatures to our font system since the VictorMono Nerd Font supports all ligatures being a "Nerd Font". 
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
 (let ((alist '((?! . "\\(?:!\\(?:==\\|[!=]\\)\\)")
                (?# . "\\(?:#\\(?:###?\\|_(\\|[!#(:=?[_{]\\)\\)")
                (?$ . "\\(?:\\$>\\)")
@@ -2088,8 +2088,8 @@ It's probably smart to have markdown.
 (use-package markdown-mode
   :mode ("\\.md\\'" . markdown-mode)
   :config
-  (setq markdown-fontify-code-blocks-natively t))
-        
+  (setq markdown-fontify-code-blocks-natively t)
+  (add-hook 'markdown-mode-hook 'chris/org-mode-setup))
 #+end_src
 
 *** QML
@@ -2765,12 +2765,10 @@ Using sly makes a lot better common-lisp interaction within emacs.
 Let's use pdf-tools for a lot better interaction with pdfs.
 #+begin_src emacs-lisp
 (use-package pdf-tools
-  :straight (:host github
-                   :repo "flatwhatson/pdf-tools"
-                   :branch "fix-macros")
-  :defer 1
-  :config
+  :ensure nil
+  :init
   (pdf-tools-install)
+  :config
   (custom-set-variables '(pdf-misc-print-program "/usr/bin/lpr")
                         '(pdf-misc-print-program-args (quote ("-o media=Letter" "-o fitplot"))))
   (add-hook 'pdf-view-mode 'pdf-view-fit-page-to-window))
diff --git a/init.el b/init.el
index 06c03560..0565ed0b 100644
--- a/init.el
+++ b/init.el
@@ -173,33 +173,6 @@
 (setq auto-save-file-name-transforms
       `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))
 
-(let ((alist '((?! . "\\(?:!\\(?:==\\|[!=]\\)\\)")
-               (?# . "\\(?:#\\(?:###?\\|_(\\|[!#(:=?[_{]\\)\\)")
-               (?$ . "\\(?:\\$>\\)")
-               (?& . "\\(?:&&&?\\)")
-               (?* . "\\(?:\\*\\(?:\\*\\*\\|[/>]\\)\\)")
-               (?+ . "\\(?:\\+\\(?:\\+\\+\\|[+>]\\)\\)")
-               (?- . "\\(?:-\\(?:-[>-]\\|<<\\|>>\\|[<>|~-]\\)\\)")
-               (?. . "\\(?:\\.\\(?:\\.[.<]\\|[.=?-]\\)\\)")
-               (?/ . "\\(?:/\\(?:\\*\\*\\|//\\|==\\|[*/=>]\\)\\)")
-               (?: . "\\(?::\\(?:::\\|\\?>\\|[:<-?]\\)\\)")
-               (?\; . "\\(?:;;\\)")
-               (?< . "\\(?:<\\(?:!--\\|\\$>\\|\\*>\\|\\+>\\|-[<>|]\\|/>\\|<[<=-]\\|=\\(?:=>\\|[<=>|]\\)\\||\\(?:||::=\\|[>|]\\)\\|~[>~]\\|[$*+/:<=>|~-]\\)\\)")
-               (?= . "\\(?:=\\(?:!=\\|/=\\|:=\\|=[=>]\\|>>\\|[=>]\\)\\)")
-               (?> . "\\(?:>\\(?:=>\\|>[=>-]\\|[]:=-]\\)\\)")
-               (?? . "\\(?:\\?[.:=?]\\)")
-               (?\[ . "\\(?:\\[\\(?:||]\\|[<|]\\)\\)")
-               (?\ . "\\(?:\\\\/?\\)")
-               (?\] . "\\(?:]#\\)")
-               (?^ . "\\(?:\\^=\\)")
-               (?_ . "\\(?:_\\(?:|?_\\)\\)")
-               (?{ . "\\(?:{|\\)")
-               (?| . "\\(?:|\\(?:->\\|=>\\||\\(?:|>\\|[=>-]\\)\\|[]=>|}-]\\)\\)")
-               (?~ . "\\(?:~\\(?:~>\\|[=>@~-]\\)\\)"))))
-  (dolist (char-regexp alist)
-    (set-char-table-range composition-function-table (car char-regexp)
-                          `([,(cdr char-regexp) 0 font-shape-gstring]))))
-
 (use-package evil
   :init
   (setq evil-want-integration t
@@ -1430,7 +1403,8 @@ targets."
 (use-package markdown-mode
   :mode ("\\.md\\'" . markdown-mode)
   :config
-  (setq markdown-fontify-code-blocks-natively t))
+  (setq markdown-fontify-code-blocks-natively t)
+  (add-hook 'markdown-mode-hook 'chris/org-mode-setup))
 
 (use-package qml-mode
   :mode ("\\.qml\\'" . qml-mode))
@@ -1955,12 +1929,10 @@ targets."
     (sly-connect "localhost" 4006)))
 
 (use-package pdf-tools
-  :straight (:host github
-                   :repo "flatwhatson/pdf-tools"
-                   :branch "fix-macros")
-  :defer 1
-  :config
+  :ensure nil
+  :init
   (pdf-tools-install)
+  :config
   (custom-set-variables '(pdf-misc-print-program "/usr/bin/lpr")
                         '(pdf-misc-print-program-args (quote ("-o media=Letter" "-o fitplot"))))
   (add-hook 'pdf-view-mode 'pdf-view-fit-page-to-window))
@@ -2341,17 +2313,3 @@ interfere with the default `bongo-playlist-buffer'."
         gcmh-verbose nil))
 
 (setq warning-suppress-types '((comp)))
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(safe-local-variable-values
-   '((projectile-project-run-cmd . "./build/bin/presenter")
-     (projectile-project-compilation-cmd . "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ . && make --dir build/"))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(org-modern-tag ((t :background "#9aedfe" :foreground "#282a36"))))