fill-column-desired-width local variable

5 files changed, 18 insertions, 13 deletions

diff --git a/.config/emacs/libraries/fill-column.el b/.config/emacs/libraries/fill-column.el
index 2a70cd6..625e685 100644
--- a/.config/emacs/libraries/fill-column.el
+++ b/.config/emacs/libraries/fill-column.el
@@ -1,12 +1,12 @@
 ;;; -*- lexical-binding: t; -*-
 ;;; Commentary:
 
-;; yanked from https://codeberg.org/daviwil/dotfiles/src/branch/master/emacs
+;; modified version of https://codeberg.org/daviwil/dotfiles/src/branch/master/emacs
 
 ;;; Code:
 
 
-(defvar fill-column-desired-width 120
+(defvar-local fill-column-desired-width 120
   "The desired width of a document centered in the window.")
 
 (defun fill-column--adjust-margins ()
diff --git a/.config/emacs/modules/bd--browse.el b/.config/emacs/modules/bd--browse.el
index 3dd15fe..5894b87 100644
--- a/.config/emacs/modules/bd--browse.el
+++ b/.config/emacs/modules/bd--browse.el
@@ -4,7 +4,7 @@
 
 (require 'selector)
 (require 'dash)
-
+(require 'fill-column)
 (defvar bd/bookmarks nil) ;; in secret file
 ;;;; searching
 (defun bd/browse (url &optional pref &rest _)
@@ -67,6 +67,10 @@ icecat, or eww."
   (shr-max-width 85))
 
 (use-package eww
+  :hook
+  ((eww-after-render . (lambda ()
+			 (setopt fill-column-desired-width 90)
+			 (fill-column-mode))))
   :custom
   (eww-search-prefix "https://duckduckgo.com/html/?q=")
   (eww-auto-rename-buffer 'title)
diff --git a/.config/emacs/modules/bd--buffers.el b/.config/emacs/modules/bd--buffers.el
index 7f3ff26..c7d0a1e 100644
--- a/.config/emacs/modules/bd--buffers.el
+++ b/.config/emacs/modules/bd--buffers.el
@@ -40,13 +40,6 @@ dedicated buffer will never be automatically orphaned."
   (global-auto-revert-non-file-buffers t)
   (auto-revert-interval 30))
 
-(use-package fill-column
-  :hook ((org-mode . fill-column-mode)
-	 (eww-after-render . fill-column-mode)
-	 (rcirc-mode . fill-column-mode))
-  :custom
-  (fill-column-desired-width 120))
-
 (use-package shackle
   :demand t
   :config
diff --git a/.config/emacs/modules/bd--irc.el b/.config/emacs/modules/bd--irc.el
index 17f1f4e..6b7a2b1 100644
--- a/.config/emacs/modules/bd--irc.el
+++ b/.config/emacs/modules/bd--irc.el
@@ -3,10 +3,13 @@
 ;;; Code:
 
 
+(require 'fill-column)
 (use-package rcirc
   :defer t
   :hook
   ((rcirc-mode . (lambda ()
+		   (setopt fill-column-desired-width 80)
+		   (rcirc-mode . fill-column-mode)
 		   (rcirc-omit-mode))))
   :custom
   (rcirc-fill-column 80)
diff --git a/.config/emacs/modules/bd--org.el b/.config/emacs/modules/bd--org.el
index 08a7652..b2ee2a5 100644
--- a/.config/emacs/modules/bd--org.el
+++ b/.config/emacs/modules/bd--org.el
@@ -3,7 +3,14 @@
 ;;; Code:
 
 
+(require 'fill-column)
 (use-package org
+  :hook
+  ((org-mode . (lambda ()
+	       (org-indent-mode)
+	       (org-toggle-inline-images)
+	       (fill-column-mode)
+	       (org-latex-preview '(16)))))
   :custom
   (org-ellipsis " ▾")
   (org-babel-python-command "python3")
@@ -14,9 +21,7 @@
   (defun bd/org-mode-setup-hook ()
     "Sets up improved org-mode defaults upon
 each org file open."
-    (org-indent-mode)
-    (org-toggle-inline-images)
-    (org-latex-preview '(16)))
+    )
   (add-hook 'org-mode-hook 'bd/org-mode-setup-hook)
 
   (plist-put org-format-latex-options :scale 1.2)