erc -> rcirc, remove visual-fill-column, icomplete, change vpf

10 files changed, 103 insertions, 68 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 25a3234..4b08552 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -96,7 +96,7 @@
 (require 'bd--project)
 (require 'bd--files)
 (require 'bd--dictionary)
-(require 'bd--erc)
+(require 'bd--irc)
 (require 'bd--shells)
 (require 'bd--minibuffer)
 (require 'bd--buffers)
diff --git a/.config/emacs/libraries/fill-column.el b/.config/emacs/libraries/fill-column.el
new file mode 100644
index 0000000..2a70cd6
--- /dev/null
+++ b/.config/emacs/libraries/fill-column.el
@@ -0,0 +1,39 @@
+;;; -*- lexical-binding: t; -*-
+;;; Commentary:
+
+;; yanked from https://codeberg.org/daviwil/dotfiles/src/branch/master/emacs
+
+;;; Code:
+
+
+(defvar fill-column-desired-width 120
+  "The desired width of a document centered in the window.")
+
+(defun fill-column--adjust-margins ()
+  "Resets window margins, then calculates the appropriate
+margin given the window width and `fill-column-desired-width'
+if fill-column-mode is t."
+  (set-window-parameter nil 'min-margins nil)
+  (set-window-margins nil nil)
+  (when fill-column-mode
+    (let ((margin-width (max 0
+			     (truncate
+			      (/ (- (window-width)
+				    fill-column-desired-width)
+				 2.0)))))
+      (when (> margin-width 0)
+	(set-window-parameter nil 'min-margins '(0 . 0))
+	(set-window-margins nil margin-width margin-width)))))
+
+(define-minor-mode fill-column-mode
+  "Toggle centered text layout in the current buffer."
+  :lighter " Centered"
+  :group 'editing
+  (if fill-column-mode
+      (add-hook 'window-configuration-change-hook #'fill-column--adjust-margins 'append 'local)
+    (remove-hook 'window-configuration-change-hook #'fill-column--adjust-margins 'local))
+  (fill-column--adjust-margins))
+
+
+(provide 'fill-column)
+;;; fill-column ends here
diff --git a/.config/emacs/modules/bd--buffers.el b/.config/emacs/modules/bd--buffers.el
index 6342e47..7f3ff26 100644
--- a/.config/emacs/modules/bd--buffers.el
+++ b/.config/emacs/modules/bd--buffers.el
@@ -40,12 +40,12 @@ dedicated buffer will never be automatically orphaned."
   (global-auto-revert-non-file-buffers t)
   (auto-revert-interval 30))
 
-(use-package visual-fill-column
-  :hook ((org-mode . visual-fill-column-mode)
-	 (eww-after-render . visual-fill-column-mode))
+(use-package fill-column
+  :hook ((org-mode . fill-column-mode)
+	 (eww-after-render . fill-column-mode)
+	 (rcirc-mode . fill-column-mode))
   :custom
-  (visual-fill-column-center-text t)
-  (visual-fill-column-width 120))
+  (fill-column-desired-width 120))
 
 (use-package shackle
   :demand t
diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el
index 2e8e007..76c8a6c 100644
--- a/.config/emacs/modules/bd--devel.el
+++ b/.config/emacs/modules/bd--devel.el
@@ -83,8 +83,6 @@ to.")
 (use-package rainbow-mode
   :hook css-mode)
 
-(use-package lua-mode)
-
 ;; fix to force-load newest transient
 (use-package transient
   :load-path (lambda () (car (directory-files
@@ -95,18 +93,6 @@ to.")
   :custom
   (magit-define-global-key-bindings 'recommended))
 
-(use-package tex
-  :ensure auctex
-  :hook
-  ((latex-mode)
-   (text-mode . (lambda() (setq ispell-parser 'tex)))) ; improves ispell in LaTeX
-  :config
-  (push '(output-pdf "Zathura") TeX-view-program-selection)
-  :custom
-  (TeX-auto-save t)
-  ;; better support for latex packages
-  (TeX-parse-self t))
-
 (use-package rainbow-delimiters
   :hook prog-mode)
 
diff --git a/.config/emacs/modules/bd--erc.el b/.config/emacs/modules/bd--erc.el
deleted file mode 100644
index 1544932..0000000
--- a/.config/emacs/modules/bd--erc.el
+++ /dev/null
@@ -1,31 +0,0 @@
-;;; -*- lexical-binding: t; -*-
-;;; Commentary:
-;;; Code:
-
-
-(with-eval-after-load "erc" (defalias 'erc 'erc-tls))
-(use-package erc
-  :defer t
-  :custom
-  (erc-lurker-threshold-time 3600)
-  (erc-hide-list '("JOIN" "PART" "QUIT"))
-  (erc-server "operationnull.com")
-  (erc-nick "Isaz")
-  (erc-prompt-for-password t)
-  (erc-kill-buffer-on-part t)
-  (erc-autojoin-channels-alist nil)
-  (erc-fill-function 'erc-fill-static)
-  (erc-fill-column 80)
-  (erc-fill-static-center 15)
-  :config
-  (define-abbrev erc-mode-abbrev-table "pu" ",pounce")
-  (erc-autojoin-mode -1)
-  ;; for tab-bar
-  (defvar-local bd/erc-status
-      '(:eval
-        erc-modified-channels-object))
-  (add-to-list 'global-mode-string bd/erc-status))
-
-
-(provide 'bd--erc)
-;;; bd-erc ends here
diff --git a/.config/emacs/modules/bd--irc.el b/.config/emacs/modules/bd--irc.el
new file mode 100644
index 0000000..6c97cc1
--- /dev/null
+++ b/.config/emacs/modules/bd--irc.el
@@ -0,0 +1,31 @@
+;;; -*- lexical-binding: t; -*-
+;;; Commentary:
+;;; Code:
+
+
+(use-package rcirc
+  :defer t
+  :hook
+  ((rcirc-mode . (lambda ()
+		   (rcirc-omit-mode))))
+  :custom
+  (rcirc-fill-column 80)
+  (rcirc-omit-threshold 10)
+  (rcirc-reconnect-delay 60)
+  (rcirc-omit-responses '("JOIN" "PART" "QUIT" "NICK" "AWAY"))
+  (rcirc-track-minor-mode 1)
+  (rcirc-server-alist
+   '(("operationnull.com"
+      :nick "Gondul"
+      :user-name "Gondul"
+      :port 6697
+      :encryption tls)))
+  ;; for tab-bar
+  (defvar-local bd/irc-status
+      '(:eval
+        rcirc-activity-string))
+  (add-to-list 'global-mode-string bd/irc-status))
+
+
+(provide 'bd--irc)
+;;; bd-irc ends here
diff --git a/.config/emacs/modules/bd--minibuffer.el b/.config/emacs/modules/bd--minibuffer.el
index d42c81e..2e67ca7 100644
--- a/.config/emacs/modules/bd--minibuffer.el
+++ b/.config/emacs/modules/bd--minibuffer.el
@@ -6,12 +6,22 @@
 (require 'f)
 
 
-(use-package selector
-  :demand t
-  :bind (("M-x" . 'selector-M-x))
+(use-package icomplete
   :custom
   (completing-read-function #'completing-read-default)
   (read-file-name-function #'read-file-name-default)
+  (completion-styles '(basic
+                       substring
+                       initials
+                       flex))
+  (completions-max-height '30)
+  :config
+  (icomplete-vertical-mode))
+
+(use-package selector
+  :demand t
+  :bind (("M-x" . 'selector-M-x))
+  :config
   (defvar bd/navigate-recent-display-number 6
     "The number of recent buffers that show up in bd/navigate.")
   (defvar bd/blacklisted-buffer-regexp-list
@@ -55,16 +65,16 @@ selection commands.")
      (buffer-local-value 'major-mode (get-buffer buf))
      '(dired-mode)))
 
-  (defun bd/buffer-erc-p (buf)
-    "Return non-nil if BUF is an `erc-mode' buffer."
+  (defun bd/buffer-irc-p (buf)
+    "Return non-nil if BUF is an `irc-mode' buffer."
     (member
      (buffer-local-value 'major-mode (get-buffer buf))
-     '(erc-mode)))
+     '(rcirc-mode erc-mode)))
 
   (defun bd/buffer-blacklisted-p (buf)
     "Return non-nil if BUF is blacklisted."
     (cl-reduce (lambda (x y) (or x y)) (mapcar (lambda (r) (string-match r buf))
-                                               bd/blacklisted-buffer-regexp-list)))
+                                          bd/blacklisted-buffer-regexp-list)))
 
   (defun bd/buffer-ordinary-p (buf)
     "Return non-nil if BUF does not fit into known categories."
@@ -73,7 +83,7 @@ selection commands.")
              (bd/buffer-prog-p buf)
 	     (bd/buffer-scratch-p buf)
              (bd/buffer-dired-p buf)
-             (bd/buffer-erc-p buf))))
+             (bd/buffer-irc-p buf))))
 
   (defun bd/buffer-list ()
     "Return a list of non-blacklisted buffers."
@@ -118,7 +128,7 @@ selection commands.")
       (bd/selector-buffer-type "Source" #'bd/buffer-prog-p)
       (bd/selector-buffer-type "Scratch" #'bd/buffer-scratch-p)
       (bd/selector-buffer-type "Directories" #'bd/buffer-dired-p)
-      (bd/selector-buffer-type "IRC" #'bd/buffer-erc-p)
+      (bd/selector-buffer-type "IRC" #'bd/buffer-irc-p)
       (bd/selector-buffer-type "Ordinary" #'bd/buffer-ordinary-p)
       (bd/selector-project-files)
       (bd/selector-bookmarks)
@@ -129,8 +139,8 @@ selection commands.")
   (defun bd/get-directory-dwim ()
     "Returns the directory you always wanted."
     (or (when (project-current)
-	  (project-root (project-current)))	  ;; git
-	(locate-dominating-file "." "Makefile")	  ;; make
+	  (project-root (project-current)))	    ;; git
+	(locate-dominating-file "." "Makefile")	    ;; make
 	(locate-dominating-file "." "manifest.scm") ;; guix
 	default-directory))
 
diff --git a/.config/emacs/modules/bd--org.el b/.config/emacs/modules/bd--org.el
index fc24f14..d9256e2 100644
--- a/.config/emacs/modules/bd--org.el
+++ b/.config/emacs/modules/bd--org.el
@@ -23,6 +23,7 @@ each org file open."
   (add-hook 'org-mode-hook 'bd/org-mode-setup-hook)
 
   (plist-put org-format-latex-options :scale 1.2)
+  (push '("\\.pdf\\'" . "zathura %s") org-file-apps)
 
   (org-babel-do-load-languages
    'org-babel-load-languages
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el
index 5aabb30..cddcbe9 100644
--- a/.config/emacs/modules/bd--themes.el
+++ b/.config/emacs/modules/bd--themes.el
@@ -20,11 +20,11 @@ to.")
  bd/enable-variable-pitch-in-hooks)
 
 (set-face-attribute 'variable-pitch nil
-                    :family "Dejavu Serif"
-                    :height 102)
+                    :family "Dejavu Math TeX Gyre"
+                    :height 110)
 (set-face-attribute 'fixed-pitch nil
                     :family "Terminus"
-                    :height 120)
+                    :height 110)
 (set-face-attribute 'default nil
                     :family "Terminus"
                     :height 120)
@@ -55,6 +55,8 @@ to.")
      (bg-tab-other bg-inactive)))
   (ef-bio-palette-overrides
    '((bg-main "#000000")))
+  (ef-tritanopia-dark-palette-overrides
+   '((bg-main "#000000")))
   (ef-autumn-palette-overrides
    '((bg-main "#000000"))))
 
diff --git a/.config/guix/modules/emacs.scm b/.config/guix/modules/emacs.scm
index ecf820b..4e9b75e 100644
--- a/.config/guix/modules/emacs.scm
+++ b/.config/guix/modules/emacs.scm
@@ -26,7 +26,6 @@
 
 (define (bd-emacs-package-list config)
   (list
-   emacs-auctex
    emacs-dash
    emacs-denote
    emacs-desktop-environment
@@ -36,7 +35,6 @@
    emacs-f
    emacs-guix
    emacs-hydra
-   emacs-lua-mode
    emacs-magit
    emacs-paredit
    emacs-pinentry
@@ -45,7 +43,6 @@
    emacs-shackle
    emacs-transient
    emacs-transmission
-   emacs-visual-fill-column
    emacs-yasnippet
    emacs-yasnippet-snippets