nits

6 files changed, 33 insertions, 23 deletions

diff --git a/completion.org b/completion.org
index ad35b9a..8fdeb23 100644
--- a/completion.org
+++ b/completion.org
@@ -166,11 +166,10 @@
                   ("C-p" . jao-corfu-quit-or-previous)))
 
     (defun corfu-in-minibuffer ()
-      "Enable Corfu in the minibuffer only if vertico is not active."
-      (when (and window-system (not (bound-and-true-p vertico--input)))
-        (corfu-mode 1)))
+      (when (not (bound-and-true-p vertico--input)) (corfu-mode 1)))
 
     (add-hook 'minibuffer-setup-hook #'corfu-in-minibuffer 1)
+
     (global-corfu-mode 1)
 
   #+end_src
@@ -578,6 +577,7 @@
           (link-hint-open-link)))
 
       :bind (("C-l" . link-hint-open-link)
+             ("C-M-l" . jao-link-hint-open-link-ext)
              ("C-S-l" . jao-link-hint-open-link-ext)
              ("C-x C-l" . recenter-top-bottom)))
 
diff --git a/exwm.org b/exwm.org
index 41adb52..65db454 100644
--- a/exwm.org
+++ b/exwm.org
@@ -437,7 +437,8 @@
         (let ((cb (current-buffer)))
           (switch-to-buffer b)
           (jao-exwm--send-str "yy")
-          (switch-to-buffer cb))))
+          (prog1 (current-kill 1)
+           (switch-to-buffer cb)))))
 
   #+end_src
 * Transients
@@ -511,7 +512,8 @@
        ([?\s-A] . org-agenda-list)
        ([?\s-a] . jao-first-window)
        ([?\s-b] . jao-transient-org-blog)
-       ([?\s-d] . jao-exwm-tidal*)
+       ;; ([?\s-d] . jao-exwm-tidal*)
+       ([?\s-d] . jao-mpc-echo-current)
        ([?\s-e] . jao-exwm-firefox*)
        ([?\s-m] . jao-transient-media)
        ;; ([?\s-O] . jao-transpose-windows)
@@ -531,6 +533,7 @@
        ([XF86AudioPause] . jao-player-toggle)
        ([XF86AudioNext] . jao-player-next)
        ([XF86AudioPrev] . jao-player-previous)
+       ([XF86AudioStop] . jao-player-stop)
        ([XF86AudioRaiseVolume] . jao-mixer-master-up)
        ([XF86AudioLowerVolume] . jao-mixer-master-down)
        ([XF86MonBrightnessUp] . jao-bright-up)
