Merge branch 'master' of https://git.sr.ht/~acdw/.emacs.d

1 files changed, 83 insertions, 5 deletions

@@ -248,6 +248,17 @@ I don't like the customize interface, but I still sometimes use it when I'm not
 #+BEGIN_SRC emacs-lisp
   (cuss disabled-command-function nil)
 #+END_SRC
+**** Function aliases
+#+begin_src emacs-lisp
+  (fset 'yes-or-no-p #'y-or-n-p)
+#+end_src
+*** Miscellaneous
+**** Convert =^L= to a line
+#+begin_src emacs-lisp
+  (use-package page-break-lines
+    :config
+    (global-page-break-lines-mode 1))
+#+end_src
 ** Themes: [[https://github.com/protesilaos/modus-themes][Modus]]
 #+BEGIN_SRC emacs-lisp
   (use-package modus-operandi-theme)
@@ -301,7 +312,31 @@ I'm sure there's a better way to do this, but for now, this is the best I've got
                       :family "VariablePitch"
                       :height 110)
 #+END_SRC
-
+*** Ligatures
+#+begin_src emacs-lisp
+  (use-package ligature
+    :straight (ligature
+               :host github
+               :repo "mickeynp/ligature.el")
+    :config
+    (ligature-set-ligatures 'prog-mode
+                            '("++" "--" "/=" "&&" "||" "||="
+                              "->" "=>" "::" "__"
+                              "==" "===" "!=" "=/=" "!=="
+                              "<=" ">=" "<=>"
+                              "/*" "*/" "//" "///"
+                              "\\n" "\\\\"
+                              "<<" "<<<" "<<=" ">>" ">>>" ">>="
+                              "|=" "^="
+                              "**" "--" "---" "----" "-----"
+                              "==" "===" "====" "====="
+                              "</" "<!--" "</>" "-->" "/>"
+                              ":=" "..." ":>" ":<" ">:" "<:"
+                              "::=" ;; add others here
+                              ))
+    :config
+    (global-ligature-mode))
+#+end_src
 *** [[https://github.com/rolandwalker/unicode-fonts][Unicode fonts]]
 #+BEGIN_SRC emacs-lisp
   (use-package persistent-soft)
@@ -312,10 +347,6 @@ I'm sure there's a better way to do this, but for now, this is the best I've got
     (unicode-fonts-setup))
 
 #+END_SRC
-** Interactivity
-#+begin_src emacs-lisp
-  (fset 'yes-or-no-p #'y-or-n-p)
-#+end_src
 * Editing
 ** Completion
 I was using company, but I think it might've been causing issues with ~awk-mode~, so I'm trying ~hippie-mode~ right now.  So far, I'm also enjoying not having a popup all the time.
@@ -530,6 +561,37 @@ I was using company, but I think it might've been causing issues with ~awk-mode~
            ("\\.js\\'" . web-mode)))
 #+END_SRC
 * Writing
+** Visual fill column
+#+begin_src emacs-lisp
+  (use-package visual-fill-column
+    :custom
+    (split-window-preferred-function 'visual-fill-column-split-window-sensibly)
+    (visual-fill-column-center-text t)
+    (fill-column 100)
+    :config
+    (advice-add 'text-scale-adjust
+                :after #'visual-fill-column-adjust)
+    :hook
+    (org-mode . visual-fill-column-mode))
+#+end_src
+** Org mode
+#+begin_src emacs-lisp
+  (use-package org
+    :custom
+    (org-startup-indented t)
+    (org-src-tab-acts-natively t)
+    (org-hide-emphasis-markers t)
+    (org-fontify-done-headline t)
+    (org-hide-leading-stars t)
+    (org-pretty-entities t)
+    :hook
+    (org-mode . variable-pitch-mode))
+
+  (use-package org-superstar
+    :hook
+    (org-mode . org-superstar-mode))
+#+end_src
+
 * Applications
 ** Gemini & Gopher
 #+BEGIN_SRC emacs-lisp
@@ -570,3 +632,19 @@ I was using company, but I think it might've been causing issues with ~awk-mode~
                  (nnimap-expunge t)
                  (nnimap-stream ssl)))
 #+end_src
+* Machine-specific configurations
+#+begin_src emacs-lisp
+  (cond
+   (*acdw/at-home*
+    (use-package su
+      :config
+      (su-mode 1))
+    (use-package trashed
+      :custom
+      (delete-by-moving-to-trash t))
+    (use-package exec-path-from-shell
+      :demand
+      :config
+      (exec-path-from-shell-initialize)))
+   )
+#+end_src