back to linux tweaks

7 files changed, 80 insertions, 95 deletions

diff --git a/attic/elisp/jao-recoll.el b/attic/elisp/jao-recoll.el
index b23106f..def4b5a 100644
--- a/attic/elisp/jao-recoll.el
+++ b/attic/elisp/jao-recoll.el
@@ -1,6 +1,6 @@
 ;;; jao-recoll.el -- Displaying recoll queries -*- lexical-binding: t; -*-
 
-;; Copyright (c) 2017, 2020, 2021, 2022 Jose Antonio Ortega Ruiz
+;; Copyright (c) 2017, 2020, 2021, 2022, 2026 Jose Antonio Ortega Ruiz
 
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -41,6 +41,7 @@
 (defvar-local jao-recoll--last-query nil)
 (defvar-local jao-recoll--last-full-query nil)
 
+;;;###autoload
 (defun jao-recoll-show-query ()
   (interactive)
   (message (concat jao-recoll--last-query "\n"
@@ -65,7 +66,7 @@
               ((looking-at "^0 : \\(.[^\n]+\\)")
                (let ((desc (match-string 1)))
                  (replace-match "  - ")
-                 (insert (org-make-link-string lnk desc))))
+                 (insert (org-link-make-string lnk desc))))
               (t (insert "  - ")))
         (forward-line 1))
       (unless (eobp) (kill-line)))))
@@ -110,7 +111,7 @@
                           (concat (file-name-nondirectory ref) " :: " desc))
                        desc)))
           (delete-region start end)
-          (insert "* " (org-make-link-string lnk desc) " (" mime ")")
+          (insert "* " (org-link-make-string lnk desc) " (" mime ")")
           (forward-line)
           (jao-recoll--format-snippets lnk)))
       (pop-to-buffer (current-buffer))
diff --git a/attic/elisp/misc.el b/attic/elisp/misc.el
index c2a6bd3..7e15ee9 100644
--- a/attic/elisp/misc.el
+++ b/attic/elisp/misc.el
@@ -298,8 +298,7 @@
         mu4e-user-mail-address-list jao-mails
         mu4e-view-show-addresses t
         mu4e-view-show-images t