diff --git a/init.org b/init.org
index 282030d..68e56a7 100644
--- a/init.org
+++ b/init.org
@@ -299,13 +299,10 @@
       #+begin_src emacs-lisp
         (defun jao--set-fontsets (_f)
           (set-fontset-font t 64257 "Quivira" nil)
-          (set-fontset-font t 'egyptian "Noto Sans Egyptian Hieroglyphs"
-                            nil)
+          (set-fontset-font t 'egyptian "Noto Sans Egyptian Hieroglyphs" nil)
           (set-fontset-font t 'hangul "NanumGothicCoding" nil)
-          (set-fontset-font t 'unicode (face-attribute 'default :family)
-                            nil)
-          (set-fontset-font t 'unicode-bmp (face-attribute 'default :family)
-                            nil)
+          (set-fontset-font t 'unicode (face-attribute 'default :family) nil)
+          (set-fontset-font t 'unicode-bmp (face-attribute 'default :family) nil)
           (set-fontset-font t 'symbol "Symbola-10" nil)
           (set-fontset-font t 'greek "GFS Didot" nil)
           (set-fontset-font t 'mathematical "FreeSerif" nil)
@@ -1332,12 +1329,11 @@
 * Frames
 *** Frame geometry
     #+begin_src emacs-lisp
-      (setq frame-resize-pixelwise nil)
-      ;;; modeline, toolbars and co.
+      (setq frame-resize-pixelwise t)
       (modify-all-frames-parameters
        `((horizontal-scroll-bars . nil)
          (vertical-scroll-bars . nil)
-         (scroll-bar-width . 11)
+         (scroll-bar-width . 0)
          (menu-bar . nil)))
     #+end_src
 *** Frame layout, title, etc.
@@ -1503,7 +1499,7 @@
         (add-to-list 'auto-mode-alist (cons ext 'markdown-mode)))
     #+END_SRC
 *** TeX and LaTex
-    #+BEGIN_SRC emacs-lisp
+    #+begin_src emacs-lisp
       (use-package tex-site
         :ensure auctex
         :init
@@ -1540,13 +1536,13 @@
         (add-hook 'LaTeX-mode-hook 'turn-on-reftex)
         )
 
-;; (use-package ebib
+      ;; (use-package ebib
       ;;  :ensure t
       ;;  :config (setq ebib-bibtex-dialect 'biblatex))
 
       ;; for M-x biblio-lookup
       ;; (use-package biblio :ensure t)
-    #+END_SRC
+    #+end_src
 * Browsing
 *** Variables
     #+begin_src emacs-lisp
@@ -2009,8 +2005,7 @@
                     vterm-copy-exclude-prompt t
                     jao-use-vterm t)
         :config (jao-define-attached-buffer "\\*vterm\\*" 0.5)
-        :bind (("<f3>" . vterm)
-               :map vterm-mode-map ("C-c C-c" . vterm-send-C-c)))
+        :bind (:map vterm-mode-map ("C-c C-c" . vterm-send-C-c)))
 
       (defun jao-exec-in-vterm (cmd bname)
         (if (string-blank-p (or cmd ""))
@@ -2647,7 +2642,8 @@
                     cider-use-fringe-indicators nil
                     cider-use-overlays nil
                     clojure-docstring-fill-column 72
-                    nrepl-prompt-to-kill-server-buffer-on-quit nil))
+                    nrepl-prompt-to-kill-server-buffer-on-quit nil)
+        :bind (("<f3>" . cider-selector)))
 
       (with-eval-after-load "cider-test"
         (advice-add 'cider-scale-background-color :override
@@ -2960,10 +2956,15 @@
               lui-time-stamp-format "%H:%M"
               lui-flyspell-p nil
 
-              lui-track-indicator 'fringe
+              lui-track-indicator (if window-system 'fringe 'bar)
               lui-track-behavior 'before-tracking-next-buffer)
         :config
 
+        (define-minor-mode jao-circe-user-number-mode ""
+          :lighter (:eval (format " [%s]" (length (circe-channel-nicks)))))
+
+        (add-hook 'circe-channel-mode-hook #'jao-circe-user-number-mode)
+
         (defun circe-command-RECOVER (&rest ignore)
           "Recover nick"
           (let* ((fn (jao--get-user/password "freenode"))
diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el
index bdafa74..40dabf4 100644
--- a/lib/eos/jao-minibuffer.el
+++ b/lib/eos/jao-minibuffer.el
@@ -27,7 +27,7 @@
 (defvar jao-minibuffer-info ())
 (defvar jao-minibuffer-msg-info '(""))
 (defvar jao-minibuffer-align-right t)
-(defvar jao-minibuffer-right-margin (if window-system 0 2))
+(defvar jao-minibuffer-right-margin (if window-system 0 1))
 (defvar jao-minibuffer-maximized-frames-p t)
 (defvar jao-minibuffer-frame-width nil)
 (defvar jao-minibuffer-active-buffer-line-color "azure4")
diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el
index 385b429..caf43d9 100644
--- a/lib/themes/jao-light-theme.el
+++ b/lib/themes/jao-light-theme.el
@@ -39,7 +39,9 @@
           (blue "#023770")
           (green "#005555"))
   (:face-size 9)
-  (:face-family "Hack")
+  ;; (:face-family "Hack")
+  (:face-family "DejaVu Sans Mono")
+  ;; (:face-family "Iosevka Comfy Fixed")
   (:bold-weight jao-theme-light-bold)
   (:palette (fg "black")
             (bg "white")
diff --git a/org.org b/org.org
index a7c97b5..6b08ed9 100644
--- a/org.org
+++ b/org.org
@@ -116,6 +116,10 @@
           org-startup-with-inline-images t
           org-image-actual-width '(300))
 
+    (use-package org-modern
+      :ensure t
+      :hook (org-mode . org-modern-mode))
+
   #+end_src
 * LaTeX
   #+begin_src emacs-lisp