From c0f40005ba5890f82212deedfe81af9bb53c26af Mon Sep 17 00:00:00 2001
From: Ashton Wiersdorf <mail@wiersdorf.dev>
Date: Tue, 21 Mar 2023 11:43:17 -0600
Subject: Rename mixins/ui.el → mixins/base.el; add some researcher config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 init.el              |  3 +-
 mixins/base.el       | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 mixins/researcher.el | 54 ++++++++++++++++++++++++++++++
 mixins/ui.el         | 93 ----------------------------------------------------
 4 files changed, 149 insertions(+), 94 deletions(-)
 create mode 100644 mixins/base.el
 delete mode 100644 mixins/ui.el

diff --git a/init.el b/init.el
index 2a4e17c..98a72dd 100644
--- a/init.el
+++ b/init.el
@@ -45,7 +45,8 @@
 (windmove-default-keybindings 'control) ; You can use other modifiers here
 
 ;; Make right-click do something sensible
-(context-menu-mode)
+(when (display-graphic-p)
+  (context-menu-mode))
 
 ;; Don't litter filesystem with *~ backup files; put them all inside
 ;; ~/.emacs.d/backup or wherever
diff --git a/mixins/base.el b/mixins/base.el
new file mode 100644
index 0000000..4a3f003
--- /dev/null
+++ b/mixins/base.el
@@ -0,0 +1,93 @@
+;;; Emacs Bedrock
+;;;
+;;; Mixin: UI enhancements
+
+;;; Usage: Append or require this file from init.el to enable various UI/UX
+;;; enhancements.
+
+;;; Contents:
+;;;
+;;;  - Motion aids
+;;;  - Minibuffer and completion
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;
+;;;   Motion aids
+;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(use-package avy
+  :ensure t
+  :bind (("C-c j" . avy-goto-line)
+         ("s-j"   . avy-goto-char-timer)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;
+;;;   Minibuffer and completion
+;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Vertico: better vertical completion for minibuffer commands
+(use-package vertico
+  :ensure t
+  :init
+  (fido-mode -1)
+  (vertico-mode))
+
+;; Marginalia: annotations for minibuffer
+(use-package marginalia
+  :ensure t
+  :config
+  (marginalia-mode))
+
+;; Popup completion-at-point
+(use-package corfu
+  :ensure t
+  :config
+  (global-corfu-mode))
+
+;; Part of corfu
+(use-package corfu-popupinfo
+  :after corfu
+  :hook (corfu-mode . corfu-popupinfo-mode)
+  :custom
+  (corfu-popupinfo-delay '(0.25 . 0.1))
+  (corfu-popupinfo-hide nil)
+  :config
+  (corfu-popupinfo-mode))
+
+;; Make corfu popup come up in terminal overlay
+(use-package corfu-terminal
+  :if (not (display-graphic-p))
+  :ensure t
+  :config
+  (corfu-terminal-mode))
+
+;; Pretty icons for corfu
+(use-package kind-icon
+  :if (display-graphic-p)
+  :ensure t
+  :after corfu
+  :config
+  (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
+
+;; Consult: Misc. enhanced commands
+(use-package consult
+  :ensure t
+  ;; Other good things to bind: consult-ripgrep, consult-line-multi,
+  ;; consult-history, consult-outline, consult-error
+  :bind (("C-x b" . consult-buffer) ;; orig. switch-to-buffer
+         ("M-y" . consult-yank-pop) ;; orig. yank-pop
+         ("C-s" . consult-line))    ;; orig. isearch
+  :config
+  ;; Narrowing lets you restrict results to certain groups of candidates
+  (setq consult-narrow-key "<"))
+
+(use-package eshell
+  :bind (("C-r" . consult-history)))
+
+;; Orderless: powerful completion style
+(use-package orderless
+  :ensure t
+  :config
+  (setq completion-styles '(orderless)))
diff --git a/mixins/researcher.el b/mixins/researcher.el
index fad1a36..7cf738c 100644
--- a/mixins/researcher.el
+++ b/mixins/researcher.el
@@ -5,6 +5,9 @@
 ;;; Usage: Append or require this file from init.el for research helps. If you
 ;;; write papers in LaTeX and need to manage your citations or keep track of
 ;;; notes, this package is for you.
+;;;
+;;; Highly recommended to enable this mixin with the UI enhancements in
+;;; `base.el', as citar works best with the Vertico completing-read interface.
 
 ;;; Contents:
 ;;;
@@ -13,12 +16,50 @@
 ;;;  - Note Taking: Org-Roam
 ;;;  - Note Taking: Denote
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;
+;;;   Critical variables
+;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; These variables must be set for citar to work properly!
+
+(setq citar-bibliography '("~/refs.bib")) ; paths to your bibtex files
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;;   Citation Management
 ;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-package citar
+  :ensure t
+  :bind (("C-c b" . citar-insert-citation)
+         :map minibuffer-local-map
+         ("M-b" . citar-insert-preset))
+  :custom
+  ;; Allows you to customize what citar-open does
+  (citar-file-open-functions '(("html" . citar-file-open-external)
+                               ;; ("pdf" . citar-file-open-external)
+                               (t . find-file))))
+
+;; Optional: if you have the embark package installed, enable the ability to act
+;; on citations with citar by invoking `embark-act'.
+;(use-package citar-embark
+;  :after citar embark
+;  :diminish ""
+;  :no-require
+;  :config (citar-embark-mode))
+
+(use-package citar-org-roam
+  :diminish ""
+  ;; To get this to work both citar *and* org-roam have to have been used
+  :after citar org-roam
+  :no-require
+  :config
+  (citar-org-roam-mode)
+  (setq citar-org-roam-note-title-template "${author} - ${title}\n#+filetags: ${tags}"))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;;   Authoring
@@ -31,6 +72,19 @@
 ;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-package org-roam
+  :ensure t
+  :config
+  ;; Make sure the backlinks buffer always shows up in a side window
+  (add-to-list 'display-buffer-alist
+               '("\\*org-roam\\*"
+                 (display-buffer-in-side-window)
+                 (side . right)
+                 (window-width . 0.4)
+                 (window-height . fit-window-to-buffer)))
+
+  (org-roam-db-autosync-mode))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;;   Note Taking: Denote
diff --git a/mixins/ui.el b/mixins/ui.el
deleted file mode 100644
index 4a3f003..0000000
--- a/mixins/ui.el
+++ /dev/null
@@ -1,93 +0,0 @@
-;;; Emacs Bedrock
-;;;
-;;; Mixin: UI enhancements
-
-;;; Usage: Append or require this file from init.el to enable various UI/UX
-;;; enhancements.
-
-;;; Contents:
-;;;
-;;;  - Motion aids
-;;;  - Minibuffer and completion
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
-;;;   Motion aids
-;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(use-package avy
-  :ensure t
-  :bind (("C-c j" . avy-goto-line)
-         ("s-j"   . avy-goto-char-timer)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
-;;;   Minibuffer and completion
-;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Vertico: better vertical completion for minibuffer commands
-(use-package vertico
-  :ensure t
-  :init
-  (fido-mode -1)
-  (vertico-mode))
-
-;; Marginalia: annotations for minibuffer
-(use-package marginalia
-  :ensure t
-  :config
-  (marginalia-mode))
-
-;; Popup completion-at-point
-(use-package corfu
-  :ensure t
-  :config
-  (global-corfu-mode))
-
-;; Part of corfu
-(use-package corfu-popupinfo
-  :after corfu
-  :hook (corfu-mode . corfu-popupinfo-mode)
-  :custom
-  (corfu-popupinfo-delay '(0.25 . 0.1))
-  (corfu-popupinfo-hide nil)
-  :config
-  (corfu-popupinfo-mode))
-
-;; Make corfu popup come up in terminal overlay
-(use-package corfu-terminal
-  :if (not (display-graphic-p))
-  :ensure t
-  :config
-  (corfu-terminal-mode))
-
-;; Pretty icons for corfu
-(use-package kind-icon
-  :if (display-graphic-p)
-  :ensure t
-  :after corfu
-  :config
-  (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
-
-;; Consult: Misc. enhanced commands
-(use-package consult
-  :ensure t
-  ;; Other good things to bind: consult-ripgrep, consult-line-multi,
-  ;; consult-history, consult-outline, consult-error
-  :bind (("C-x b" . consult-buffer) ;; orig. switch-to-buffer
-         ("M-y" . consult-yank-pop) ;; orig. yank-pop
-         ("C-s" . consult-line))    ;; orig. isearch
-  :config
-  ;; Narrowing lets you restrict results to certain groups of candidates
-  (setq consult-narrow-key "<"))
-
-(use-package eshell
-  :bind (("C-r" . consult-history)))
-
-;; Orderless: powerful completion style
-(use-package orderless
-  :ensure t
-  :config
-  (setq completion-styles '(orderless)))
-- 
cgit v1.2.3