-        mu4e-maildir-shortcuts '((:maildir "/jao/inbox" :key ?j)
-                                 (:maildir "/bigml/inbox" :key ?b))
+        mu4e-maildir-shortcuts '((:maildir "/jao/inbox" :key ?j))
         jao-mu4e-uninteresting-mail-query
         (concat
          "flag:unread AND NOT flag:trashed"
diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index 8b8cd58..0cb60e7 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -33,10 +33,10 @@
 (defun jao-notmuch-notify ()
   (interactive)
   (let* ((cnts (notmuch-hello-query-counts jao-notmuch-minibuffer-queries))
-         (mc (jao-d-l
+         (mc (jao-when-darwin
               (when jao-notmuch-mac-mail-badge
-                (jao-mac-app-badge jao-notmuch-mac-mail-badge))
-              0))
+                (jao-mac-app-badge jao-notmuch-mac-mail-badge)
+                0)))
          (cnts (if mc (cons `(:name "" :count ,(format "[%s]" mc)) cnts) cnts)))
     (setq jao-notmuch-minibuffer-string (mapconcat #'jao-notmuch--qstr cnts " "))
     (when jao-notmuch-mac-hammerspoon (jao-notmuch-hammerspoon))
@@ -260,7 +260,6 @@
       (let (;; (d `(:foreground ,(face-attribute 'jao-themes-dimm :foreground)))
             (e `(:foreground ,(face-attribute 'jao-themes-error :foreground))))
         `(("attachment" "⧺")
-          ("bigml" "b")
           ("deleted" "⛒" (propertize tag 'face '(:underline nil ,@e)))
           ("feeds" "f")
           ("flagged" "✓")
@@ -594,10 +593,7 @@
     (advice-remove 'notmuch-tree #'jao-notmuch-before-tree)
     (advice-remove 'notmuch-tree-quit #'jao-notmuch-after-tree-quit))
 
-  (when jao-notmuch-enabled
-    ;; (jao-d-l (jao-notmuch-use-one-pane) (jao-notmuch-use-two-panes))
-    (jao-notmuch-use-two-panes)
-    )
+  (when jao-notmuch-enabled (jao-notmuch-use-two-panes))
 
   :bind (:map notmuch-tree-mode-map
               (("b" . jao-notmuch-browse-urls)
@@ -721,7 +717,7 @@
 
  (defvar jao-consult-notmuch-history nil)
 
- (defvar jao-mailbox-folders '("bigml" "jao"))
+ (defvar jao-mailbox-folders '("jao"))
 
  (defun jao-consult-notmuch-folder (&optional tree folder)
    (interactive "P")
diff --git a/custom/jao-custom-programming.el b/custom/jao-custom-programming.el
index 4ea4029..0e749c0 100644
--- a/custom/jao-custom-programming.el
+++ b/custom/jao-custom-programming.el
@@ -74,10 +74,10 @@
          (lisp-interaction-mode . disable-paredit-mode))
   :diminish ((paredit-mode . " þ")))
 
-(use-package smartparens
-  :ensure t
-  :bind (:map smartparens-mode-map
-              ("C-)" . sp-forward-slurp-sexp)))
+;; (use-package smartparens
+;;   :ensure t
+;;   :bind (:map smartparens-mode-map
+;;               ("C-)" . sp-forward-slurp-sexp)))
 
 ;;;; diff/ediff
 (setq ediff-split-window-function 'split-window-horizontally)
@@ -624,12 +624,6 @@
                   (t "prolog")))))
 
 ;;;; Python
-(use-package virtualenvwrapper
-  :ensure t
-  :config
-  (venv-initialize-eshell)
-  (jao-compilation-env "VIRTUAL_ENV"))
-
 (use-package uv-mode
   :ensure t
   :hook (python-mode . uv-mode-auto-activate-hook))
diff --git a/custom/jao-custom-x11.el b/custom/jao-custom-x11.el
index 6f0a607..3922bc5 100644
--- a/custom/jao-custom-x11.el
+++ b/custom/jao-custom-x11.el
@@ -22,6 +22,7 @@
 
 ;;; exwm
 (defun jao-exwm-enable ()
+  (interactive)
   (require 'jao-custom-exwm)
   (setq jao-exwm-enabled t)
   (display-time-mode -1)
diff --git a/init.el b/init.el
index 2a69e8e..5c79f06 100644
--- a/init.el
+++ b/init.el
@@ -33,12 +33,11 @@
         ("melpa" . "https://melpa.org/packages/"))
       package-archive-priorities '(("gnu-devel" . 2)
                                    ("nongnu-devel" . 1)
-                                   ("melpa" . 0)))
+                                   ("melpa" . 0))
+      package-install-upgrade-built-in t)
 
 (package-initialize)
 
-(require 'use-package)
-
 (use-package gnu-elpa-keyring-update :ensure t)
 
 ;;;; .elc vs .el loading
@@ -165,7 +164,7 @@
 
 ;;;; docker
 (use-package dockerfile-mode :ensure t)
-(use-package docker :ensure t)
+(jao-when-darwin (use-package docker :ensure t))
 
 ;;;; sleep/awake
 (use-package jao-sleep
@@ -834,71 +833,71 @@
 (require 'jao-custom-completion)
 
 ;;;; recoll
-(jao-when-linux (jao-load-path "consult-recoll"))
-
-(use-package consult-recoll
-  :if (jao-is-linux)
-  :commands (consult-recoll consult-recoll-embark-setup)
-  :init
-  (defun jao-recoll-format (title url _mtype)
-    (let* ((u (replace-regexp-in-string "file://" "" url))
-           (u (replace-regexp-in-string "/home/jao/" "" u))
-           (u (replace-regexp-in-string
-               "\\(doc\\|org/doc\\|.emacs.d/gnus/Mail\\|var/mail\\)/" "" u)))
-      (format "%s (%s)" ;; "%s (%s, %s)"
-              title
-              (propertize u 'face 'jao-themes-f01)
-              ;; (propertize mtype 'face 'jao-themes-f01)
-              )))
-
-  (defun jao-recoll-open-html (file &optional _page)
-    (if (string-match-p "\.epub\\'" file)
-        (find-file file)
-      (jao-afio-goto-www)
-      (if jao-afio-use-w3m (w3m-find-file file) (eww-open-file file))))
-
-  (defun jao-recoll-open-pdf (file &optional page)
-    (if (string-match-p "/gnus/Mail/" file)
-        (funcall
-         (or (cdr (assoc-string "message/rfc822" consult-recoll-open-fns))
-             'find-file)
-         file
-         page)
-      (jao-open-doc file page)))
-
-  (defun jao-recoll-consult-messages ()
-    (interactive)
-    (consult-recoll "mime:message "))
-
-  (defun jao-recoll-consult-docs ()
-    (interactive)
-    (consult-recoll (format "dir:%s/doc " (jao-org-dir))))
-
-  (defun jao-recoll-consult-notes ()
-    "Use consult-recoll to search notes."
-    (interactive)
-    (consult-recoll (format "dir:%s " jao-org-notes-dir)))
+(jao-when-linux
+ (jao-load-path "consult-recoll")
+
+ (defun jao-recoll-format (title url _mtype)
+   (let* ((u (replace-regexp-in-string "file://" "" url))
+          (u (replace-regexp-in-string "/home/jao/" "" u))
+          (u (replace-regexp-in-string
+              "\\(doc\\|org/doc\\|.emacs.d/gnus/Mail\\|var/mail\\)/" "" u)))
+     (format "%s (%s)" ;; "%s (%s, %s)"
+             title
+             (propertize u 'face 'jao-themes-f01)
+             ;; (propertize mtype 'face 'jao-themes-f01)
+             )))
+
+ (defun jao-recoll-open-html (file &optional _page)
+   (if (string-match-p "\.epub\\'" file)
+       (find-file file)
+     (jao-afio-goto-www)
+     (if jao-afio-use-w3m (w3m-find-file file) (eww-open-file file))))
+
+ (defun jao-recoll-open-pdf (file &optional page)
+   (if (string-match-p "/gnus/Mail/" file)
+       (funcall
+        (or (cdr (assoc-string "message/rfc822" consult-recoll-open-fns))
+            'find-file)
+        file
+        page)
+     (jao-open-doc file page)))
+
+ (defun jao-recoll-consult-messages ()
+   (interactive)
+   (consult-recoll "mime:message "))
 
-  (setq consult-recoll-open-fns
-        '(("application/pdf" . jao-recoll-open-pdf)
-          ("text/html" . jao-recoll-open-html))
-        consult-recoll-search-flags 'query
-        consult-recoll-inline-snippets t
-        consult-recoll-format-candidate #'jao-recoll-format)
+ (defun jao-recoll-consult-docs ()
+   (interactive)
+   (consult-recoll (format "dir:%s/doc " (jao-org-dir))))
 
-  :config
+ (defun jao-recoll-consult-notes ()
+   "Use consult-recoll to search notes."
+   (interactive)
+   (consult-recoll (format "dir:%s " jao-org-notes-dir)))
+
+ (setq consult-recoll-open-fns
+       '(("application/pdf" . jao-recoll-open-pdf)
+         ("text/html" . jao-recoll-open-html))
+       consult-recoll-search-flags 'query
+       consult-recoll-inline-snippets t
+       consult-recoll-format-candidate #'jao-recoll-format)
+
+ (use-package consult-recoll
+   :demand t
+   :commands (consult-recoll consult-recoll-embark-setup)
+   :config
+   (consult-customize consult-recoll :preview-key 'any)
 
-  (consult-customize consult-recoll :preview-key 'any)
-  (with-eval-after-load "embark" (consult-recoll-embark-setup))
+   (with-eval-after-load "embark" (consult-recoll-embark-setup))
 
-  (transient-define-prefix jao-transient-recoll ()
-    ["Consult recoll queries"
-     ("r" "everywhere" consult-recoll)
-     ("n" "on notes" jao-recoll-consult-notes)
-     ("d" "on docs" jao-recoll-consult-docs)
-     ("m" "on messages" jao-recoll-consult-messages)])
+   (transient-define-prefix jao-transient-recoll ()
+     ["Consult recoll queries"
+      ("r" "everywhere" consult-recoll)
+      ("n" "on notes" jao-recoll-consult-notes)
+      ("d" "on docs" jao-recoll-consult-docs)
+      ("m" "on messages" jao-recoll-consult-messages)])
 
-  :bind (("s-r" . #'jao-transient-recoll)))
+   :bind (("s-r" . #'jao-transient-recoll))))
 
 ;;;; alternative (mac): consult-spotlight
 
@@ -1382,10 +1381,6 @@
 (add-to-list 'display-buffer-alist
              '("\\*Async Shell Command\\*" (display-buffer-no-window)))
 
-(use-package nushell-ts-mode
-  :ensure t
-  :config (setq nushell-ts-mode-indent-offset 4))
-
 ;;;; eat
 (use-package eat
   :ensure t
@@ -1603,8 +1598,7 @@
   (setq magit-repository-directories
         (jao-d-l
          '(("/Users/jao/Projects" . 3))
-         '(("/home/jao/usr/bigml" . 2)
-           ("/home/jao/usr/jao" . 3)
+         '(("/home/jao/usr/jao" . 3)
            ("/usr/local/src" . 1))))
 
   (setq magit-status-initial-section nil
@@ -2138,7 +2132,7 @@
      ("do" "open doc" jao-open-doc)
      ("dr" "search docs with recoll" jao-recoll-consult-docs)]
     ["Monitors"
-     ("p" "list projects" list-projects)
+     ;; ("p" "list projects" list-projects)
      ;; ("p" "htop" jao-term-htop)
      ("P" "pasytray" jao-toggle-pasystray-applet)
      ("x" "restart i3bar" jao-river-restart-i3bar :if jao-river-enabled-p)
diff --git a/attic/elisp/jao-ednc.el b/lib/eos/jao-ednc.el
index 92ee21f..92ee21f 100644
--- a/attic/elisp/jao-ednc.el
+++ b/lib/eos/jao-ednc.el