diff --git a/emacs/.config/emacs/Emacs.org b/emacs/.config/emacs/Emacs.org index c156eca..bf5ca08 100644 --- a/emacs/.config/emacs/Emacs.org +++ b/emacs/.config/emacs/Emacs.org @@ -122,7 +122,7 @@ ;; (require-theme 'modus-themes) ;; (setq modus-themes-italic-constructs t ;; modus-themes-bold-constructs t - ;; modus-themes-links '(no-underline background faint) + ;; modus-themes-links '(no-underline background faint) ;; modus-themes-prompts '(bold intense) ;; modus-themes-mode-line '(borderless accented moody) ;; modus-themes-org-blocks 'gray-background @@ -139,10 +139,22 @@ #+end_src *** Catpuccin #+begin_src emacs-lisp - (use-package catppuccin-theme - :init (setq catppuccin-flavor 'mocha) - :config - (load-theme 'catppuccin :no-confirm)) + ;; (use-package catppuccin-theme + ;; :init (setq catppuccin-flavor 'mocha) + ;; :config + ;; (load-theme 'catppuccin :no-confirm)) +#+end_src +*** Doom-themes +#+begin_src emacs-lisp + (use-package doom-themes + :config + (load-theme 'doom-gruvbox t)) +#+end_src +*** Solaire +#+begin_src emacs-lisp + (use-package solaire-mode + :config + (solaire-global-mode)) #+end_src ** Ultra Scroll #+begin_src emacs-lisp @@ -169,6 +181,19 @@ ("M-g w" . avy-goto-word-1) ("M-g W" . avy-goto-word-0))) #+end_src +** Inhibit Mouse +I find I accidentally click with the trackpad on my laptop not infrequently, and basically never use it otherwise, so I might as well get rid of it. +#+begin_src emacs-lisp + (use-package inhibit-mouse + :custom + (inhibit-mouse-adjust-mouse-highlight t) + (inhibit-mouse-adjust-show-help-function t) + :config + (if (daemonp) + (add-hook 'server-after-make-frame-hook #'inhibit-mouse-mode) + (inhibit-mouse-mode 1))) +#+end_src + * Completion ** Vertico #+begin_src emacs-lisp @@ -309,8 +334,8 @@ ("C-c l R" . eglot-restart-process) ("C-c l e" . eglot-errors-at-point)) (:map flymake-mode-map - ("M-n" . flymake-goto-next-error) - ("M-p" . flymake-goto-prev-error))) + ("M-n" . flymake-goto-next-error) + ("M-p" . flymake-goto-prev-error))) #+end_src ** eldoc-box #+begin_src emacs-lisp @@ -349,6 +374,10 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's #+begin_src emacs-lisp (use-package haskell-mode) #+end_src +** SML +#+begin_src emacs-lisp + (use-package sml-mode) +#+end_src * Latex ** Auctex #+begin_src emacs-lisp @@ -505,13 +534,13 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode ** toki pona support #+begin_src emacs-lisp (with-eval-after-load 'ox - (add-to-list 'org-export-dictionary + (add-to-list 'org-export-dictionary '("Footnotes" ("tok" :default "toki anpa"))) - (add-to-list 'org-export-dictionary + (add-to-list 'org-export-dictionary '("Author" ("tok" :default "jan toki"))) - (add-to-list 'org-export-dictionary + (add-to-list 'org-export-dictionary '("Table of Contents" ("tok" :default "ni li lon lipu ni::"))) - (add-to-list 'org-export-dictionary + (add-to-list 'org-export-dictionary '("Created" ("tok" :default "mi pali e ni lon tenpo")))) #+end_src ** Prettify @@ -533,44 +562,44 @@ I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode :base-extension "org" :recursive t :publishing-function org-html-publish-to-html - :author "William Ball" - :language "en" + :author "William Ball" + :language "en" :auto-sitemap t :sitemap-filename "archive.org" :sitemap-title "Archive" :sitemap-style list - :sitemap-sort-files anti-chronologically + :sitemap-sort-files anti-chronologically :html-head "" :html-preamble t :html-preamble-format (("en" "
Post Archive
") ("tok" "
toki ante
")) ) - ("org-pages" - :base-directory "~/repos/blog/pages/" - :publishing-directory "/ssh:server:~/blog/" - :base-extension "org" - :recursive t - :publishing-function org-html-publish-to-html - :author "William Ball" - :language "en" - :html-head "" - ) - ("org-static" - :base-directory "~/repos/blog/static/" - :publishing-directory "/ssh:server:~/blog/static/" - :base-extension "ico\\|ttf\\|css" - :publishing-function org-publish-attachment - :recursive t - ) - ("org-media" - :base-directory "~/repos/blog/media/" - :publishing-directory "/ssh:server:~/blog/media/" - :base-extension "png\\|svg\\|pdf\\|mp4\\|mp3\\|ogg" - :publishing-function org-publish-attachment - :recursive t - ) - ("org" :components ("org-posts" "org-static" "org-media" "org-pages")) - )) + ("org-pages" + :base-directory "~/repos/blog/pages/" + :publishing-directory "/ssh:server:~/blog/" + :base-extension "org" + :recursive t + :publishing-function org-html-publish-to-html + :author "William Ball" + :language "en" + :html-head "" + ) + ("org-static" + :base-directory "~/repos/blog/static/" + :publishing-directory "/ssh:server:~/blog/static/" + :base-extension "ico\\|ttf\\|css" + :publishing-function org-publish-attachment + :recursive t + ) + ("org-media" + :base-directory "~/repos/blog/media/" + :publishing-directory "/ssh:server:~/blog/media/" + :base-extension "png\\|svg\\|pdf\\|mp4\\|mp3\\|ogg" + :publishing-function org-publish-attachment + :recursive t + ) + ("org" :components ("org-posts" "org-static" "org-media" "org-pages")) + )) (use-package htmlize) #+end_src @@ -655,7 +684,7 @@ I'm running into weird performance issues with =pdf-tools=. I think it has to do (interactive) (let* ((books-dir (expand-file-name "~/Nextcloud/Books/")) (files (directory-files-recursively books-dir "\\.pdf$\\|\\.epub$\\|\\.djvu$" nil)) - (relative-files (mapcar (lambda (f) + (relative-files (mapcar (lambda (f) (string-remove-prefix books-dir f)) files)) (choice (completing-read "Book: " relative-files nil t)))