summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--attic/elisp/misc.el75
-rw-r--r--custom/jao-custom-blog.el6
-rw-r--r--custom/jao-custom-browse.el251
-rw-r--r--custom/jao-custom-chats.el344
-rw-r--r--custom/jao-custom-completion.el5
-rw-r--r--custom/jao-custom-eww.el35
-rw-r--r--custom/jao-custom-exwm.el11
-rw-r--r--custom/jao-custom-gnus.el110
-rw-r--r--custom/jao-custom-multimedia.el291
-rw-r--r--custom/jao-custom-notmuch.el13
-rw-r--r--custom/jao-custom-org.el14
-rw-r--r--custom/jao-custom-pdf.el144
-rw-r--r--custom/jao-custom-programming.el508
-rw-r--r--custom/jao-custom-shells.el6
-rw-r--r--custom/jao-custom-window-system.el198
-rw-r--r--init.el2380
-rw-r--r--lib/doc/jao-org-notes.el33
-rw-r--r--lib/eos/jao-afio.el4
-rw-r--r--lib/eos/jao-dirmon.el18
-rw-r--r--lib/eos/jao-minibuffer.el6
-rw-r--r--lib/media/jao-mpc.el3
-rw-r--r--lib/media/jao-mpris.el32
-rw-r--r--lib/media/jao-random-album.el12
-rw-r--r--lib/net/jao-notmuch-gnus.el246
-rw-r--r--lib/net/randomsig.el9
-rw-r--r--lib/prog/jao-compilation.el4
-rw-r--r--lib/themes/jao-light-theme.el1
-rw-r--r--lib/themes/jao-themes.el5
28 files changed, 2717 insertions, 2047 deletions
diff --git a/attic/elisp/misc.el b/attic/elisp/misc.el
index 6484310..3e12ec1 100644
--- a/attic/elisp/misc.el
+++ b/attic/elisp/misc.el
@@ -813,11 +813,6 @@
:diminish ((disable-mouse-global-mode . "")))
(global-disable-mouse-mode)
-;;; tmr
-(use-package tmr
- :ensure t
- :init
- (setq tmr-sound-file "/usr/share/sounds/freedesktop/stereo/message.oga"))
;;; pdf-tools
(use-package pdf-tools
:ensure t
@@ -892,6 +887,12 @@
"^\\*Slack - .*? : \\(MPIM: \\)?\\([^ ]+\\)\\( \\(T\\)\\)?.*" "\\2\\4")
(jao-define-attached-buffer "\\*Slack .+ Edit Message [0-9].+" 20))
+;;; alert
+(use-package alert
+ :ensure t
+ :init
+ (setq alert-default-style 'message ;; 'libnotify
+ alert-hide-all-notifications nil))
;;; snippets
(defun jao-org-notes-open-tags ()
"Search for a note file, matching all tags with completion."
@@ -949,3 +950,67 @@
'notmuch-tree-match-author-face
'notmuch-tree-no-match-author-face)))
(propertize auth 'face face)))
+
+;; winttr
+
+(defun jao-weather (&optional wide)
+ (interactive "P")
+ (if (not wide)
+ (message "%s"
+ (jao-shell-string "curl -s"
+ "https://wttr.in/?format=%l++%m++%C+%c+%t+%w++%p"))
+ (jao-afio-goto-scratch)
+ (if-let ((b (get-buffer "*wttr*")))
+ (progn (pop-to-buffer b)
+ (term-send-string (get-buffer-process nil) "clear;curl wttr.in\n"))
+ (jao-exec-in-term "curl wttr.in" "*wttr*"))))
+(global-set-key (kbd "<f5>") #'jao-weather)
+
+;; so-long
+(setq large-file-warning-threshold (* 200 1024 1024))
+
+(use-package so-long
+ :ensure t
+ :diminish)
+(global-so-long-mode 1)
+
+;;;; code reviews
+(use-package code-review
+ :disabled t
+ :ensure t
+ :after forge
+ :bind (:map magit-status-mode-map
+ ("C-c C-r" . code-review-forge-pr-at-point)))
+
+;;;; jenkins
+(use-package jenkins
+ :ensure t
+ :init
+ ;; one also needs jenkins-api-token, jenkins-username and jenkins-url
+ ;; optionally: jenkins-colwidth-id, jenkins-colwidth-last-status
+ (setq jenkins-colwidth-name 35)
+ :config
+ (defun jao-jenkins-first-job (&rest _)
+ (interactive)
+ (goto-char (point-min))
+ (when (re-search-forward "^- Job" nil t)
+ (goto-char (match-beginning 0))))
+ (add-hook 'jenkins-job-view-mode-hook #'jao-jenkins-first-job)
+ (advice-add 'jenkins-job-render :after #'jao-jenkins-first-job)
+
+ (defun jenkins-refresh-console-output ()
+ (interactive)
+ (let ((n (buffer-name)))
+ (when (string-match "\\*jenkins-console-\\([^-]+\\)-\\(.+\\)\\*$" n)
+ (jenkins-get-console-output (match-string 1 n) (match-string 2 n))
+ (goto-char (point-max)))))
+
+ :bind (:map jenkins-job-view-mode-map
+ (("n" . next-line)
+ ("p" . previous-line)
+ ("f" . jao-jenkins-first-job)
+ ("RET" . jenkins--show-console-output-from-job-screen))
+ :map jenkins-console-output-mode-map
+ (("n" . next-line)
+ ("p" . previous-line)
+ ("g" . jenkins-refresh-console-output))))
diff --git a/custom/jao-custom-blog.el b/custom/jao-custom-blog.el
index a11c5c0..8d193bd 100644
--- a/custom/jao-custom-blog.el
+++ b/custom/jao-custom-blog.el
@@ -1,9 +1,9 @@
;; -*- lexical-binding: t -*-
;;; Vars and setup
-(jao-load-path "org-static-blog")
-(when (> emacs-major-version 26) (use-package htmlize :ensure t))
-(defvar jao-blog-base-dir "~/doc/jao.io")
+(use-package htmlize :ensure t)
+
+(defvar jao-blog-base-dir (expand-file-name "jao.io" jao-doc-dir))
(defun jao-blog-dir (p) (expand-file-name p jao-blog-base-dir))
(setq jao-org-blog-tag-files
diff --git a/custom/jao-custom-browse.el b/custom/jao-custom-browse.el
new file mode 100644
index 0000000..37f4c9f
--- /dev/null
+++ b/custom/jao-custom-browse.el
@@ -0,0 +1,251 @@
+;; -*- lexical-binding: t -*-
+
+;;; Browsing
+;;;; variables
+(defvar jao-browse-doc-use-emacs-p (jao-is-linux))
+(defvar jao-browse-url-function nil)
+(defvar jao-browse-url-external-function nil)
+
+;;;; url around point
+(defun jao-url-around-point (&optional current-url)
+ (or (and (fboundp 'w3m-anchor) (w3m-anchor))
+ (shr-url-at-point nil)
+ (ffap-url-at-point)
+ (thing-at-point 'url)
+ (when current-url
+ (or (and (fboundp 'w3m-anchor) (w3m-anchor))
+ (and (derived-mode-p 'eww-mode) (plist-get eww-data :url))))))
+
+(defun jao--url-prompt (&optional prefix)
+ (let* ((def (jao-url-around-point t))
+ (prompt (concat prefix "URL" (if def (format " (%s): " def) ": "))))
+ (read-string prompt nil nil def)))
+
+;;;; downloads using wget
+(defun jao-wget--get-title (filename)
+ (or (and (derived-mode-p 'w3m-mode) (w3m-current-title))
+ (plist-get eww-data :title)
+ (and (not (string-blank-p (or filename "")))
+ (subst-char-in-string ?- ?
+ (capitalize (file-name-base filename))))))
+
+(defun jao-wget (url &optional user pwd)
+ "Download URL using wget and kill a link for an org note."
+ (let* ((def (file-name-nondirectory url))
+ (pmt (format "Save %s to: " url))
+ (read-file-name-function nil)
+ (dest (expand-file-name
+ (read-file-name pmt jao-sink-dir nil nil def)))
+ (title (jao-wget--get-title dest))
+ (src-url (or (jao-url-around-point t) (file-name-directory url)))
+ (auth (when (and user pwd)
+ `(,(format "--http-user=%s" user)
+ ,(format "--http-password=%s" pwd))))
+ (lnk (concat "doc:" (file-name-nondirectory dest))))
+ (switch-to-buffer-other-window (get-buffer-create "*downloads*"))
+ (erase-buffer)
+ (kill-new (format "%s (from %s)"
+ (org-link-make-string lnk title)
+ (org-link-make-string src-url "here")))
+ (apply 'make-term `("downloads" "wget" nil ,@auth "-O" ,dest ,url))))
+
+(defun jao-download (url &optional pws)
+ "Download URL using wget"
+ (interactive (list (jao--url-prompt)))
+ (when url
+ (let ((usr (and pws (read-string "Login name: ")))
+ (pwd (and pws (read-passwd "Password: "))))
+ (jao-wget url usr pwd))))
+
+(with-eval-after-load "embark"
+ (define-key embark-url-map (kbd "d") #'jao-download))
+
+;;;; video
+(defvar jao-video--url-rx
+ (format "^https?://\\(?:www\\.\\)?%s/.+"
+ (regexp-opt '("youtu.be"
+ "youtube.com"
+ "blip.tv"
+ "vimeo.com"
+ "infoq.com")
+ t)))
+
+(defvar jao-video--ext-rx
+ (format "^https?://.+/.+\\.%s" (regexp-opt '("mp3" "webm" "mp4"))))
+
+(defun jao-video--url-p (url)
+ (or (string-match-p jao-video--url-rx url)
+ (string-match-p jao-video--ext-rx url)))
+
+(defun jao--remote-run (url prg)
+ (let ((args (format "%s %s" prg (shell-quote-argument url))))
+ (start-process-shell-command prg nil args)))
+
+(defun jao--mpv (url &rest _args) (jao--remote-run url "mpv"))
+(defun jao--vlc (url &rest _args) (jao--remote-run url "vlc"))
+
+(defvar jao--video-player 'jao--mpv)
+
+(defun jao-view-video (url)
+ "Tries to stream a video from the current or given URL"
+ (interactive (list (jao--url-prompt "Video ")))
+ (when url (funcall jao--video-player url)))
+
+(defun jao-maybe-view-video (url &rest _ignored)
+ (interactive)
+ (let ((w (read-char "View video (v) or web page (w)? ")))
+ (cond ((eq w ?v) (jao-view-video url))
+ ((eq w ?w) (funcall jao-browse-url-function url))
+ (t (message "Aborted")))))
+
+;;;; web browsers
+(defun jao-www--buffer-p (b)
+ (with-current-buffer b
+ (or (derived-mode-p 'w3m-mode 'eww-mode)
+ (and (boundp 'exwm-class-name)
+ (member exwm-class-name '("vlc" "mpv"))))))
+
+;;;; browse-url
+(require 'browse-url)
+
+(setq browse-url-generic-program "~/bin/firehog")
+
+(defun jao-browse-with-external-browser (&rest url)
+ "Browse with external hogging"
+ (interactive "s")
+ (let ((url (or (car url) (jao-url-around-point))))
+ (if (not url)
+ (message "No URL at point")
+ (cond ((and (jao-exwm-enabled-p) (fboundp 'jao-exwm-firefox))
+ (jao-exwm-firefox))
+ (jao-river-enabled (jao-river-to-ws 2))
+ (jao-sway-enabled (jao-sway-firefox)))
+ (browse-url-generic url))))
+(setq jao-browse-url-external-function 'jao-browse-with-external-browser)
+
+(defun jao--fln (url)
+ (shell-quote-argument
+ (if (string-match "^[^:]*:/*?\\(/?[^/].*\\)" url)
+ (match-string-no-properties 1 url)
+ url)))
+
+(defun jao--browse-doc (url &rest _ignored)
+ (let* ((url (substring-no-properties url))
+ (file (jao--fln url)))
+ (when file
+ (unless (file-exists-p file)
+ (error "File %s does not exist" file))
+ (jao-open-doc file))))
+
+(defun jao--make-file-rx (exts)
+ (format "file:/?/?.+\\.%s$" (regexp-opt exts)))
+
+(defvar jao--see-exts (jao--make-file-rx '("jpg" "jpeg" "png")))
+
+(defvar jao--doc-exts
+ (jao--make-file-rx '("ps" "ps.gz" "pdf" "dvi" "djvu" "chm")))
+
+(defvar jao-browse-url-wget-exts
+ '("ps" "pdf" "dvi" "djvu" "zip" "gz" "tgz"))
+
+(defvar jao-browse-external-domains
+ '("github.com" "gitlab.com" "slack.com" "spotify.com" "drive.google.com"
+ "meet.google.com" "docs.google.com" "x.com" "twitter.com"
+ "t.com" "linkedin.com" "bigml.com" "slack.com" "zoom.us"))
+
+(defvar jao-browse--external-regexp
+ (format "https?://.*%s\\(/.*\\)?"
+ (regexp-opt jao-browse-external-domains)))
+
+(defun jao-wget--regexp ()
+ (concat "^http[s]?://.+\\(\\."
+ (mapconcat 'identity jao-browse-url-wget-exts "\\|\\.")
+ "\\)\\'"))
+
+(defun jao--see (url &rest _r)
+ (start-process-shell-command "see" nil (format "see %s" (jao--fln url))))
+
+(defun jao--find-file-other-window (url &rest _)
+ (find-file-other-window (jao--fln url)))
+
+(defvar jao-browse--sound-rx
+ (format "^https?://.*/.*\\.%s" (regexp-opt '("mp3" "flv"))))
+
+(defun jao-browse-play-sound-url (url &rest _)
+ (jao-mpc-add-or-play-url url))
+
+(defun jao-browse-url-browse (&rest args)
+ (apply jao-browse-url-function args))
+
+(setq browse-url-handlers
+ `((jao-video--url-p . jao-maybe-view-video)
+ (,jao--doc-exts . jao--browse-doc)
+ (,jao--see-exts . jao--see)
+ ("^file://?.+\\.html?$" . ,jao-browse-url-function)
+ ("^file://?" . jao--find-file-other-window)
+ (,jao-browse--external-regexp . ,jao-browse-url-external-function)
+ ("^https?://.*\\.gotomeeting\\.com\\.*" . browse-url-chrome)
+ (,jao-browse--sound-rx . jao-browse-play-sound-url)
+ (,(jao-wget--regexp) . jao-download)
+ ("." . jao-browse-url-browse)))
+
+(when (< emacs-major-version 28)
+ (setf (alist-get 'jao-video--url-p browse-url-handlers nil t) nil)
+ (setq browse-url-browser-function browse-url-handlers))
+
+;;;; subscribe to rss using r2e
+(autoload 'View-quit "view")
+
+(defun jao-rss--find-url ()
+ (save-excursion
+ (when (derived-mode-p 'w3m-mode 'eww-mode)
+ (if (fboundp 'w3m-view-source) (w3m-view-source) (eww-view-source)))
+ (goto-char (point-min))
+ (when (re-search-forward
+ "type=\"application/\\(?:atom\\|rss\\)\\+xml\" +" nil t)
+ (let ((url (save-excursion
+ (when (re-search-forward
+ "href=\"\\([^\n\"]+\\)\"" nil t)
+ (match-string-no-properties 1))))
+ (title (when (re-search-forward
+ "\\(?:title=\"\\([^\n\"]+\\)\" +\\)" nil t)
+ (match-string-no-properties 1))))
+ (cond ((derived-mode-p 'w3m-view-mode) (w3m-view-source))
+ ((string-match-p ".*\\*eww-source\\b.*" (buffer-name))
+ (View-quit)))
+ (when url (cons url (or title "")))))))
+
+(defun jao-rss2e-append (name url mbox)
+ (with-current-buffer (find-file-noselect "~/.config/rss2email.cfg")
+ (goto-char (point-max))
+ (insert "[feed." name "]\nurl = " url)
+ (insert "\nto = " mbox "+" name "@localhost")
+ (insert "\nmaildir-mailbox = " mbox "\n\n")
+ (save-buffer)))
+
+(defun jao-rss--feeds-dirs ()
+ (mapcar (lambda (d) (cadr (split-string d "\\.")))
+ (directory-files "~/.emacs.d/gnus/Mail/" nil "^feeds")))
+
+(defun jao-rss-subscribe (url)
+ "Subscribe to a given RSS URL. If URL not given, look for it."
+ (interactive (list (or (jao-url-around-point)
+ (jao-rss--find-url)
+ (read-string "Feed URL: "))))
+ (let* ((url+title (ensure-list url))
+ (url (car url+title))
+ (title (cdr url+title)))
+ (unless url (error "No feeds found"))
+ (let ((url (if (string-match "^feed:" url) (substring url 5) url)))
+ (when (y-or-n-p (format "Subscribe to <%s>? " url))
+ (let* ((name (read-string "Feed name: " title))
+ (cats (cons "prog" (jao-notmuch--subtags "feeds")))
+ (cat (completing-read "Category: " cats nil t))
+ (subs (format "r2e add %s '%s' feeds.%s@localhost"
+ name url cat)))
+ ;; (jao-rss2e-append name url cat)
+ (shell-command-to-string subs)
+ (shell-command (format "r2e run %s" name)))))))
+
+(provide 'jao-custom-browse)
+;;; jao-custom-browse.el ends here
diff --git a/custom/jao-custom-chats.el b/custom/jao-custom-chats.el
new file mode 100644
index 0000000..7f5bfe4
--- /dev/null
+++ b/custom/jao-custom-chats.el
@@ -0,0 +1,344 @@
+;; -*- lexical-binding: t -*-
+
+
+;;;; circe
+(defvar jao-libera-channels ())
+(defvar jao-oftc-channels ())
+(defvar jao-bitlbee-channels ())
+(defvar jao-slack-channels ())
+
+(use-package circe
+ :ensure t
+ :bind (:map circe-channel-mode-map
+ (("C-c C-a" . lui-track-jump-to-indicator)))
+ :init
+ (setq circe-chat-buffer-name "{target} - {network}"
+ circe-default-realname "https://jao.io"
+ circe-default-part-message ""
+ circe-default-quit-message ""
+ circe-ignore-list nil
+ circe-server-coding-system '(undecided . undecided)
+ circe-server-killed-confirmation 'ask-and-kill-all
+ circe-server-auto-join-default-type :after-auth
+ circe-server-buffer-name "{network} - {host}:{port}"
+ circe-format-say "({nick}) {body}"
+ circe-format-self-say "(jao) {body}"
+ circe-new-buffer-behavior 'ignore
+ circe-new-buffer-behavior-ignore-auto-joins t
+ circe-nickserv-ghost-style 'after-auth
+ circe-prompt-string ": "
+ circe-completion-suffix ", "
+ circe-reduce-lurker-spam t
+
+ circe-lagmon-mode-line-format-string "" ;; "%.0f "
+ circe-lagmon-mode-line-unknown-lag-string "" ;; "? "
+ circe-lagmon-timer-tick 120
+ circe-lagmon-reconnect-interval 180
+
+ lui-max-buffer-size 30000
+ lui-fill-column 80
+ lui-time-stamp-position 'right
+ lui-time-stamp-format "%H:%M"
+ lui-flyspell-p nil
+
+ lui-track-indicator (if window-system 'fringe 'bar)
+ lui-track-behavior 'before-tracking-next-buffer)
+ :config
+
+ (defsubst jao-circe-nick-no ()
+ (if (derived-mode-p 'circe-query-mode)
+ 2
+ (length (circe-channel-nicks))))
+
+ (defsubst jao-circe-netowrk ()
+ (or (plist-get lui-logging-format-arguments :network) ""))
+
+ (define-minor-mode jao-circe-user-number-mode ""
+ :lighter (:eval (format " [%s]" (jao-circe-nick-no))))
+
+ (defun jao-circe-channel-hook ()
+ (when jao-mode-line-in-minibuffer
+ (setq header-line-format
+ '(" %b" (:eval (format "@%s - %s nicks"
+ (jao-circe-netowrk)
+ (jao-circe-nick-no))))))
+ (jao-circe-user-number-mode 1))
+
+ (add-hook 'circe-channel-mode-hook #'jao-circe-channel-hook)
+ (add-hook 'circe-query-mode-hook #'jao-circe-channel-hook)
+
+ (defun circe-command-RECOVER (&rest _ignore)
+ "Recover nick"
+ (jao-with-auth "freenode" u p
+ (circe-command-MSG "nickserv" (format "IDENTIFY %s %s" u p))
+ (circe-command-MSG "nickserv" (format "GHOST %s" u))
+ (circe-command-MSG "nickserv" (format "RELEASE %s" u))
+ (circe-command-NICK u)))
+
+ (defun circe-command-NNICKS (&rest _)
+ "Echo number of nicks"
+ (circe-display-server-message
+ (format "%d nicks in this channel" (jao-circe-nick-no))))
+
+ (defun circe-command-SENDFILE (line)
+ "/sendfile for localslackirc"
+ (circe-command-QUOTE (format "sendfile %s" line)))
+
+ (advice-add 'circe-command-NAMES :after #'circe-command-NNICKS)
+
+ (defun jao-circe-reconnect-unmonitored ()
+ (interactive)
+ (dolist (b (buffer-list))
+ (with-current-buffer b
+ (when (and (derived-mode-p 'circe-server-mode)
+ circe-lagmon-disabled)
+ (circe-reconnect)))))
+
+ (add-to-list 'jao-sleep-awake-functions #'jao-circe-reconnect-unmonitored)
+
+ (setq circe-network-options
+ (list (jao-with-auth "libera" u p
+ (list "Libera Chat" :nick u :channels jao-libera-channels
+ :tls t :sasl-username u :sasl-password p))
+ (jao-with-auth "oftc" u p
+ (list "OFTC"
+ :nick u :channels jao-oftc-channels :nickserv-password p
+ :tls t :sasl-username u :sasl-password p))
+ (jao-with-auth "bitlbee" u p
+ (list "Bitlbee" :host "127.0.0.1" :nick u
+ :channels jao-bitlbee-channels :lagmon-disabled t
+ :nickserv-password u :user p))))
+
+ (jao-shorten-modes 'circe-channel-mode
+ 'circe-server-mode
+ 'circe-query-mode)
+
+ (enable-circe-display-images)
+ (enable-lui-track)
+ (circe-lagmon-mode))
+
+;;;; telegram
+(use-package telega
+ :ensure t
+ :custom
+ (telega-use-tracking-for '(unmuted) ;; '(or unmuted mention)
+ telega-rainbow-color-custom-for nil
+ telega-msg-rainbow-title nil
+ telega-sticker-set-download t
+ telega-symbol-checkmark "·"
+ telega-symbol-heavy-checkmark "×"
+ telega-symbol-verified "*")
+ :config
+ (define-key global-map (kbd "C-c C-t") telega-prefix-map)
+ (setq telega-chat-show-avatars nil
+ telega-chat-prompt-insexp '(telega-ins "> ")
+ telega-completing-read-function #'completing-read
+ telega-root-show-avatars nil
+ telega-emoji-use-images nil
+ telega-temp-dir "/tmp/telega"
+ telega-symbol-horizontal-bar
+ (propertize "-" 'face 'jao-themes-f00)
+ telega-symbol-vertical-bar
+ (propertize "| " 'face 'jao-themes-dimm)
+ telega-mode-line-string-format
+ '(:eval (telega-mode-line-unread-unmuted))
+ telega-use-images (display-graphic-p)
+ telega-open-file-function #'jao--see
+ telega-open-message-as-file
+ (unless (display-graphic-p) '(photo video animation)))
+ (with-eval-after-load "tracking"
+ (jao-shorten-modes 'telega-chat-mode)
+ (jao-tracking-faces 'telega-tracking))
+ (telega-mode-line-mode 1))
+
+(defun jao-telega ()
+ (interactive)
+ (jao-tracking-go-to-chats)
+ (if (get-buffer telega-root-buffer-name)
+ (pop-to-buffer telega-root-buffer-name)
+ (telega)))
+
+;;;; ement
+(use-package ement
+ :disabled t
+ :ensure t
+ :init (setq ement-save-sessions t
+ ement-sessions-file (locate-user-emacs-file "cache/ement.el")
+ ement-room-avatars nil
+ ement-notify-dbus-p nil
+ ement-room-left-margin-width 0
+ ement-room-right-margin-width 11
+ ement-room-timestamp-format "%H:%M"
+ ement-room-timestamp-header-format "­­--------")
+
+ :custom ((ement-room-message-format-spec "(%S) %B%r%R %t"))
+
+ :config
+ (defun jao-ement-track (event room session)
+ (when (ement-notify--room-unread-p event room session)
+ (when-let ((n (ement-room--buffer-name room))
+ (b (get-buffer n)))
+ (tracking-add-buffer b))))
+
+ (add-hook 'ement-event-hook #'jao-ement-track)
+ (jao-shorten-modes 'ement-room-mode)
+ (jao-tracking-cleaner "^\\*Ement Room: \\(.+\\)\\*" "@\\1"))
+
+;;;; mastodon
+(use-package mastodon
+ :ensure t
+ :init
+ (setq mastodon-instance-url "https://fosstodon.org"
+ mastodon-active-user "jao@gnu.org"
+ mastodon-group-notifications t
+ mastodon-images-in-notifs t
+ mastodon-tl-position-after-update nil
+ mastodon-toot-display-orig-in-reply-buffer t
+ mastodon-media--hide-sensitive-media nil)
+ :config
+ ;; (defun jao-mastodon--setup ()
+ ;; (setq-local scroll-margin 12))
+
+ ;; (add-hook 'mastodon-mode-hook #'jao-mastodon--setup)
+ (with-eval-after-load "ewww"
+ (define-key eww-mode-map (kbd "T") #'jao-mastodon-toot-url)))
+
+(defun jao-mastodon-toot-url ()
+ (interactive)
+ (when-let (url (jao-url-around-point t))
+ (jao-tracking-go-to-chats)
+ (mastodon-toot--compose-buffer nil nil nil url)))
+
+(defun jao-mastodon ()
+ (interactive)
+ (jao-afio-goto-chats)
+ (mastodon))
+
+;; https://0x0.st/XJ14.txt
+(jao-transient-major-mode mastodon
+ ["Timelines"
+ ("H" "home" mastodon-tl--get-home-timeline)
+ ("L" "local" mastodon-tl--get-local-timeline)
+ ("F" "federated" mastodon-tl--get-federated-timeline)
+ ("K" "bookmarks" mastodon-profile--view-bookmarks)
+ ("V" "favorites" mastodon-profile--view-favourites)
+ ("'" "followed tags" mastodon-tl--followed-tags-timeline)
+ ("@" "mentions" mastodon-notifications--get-mentions)
+ ("N" "notifications" mastodon-notifications-get)
+ ("\\" "of remote host" mastodon-tl--get-remote-local-timeline)]
+
+ ;; u mastodon-tl--update
+
+ ["Search"
+ ("s" "search" mastodon-search--query)
+ ("#" "tagged" mastodon-tl--get-tag-timeline)
+ ("\"" "followed tags" mastodon-tl--list-followed-tags)
+ ("I" "filter" mastodon-views--view-filters)
+ ("X" "lists" mastodon-views--view-lists)]
+
+ ["Toots"
+ ("n" "next" mastodon-tl--goto-next-item :transient t)
+ ("p" "prev" mastodon-tl--goto-prev-item :transient t)
+ ("c" "spoiler" mastodon-tl--toggle-spoiler-text-in-toot :transient t)
+ ("T" "thread" mastodon-tl--thread)
+ ("b" "(un)boost" mastodon-toot--toggle-boost :transient t)
+ ("f" "(un)fav" mastodon-toot--toggle-favourite :transient t)
+ ("i" "(un)pin" mastodon-toot--pin-toot-toggle :transient t)
+ ("k" "(un)bookmark" mastodon-toot--toggle-bookmark :transient t)
+ ("v" "vote" mastodon-tl--poll-vote)]
+
+ ;; Z mastodon-tl--report-to-mods
+ ;; o mastodon-toot--open-toot-url
+
+ ["Own Toots"
+ ("r" "replay" mastodon-toot--reply)
+ ("t" "write" mastodon-toot)
+ ("e" "edit" mastodon-toot--edit-toot-at-point)
+ ("d" "delete" mastodon-toot--delete-toot)
+ ("D" "del & redraft" mastodon-toot--delete-and-redraft-toot)
+ ("E" "show edits" mastodon-toot--view-toot-edits)]
+
+ ;; S mastodon-views--view-scheduled-toots
+
+ ["Users"
+ ("W" "follow" mastodon-tl--follow-user)
+ ("R" "follow req" mastodon-views--view-follow-requests)
+ ("G" "suggestions" mastodon-views--view-follow-suggestions)
+ ("M" "mute user" mastodon-tl--mute-user)
+ ("B" "block user" mastodon-tl--block-user)
+ ("m" "message user" mastodon-tl--dm-user)
+ ;; ""
+ ;; ("," "favouriters" mastodon-toot--list-toot-favouriters)
+ ;; ("." "boosters" mastodon-toot--list-toot-boosters)
+ ]
+
+ ;; S-RET mastodon-tl--unmute-user
+ ;; C-S-b mastodon-tl--unblock-user
+
+ ["Profiles"
+ ("A" "author" mastodon-profile--get-toot-author)
+ ("P" "any user" mastodon-profile--show-user)
+ ("O" "own" mastodon-profile--my-profile)
+ ("U" "update own" mastodon-profile--update-user-profile-note)]
+
+ ["Misc"
+ ("C" "copy URL" mastodon-toot--copy-toot-url)
+ ("?" "help" describe-mode)
+ ("q" "quit" transient-quit-one)])
+
+;;;; startup
+(defun jao-chats (&optional p)
+ (interactive "P")
+ (when (or p (y-or-n-p "Connect to telegram? "))
+ (telega))
+ (when (and (fboundp 'ement-connect) (or p (y-or-n-p "Connect to matrix? ")))
+ (unless (get-buffer "*Ement Rooms*")
+ (jao-with-auth "matrix.org" u p (ement-connect :user-id u :password p))))
+ ;; (when (and (fboundp 'mastodon) (or p (y-or-n-p "Connect to mastodon? ")))
+ ;; (mastodon))
+ (dolist (c '(("Libera Chat" . "irc.libera.chat:6697")))
+ (unless (get-buffer (cdr c))
+ (when (or p (y-or-n-p (format "Connect to %s? " (car c))))
+ (circe (car c))))))
+
+(defun jao-all-chats ()
+ (interactive)
+ (when jao-tracking-use-scratch
+ (jao-afio-goto-chats)
+ (delete-other-windows))
+ (jao-chats t))
+
+(defun jao-chats-telega ()
+ (interactive)
+ (jao-buffer-same-mode '(telega-root-mode telega-chat-mode)))
+
+(defun jao-chats-slack ()
+ (interactive)
+ (jao-buffer-same-mode 'slack-message-buffer-mode))
+
+(defun jao-chats-irc ()
+ (interactive)
+ (jao-buffer-same-mode '(circe-channel-mode circe-query-mode erc-mode)))
+
+;;;; consult narrowing
+(defvar jao-chat-buffer-source
+ (list :name "chats"
+ :category 'buffer
+ :action (lambda (b) (jao-afio-pop-to-buffer 0 b))
+ :hidden t
+ :narrow (cons ?c "chats")
+ :items (jao-consult--mode-buffers 'erc-mode
+ 'circe-channel-mode
+ 'circe-query-mode
+ 'signel-chat-mode
+ 'slack-message-buffer-mode
+ 'slack-thread-message-buffer-mode
+ 'telega-root-mode
+ 'telega-chat-mode
+ 'ement-room-mode
+ 'ement-room-list-mode)))
+(with-eval-after-load "consult"
+ (jao-consult-add-buffer-source 'jao-chat-buffer-source))
+
+
+(provide 'jao-custom-chats)
diff --git a/custom/jao-custom-completion.el b/custom/jao-custom-completion.el
index b44f9b6..436a4db 100644
--- a/custom/jao-custom-completion.el
+++ b/custom/jao-custom-completion.el
@@ -107,7 +107,7 @@
:ensure t
:bind (("C-x M-:" . consult-complex-command)
("C-x b" . consult-buffer)
- ("C-x C-b" . consult-buffer)
+ ("C-x C-b" . switch-to-buffer)
("C-x 4 b" . consult-buffer-other-window)
("C-c b" . project-find-file)
("C-c h" . nil)
@@ -126,8 +126,7 @@
("M-g e" . consult-error)
("M-s m" . consult-multi-occur)
("M-y" . consult-yank-pop)
- ("C-s" . isearch-forward)
- ("<help> a" . consult-apropos))
+ ("C-s" . isearch-forward))
:custom ((consult-preview-key (kbd "`")))
diff --git a/custom/jao-custom-eww.el b/custom/jao-custom-eww.el
index a3f4df9..1b766c9 100644
--- a/custom/jao-custom-eww.el
+++ b/custom/jao-custom-eww.el
@@ -116,16 +116,17 @@
;;; eww to org
(defun jao-eww-to-org (&optional dest)
- (interactive)
- (unless (org-region-active-p)
+ (interactive "P")
+ (unless (or (and (interactive-p) dest) (org-region-active-p))
(let ((shr-width 80)) (eww-readable)))
- (let* ((start (if (org-region-active-p) (region-beginning) (point-min)))
+ (let* ((dest (unless (interactive-p) dest))
+ (start (if (org-region-active-p) (region-beginning) (point-min)))
(end (if (org-region-active-p) (region-end) (point-max)))
- (buff (or dest (generate-new-buffer "*eww-to-org*")))
(link (eww-current-url))
- (title (or (plist-get eww-data :title) "")))
+ (title (plist-get eww-data :title))
+ (buff (save-current-buffer (or dest (jao-org-notes-create title)))))
(with-current-buffer buff
- (insert "#+title: " title "\n#+link: " link "\n\n")
+ (insert "#+link: " link "\n\n")
(org-mode))
(save-excursion
(goto-char start)
@@ -183,6 +184,15 @@ It should be the title of the web page as returned by `rdrview'"
(if eww-rdrview-mode (eww-rdrview-mode -1)
(eww-rdrview-mode 1))
(eww-reload))
+;;; auto-readable
+(defvar jao-eww-auto-readable-urls
+ (regexp-opt '("guardian.co.uk" "theguardian.com" "github.com" "eldiario.es")))
+
+(defun jao-eww-autoread ()
+ (when (string-match-p jao-eww-auto-readable-urls (or (eww-current-url)))
+ (eww-readable)))
+
+(add-hook 'eww-after-render-hook #'jao-eww-autoread)
;;; package
(use-package shr
:custom ((shr-width nil)
@@ -246,16 +256,6 @@ It should be the title of the web page as returned by `rdrview'"
("C-c C-w" . jao-eww-close)
("M-i" . eww-toggle-images))))
-;;; auto-readable
-(defvar jao-eww-auto-readable-urls
- (regexp-opt '("guardian.co.uk" "theguardian.com" "github.com" "eldiario.es")))
-
-(defun jao-eww-autoread ()
- (when (string-match-p jao-eww-auto-readable-urls (or (eww-current-url)))
- (eww-readable)))
-
-(add-hook 'eww-after-render-hook #'jao-eww-autoread)
-
;;; fixes for shr image rendering
(require 'shr)
@@ -279,5 +279,8 @@ It should be the title of the web page as returned by `rdrview'"
(advice-add 'shr-tag-img :around #'jao-shr-tag-img)
(advice-add 'shr-insert :around #'jao-shr-insert)
+;; (advice-remove 'shr-tag-img #'jao-shr-tag-img)
+;; (advice-remove 'shr-insert #'jao-shr-insert)
+
;;; .
(provide 'jao-custom-eww)
diff --git a/custom/jao-custom-exwm.el b/custom/jao-custom-exwm.el
index dbad1da..ac88ec1 100644
--- a/custom/jao-custom-exwm.el
+++ b/custom/jao-custom-exwm.el
@@ -151,13 +151,13 @@
(add-hook 'exwm-workspace-switch-hook #'jao-minibuffer-refresh)
(require 'exwm-systemtray)
-(exwm-systemtray-enable)
+(exwm-systemtray-mode 1)
(defun jao-exwm--watch-tray (sym newval op where)
- (setq jao-minibuffer-right-margin (* 2 (length newval)))
+ (setq jao-minibuffer-right-margin (/ newval (string-pixel-width "a")))
(jao-minibuffer-refresh))
-(add-variable-watcher 'exwm-systemtray--list #'jao-exwm--watch-tray)
+(add-variable-watcher 'exwm-systemtray-width #'jao-exwm--watch-tray)
;; Switch to buffer / app
(defvar-local jao-exwm--name nil)
@@ -194,7 +194,9 @@
(defun jao-exwm-switch-to-next-x ()
(interactive)
- (let ((bfs (seq-filter (lambda (b) (buffer-local-value 'exwm-class-name b))
+ (let ((bfs (seq-filter (lambda (b)
+ (with-current-buffer b
+ (derived-mode-p 'exwm-mode)))
(buffer-list (window-frame)))))
(when (car bfs) (switch-to-buffer (car (reverse bfs))))))
@@ -530,6 +532,7 @@
([f9] . jao-bright-show)))
;; (customize-set-variable 'exwm-input-global-keys exwm-input-global-keys)
+(exwm-wm-mode)
;;; .
(provide 'jao-custom-exwm)
diff --git a/custom/jao-custom-gnus.el b/custom/jao-custom-gnus.el
index e5a1762..ce77285 100644
--- a/custom/jao-custom-gnus.el
+++ b/custom/jao-custom-gnus.el
@@ -114,7 +114,7 @@
(cl-defmethod gnus-search-indexed-search-command ((engine gnus-search-recoll)
(qstring string)
- _query
+ query
&optional groups)
(let* ((subdir (slot-value engine 'remove-prefix))
(sep (slot-value engine 'separator))
@@ -128,8 +128,18 @@
(mapconcat (lambda (d) (format "dir:%s" d))
gdirs " OR ")
")")))
- (q (concat "mime:message " dirsq " (" qstring ")")))
- ;; (message "query is: %s" q)
+ (qstring (if (string-prefix-p "id:" qstring)
+ (replace-regexp-in-string "<\\|>" "\"" qstring)
+ qstring))
+ (qstring (if (cdr (assoc 'thread query))
+ (concat qstring " OR "
+ (replace-regexp-in-string "id:\"" "ref:\""
+ qstring))
+ qstring))
+ (qstring (replace-regexp-in-string " or " " OR " qstring))
+ (qstring (replace-regexp-in-string " and " " AND " qstring))
+ (q (format "mime:message %s (%s)" dirsq qstring)))
+ ;; (message "query is: %s -- %S" q query)
`("-b" "-t" "-q" ,q))))
;; (add-to-list 'gnus-parameters '("^nnselect:.*" (nnselect-rescan . t)))
@@ -202,8 +212,10 @@
(when jao-gnus-use-nnml
(add-to-list
'gnus-secondary-select-methods
- `(nnml "" (gnus-search-engine gnus-search-recoll
- (remove-prefix ,(jao-gnus-dir "Mail/"))))))
+ ;; `(nnml "" (gnus-search-engine gnus-search-recoll
+ ;; (remove-prefix ,(jao-gnus-dir "Mail/"))))
+ `(nnml "" (gnus-search-engine gnus-search-notmuch
+ (remove-prefix "/home/jao/var/mail/gnus")))))
(when jao-gnus-use-nnml
(dolist (p jao-gnus-nnml-group-params)
@@ -437,20 +449,49 @@
(use-package org-capture
:config
(add-to-list 'org-capture-templates
+ '("x" "arXiv" entry (file "notes/physics/arxiv.org")
+ "* %(jao-gnus-subject)\n\n %i\n\n %(jao-gnus-org-url)"
+ :immediate-finish t)
+ t)
+ (add-to-list 'org-capture-templates
'("X" "arXiv" entry (file "notes/physics/arxiv.org")
- "* %:subject\n %i" :immediate-finish t)
+ "* %(jao-gnus-subject)\n\n%(jao-gnus-org-paragraph \"%i\")"
+ :immediate-finish t)
t)
(org-capture-upgrade-templates org-capture-templates))
+(defvar jao-gnus-org-url nil)
+(defun jao-gnus-org-url () jao-gnus-org-url)
+(defun jao-gnus-org-paragraph (x)
+ (with-temp-buffer
+ (insert " " (string-trim (or x "")) "\n ")
+ (goto-char 0)
+ (fill-paragraph)
+ (goto-char (point-max))
+ (open-rectangle 0 (point))
+ (concat (buffer-string) "\n " (or jao-gnus-org-url ""))))
+(defvar jao-gnus-subject nil)
+(defun jao-gnus-subject () jao-gnus-subject)
+
(defun jao-gnus-arXiv-capture ()
(interactive)
+ (unless (derived-mode-p '(gnus-summary-mode)) (gnus-article-show-summary))
+ (setq jao-gnus-subject (gnus-summary-article-subject))
(gnus-summary-select-article-buffer)
(gnus-article-goto-part 0)
- (forward-paragraph)
- (setq-local transient-mark-mode 'lambda)
- (set-mark (point))
- (goto-char (point-max))
- (org-capture nil "X"))
+ (let ((transient-mark-mode t))
+ (set-mark (point))
+ (forward-paragraph)
+ (or (and (save-excursion
+ (when (re-search-forward "^Link" nil t)
+ (beginning-of-line)
+ (setq jao-gnus-org-url (org-eww-url-below-point))))
+ (org-capture nil "X"))
+ (and (save-excursion
+ (when (re-search-forward "^URL: " nil t)
+ (setq jao-gnus-org-url (thing-at-point-url-at-point))))
+ (org-capture nil "x"))))
+ (gnus-article-show-summary))
;;; article
;;;; config, headers
@@ -530,12 +571,21 @@
(save-excursion
(goto-char (point-min))
(when (or (search-forward-regexp "^Via: h" nil t)
- (search-forward-regexp "^URL: h" nil t)
+ (search-forward-regexp "^URL:[\n ]h" nil t)
(and (search-forward-regexp "^Link$" nil t)
(not (beginning-of-line))))
- (if external
- (jao-browse-with-external-browser)
- (browse-url (jao-url-around-point))))))
+ (cond (external (jao-browse-with-external-browser))
+ ((featurep 'jao-custom-eww) (eww (jao-url-around-point)))
+ (t (browse-url (jao-url-around-point)))))))
+
+(defun jao-gnus-from-eww (keep-eww-buffer)
+ (interactive "P")
+ (unless keep-eww-buffer (jao-eww-close))
+ (jao-afio-goto-mail)
+ (gnus-article-show-summary))
+
+(with-eval-after-load 'eww
+ (define-key eww-mode-map (kbd "h") #'jao-gnus-from-eww))
(defun jao-gnus-open-enclosure ()
(interactive)
@@ -543,7 +593,7 @@
(gnus-summary-select-article-buffer)
(save-excursion
(goto-char (point-min))
- (let ((offset (or (and (search-forward-regexp "^Enclosure: " nil t) 2)
+ (let ((offset (or (and (search-forward-regexp "^Enclosure: ?" nil t) 2)
(and (search-forward-regexp "^Enclosure$" nil t) -2))))
(when offset (forward-char offset))
(if-let ((url (jao-url-around-point)))
@@ -576,7 +626,16 @@
(gnus-demon-scan-news)
(jao-gnus--notify)))
-(gnus-demon-add-handler 'jao-gnus--scan 5 1)
+(defun jao-gnus-add-demon ()
+ (interactive)
+ (gnus-demon-add-handler 'jao-gnus--scan 5 1))
+
+(jao-gnus-add-demon)
+(gnus-demon-init)
+
+;; this is, in theory, not needed; but at some point in the way to emacs
+;; version 31 this idle timers have ceased to work after a sleep/awake cycle
+(add-to-list 'jao-sleep-awake-functions #'jao-gnus-add-demon)
;;; add-ons
;;;; notifications
@@ -587,13 +646,14 @@
(seq-difference '("feeds.trove")))))
`(("nnml:bigml\\.inbox" "B" jao-themes-f00)
("nnml:bigml\\.alba" "A" jao-themes-f00)
+ ("nnml:bigml\\.ryou" "R" jao-themes-f00)
("nnml:bigml\\.bugs" "b" jao-themes-error)
("nnml:bigml\\.support" "S" default)
+ ("nnml:bigml\\.[^aibsr]" "W" jao-themes-dimm)
("nnml:jao\\.\\(inbox\\|trove\\)" "I" jao-themes-f01)
- ("nnml:bigml\\.[^ibs]" "W" jao-themes-dimm)
("nnml:jao.hacking" "H" jao-themes-dimm)
- ("nnml:jao.write" "W" jao-themes-error)
- ("nnml:jao.[^isthw]" "J" jao-themes-dimm)
+ ("nnml:jao.write" "W" jao-themes-warning)
+ ("nnml:jao.[^ithw]" "J" jao-themes-dimm)
(,(format "^nnml:%s" (regexp-opt feeds)) "F" jao-themes-dimm)
("feeds\\.e" "E" jao-themes-dimm)
("nnml:local" "l" jao-themes-dimm)
@@ -643,6 +703,7 @@
(jao-gnus--notify)))
(add-hook 'gnus-summary-exit-hook #'jao-gnus--on-summary-exit)
+(add-hook 'gnus-exit-group-hook #'jao-gnus--notify)
;;;; open mail file in gnus
(defun jao-gnus-file-to-group (file &optional maildir newsdir m-server n-server)
@@ -717,6 +778,15 @@
(with-eval-after-load "consult-recoll"
(add-to-list 'consult-recoll-open-fns
'("message/rfc822" . jao-gnus-goto-file))))
+;;;; notmuch
+(use-package jao-notmuch-gnus
+ :demand t)
+
+(jao-load-path "consult-notmuch")
+
+(use-package consult-notmuch
+ :bind (:map gnus-group-mode-map ("S" . #'jao-gnus-consult-notmuch)))
+
;;; keyboard shortcuts
(define-key gnus-article-mode-map "i" 'jao-gnus-show-images)
(define-key gnus-summary-mode-map "i" 'jao-gnus-show-images)
diff --git a/custom/jao-custom-multimedia.el b/custom/jao-custom-multimedia.el
new file mode 100644
index 0000000..a550a47
--- /dev/null
+++ b/custom/jao-custom-multimedia.el
@@ -0,0 +1,291 @@
+;; -*- lexical-binding: t -*-
+
+;;; utilities
+
+(defun jao-mixer-get-level (&optional dev nomsg)
+ (interactive)
+ (let* ((dev (or dev "Master"))
+ (s (shell-command-to-string (format "amixer sget %s" dev)))
+ (s (car (last (split-string s "\n" t)))))
+ (when (string-match ".*Front .*\\[\\([0-9]+\\)%\\] .*" s)
+ (let ((level (match-string 1 s)))
+ (unless nomsg (message "%s level: %s%%" dev level))
+ (string-to-number level)))))
+
+(defun jao-mixer-set (dev v)
+ (jao-shell-exec* t "amixer" "sset" dev v)
+ (jao-mixer-get-level dev))
+
+(defun jao-mixer-master-toggle ()
+ (interactive)
+ (jao-mixer-set "Master" "toggle"))
+
+(defun jao-mixer-master-up ()
+ (interactive)
+ (jao-mixer-set "Master" "10%+"))
+
+(defun jao-mixer-master-down ()
+ (interactive)
+ (jao-mixer-set "Master" "10%-"))
+
+(defun jao-mixer-capture-up ()
+ (interactive)
+ (jao-mixer-set "Capture" "10%+"))
+
+(defun jao-mixer-capture-down ()
+ (interactive)
+ (jao-mixer-set "Capture" "10%-"))
+
+(jao-shell-def-exec jao-audio-applet "pasystray")
+
+(defun jao-toggle-audio-applet ()
+ (interactive)
+ (or (jao-shell-kill-p "paystray") (jao-audio-applet)))
+
+(global-set-key (kbd "<f4>") #'jao-toggle-audio-applet)
+
+;;; streaming aliases
+(defalias 'jao-streaming-list #'ignore)
+(defalias 'jao-streaming-like #'ignore)
+(defalias 'jao-streaming-dislike #'ignore)
+(defalias 'jao-streaming-toggle-shuffle #'ignore)
+(defalias 'jao-streaming-lyrics #'ignore)
+(defalias 'jao-streaming-toggle #'ignore)
+(defalias 'jao-streaming-next #'ignore)
+(defalias 'jao-streaming-prev #'ignore)
+(defalias 'jao-streaming-current #'ignore)
+(defalias 'jao-streaming-seek #'ignore)
+(defalias 'jao-streaming-seek-back #'ignore)
+(defalias 'jao-streaming-volume #'ignore)
+(defalias 'jao-streaming-volume-down #'ignore)
+
+;;; mpris
+(defun jao-mpris-lyrics (&optional force)
+ (interactive "P")
+ (jao-show-lyrics force #'jao-mpris-artist-title))
+
+(defun jao-mpris-mopidy-p () (string= "mopidy "jao-mpris-player))
+
+(defun jao-mpc-mopidy-playlist ()
+ (interactive)
+ (jao-mpc-show-playlist jao-mopidy-port))
+
+(use-package jao-mpris :demand t)
+
+(defun jao-mpris-setup-aliases ()
+ (setq espotify-play-uri-function #'espotify-play-uri-with-dbus)
+ ;; (setq jao-mpris-player "mopidy")
+ (defalias 'jao-streaming-list #'jao-mpc-mopidy-playlist)
+ (defalias 'jao-streaming-lyrics #'jao-mpris-lyrics)
+ (defalias 'jao-streaming-toggle #'jao-mpris-play-pause)
+ (defalias 'jao-streaming-next #'jao-mpris-next)
+ (defalias 'jao-streaming-prev #'jao-mpris-previous)
+ (defalias 'jao-streaming-current #'jao-mpris-show-osd)
+ (defalias 'jao-streaming-seek #'jao-mpris-seek)
+ (defalias 'jao-streaming-seek-back #'jao-mpris-seek-back)
+ (defalias 'jao-streaming-volume #'jao-mpris-vol)
+ (defalias 'jao-streaming-volume-down #'jao-mpris-vol-down))
+
+(jao-mpris-register "playerctld" :session 70)
+;; (jao-mpris-register "mopidy" :session 70)
+
+;;; mpc
+(use-package jao-mpc
+ :demand t
+ :commands jao-mpc-setup)
+
+(defvar jao-mopidy-port 6669)
+(defvar jao-mpc-last-port jao-mpc-port)
+
+(defun jao-mpc-toggle-port ()
+ (interactive)
+ (setq jao-mpc-port
+ (if (equal jao-mpc-port jao-mopidy-port) 6600 jao-mopidy-port)
+ jao-mpc-last-port jao-mpc-port))
+
+(defsubst jao-mpc-mopidy-p () (equal jao-mpc-last-port jao-mopidy-port))
+
+(jao-mpc-setup jao-mopidy-port 70)
+
+(defun jao-mpc-pport (&optional mop)
+ (cond ((or mop (jao-mpc-playing-p jao-mopidy-port)) jao-mopidy-port)
+ ((jao-mpc-playing-p) 6600)
+ (t jao-mpc-last-port)))
+
+(defmacro jao-defun-play (name &optional mpc-name)
+ (let ((arg (gensym)))
+ `(defun ,(intern (format "jao-player-%s" name)) (&optional ,arg)
+ (interactive "P")
+ (,(intern (format "jao-mpc-%s" (or mpc-name name)))
+ (setq jao-mpc-last-port (jao-mpc-pport ,arg))))))
+
+(jao-defun-play toggle)
+(jao-defun-play next)
+(jao-defun-play previous)
+(jao-defun-play stop)
+(jao-defun-play echo echo-current-times)
+(jao-defun-play list show-playlist)
+(jao-defun-play info lyrics-track-data)
+(jao-defun-play browse show-albums)
+(jao-defun-play select-album)
+
+(defun jao-player-seek (delta) (jao-mpc-seek delta (jao-mpc-pport)))
+
+(defalias 'jao-player-connect 'jao-mpc-connect)
+(defalias 'jao-player-play 'jao-mpc-play)
+
+;;; spotify
+(jao-load-path "espotify")
+
+(use-package espotify
+ :demand t
+ :init (setq espotify-service-name "mopidy"))
+
+(use-package consult-spotify :demand t)
+
+(defalias 'jao-streaming-album #'consult-spotify-album)
+(defalias 'jao-streaming-track #'consult-spotify-track)
+(defalias 'jao-streaming-artist #'consult-spotify-artist)
+(defalias 'jao-streaming-playlist #'consult-spotify-playlist)
+
+(jao-def-exec-in-term "ncmpcpp" "ncmpcpp" (jao-afio-goto-scratch))
+
+;;; spt
+(use-package jao-spt
+ :demand t
+ :config
+ (defun jao-spt-setup-aliases ()
+ (setq espotify-play-uri-function #'jao-spt-play-uri)
+ (defalias 'jao-streaming-list #'jao-term-spt)
+ (defalias 'jao-streaming-lyrics #'jao-spt-show-lyrics)
+ (defalias 'jao-streaming-toggle #'jao-spt-toggle)
+ (defalias 'jao-streaming-next #'jao-spt-next)
+ (defalias 'jao-streaming-prev #'jao-spt-previous)
+ (defalias 'jao-streaming-current #'jao-spt-echo-current)
+ (defalias 'jao-streaming-seek #'jao-spt-seek)
+ (defalias 'jao-streaming-seek-back #'jao-spt-seek-back)
+ (defalias 'jao-streaming-volume #'jao-spt-vol)
+ (defalias 'jao-streaming-volume-down #'jao-spt-vol-down)
+ (defalias 'jao-streaming-like #'jao-spt-like)
+ (defalias 'jao-streaming-dislike #'jao-spt-dislike)
+ (defalias 'jao-streaming-toggle-shuffle #'jao-spt-toggle-shuffle)))
+
+(jao-def-exec-in-term "spt" "spt" (jao-afio-goto-scratch))
+
+(defvar jao-spt-on t)
+
+(defun jao-streaming-toggle-player ()
+ (interactive)
+ (if jao-spt-on
+ (progn (setq jao-mpris-player "playerctld")
+ (require 'jao-mpris)
+ (jao-mpris-setup-aliases))
+ (jao-spt-setup-aliases)
+ (setq jao-mpris-player "spt"))
+ (setq jao-spt-on (not jao-spt-on))
+ (message "%s activated " jao-mpris-player))
+
+(jao-streaming-toggle-player)
+
+;;; music transients
+(require 'jao-lyrics)
+(setq jao-lyrics-info-function #'jao-player-info)
+
+(defun jao-player-seek-10 () (interactive) (jao-player-seek 10))
+(defun jao-player-seek--10 () (interactive) (jao-player-seek -10))
+
+(defun jao-streaming-clear () (interactive) (jao-mpc-clear jao-mopidy-port))
+
+(defun jao-streaming-echo-current ()
+ (interactive)
+ (jao-mpc-echo-current jao-mopidy-port))
+
+(defun jao-streaming-show-playlist ()
+ (interactive)
+ (jao-mpc-show-playlist jao-mopidy-port))
+
+(use-package jao-random-album
+ :demand t
+ :config
+ (defun jao--notify-album (album)
+ (unless jao-minibuffer-mode
+ (jao-notify album "Next album" jao-notify-audio-icon))
+ (jao-minibuffer-refresh))
+ (setq jao-random-album-notify #'jao--notify-album))
+
+(defun jao-toggle-pasystray-applet ()
+ (interactive)
+ (or (jao-shell-kill-p "pasystray") (jao-shell-exec "pasystray")))
+
+(transient-define-prefix jao-transient-streaming ()
+ [:description
+ (lambda () (format "Streaming using %s" jao-mpris-player))
+ ["Search" :if jao-mpris-mopidy-p
+ ("a" "album" jao-streaming-album)
+ ("A" "artist" jao-streaming-artist)
+ ("t" "track" jao-streaming-track)
+ ("P" "playlist" jao-streaming-playlist)]
+ ["Play"
+ ("s" "toggle" jao-streaming-toggle)
+ ("n" "next" jao-streaming-next)
+ ("p" "previous" jao-streaming-prev)
+ ("T" "toggle player" jao-streaming-toggle-player)]
+ ["Seek & shout"
+ ("f" "seek fwd" jao-streaming-seek :transient t)
+ ("F" "seek bwd" jao-streaming-seek-back :transient t)
+ ("u" "up" jao-streaming-volume :transient t)
+ ("d" "down" jao-streaming-volume-down :transient t)]
+ ["Browse"
+ ("l" "playing list" jao-streaming-list :if jao-mpris-mopidy-p)
+ ("L" "lyrics" jao-streaming-lyrics)
+ ("w" "currently playing" jao-streaming-current)]
+ ["Act" :if jao-mpris-mopidy-p
+ ("k" "like" jao-streaming-like)
+ ("K" "dislike" jao-streaming-dislike)
+ ("S" "toggle shuffle" jao-streaming-toggle-shuffle)]])
+
+(transient-define-prefix jao-transient-media ()
+ [["Play"
+ ("m" "toggle" jao-player-toggle)
+ ("n" "next" jao-player-next)
+ ("p" "previous" jao-player-previous)
+ ("s" "select album" jao-player-select-album)]
+ ["Seek and search"
+ ("f" "seek fwd" jao-player-seek-10 :transient t)
+ ("F" "seek bwd" jao-player-seek--10 :transient t)
+ ("a" "search album" jao-mpc-select-album)
+ ("S" "play stream" jao-mpc-play-stream)]
+ ["Browse"
+ ("b" "browse" jao-player-browse)
+ ("l" "show play list" jao-player-list)
+ ("L" "show lyrics" jao-show-lyrics)
+ ("w" "now playing" jao-player-echo)]
+ [:description
+ (lambda ()
+ (message "%s %s"
+ (if (jao-mpc-mopidy-p) "mopidy" "mpd")
+ (if (jao-mpc-playing-p)
+ (jao-mpc--current-timestr t)
+ (jao-mpc--current-str)))
+ (format "Master %s%%" (jao-mixer-get-level nil t)))
+ ("d" "down" jao-mixer-master-down :transient t)
+ ("u" "up" jao-mixer-master-up :transient t)
+ ("M" "toggle" jao-mixer-master-toggle)]
+ [:description
+ (lambda () (format "Capture %s%%" (jao-mixer-get-level "Capture" t)))
+ ("D" "down" jao-mixer-capture-down :transient t)
+ ("U" "up" jao-mixer-capture-up :transient t)]
+ ["Utilities"
+ ("c" "reconnect to mpd" jao-player-connect)
+ ("N" "next random album" jao-random-album-next)
+ ("r" (lambda ()
+ (concat (if jao-random-album-active "dis" "en") "able random album"))
+ jao-random-album-toggle)
+ ;; ("P" (lambda () (concat "Toggle to " (if (jao-mpc-mopidy-p) "mpd" "mopidy")))
+ ;; jao-mpc-toggle-port)
+ ("P" "pasystray" jao-toggle-pasystray-applet)]])
+
+(global-set-key (kbd "s-m") #'jao-transient-media)
+
+;;; - provide
+(provide 'jao-custom-multimedia)
diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index 3919897..42d9e12 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -588,12 +588,13 @@
;;; arXiv
(use-package org-capture
:config
- (add-to-list 'org-capture-templates
- '("X" "arXiv" entry (file "notes/physics/arxiv.org")
- "* %(jao-org-notmuch-last-subject)\n %i"
- :immediate-finish t)
- t)
- (org-capture-upgrade-templates org-capture-templates))
+ (when jao-notmuch-enabled
+ (add-to-list 'org-capture-templates
+ '("X" "arXiv" entry (file "notes/physics/arxiv.org")
+ "* %(jao-org-notmuch-last-subject)\n %i"
+ :immediate-finish t)
+ t)
+ (org-capture-upgrade-templates org-capture-templates)))
(defun jao-notmuch-arXiv-capture ()
(interactive)
diff --git a/custom/jao-custom-org.el b/custom/jao-custom-org.el
index 02e7a03..546c9af 100644
--- a/custom/jao-custom-org.el
+++ b/custom/jao-custom-org.el
@@ -1,7 +1,7 @@
;; -*- lexical-binding: t -*-
;;; General configuration
-(defvar jao-org-dir (expand-file-name "~/doc/org"))
+(defvar jao-org-dir (expand-file-name "org" jao-doc-dir))
(use-package org
:ensure t
@@ -99,7 +99,7 @@
"* TODO %?\n %i%a" :prepend t)
("r" "REPLY" entry
(file+headline "inbox.org" "Todo")
- "* REPLY %:subject%?\n %t\n %i%a" :prepend t)
+ "* REPLY %a\n %t\n %?" :prepend t)
("a" "Appointment" entry
(file+olp "inbox.org" "Appointments")
"* %^T %?\n %a" :time-prompt t)
@@ -140,10 +140,9 @@
(use-package org-fragtog
:after org
:ensure t
+ :demand t
:hook ((org-mode . org-fragtog-mode)))
-(require 'org-fragtog)
-
(setq org-format-latex-options
`(:foreground default
:background
@@ -160,6 +159,9 @@
(require 'ox-latex)
+;;; Export (org)
+(require 'ox-org)
+
;;; Export (minted and pandoc)
(setq org-latex-listings 'minted
org-latex-packages-alist '(("" "minted"))
@@ -167,10 +169,6 @@
'("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
"pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"))
-(use-package ox-pandoc
- :after org
- :ensure t)
-
;;; Babel and literate programming
(setq org-src-window-setup 'other-window) ;; current-window
(require 'org-tempo nil t) ;; <s TAB for 9.2 and later
diff --git a/custom/jao-custom-pdf.el b/custom/jao-custom-pdf.el
new file mode 100644
index 0000000..4ebd7f1
--- /dev/null
+++ b/custom/jao-custom-pdf.el
@@ -0,0 +1,144 @@
+;; -*- lexical-binding: t -*-
+
+;;;; open pdfs
+(jao-when-linux
+ (use-package saveplace-pdf-view
+ :ensure t
+ :demand t
+ :after doc-view))
+
+(use-package jao-pdf :demand t)
+
+(setq jao-open-doc-fun 'jao-find-or-open)
+(setq jao-org-open-pdf-fun 'jao-find-or-open)
+
+(defun jao-zathura-open (file page)
+ (let ((id (jao-x11-search-window (jao-pdf-zathura-title-rx file))))
+ (if (string-blank-p id)
+ (progn
+ (when jao-xmonad-enabled (jao-x11-goto-ws 2))
+ (jao-shell-exec (jao-pdf-zathura-open-cmd file page)))
+ (let* ((page (if page (format " && xdotool type %dg" page) ""))
+ (cmd (format "xdotool windowactivate %s%s" id page)))
+ (jao-shell-exec cmd t)))))
+
+(defun jao-x11-zathura-goto-org (&optional title no-ask)
+ (let ((title (or title (jao-shell-string "xdotool"
+ "getactivewindow"
+ "getwindowname"))))
+ (jao-org-open-from-zathura title no-ask)))
+
+(defun jao-find-or-open (file &optional page height)
+ (cond ((and jao-browse-doc-use-emacs-p window-system)
+ (let* ((buffs (buffer-list))
+ (b (catch 'done
+ (while buffs
+ (when (string-equal (buffer-file-name (car buffs)) file)
+ (throw 'done (car buffs)))
+ (setq buffs (cdr buffs))))))
+ (jao-afio-goto-docs)
+ (if b (pop-to-buffer b) (find-file file))
+ (when page (jao-doc-view-goto-page page height))))
+ (jao-river-enabled (jao-river-open-with-zathura file page))
+ (jao-sway-enabled (jao-sway-open-with-zathura file page))
+ (t (jao-zathura-open file page))))
+
+(defun jao-open-doc (&optional file page height)
+ (interactive)
+ (when-let (file (or file
+ (read-file-name "Document: "
+ (concat jao-org-dir "/doc/"))))
+ (funcall jao-open-doc-fun file page height)))
+
+(defun jao-select-pdf ()
+ (interactive)
+ (jao-buffer-same-mode '(pdf-view-mode doc-view-mode)
+ #'jao-afio-goto-docs))
+
+(defun jao-open-with-zathura ()
+ (interactive)
+ (when-let (f buffer-file-name)
+ (let ((p (jao-doc-view-current-page)))
+ (cond (jao-river-enabled (jao-river-open-with-zathura f p))
+ (jao-sway-enabled (jao-sway-open-with-zathura f p))
+ (t (jao-zathura-open f p))))))
+
+;; doc:// links for browse-url
+(defun jao-open-doc-url (url &rest _)
+ (when (string-match "doc://\\([^?]+\\)\\(\\?.*\\)?" url)
+ (let ((file (match-string 1 url))
+ (page (when-let* ((qs (match-string 2 url))
+ (long (> (length qs) 1))
+ (ps (url-parse-query-string (substring qs 1)))
+ (pn (cadr (assoc "page" ps))))
+ (string-to-number pn))))
+ (jao-open-doc (expand-file-name (concat "doc/" file) jao-org-dir) page))))
+
+(add-to-list 'browse-url-handlers (cons "^doc://.+" 'jao-open-doc-url))
+
+;;;; doc-view
+(use-package doc-view
+ :init
+ (setq doc-view-cache-directory "~/.emacs.d/cache/docview"
+ doc-view-resolution 110
+ doc-view-continuous t
+ doc-view-conversion-refresh-interval 1
+ doc-view-mupdf-use-svg t)
+ :hook ((doc-view-mode . jao-doc-session-mark))
+ :bind (:map doc-view-mode-map
+ ("j" . doc-view-next-line-or-next-page)
+ ("J" . doc-view-search-next-match)
+ ("k" . doc-view-previous-line-or-previous-page)
+ ("K" . doc-view-search-previous-match)
+ ("z" . jao-open-with-zathura)))
+
+(use-package jao-doc-session :demand t)
+
+(use-package jao-doc-view
+ :demand t
+ :bind (:map doc-view-mode-map
+ ("b" . jao-doc-view-back)
+ ("B" . jao-doc-view-forward)
+ ("S" . jao-doc-session-save)
+ ("u" . jao-doc-view-visit-url)))
+
+;;;; transient
+(defun jao-org-pdf-goto-org-linking ()
+ (interactive)
+ (jao-org-pdf-goto-org 4))
+
+(jao-transient-major-mode doc-view
+ ["Notes"
+ ("o" "notes file" jao-org-pdf-goto-org)
+ ("O" "notes file, linking" jao-org-pdf-goto-org-linking)]
+ ["Navigation"
+ ("b" "back jump" jao-doc-view-back)
+ ("B" "forward jump" jao-doc-view-back)
+ ("u" "visit URL" jao-doc-view-visit-url)]
+ ["Slices"
+ ("cb" "bounding box" doc-view-set-slice-from-bounding-box)
+ ("cm" "using mouse" doc-view-set-slice-using-mouse)]
+ ["Session"
+ ("s" "load session" jao-afio-open-pdf-session)
+ ("S" "save session" jao-doc-session-save)
+ ("d" "visit cache directory" doc-view-dired-cache)]
+ ["External viewers"
+ ("z" "open with zathura" jao-open-with-zathura)])
+
+(with-eval-after-load "pdf-view"
+ (jao-transient-major-mode pdf-view
+ ["Notes"
+ ("o" "notes file" jao-org-pdf-goto-org)
+ ("O" "notes file, linking" jao-org-pdf-goto-org-linking)]
+ ["Navigation"
+ ("b" "back jump" pdf-history-backward)
+ ("f" "forward jump" pdf-history-forward)]
+ ["Session"
+ ("s" "load session" jao-afio-open-pdf-session)
+ ("S" "save session" jao-doc-session-save)]
+ ["External viewers"
+ ("z" "open with zathura" jao-open-with-zathura)]))
+
+;; (transient-get-suffix 'jao-transient-pdf-view '(0 -1))
+
+(provide 'jao-custom-pdf)
diff --git a/custom/jao-custom-programming.el b/custom/jao-custom-programming.el
new file mode 100644
index 0000000..4028f3d
--- /dev/null
+++ b/custom/jao-custom-programming.el
@@ -0,0 +1,508 @@
+;; -*- lexical-binding: t -*-
+
+;;; Programming
+;;;; automatic modes
+(add-to-list 'auto-mode-alist '("\\.mix\\'" . hexl-mode))
+(add-to-list 'auto-mode-alist '("\\.m4\\'" . m4-mode))
+(add-to-list 'auto-mode-alist '("\\.am\\'" . makefile-mode))
+(add-to-list 'auto-mode-alist '("\\.pl\\'\\|\\.pm\\'" . cperl-mode))
+
+;;;; symbol overlay
+(use-package symbol-overlay
+ :ensure t
+ :config
+ (defun jao-symbol-reveal (&rest _)
+ (when outline-minor-mode (outline-show-entry)))
+ (advice-add 'symbol-overlay-basic-jump :after 'jao-symbol-reveal)
+
+ (defun jao-symbol-put-and-next ()
+ (interactive)
+ (symbol-overlay-put)
+ (symbol-overlay-jump-next))
+
+ (defun jao-symbol-put-and-prev ()
+ (interactive)
+ (symbol-overlay-put)
+ (symbol-overlay-jump-prev))
+
+ :bind (:map prog-mode-map (("M-i" . symbol-overlay-put)
+ ("M-n" . jao-symbol-put-and-next)
+ ("M-p" . jao-symbol-put-and-prev)))
+ :hook (prog-mode . symbol-overlay-mode)
+ :diminish " ^")
+
+;;;; eglot
+(use-package eglot
+ :bind (:map eglot-mode-map (("C-h ." . jao-eldoc-toggle))))
+
+;;;; paredit and parens
+(require 'paren)
+(show-paren-mode t)
+(setq show-paren-context-when-offscreen t
+ show-paren-when-point-inside-paren nil)
+
+(use-package paredit
+ :ensure t
+ :commands paredit-mode
+ :hook ((pie-mode . paredit-mode)
+ (scheme-mode . paredit-mode)
+ (clojure-mode . paredit-mode)
+ (emacs-lisp-mode . paredit-mode)
+ ;; (eval-expression-minibuffer-setup . paredit-mode)
+ (lisp-interaction-mode . disable-paredit-mode))
+ :diminish ((paredit-mode . " þ")))
+
+;;;; diff/ediff
+(setq ediff-split-window-function 'split-window-horizontally)
+(setq ediff-make-buffers-readonly-at-startup nil)
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+(setq ediff-keep-variants nil)
+
+;;;; compilation
+;;;;; compilation mode options
+(require 'compile)
+(setq compilation-scroll-output t)
+(setq compilation-error-regexp-alist
+ (remove 'omake compilation-error-regexp-alist))
+;; (add-hook 'compilation-mode-hook #'visual-line-mode)
+
+;;;;; mode line (no "Compiling"!)
+(require 'compile)
+(diminish 'compilation-minor-mode " ‡")
+(when (< emacs-major-version 27)
+ (setcdr (assq 'compilation-in-progress minor-mode-alist) '(" ‡")))
+(when (> emacs-major-version 26)
+ (setcdr (assq 'compilation-in-progress mode-line-modes) '("‡ ")))
+
+;;;;; colorizing compilation buffer
+(setq compilation-message-face 'default)
+(require 'ansi-color)
+(defun endless/colorize-compilation ()
+ "Colorize from `compilation-filter-start' to `point'."
+ (let ((inhibit-read-only t))
+ (ansi-color-apply-on-region
+ compilation-filter-start (point))))
+
+(add-hook 'compilation-filter-hook #'endless/colorize-compilation)
+
+;;;;; compilation commands
+(use-package jao-compilation
+ :commands jao-compilation-setup
+ :bind (("C-c C" . compile)
+ ("C-c c" . jao-compile)))
+(jao-compilation-setup)
+
+;;;;; next error
+(setq next-error-find-buffer-function
+ #'next-error-buffer-on-selected-frame
+ next-error-verbose t)
+
+;;;; flymake
+(use-package flymake
+ :ensure t
+ :custom ((flymake-mode-line-format '(" " flymake-mode-line-counters)))
+ :config
+ (jao-define-attached-buffer "^\\*Flymake diagnostics .*\\*\\'")
+
+ (transient-define-prefix jao-transient-flymake ()
+ ["Flymake"
+ ("d" "show diagnostics" flymake-show-buffer-diagnostics)
+ ("i" "show diagnostic" flymake-show-diagnostic)
+ ("n" "next error" flymake-goto-next-error)
+ ("p" "previous error" flymake-goto-prev-error)
+ ("c" "consult flymake" consult-flymake)])
+
+ :bind (:map flymake-mode-map (("M-m" . jao-transient-flymake))))
+
+;;;; workarounds
+(setq c-type-finder-time-slot nil)
+
+;;;; outline minor mode
+(use-package outline
+ :init (setq outline-minor-mode-use-buttons nil
+ outline-minor-mode-use-margins nil
+ outline-minor-mode-cycle t))
+
+(defvar-local jao-outline-folded nil)
+(dolist (v '(4 5 outline-show-only-headings))
+ (add-to-list 'safe-local-variable-values `(outline-default-state . ,v)))
+
+(defun jao-outline-minor-mode-hide-all (&optional arg)
+ (interactive "P")
+ (outline-hide-sublevels (if arg 5 4)))
+
+(defun jao-outline-minor-expand-all ()
+ (when jao-outline-minor-mode (outline-show-all)))
+
+(defun jao-outline-minor-mode-toogle-fold (&optional arg)
+ (interactive "P")
+ (if (setq jao-outline-folded (not jao-outline-folded))
+ (jao-outline-minor-mode-hide-all arg)
+ (jao-outline-minor-expand-all)))
+
+(use-package outline-minor-faces
+ :ensure t
+ :after outline)
+
+(define-minor-mode jao-outline-minor-mode
+ "Minor outline mode for programming languages"
+ :lighter ""
+ :keymap `((,(kbd "C-c C-n") . outline-next-visible-heading)
+ (,(kbd "C-c C-p") . outline-previous-visible-heading)
+ (,(kbd "C-c o") . consult-outline)
+ (,(kbd "<f3>") . jao-outline-minor-mode-toogle-fold))
+ (if jao-outline-minor-mode
+ (progn (setq-local outline-level #'outline-level
+ outline-regexp (format "[%s]\\{3,\\} " comment-start))
+ (outline-minor-mode 1)
+ (outline-minor-faces-mode 1))
+ (outline-minor-mode -1)
+ (outline-minor-faces-mode -1)))
+
+(add-hook 'find-function-after-hook #'jao-outline-minor-expand-all)
+
+;;; Programming languages
+;;;; Elisp
+(add-hook 'emacs-lisp-mode-hook #'jao-outline-minor-mode)
+
+(use-package edit-list :ensure t)
+;; (use-package package-lint :ensure t)
+;; (use-package tree-inspector :ensure t)
+
+(defun elisp-disassemble (function)
+ (interactive (list (function-called-at-point)))
+ (disassemble function))
+
+(defun elisp-pp (sexp)
+ (with-output-to-temp-buffer "*Pp Eval Output*"
+ (pp sexp)
+ (with-current-buffer standard-output
+ (emacs-lisp-mode))))
+
+(defun elisp-macroexpand (form)
+ (interactive (list (form-at-point 'sexp)))
+ (elisp-pp (macroexpand form)))
+
+(defun elisp-macroexpand-all (form)
+ (interactive (list (form-at-point 'sexp)))
+ (elisp-pp (macroexpand-all form)))
+
+(defun elisp-find-definition (name)
+ (interactive (list (thing-at-point 'symbol)))
+ (cond (name
+ (let ((symbol (intern-soft name))
+ (search (lambda (fun sym)
+ (let* ((r (save-excursion (funcall fun sym)))
+ (buffer (car r))
+ (point (cdr r)))
+ (cond ((not point)
+ (error "Found no definition for %s in %s"
+ name buffer))
+ (t
+ (switch-to-buffer buffer)
+ (goto-char point)
+ (recenter 1)))))))
+ (cond ((fboundp symbol)
+ (xref-push-marker-stack)
+ (funcall search 'find-function-noselect symbol))
+ ((boundp symbol)
+ (xref-push-marker-stack)
+ (funcall search 'find-variable-noselect symbol))
+ (t
+ (message "Symbol not bound: %S" symbol)))))
+ (t (message "No symbol at point"))))
+
+
+(defun elisp-bytecompile-and-load ()
+ (interactive)
+ (or buffer-file-name
+ (error "The buffer must be saved in a file first"))
+ (require 'bytecomp)
+ ;; Recompile if file or buffer has changed since last compilation.
+ (when (and (buffer-modified-p)
+ (y-or-n-p (format "save buffer %s first? " (buffer-name))))
+ (save-buffer))
+ (let ((filename (expand-file-name buffer-file-name)))
+ (with-temp-buffer
+ (byte-compile-file filename))))
+
+(use-package elisp-mode
+ :bind (:map emacs-lisp-mode-map
+ (("C-c C-M" . emacs-lisp-macroexpand)
+ ("C-c C-m" . elisp-macroexpand-all)
+ ("C-c C-k" . elisp-bytecompile-and-load)
+ ;; ("C-c C-p" . pp-eval-last-sexp)
+ ("M-." . elisp-find-definition)
+ ("M-," . pop-tag-mark)
+ ("C-c <" . lc-show-package-summary))))
+
+;;;; Clojure
+(use-package clojure-mode
+ :ensure t
+ :config
+ (defun jao-clojure--fix-things ()
+ (setq-local completion-styles '(basic partial-completion emacs22))
+ (eldoc-mode 1)
+ (setq mode-name "λ"))
+ :hook (clojure-mode . jao-clojure--fix-things))
+
+(defun jao-cider-test-ns (ns)
+ (let ((parts (string-split ns "\\.")))
+ (if (string= "test" (cadr parts))
+ ns
+ (mapconcat #'identity (cons (car parts) (cons "test" (cdr parts))) "."))))
+
+(defun jao-kaocha-file-name ()
+ (let* ((filename (match-string 2))
+ (path (replace-regexp-in-string "\\." "/" (match-string 1))))
+ (substring-no-properties (concat "test/" path filename))))
+
+(defconst jao-kaocha-compilation-error
+ '(kaocha-error "^FAIL in \\(.+\\.\\)[^ ]+ (\\([^:]+\\.clj[cs]?\\):\\([0-9]+\\))"
+ jao-kaocha-file-name 3))
+
+(use-package compile
+ :config
+ (add-to-list 'compilation-error-regexp-alist-alist
+ jao-kaocha-compilation-error))
+
+(use-package cider
+ :ensure t
+ :commands cider-mode
+ :init (setq cider-annotate-completion-candidates t
+ cider-auto-select-error-buffer nil
+ cider-auto-select-test-report-buffer nil
+ cider-eldoc-display-for-symbol-at-point t
+ cider-eldoc-ns-function #'identity ;; #'cider-last-ns-segment
+ cider-enrich-classpath nil
+ cider-lein-parameters "repl :headless :host localhost"
+ cider-mode-line " ÷"
+ cider-prompt-for-symbol nil
+ cider-repl-history-file
+ (expand-file-name "~/.emacs.d/cache/cider.history")
+ cider-repl-pop-to-buffer-on-connect nil
+ cider-repl-use-pretty-printing t
+ cider-show-error-buffer 'except-in-repl
+ cider-test-show-report-on-success nil
+ cider-test-infer-test-ns #'jao-cider-test-ns
+ cider-use-fringe-indicators nil
+ cider-use-overlays nil
+ clojure-docstring-fill-column 72
+ 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
+ (lambda () (frame-parameter nil 'background-color)))
+ (setq cider-test-items-background-color
+ (frame-parameter nil 'background-color)))
+
+(use-package cider-macroexpansion
+ :after cider
+ :diminish " µ")
+
+;;;; Geiser
+(defun jao-org--set-geiser-impl () (setq-local geiser-repl--impl 'guile))
+(add-hook 'org-mode-hook #'jao-org--set-geiser-impl)
+
+(jao-load-path "geiser")
+;; (package-vc-install-from-checkout ...)
+(use-package geiser
+ :demand t
+ :init
+ (setq geiser-repl-history-filename "~/.emacs.d/cache/geiser-history"
+ geiser-repl-startup-time 20000
+ geiser-debug-auto-display-images t
+ geiser-log-verbose t)
+ :config
+ (dolist (m '(geiser-repl-mode geiser-doc-mode geiser-debug-mode))
+ (jao-define-attached-buffer `(major-mode . ,m) 0.4)))
+
+(jao-load-path "geiser-guile")
+(use-package geiser-guile)
+
+(jao-load-path "geiser-chez")
+(use-package geiser-chez)
+
+;; (jao-load-path "geiser/mit")
+;; (use-package geiser-mit)
+
+;; (jao-load-path "geiser/chicken")
+;; (use-package geiser-chicken)
+
+;; (jao-load-path "geiser/chibi")
+;; (use-package geiser-chibi)
+
+;; (jao-load-path "geiser/gambit")
+;; (use-package geiser-gambit)
+
+;; (jao-load-path "geiser/gauche")
+;; (use-package geiser-gauche)
+
+;;;; Haskell
+;;;;; packages
+;; (jao-load-path "haskell-mode")
+
+(use-package haskell-mode
+ :ensure t
+ :custom
+ ((inferior-haskell-find-project-root t)
+ (haskell-check-remember-last-command-p nil)
+ (haskell-completing-read-function 'completing-read)
+ (haskell-font-lock-symbols nil)
+ (haskell-hoogle-command "hoogle")
+ (haskell-interactive-popup-errors t)
+ (haskell-process-auto-import-loaded-modules t)
+ (haskell-process-log t)
+ (haskell-process-suggest-remove-import-lines t)
+ (haskell-process-suggest-hoogle-imports t)
+ (haskell-process-type 'cabal-repl)
+ (haskell-process-use-presentation-mode t)
+ (haskell-stylish-on-save nil)
+ (haskell-tags-on-save t))
+
+ :init
+ ;; For use with M-x align
+ (require 'align)
+ (add-to-list 'align-rules-list
+ '(haskell-types
+ (regexp . "\\(\\s-+\\)\\(::\\|∷\\)\\s-+")
+ (modes quote (haskell-mode haskell-literate-mode))))
+ (add-to-list 'align-rules-list
+ '(haskell-assignment
+ (regexp . "\\(\\s-+\\)=\\s-+")
+ (modes quote (haskell-mode haskell-literate-mode))))
+ (add-to-list 'align-rules-list
+ '(haskell-arrows
+ (regexp . "\\(\\s-+\\)\\(->\\|→\\)\\s-+")
+ (modes quote (haskell-mode haskell-literate-mode))))
+ (add-to-list 'align-rules-list
+ '(haskell-left-arrows
+ (regexp . "\\(\\s-+\\)\\(<-\\|←\\)\\s-+")
+ (modes quote (haskell-mode haskell-literate-mode))))
+
+ :config
+ (defun jao-haskell-hoogle (no-info)
+ (interactive "P")
+ (haskell-hoogle (format "%s" (haskell-ident-at-point)) (not no-info)))
+
+ (put 'haskell-process-args-cabal-repl
+ 'safe-local-variable
+ (apply-partially #'seq-every-p #'stringp))
+
+ (defun jao-haskell-eldoc (cb)
+ (let ((msg (or (haskell-doc-current-info--interaction t)
+ (haskell-doc-sym-doc (haskell-ident-at-point))
+ "")))
+ (funcall cb (replace-regexp-in-string "[\n ]+" " " msg))))
+
+ (setq tags-revert-without-query t)
+
+ (defun jao-haskell-mode ()
+ (require 'haskell-doc)
+ (setq-local eldoc-documentation-function 'eldoc-documentation-default
+ eldoc-documentation-functions '(jao-haskell-eldoc))
+ (eldoc-mode))
+
+ (dolist (h '(jao-haskell-mode
+ haskell-decl-scan-mode
+ haskell-indentation-mode
+ interactive-haskell-mode))
+ (add-hook 'haskell-mode-hook h))
+
+ (add-hook 'haskell-presentation-mode-hook (lambda () (whitespace-mode -1)))
+
+ :bind (:map haskell-mode-map
+ (("C-c C-d" . jao-haskell-hoogle)
+ ("C-c C-s" . haskell-session-change-target)
+ ("C-c h" . haskell-hoogle)
+ ("C-c t" . haskell-doc-show-type)
+ ("C-c C-e" . haskell-command-insert-language-pragma)
+ ("C-M-n" . flymake-goto-next-error)
+ ("C-M-p" . flymake-goto-prev-error)
+ ("<f3>" . haskell-session-kill))))
+
+(jao-when-linux
+ (use-package hlint-refactor
+ :ensure t
+ :after haskell-mode
+ :hook ((haskell-mode . hlint-refactor-mode))
+ :bind (:map haskell-mode-map (("C-M-h" . 'hlint-refactor-refactor-at-point)
+ ("C-M-S-h" . 'hlint-refactor-refactor-buffer)))
+ :diminish)
+
+ (use-package flymake-hlint
+ :ensure t
+ :after haskell-mode
+ :hook ((haskell-mode . flymake-hlint-load))))
+
+(use-package consult-hoogle
+ :ensure t)
+
+(require 'haskell)
+
+(diminish 'interactive-haskell-mode " λ")
+(diminish 'haskell-doc-mode)
+(diminish 'haskell-decl-scan-mode)
+
+(jao-define-attached-buffer "\\*hoogle\\*.*")
+(jao-define-attached-buffer '(major-mode . haskell-interactive-mode) 0.33)
+(jao-define-attached-buffer '(major-mode . haskell-presentation-mode) 0.25)
+
+;;;;; transient
+(jao-transient-major-mode haskell
+ ["Imports"
+ ("in" "Navigate imports" haskell-navigate-imports)
+ ("if" "Format imports" haskell-mode-format-imports)
+ ("is" "Sort imports" haskell-sort-imports)
+ ("ia" "Align imports" haskell-align-imports)]
+ ["Session"
+ ("s" "Change the session's target" haskell-session-change-target)]
+ ["Code"
+ ("e" "insert language pragma" haskell-command-insert-language-pragma)
+ ("v" "visit cabal file" haskell-cabal-visit-file)
+ ("h" "hoogle" jao-haskell-hoogle)
+ ("t" "show type" haskell-doc-show-type)]
+ ["Flymake"
+ ("n" "next error" flymake-goto-next-error)
+ ("p" "previous error" flymake-goto-prev-error)])
+
+;;;; Pie
+;; (jao-load-path "pie")
+;; (use-package pie
+;; :commands (pie-mode))
+
+;;;; Prolog
+;; (use-package ediprolog :ensure t)
+
+(use-package prolog
+ :disabled t
+ :ensure t
+ :commands (run-prolog prolog-mode mercury-mode)
+ :init (progn
+ (setq prolog-system 'swi)
+ (add-to-list 'auto-mode-alist '("\\.pl$" . prolog-mode))
+ (setq prolog-consult-string '((t "[%f].")))
+ (setq prolog-program-name
+ '(((getenv "EPROLOG") (eval (getenv "EPROLOG")))
+ (eclipse "eclipse")
+ (mercury nil)
+ (sicstus "sicstus")
+ (swi "swipl")
+ (t "prolog")))))
+
+;;;; Python
+;; (use-package virtualenvwrapper
+;; :ensure t
+;; :config
+;; (venv-initialize-eshell)
+;; (jao-compilation-env "VIRTUAL_ENV"))
+
+;;;; Javascript
+
+(use-package typescript-mode
+ :ensure t
+ :custom ((typescript-indent-level 2)))
+
+;;; -
+(provide 'jao-custom-programming)
diff --git a/custom/jao-custom-shells.el b/custom/jao-custom-shells.el
new file mode 100644
index 0000000..eaae13c
--- /dev/null
+++ b/custom/jao-custom-shells.el
@@ -0,0 +1,6 @@
+;; -*- lexical-binding: t -*-
+
+
+
+
+(provide 'jao-custom-shells)
diff --git a/custom/jao-custom-window-system.el b/custom/jao-custom-window-system.el
new file mode 100644
index 0000000..32b3578
--- /dev/null
+++ b/custom/jao-custom-window-system.el
@@ -0,0 +1,198 @@
+;; -*- lexical-binding: t -*-
+
+;;; x11 utils
+(defun jao-xdotool (arg-or-wait &rest args)
+ (apply 'jao-shell-exec*
+ (if (stringp arg-or-wait) "xdotool" arg-or-wait)
+ (if (stringp arg-or-wait) arg-or-wait "xdotool")
+ args))
+
+(defsubst jao-xdotool-string (&rest args)
+ (apply 'jao-shell-string "xdotool" args))
+
+(defsubst jao-x11-focused-id () (jao-xdotool-string "getwindowfocus"))
+
+(defsubst jao-x11-window-name (&optional wid)
+ (jao-xdotool-string "getwindowname" (or wid (jao-x11-focused-id))))
+
+(defsubst jao-x11-search-window (title)
+ (jao-xdotool-string "search" "--name" title))
+
+(defsubst jao-x11-goto-ws (n) (jao-xdotool t "set_desktop" (format "%s" n)))
+
+;;; exwm
+(defvar jao-exwm-enabled nil)
+(defun jao-exwm-enabled-p () jao-exwm-enabled)
+
+(defun jao-exwm-enable ()
+ (require 'jao-custom-exwm)
+ (setq jao-exwm-enabled t)
+ (display-time-mode -1)
+ (jao-ednc-setup 95)
+ (x-change-window-property "_XMONAD_TRAYPAD" "" nil nil nil nil 0)
+ (jao-mode-line-add-to-minibuffer-left 90)
+ (jao-xmobar-restart)
+ (jao-trisect t))
+
+;;; xmonad
+(defvar jao-xmonad-enabled (string= "xmonad" (or (getenv "wm") "")))
+(defun jao-xmonad-enabled-p () jao-xmonad-enabled)
+
+(defun jao-xmonad-enable ()
+ (setq jao-browse-doc-use-emacs-p (display-graphic-p))
+ (setq jao-mode-line-in-minibuffer nil)
+ (display-battery-mode -1)
+ (jao-trisect)
+ (message "Welcome to xmonad"))
+
+(when jao-xmonad-enabled
+ (add-hook 'after-init-hook #'jao-xmonad-enable))
+
+;;; wayland
+
+(use-package jao-wayland :demand t)
+
+(defun jao-wayland-enable ()
+ (interactive)
+ (defalias 'x-change-window-property #'ignore)
+ (jao-trisect)
+ (message "Welcome to wayland"))
+
+(defun jao-river-enable ()
+ (jao-wayland-enable)
+ (when (jao-shell-running-p "i3bar-river")
+ (jao-tracking-set-log ""))
+ (message "Welcome to river"))
+
+(when jao-river-enabled
+ (add-hook 'after-init-hook #'jao-river-enable t))
+
+(when jao-sway-enabled
+ (add-hook 'after-init-hook #'jao-wayland-enable t))
+
+;;; wallpaper
+(defvar jao-wallpaper-dir "~/.wallpapers/")
+
+(defvar jao-wallpaper-random-candidates
+ '("wallpaper.jpg" "wallpaper2.jpg"))
+
+(defvar jao-wallpaper-random-candidates-light
+ '("wallpaper.jpg" "wallpaper2.jpg"))
+
+(defvar jao-wallpaper-random-wake t
+ "Set to t for getting a new wallpaper on awaking from sleep")
+
+(defun jao-set-wallpaper (&optional path)
+ (interactive)
+ (let ((current (format "~/.wallpaper.%s" (jao-colors-scheme))))
+ (when-let ((f (or (and path (expand-file-name path))
+ (read-file-name "Image: "
+ jao-wallpaper-dir
+ (file-symlink-p current)
+ t))))
+ (make-symbolic-link f current t)
+ (cond (jao-river-enabled (jao-river-set-wallpaper f))
+ (jao-sway-enabled (jao-sway-set-wallpaper f))
+ (t (shell-command-to-string (format "xwallpaper --zoom %s" f)))))))
+
+(defun jao-set-random-wallpaper ()
+ (interactive)
+ (when (or (called-interactively-p 'interactive)
+ jao-wallpaper-random-wake)
+ (let* ((ws (if (jao-colors-scheme-dark-p)
+ jao-wallpaper-random-candidates
+ jao-wallpaper-random-candidates-light))
+ (f (seq-random-elt ws)))
+ (jao-set-wallpaper (expand-file-name f jao-wallpaper-dir))
+ (message "%s" f))))
+
+(add-to-list 'jao-sleep-awake-functions #'jao-set-random-wallpaper)
+
+;;; screensaver and lock
+(defun jao-screensaver-enabled ()
+ (string= (jao-shell-string "xdg-screensaver status") "enabled"))
+
+(defvar jao-screensaver--wid nil)
+(defun jao-screensaver-toggle ()
+ (interactive)
+ (if (jao-screensaver-enabled)
+ (let ((wid (jao-x11-focused-id)))
+ (setq jao-screensaver--wid wid)
+ (jao-shell-exec* t "xdg-screensaver" "suspend" wid))
+ (jao-shell-exec* t "xdg-screensaver" "resume" jao-screensaver--wid)
+ (setq jao-screensaver--wid nil))
+ (jao-notify (format "Screensaver %s"
+ (jao-shell-string "xdg-screensaver status"))))
+
+(jao-shell-def-exec jao-xlock-screen "xdg-screensaver" "activate")
+(jao-shell-def-exec jao-suspend "sudo" "systemctl" "suspend")
+(jao-shell-def-exec jao-poweroff "sudo" "systemctl" "poweroff")
+
+(defun jao-lock-screen ()
+ (interactive)
+ (if jao-wayland-enabled
+ (shell-command "swaylock -i ~/.lockimage")
+ (jao-xlock-screen)))
+
+(transient-define-prefix jao-transient-sleep ()
+ ["Sleep"
+ ("l" "lock screen" jao-lock-screen)
+ ("z" "sleep" jao-suspend)
+ ("u" (lambda ()
+ (if (jao-screensaver-enabled) "suspend screensaver" "resume screensaver"))
+ jao-screensaver-toggle)
+ ("poof" "power-off" jao-poweroff)])
+
+;;; X clipboard
+(setq select-enable-clipboard t
+ select-enable-primary t
+ selection-timeout 100
+ xterm-select-active-regions t)
+
+(use-package xclip
+ :ensure t
+ :init (setq xclip-method (if jao-wayland-enabled 'wl-copy 'xclip)))
+
+(unless (display-graphic-p) (xclip-mode 1))
+
+;;; pop-up frames
+(defun jao-open-in-x-frame (&optional width height)
+ (interactive)
+ (make-frame `((window-system . x)
+ (name . "emacs popup")
+ (width . ,(or width (window-width)))
+ (height . ,(or height (window-height)))))
+ (define-key (current-local-map) "q" #'delete-frame))
+
+;;; xmobar
+(defun jao-xmobar-kill ()
+ (interactive)
+ (shell-command "killall xmobar-single"))
+
+(defun jao-xmobar-restart ()
+ (interactive)
+ (jao-xmobar-kill)
+ (start-process "" nil "xmobar-single" "-d"))
+
+(use-package tab-bar
+ :init (setq tab-bar-close-button-show nil
+ tab-bar-show (> emacs-major-version 28)
+ tab-bar-format ()))
+
+(use-package xmobar
+ :init (setq xmobar-tab-bar t
+ xmobar-tab-split "*"
+ xmobar-tab-bar-format
+ (if window-system
+ '(xmobar-left-string
+ tab-bar-format-align-right
+ xmobar-right-string)
+ '(xmobar-left-string
+ xmobar-elastic-space
+ xmobar-right-string))
+ xmobar-command
+ (if window-system '("xmobar-emacs" "-TAnsi") "xmobar-emacs")))
+
+
+;;; - provide
+(provide 'jao-custom-window-system)
diff --git a/init.el b/init.el
index 74db526..dd70de5 100644
--- a/init.el
+++ b/init.el
@@ -1,8 +1,26 @@
;; -*- lexical-binding: t; -*-
+;;; Portability macros
+(defmacro jao-syscase (clauses)
+ (let ((cls (assoc system-type clauses)))
+ (when cls `(progn ,@(cdr cls)))))
+
+(defmacro jao-d-l (darw linux)
+ `(jao-syscase ((darwin ,darw) (gnu/linux ,linux))))
+
+(defmacro jao-when-darwin (&rest body)
+ `(jao-syscase ((darwin ,@body))))
+
+(defmacro jao-when-linux (&rest body)
+ `(jao-syscase ((gnu/linux ,@body))))
+
+(defun jao-is-linux () (jao-when-linux t))
+(defun jao-is-darwin () (jao-when-darwin t))
+
;;; Initialisation
;;;; Bootstrap and use package
-(defvar jao-emacs-dir (expand-file-name "~/etc/emacs"))
+(defvar jao-emacs-dir
+ (expand-file-name (jao-d-l "~/.emacs.d/config" "~/etc/emacs")))
(setq package-user-dir
(expand-file-name (format "~/.emacs.d/elpa.%s" emacs-major-version))
@@ -33,7 +51,7 @@
warning-suppress-types '((comp)))
;;; Paths
-(defvar jao-local-lisp-dir "~/lib/elisp"
+(defvar jao-local-lisp-dir (jao-d-l "~/Library/elisp" "~/lib/elisp")
"Directory for external elisp libraries and repos")
(defvar jao-data-dir (expand-file-name "data" jao-emacs-dir)
@@ -41,10 +59,12 @@
(defun jao-data-file (file) (expand-file-name file jao-data-dir))
-(setq jao-org-dir (expand-file-name "~/doc/org"))
+(defvar jao-doc-dir (expand-file-name (jao-d-l "~/Documents/doc" "~/doc")))
+
+(setq jao-org-dir (expand-file-name "org" jao-doc-dir))
(defvar jao-sink-dir
- (file-name-as-directory (expand-file-name "~/doc/sink"))
+ (file-name-as-directory (expand-file-name "sink" jao-doc-dir))
"Directory used for downloads and such.")
(defvar jao-site-dir (expand-file-name "site" jao-emacs-dir))
@@ -59,7 +79,8 @@
(defun jao-exec-path (dir)
(let ((fn (expand-file-name dir)))
- (add-to-list 'exec-path fn nil)
+ (setq exec-path (remove fn exec-path))
+ (add-to-list 'exec-path fn)
(setenv "PATH" (concat fn ":" (getenv "PATH")))))
(defun jao-load-path (subdir)
@@ -78,10 +99,21 @@
(dolist (f (directory-files libd t "^[^.]+$"))
(when (file-directory-p f) (add-to-list 'load-path f))))
-(defvar jao-info-dir (expand-file-name "~/doc/info"))
+(defvar jao-info-dir (expand-file-name "info" jao-doc-dir))
(require 'info)
(add-to-list 'Info-directory-list jao-info-dir)
+(jao-when-darwin
+ (setenv "HOMEBREW_PREFIX" "/opt/homebrew")
+ (setenv "HOMEBREW_CELLAR" "/opt/hombrew/Cellar")
+ (setenv "HOMEBREW_REPOSITORY" "/opt/homebrew")
+ (dolist (p '("/Applications/Emacs.app/Contents/MacOS/bin-arm64-11"
+ "/Applications/Emacs.app/Contents/MacOS/libexec-arm64-11"
+ "/opt/homebrew/sbin"
+ "/opt/homebrew/bin"))
+ (jao-exec-path p))
+ (add-to-list 'Info-directory-list "/opt/homebrew/share/info"))
+
;;;; custom location of custom.el and co.
(setq custom-file (jao-site-el "custom"))
(load custom-file)
@@ -90,12 +122,11 @@
(setq custom-raised-buttons nil)
;;; Preamble
-;;;; preamble (pre.el)
(jao-load-site-el "pre")
;;; System Utilities
-;;; persist
-(require 'persist)
+;;;; persist
+(use-package persist :ensure t)
;;;; (no) backups
(setq vc-make-backup-files nil
@@ -133,6 +164,7 @@
(setq use-short-answers t)
(setq inhibit-startup-message t)
(setq visible-bell t)
+(jao-when-darwin (setq ring-bell-function (lambda () (message "Ding!"))))
;;;; server
(setenv "EDITOR" "emacsclient")
@@ -143,62 +175,80 @@
(put 'list-timers 'disabled nil)
;;;; tramp
-(setq tramp-mode nil)
+(inhibit-remote-files)
;;;; sleep/awake
-(use-package jao-sleep)
-(jao-sleep-dbus-register)
+(use-package jao-sleep
+ :if (jao-is-linux)
+ :demand t
+ :config (jao-sleep-dbus-register))
;;;; process runners
(use-package jao-shell
:demand t
- :config (jao-shell-def-exec jao-trayer "trayer.sh")
:bind (("s-r" . jao-shell-exec)))
;;;; app launcher
-(jao-load-path "app-launcher")
-(use-package app-launcher
- :bind (("s-R" . app-launcher-run-app)))
+(jao-when-linux
+ (jao-load-path "app-launcher")
+ (use-package app-launcher
+ :bind (("s-R" . app-launcher-run-app))))
;;;; brightness control
-(jao-shell-def-exec jao-bright-set-up "brightnessctl" "-q" "s" "5%+")
-(jao-shell-def-exec jao-bright-set-down "brightnessctl" "-q" "s" "5%-")
+(jao-when-linux
+ (jao-shell-def-exec jao-bright-set-up "brightnessctl" "-q" "s" "5%+")
+ (jao-shell-def-exec jao-bright-set-down "brightnessctl" "-q" "s" "5%-")
-(defun jao-brightness ()
- (string-trim (or (cadr (jao-shell-cmd-lines "brightnessctl")) "(Unknown)")))
+ (defun jao-brightness ()
+ (string-trim (or (cadr (jao-shell-cmd-lines "brightnessctl")) "(Unknown)")))
-(defun jao-bright-show ()
- (interactive)
- (message "%s" (jao-brightness)))
+ (defun jao-bright-show ()
+ (interactive)
+ (message "%s" (jao-brightness)))
-(defun jao-bright-up ()
- (interactive)
- (jao-shell-exec "brightnessctl -q s 5%%+" t)
- (jao-bright-show))
+ (defun jao-bright-up ()
+ (interactive)
+ (jao-shell-exec "brightnessctl -q s 5%%+" t)
+ (jao-bright-show))
-(defun jao-bright-down ()
- (interactive)
- (jao-shell-exec "brightnessctl -q s 5%%-" t)
- (jao-bright-show))
+ (defun jao-bright-down ()
+ (interactive)
+ (jao-shell-exec "brightnessctl -q s 5%%-" t)
+ (jao-bright-show)))
;;;; keyboard
-(when (> emacs-major-version 27)
- (use-package repeat
- :config (setq repeat-echo-function 'repeat-echo-mode-line
- repeat-exit-key "SHIFT"
- repeat-exit-timeout 2))
+(jao-when-darwin
+ (setq mac-command-modifier 'meta)
+ (setq mac-option-modifier 'super)
+ (global-set-key (kbd "£") [?#]))
+
+(use-package repeat
+ :demand t
+ :config
+ (setq repeat-echo-function 'repeat-echo-mode-line
+ repeat-exit-key "SHIFT"
+ repeat-exit-timeout 2)
(repeat-mode))
-(defun jao-kb-toggle (&optional lyt)
- (interactive)
- (shell-command-to-string (or lyt
- (if (jao-kb-toggled-p)
- "setxkbmap us"
- "setxkbmap us -variant intl"))))
+(jao-when-linux
+ (defun jao-kb-toggle (&optional lyt)
+ (interactive)
+ (shell-command-to-string (or lyt
+ (if (jao-kb-toggled-p)
+ "setxkbmap us"
+ "setxkbmap us -variant intl"))))
+
+ (defun jao-set-uk-kb (&optional lyt)
+ (interactive)
+ (jao-kb-toggle "setxkbmap gb"))
-(defun jao-kb-toggled-p ()
- (not (string-empty-p
- (shell-command-to-string "setxkbmap -query|grep variant"))))
+ (defun jao-kb-disable-laptop ()
+ (interactive)
+ (jao-shell-exec "xinput float 13"))
+
+ (defun jao-kb-toggled-p ()
+ (not (string-empty-p
+ (shell-command-to-string "setxkbmap -query|grep variant")))))
(customize-set-variable 'default-input-method "catalan-prefix")
;; http://mbork.pl/2022-03-07_Transient_input_method
@@ -209,7 +259,7 @@
;;;; transient
(use-package transient
- :init (setq transient-show-popup t) ;; 2.0
+ :init (setq transient-show-popup t)
:demand t
:config
(transient-bind-q-to-quit))
@@ -240,9 +290,12 @@
;;;; disk monitoring
(use-package jao-dirmon
+ :if (jao-is-linux)
:commands jao-dirmon-report)
+
;;;; mailcap
(use-package mailcap
+ :if (jao-is-linux)
:config
(add-to-list 'mailcap-mime-extensions '(".JPEG" . "image/jpeg"))
(add-to-list 'mailcap-mime-extensions '(".JPG" . "image/jpeg"))
@@ -270,6 +323,14 @@
("imv-wayland \"%s\"" "image/.*" jao-wayland-enabled)
("imv-x11 \"%s\"" "image/.*")))))
+;;; tmr
+(use-package tmr
+ :ensure t
+ :init
+ (jao-when-linux
+ (setq tmr-sound-file
+ "/usr/share/sounds/freedesktop/stereo/message.oga")))
+
;;; Crypto
;;;; PGP, EPG, passwords
(setq auth-source-debug nil)
@@ -279,9 +340,11 @@
(setq auth-sources '("~/.emacs.d/authinfo.gpg" "~/.netrc"))
(use-package epa-file
- :init (setq epa-file-cache-passphrase-for-symmetric-encryption t)
+ :demand t
+ :init (setq epa-file-cache-passphrase-for-symmetric-encryption t
+ epa-file-encrypt-to "A247C4780736A6156BC8DA748C081D34D321D881"
+ plstore-encrypt-to epa-file-encrypt-to)
:config (epa-file-enable))
-(require 'epa-file)
(defun jao--get-user/password (h)
(let ((item (car (auth-source-search :type 'netrc :host h :max 1))))
@@ -299,19 +362,10 @@
`(jao-call-with-auth ,host (lambda (,usr ,pwd) ,@body)))
;;;; pass
-(use-package password-store
+(use-package password-store-menu
:ensure t
- :bind (("C-c p" . jao-transient-password)))
-
-(transient-define-prefix jao-transient-password ()
- ["Password store"
- [("c" "copy secret" password-store-copy)
- ("C" "copy field" password-store-copy-field)]
- [("i" "insert entry" password-store-insert)
- ("e" "edit entry" password-store-edit)
- ("g" "generate password" password-store-generate)]
- [("d" "delete entry" password-store-remove)
- ("r" "rename entry" password-store-rename)]])
+ :config (password-store-menu-enable)
+ :custom (password-store-menu-key "C-c p"))
;;; Fonts and color themes
;;;; widgets
@@ -333,7 +387,7 @@
(make-glyph-code ?│)))
;;;; transparency
-(defvar jao-transparent-only-bg (> emacs-major-version 28))
+(defvar jao-transparent-only-bg (jao-is-linux))
(defvar jao-frames-default-alpha
(cond ((eq window-system 'pgtk) 85)
@@ -361,7 +415,7 @@
(let ((level (if jao-transparent-frame 100 jao-frames-default-alpha)))
(jao-set-transparency level all)))
-(jao-set-transparency)
+(jao-when-linux (jao-set-transparency))
;;;; themes
(defun jao-colors-scheme-dark-p ()
@@ -391,7 +445,29 @@
(load-theme theme t)
(modify-all-frames-parameters `((font . ,jao-themes-default-face)))))
-(jao-themes-setup)
+(use-package doric-themes
+ :if (jao-is-darwin)
+ :ensure t
+ :demand t
+ :config
+ ;; These are the default values.
+ (setq doric-themes-to-toggle '(doric-light doric-marble))
+ (setq doric-themes-to-rotate doric-themes-collection)
+
+ (doric-themes-select 'doric-marble)
+
+ (set-face-attribute 'default nil :family "Menlo" :height 120)
+ ;; (set-face-attribute 'variable-pitch nil :family "Aporetic Sans" :height 1.0)
+ ;; (set-face-attribute 'fixed-pitch nil :family "Aporetic Sans Mono" :height 1.0)
+
+ :bind
+ (("<f5>" . doric-themes-toggle)
+ ("C-<f5>" . doric-themes-select)
+ ("M-<f5>" . doric-themes-rotate)))
+
+(jao-when-linux (jao-themes-setup))
+
+
;;; Help system
;;;; help buffers
@@ -452,7 +528,7 @@
(setq minibuffer-default-prompt-format " (default %s)")
(minibuffer-electric-default-mode 1)
-(jao-minibuffer-mode 1)
+(jao-minibuffer-mode (jao-d-l -1 1))
;;; Mode line
;;;; config
@@ -467,7 +543,7 @@
(column-number-mode -1)
;;;; jao-mode-line
-(defvar jao-mode-line-in-minibuffer t)
+(defvar jao-mode-line-in-minibuffer (jao-is-linux))
(use-package jao-mode-line
:commands (jao-mode-line-add-to-minibuffer-left
@@ -476,12 +552,11 @@
;;;; time display
(setq world-clock-list
- '(("Europe/Paris" "Barcelona")
- ("America/Los_Angeles" "Los Angeles")
- ("America/New_York" "New York")
- ("Europe/London" "London")
- ("Asia/Calcutta" "Bangalore")
- ("Asia/Tokyo" "Tokyo")))
+ '(("Europe/London" "Edinburgh")
+ ("Europe/Paris" "Barcelona")
+ ("Asia/Tokyo" "Tokyo")
+ ("America/Los_Angeles" "Corvallis")
+ ("America/New_York" "New York")))
(setq display-time-day-and-date nil
display-time-24hr-format nil
@@ -527,25 +602,22 @@
;;;; battery
(use-package battery
- :init (setq battery-load-low 15
- battery-load-critical 8
- battery-mode-line-limit 40
- battery-echo-area-format
- "%L %r %B (%p%% load, remaining time %t)"
- battery-mode-line-format " 🔋%b%p% "))
-
-(with-eval-after-load "jao-minibuffer"
- (unless jao-mode-line-in-minibuffer
- (jao-minibuffer-add-variable 'battery-mode-line-string 80)))
-
-;;; Notifications
-;;;; alert
-(use-package alert
- :ensure t
:init
- (setq alert-default-style 'message ;; 'libnotify
- alert-hide-all-notifications nil))
+ (setq battery-load-low 15
+ battery-load-critical 8
+ battery-mode-line-limit 40
+ battery-echo-area-format
+ "%L %r %B (%p%% load, remaining time %t)"
+ battery-mode-line-format " 🔋%b%p% ")
+
+ (with-eval-after-load "jao-minibuffer"
+ (if jao-mode-line-in-minibuffer
+ (display-battery-mode 1)
+ (jao-minibuffer-add-variable 'battery-mode-line-string 80)))
+ :config
+ (jao-when-darwin (display-battery-mode 1)))
+;;; Notifications
;;;; jao-notify
(use-package jao-notify
:demand t
@@ -553,6 +625,7 @@
;;;; tracking
(use-package tracking
+ :ensure t
:demand t
:init (setq tracking-position 'before-modes
tracking-frame-behavior nil
@@ -560,21 +633,23 @@
tracking-max-mode-line-entries 10
tracking-sort-faces-first t
tracking-shorten-modes '())
- :config
- (setq erc-track-enable-keybindings nil))
+ :config (setq erc-track-enable-keybindings nil))
(use-package jao-tracking
:demand t
- :init (setq jao-tracking-bkg (if (jao-colors-scheme-dark-p) "grey20" "grey93"))
+ :init
+ (setq jao-tracking-bkg (if (jao-colors-scheme-dark-p) "grey20" "grey93"))
:config (jao-tracking-setup t))
;;;; ednc
-(use-package ednc
- :ensure t
- :diminish)
+(jao-when-linux
+ (use-package ednc
+ :ensure t
+ :diminish nil))
(use-package jao-ednc
+ :if (jao-is-linux)
:demand t
:init (setq jao-ednc-use-tracking nil)
:commands (jao-ednc-setup)
@@ -602,75 +677,58 @@
(add-hook 'diary-list-entries-hook 'diary-sort-entries t)
;;;; calendar
-(setq appt-display-format nil)
-(appt-activate 1)
-(setq calendar-latitude 55.9533
- calendar-longitude -3.1883
- calendar-left-margin 4
- calendar-location-name "Edinburgh, Scotland"
- calendar-mark-diary-entries-flag t
- calendar-week-start-day 1 ;; 0 sunday
- calendar-date-echo-text '(format "ISO date: %s"
- (calendar-iso-date-string
- (list month day year))))
-
-(setq calendar-holidays
- '((holiday-fixed 1 1 "New Year's Day")
- (holiday-fixed 4 1 "April Fools' Day")
- (holiday-float 5 0 2 "Mother's Day")
- (holiday-fixed 3 19 "Father's Day")
- (holiday-float 11 4 4 "Thanksgiving")
- (holiday-fixed 12 25 "Christmas")
- (holiday-chinese-new-year)
- (solar-equinoxes-solstices)
- (holiday-sexp calendar-daylight-savings-starts
- (format "Daylight Saving Time Begins %s"
- (solar-time-string
- (/ calendar-daylight-savings-starts-time
- (float 60))
- calendar-standard-time-zone-name)))
- (holiday-sexp calendar-daylight-savings-ends
- (format "Daylight Saving Time Ends %s"
- (solar-time-string
- (/ calendar-daylight-savings-ends-time
- (float 60))
- calendar-daylight-time-zone-name)))))
-(add-to-list 'display-buffer-alist
- `(,(regexp-quote diary-fancy-buffer)
- (display-buffer-at-bottom)
- (window-parameters (mode-line-format . none))
- (window-height . fit-window-to-buffer)))
+(use-package calendar
+ :init
+ (setq appt-display-format nil
+ calendar-latitude 55.9533
+ calendar-longitude -3.1883
+ calendar-left-margin 4
+ calendar-location-name "Edinburgh, Scotland"
+ calendar-mark-diary-entries-flag t
+ calendar-week-start-day 1 ;; 0 sunday
+ calendar-date-echo-text '(format "ISO date: %s"
+ (calendar-iso-date-string
+ (list month day year))))
+ (setq calendar-holidays
+ '((holiday-fixed 1 1 "New Year's Day")
+ (holiday-fixed 4 1 "April Fools' Day")
+ (holiday-float 5 0 2 "Mother's Day")
+ (holiday-fixed 3 19 "Father's Day")
+ (holiday-float 11 4 4 "Thanksgiving")
+ (holiday-fixed 12 25 "Christmas")
+ (holiday-chinese-new-year)
+ (solar-equinoxes-solstices)
+ (holiday-sexp calendar-daylight-savings-starts
+ (format "Daylight Saving Time Begins %s"
+ (solar-time-string
+ (/ calendar-daylight-savings-starts-time
+ (float 60))
+ calendar-standard-time-zone-name)))
+ (holiday-sexp calendar-daylight-savings-ends
+ (format "Daylight Saving Time Ends %s"
+ (solar-time-string
+ (/ calendar-daylight-savings-ends-time
+ (float 60))
+ calendar-daylight-time-zone-name)))))
+
+ (setq org-calendar-insert-diary-entry-key nil
+ org-agenda-diary-file 'diary-file)
-(defun jao-diary--select ()
- (switch-to-buffer diary-fancy-buffer))
+ :config
+ (appt-activate 1)
+ (calendar-set-date-style 'european)
-(add-hook 'diary-fancy-display-mode-hook #'jao-diary--select)
-(setq org-calendar-insert-diary-entry-key nil
- org-agenda-diary-file 'diary-file)
+ (add-to-list 'display-buffer-alist
+ `(,(regexp-quote diary-fancy-buffer)
+ (display-buffer-at-bottom)
+ (window-parameters (mode-line-format . none))
+ (window-height . fit-window-to-buffer)))
-;;;; winttr
-(defun jao-weather (&optional wide)
- (interactive "P")
- (if (not wide)
- (message "%s"
- (jao-shell-string "curl -s"
- "https://wttr.in/?format=%l++%m++%C+%c+%t+%w++%p"))
- (jao-afio-goto-scratch)
- (if-let ((b (get-buffer "*wttr*")))
- (progn (pop-to-buffer b)
- (term-send-string (get-buffer-process nil) "clear;curl wttr.in\n"))
- (jao-exec-in-term "curl wttr.in" "*wttr*"))))
-(global-set-key (kbd "<f5>") #'jao-weather)
-
-;;; Files, dired and scratch buffer
-;;;; so-long
-(setq large-file-warning-threshold (* 200 1024 1024))
-
-;; (use-package so-long
-;; :ensure t
-;; :diminish)
-;; (global-so-long-mode 1)
+ (defun jao-diary--select ()
+ (switch-to-buffer diary-fancy-buffer))
+
+ (add-hook 'diary-fancy-display-mode-hook #'jao-diary--select))
;;;; persistent scratch
(use-package persistent-scratch
@@ -687,14 +745,18 @@
dired-dwim-target t
dired-kill-when-opening-new-dired-buffer t
dired-mouse-drag-files t
- wdired-create-parent-directories t
- dired-guess-shell-alist-user
+ wdired-create-parent-directories t)
+
+ (jao-when-linux
+ (setq dired-guess-shell-alist-user
'(;; ("\\.\\(png\\|jpe?g\\|tiff\\)" "feh" "xdg-open")
("\\.\\(mp[34]\\|m4a\\|ogg\\|flac\\|webm\\|mkv\\)" "mpv" "xdg-open")
- (".*" "xdg-open")))
+ (".*" "xdg-open"))))
(put 'dired-find-alternate-file 'disabled nil)
+
:hook (dired-mode . turn-on-gnus-dired-mode)
+
:bind (:map dired-mode-map
("C-c C-r" . wdired-change-to-wdired-mode)
("C-M-m" . gnus-dired-attach)))
@@ -714,7 +776,6 @@
;;;; wgrep
(use-package wgrep :ensure t)
-(require 'wgrep)
;;;; executable scripts
(add-hook 'after-save-hook
@@ -740,7 +801,7 @@
empty missing-newline-at-eof)
whitespace-line-column 80)
:hook (prog-mode . whitespace-mode)
- :diminish)
+ :diminish nil)
(use-package display-fill-column-indicator
:init (setq-default display-fill-column-indicator-column 80)
@@ -793,56 +854,62 @@
(require 'jao-custom-completion)
;;;; recoll
-(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 "))
-
-(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"))
(use-package consult-recoll
+ :if (jao-is-linux)
:commands (consult-recoll consult-recoll-embark-setup)
- :init (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)
+ :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)))
+
+ (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)
+
:config
+
(consult-customize consult-recoll :preview-key 'any)
+ (with-eval-after-load "embark" (consult-recoll-embark-setup))
(transient-define-prefix jao-transient-recoll ()
["Consult recoll queries"
@@ -853,8 +920,6 @@
:bind (("s-r" . #'jao-transient-recoll)))
-(with-eval-after-load "embark" (consult-recoll-embark-setup))
-
;;; Buffers
;;;; cursor and mark
(transient-mark-mode -1)
@@ -924,13 +989,12 @@
(global-set-key (kbd "C-c C-b") #'jao-buffer-same-mode-cmd)
;;;; projects
-(use-package project :demand t)
-(global-set-key "\C-xp" 'jao-prev-window)
+;; (use-package project :demand t)
+;; (use-package list-projects :ensure t)
;;;; buffer quit function (the triple ESC)
(setq buffer-quit-function (lambda () t))
-
;;;; redisplay escape hatch
;; (setq max-redisplay-ticks 2250000)
;;;; scrolling
@@ -946,6 +1010,44 @@
scroll-step 1
redisplay-skip-fontification-on-input nil))
+(use-package ultra-scroll
+ :ensure t
+ :init
+ (setq scroll-conservatively 3 ; or whatever value you prefer, since v0.4
+ scroll-margin 0) ; important: scroll-margin>0 not yet supported
+ :config
+ (ultra-scroll-mode 1))
+
+;;;; show diffs when running C-x s
+(add-to-list 'save-some-buffers-action-alist
+ `("d"
+ ,(lambda (buffer)
+ (diff-buffer-with-file (buffer-file-name buffer)))
+ "show diff between the buffer and its file"))
+
+;;;; copy buffer file name
+;; https://stackoverflow.com/questions/18812938/copy-full-file-path-into-copy-paste-clipboard
+(defun copy-buffer-file-name-as-kill (choice)
+ "Copy the buffer-file-name to the kill-ring"
+ (interactive "cCopy Buffer Name (F) Full, (D) Directory, (N) Name")
+ (let ((new-kill-string)
+ (name (if (eq major-mode 'dired-mode)
+ (dired-get-filename)
+ (or (buffer-file-name) ""))))
+ (cond ((eq choice ?f)
+ (setq new-kill-string name))
+ ((eq choice ?d)
+ (setq new-kill-string (file-name-directory name)))
+ ((eq choice ?n)
+ (setq new-kill-string (file-name-nondirectory name)))
+ (t (message "Quit")))
+ (when new-kill-string
+ (message "%s copied" new-kill-string)
+ (kill-new new-kill-string))))
+
+;;;; warnings display
+(setq warning-display-at-bottom nil)
+
;;; Windows
;;;; splitting and switch
(setq split-height-threshold 80
@@ -1004,6 +1106,8 @@
(global-set-key (format "\C-c%s" (1+ n)) (jao-nth-window n)))
'(0 1 2 3 4 5 6 7 8))
+(global-set-key "\C-xp" 'jao-prev-window)
+
;; transposing windows
(defun transpose-windows (arg)
"Transpose the buffers shown in two windows."
@@ -1036,10 +1140,10 @@
(use-package fringe)
(fringe-mode)
-(menu-bar-mode -1)
+(jao-when-linux (menu-bar-mode -1))
;; (setting it to nil avoids mouse wrapping after other-frame)
-(setq focus-follows-mouse (and window-system t))
+(setq focus-follows-mouse (and (jao-is-linux) window-system t))
(use-package scroll-bar)
(set-scroll-bar-mode nil)
@@ -1056,8 +1160,23 @@
;;;; afio
(use-package jao-afio
+ :if (jao-is-linux)
:demand t
- :config (jao-afio-setup (not window-system))
+ :config
+ (jao-afio-setup (not window-system))
+ (add-hook 'jao-afio-switch-hook 'jao-minibuffer-refresh t)
+
+ (defun jao-current--frame-id ()
+ (propertize (cond ((and (fboundp 'jao-exwm-enabled)
+ (jao-exwm-enabled-p)
+ (not (bound-and-true-p jao-exwm--use-afio))
+ (boundp 'exwm-workspace-current-index))
+ (format "F%s" exwm-workspace-current-index))
+ (t jao-afio-use-frames (or (jao-afio-frame-name) ""))
+ (t (format "%s" (or (jao-afio-frame-no) ""))))
+ 'face 'font-lock-warning-face))
+ (jao-minibuffer-add-variable '(jao-current--frame-id) 100)
+
:bind (("C-c f" . 'jao-afio-goto-main)
("C-c g" . 'jao-afio-goto-mail)
("C-c w" . 'jao-afio-goto-www)
@@ -1065,19 +1184,6 @@
("C-c t" . 'jao-afio-goto-chats)
("C-c 0" . 'jao-afio-goto-scratch)
("M-o" . 'jao-afio-toggle)))
-(add-hook 'jao-afio-switch-hook 'jao-minibuffer-refresh t)
-
-(defun jao-current--frame-id ()
- (propertize (cond ((and (fboundp 'jao-exwm-enabled)
- (jao-exwm-enabled-p)
- (not (bound-and-true-p jao-exwm--use-afio))
- (boundp 'exwm-workspace-current-index))
- (format "F%s" exwm-workspace-current-index))
- (t jao-afio-use-frames (or (jao-afio-frame-name) ""))
- (t (format "%s" (or (jao-afio-frame-no) ""))))
- 'face 'font-lock-warning-face))
-
-(jao-minibuffer-add-variable '(jao-current--frame-id) 100)
;;; Writing and writing modes
;;;; copyright notices
@@ -1134,8 +1240,9 @@
global-dictionary-tooltip-mode)
:bind (("C-c d" . dictionary-search)))
-(setq ispell-personal-dictionary
- (expand-file-name "~/.emacs.d/ispell.dict"))
+(use-package ispell
+ :custom ((ispell-personal-dictionary
+ (expand-file-name "~/.emacs.d/ispell.dict"))))
(use-package reverso
:ensure t
@@ -1206,358 +1313,20 @@
(setq LaTeX-biblatex-use-Biber t)
(setq bibtex-dialect 'biblatex)
:config
- (add-hook 'TeX-after-compilation-finished-functions 'TeX-revert-document-buffer)
+ (add-hook 'TeX-after-compilation-finished-functions
+ 'TeX-revert-document-buffer)
(add-hook 'LaTeX-mode-hook 'turn-on-reftex))
;;; Browsing
-;;;; variables
-(defvar jao-browse-doc-use-emacs-p t)
-(defvar jao-browse-url-function nil)
-(defvar jao-browse-url-external-function nil)
-
-;;;; url around point
-(defun jao-url-around-point (&optional current-url)
- (or (and (fboundp 'w3m-anchor) (w3m-anchor))
- (shr-url-at-point nil)
- (ffap-url-at-point)
- (thing-at-point 'url)
- (when current-url
- (or (and (fboundp 'w3m-anchor) (w3m-anchor))
- (and (derived-mode-p 'eww-mode) (plist-get eww-data :url))))))
-
-(defun jao--url-prompt (&optional prefix)
- (let* ((def (jao-url-around-point t))
- (prompt (concat prefix "URL" (if def (format " (%s): " def) ": "))))
- (read-string prompt nil nil def)))
-
-;;;; downloads using wget
-(defun jao-wget--get-title (filename)
- (or (and (derived-mode-p 'w3m-mode) (w3m-current-title))
- (plist-get eww-data :title)
- (and (not (string-blank-p (or filename "")))
- (subst-char-in-string ?- ? (capitalize (file-name-base filename))))))
-
-(defun jao-wget (url &optional user pwd)
- "Download URL using wget and kill a link for an org note."
- (let* ((def (file-name-nondirectory url))
- (pmt (format "Save %s to: " url))
- (read-file-name-function nil)
- (dest (expand-file-name
- (read-file-name pmt jao-sink-dir nil nil def)))
- (title (jao-wget--get-title dest))
- (src-url (or (jao-url-around-point t) (file-name-directory url)))
- (auth (when (and user pwd)
- `(,(format "--http-user=%s" user)
- ,(format "--http-password=%s" pwd))))
- (lnk (concat "doc:" (file-name-nondirectory dest))))
- (switch-to-buffer-other-window (get-buffer-create "*downloads*"))
- (erase-buffer)
- (kill-new (format "%s (from %s)"
- (org-link-make-string lnk title)
- (org-link-make-string src-url "here")))
- (apply 'make-term `("downloads" "wget" nil ,@auth "-O" ,dest ,url))))
-
-(defun jao-download (url &optional pws)
- "Download URL using wget"
- (interactive (list (jao--url-prompt)))
- (when url
- (let ((usr (and pws (read-string "Login name: ")))
- (pwd (and pws (read-passwd "Password: "))))
- (jao-wget url usr pwd))))
-
-(with-eval-after-load "embark"
- (define-key embark-url-map (kbd "d") #'jao-download))
-
-;;;; video
-(defvar jao-video--url-rx
- (format "^https?://\\(?:www\\.\\)?%s/.+"
- (regexp-opt '("youtu.be"
- "youtube.com"
- "blip.tv"
- "vimeo.com"
- "infoq.com")
- t)))
-
-(defvar jao-video--ext-rx
- (format "^https?://.+/.+\\.%s" (regexp-opt '("mp3" "webm" "mp4"))))
-
-(defun jao-video--url-p (url)
- (or (string-match-p jao-video--url-rx url)
- (string-match-p jao-video--ext-rx url)))
-
-(defun jao--remote-run (url prg)
- (let ((args (format "%s %s" prg (shell-quote-argument url))))
- (start-process-shell-command prg nil args)))
-
-(defun jao--mpv (url &rest _args) (jao--remote-run url "mpv"))
-(defun jao--vlc (url &rest _args) (jao--remote-run url "vlc"))
-
-(defvar jao--video-player 'jao--mpv)
-
-(defun jao-view-video (url)
- "Tries to stream a video from the current or given URL"
- (interactive (list (jao--url-prompt "Video ")))
- (when url (funcall jao--video-player url)))
-
-(defun jao-maybe-view-video (url &rest _ignored)
- (interactive)
- (if (y-or-n-p "View video (y) or web page (n)? ")
- (jao-view-video url)
- (funcall jao-browse-url-function url)))
-
-;;;; web browsers
-(defun jao-www--buffer-p (b)
- (with-current-buffer b
- (or (derived-mode-p 'w3m-mode 'eww-mode)
- (and (boundp 'exwm-class-name)
- (member exwm-class-name '("vlc" "mpv"))))))
-
-(require 'jao-custom-eww)
-;; (require 'jao-custom-w3m)
-
-;;;; browse-url
-(require 'browse-url)
-
-(setq browse-url-generic-program "~/bin/firehog")
-
-(defun jao-browse-with-external-browser (&rest url)
- "Browse with external hogging"
- (interactive "s")
- (let ((url (or (car url) (jao-url-around-point))))
- (if (not url)
- (message "No URL at point")
- (cond ((and (jao-exwm-enabled-p) (fboundp 'jao-exwm-firefox))
- (jao-exwm-firefox))
- (jao-river-enabled (jao-river-to-ws 2))
- (jao-sway-enabled (jao-sway-firefox)))
- (browse-url-generic url))))
-(setq jao-browse-url-external-function 'jao-browse-with-external-browser)
-
-(defun jao--fln (url)
- (shell-quote-argument
- (if (string-match "^[^:]*:/*?\\(/?[^/].*\\)" url)
- (match-string-no-properties 1 url)
- url)))
-
-(defun jao--browse-doc (url &rest _ignored)
- (let* ((url (substring-no-properties url))
- (file (jao--fln url)))
- (when file
- (unless (file-exists-p file)
- (error "File %s does not exist" file))
- (jao-open-doc file))))
-
-(defun jao--make-file-rx (exts)
- (format "file:/?/?.+\\.%s$" (regexp-opt exts)))
-
-(defvar jao--see-exts (jao--make-file-rx '("jpg" "jpeg" "png")))
-
-(defvar jao--doc-exts
- (jao--make-file-rx '("ps" "ps.gz" "pdf" "dvi" "djvu" "chm")))
-
-(defvar jao-browse-url-wget-exts
- '("ps" "pdf" "dvi" "djvu" "zip" "gz" "tgz"))
-
-(defvar jao-browse-external-domains
- '("github.com" "gitlab.com" "slack.com" "meet.google.com" "docs.google.com"
- "x.com" "twitter.com" "t.com" "linkedin.com" "bigml.com" "slack.com"
- "zoom.us"))
-
-(defvar jao-browse--external-regexp
- (format "https?://.*%s\\(/.*\\)?"
- (regexp-opt jao-browse-external-domains)))
-
-(defun jao-wget--regexp ()
- (concat "^http[s]?://.+\\(\\."
- (mapconcat 'identity jao-browse-url-wget-exts "\\|\\.")
- "\\)\\'"))
-
-(defun jao--see (url &rest _r)
- (start-process-shell-command "see" nil (format "see %s" (jao--fln url))))
-
-(defun jao--find-file-other-window (url &rest _)
- (find-file-other-window (jao--fln url)))
-
-(defvar jao-browse--sound-rx
- (format "^https?://.*/.*\\.%s" (regexp-opt '("mp3" "flv"))))
-
-(defun jao-browse-play-sound-url (url &rest _)
- (jao-mpc-add-or-play-url url))
-
-(defun jao-browse-url-browse (&rest args)
- (apply jao-browse-url-function args))
-
-(setq browse-url-handlers
- `((jao-video--url-p . jao-maybe-view-video)
- (,jao--doc-exts . jao--browse-doc)
- (,jao--see-exts . jao--see)
- ("^file://?.+\\.html?$" . ,jao-browse-url-function)
- ("^file://?" . jao--find-file-other-window)
- (,jao-browse--external-regexp . ,jao-browse-url-external-function)
- ("^https?://.*\\.gotomeeting\\.com\\.*" . browse-url-chrome)
- (,jao-browse--sound-rx . jao-browse-play-sound-url)
- (,(jao-wget--regexp) . jao-download)
- ("." . jao-browse-url-browse)))
-
-(when (< emacs-major-version 28)
- (setf (alist-get 'jao-video--url-p browse-url-handlers nil t) nil)
- (setq browse-url-browser-function browse-url-handlers))
-
-;;;; subscribe to rss using r2e
-(autoload 'View-quit "view")
-
-(defun jao-rss--find-url ()
- (save-excursion
- (when (derived-mode-p 'w3m-mode 'eww-mode)
- (if (fboundp 'w3m-view-source) (w3m-view-source) (eww-view-source)))
- (goto-char (point-min))
- (when (re-search-forward
- "type=\"application/\\(?:atom\\|rss\\)\\+xml\" +" nil t)
- (let ((url (save-excursion
- (when (re-search-forward
- "href=\"\\([^\n\"]+\\)\"" nil t)
- (match-string-no-properties 1))))
- (title (when (re-search-forward
- "\\(?:title=\"\\([^\n\"]+\\)\" +\\)" nil t)
- (match-string-no-properties 1))))
- (cond ((derived-mode-p 'w3m-view-mode) (w3m-view-source))
- ((string-match-p ".*\\*eww-source\\b.*" (buffer-name))
- (View-quit)))
- (when url (cons url (or title "")))))))
-
-(defun jao-rss2e-append (name url mbox)
- (with-current-buffer (find-file-noselect "~/.config/rss2email.cfg")
- (goto-char (point-max))
- (insert "[feed." name "]\nurl = " url)
- (insert "\nto = " mbox "+" name "@localhost")
- (insert "\nmaildir-mailbox = " mbox "\n\n")
- (save-buffer)))
-
-(defun jao-rss--feeds-dirs ()
- (mapcar (lambda (d) (cadr (split-string d "\\.")))
- (directory-files "~/.emacs.d/gnus/Mail/" nil "^feeds")))
-
-(defun jao-rss-subscribe (url)
- "Subscribe to a given RSS URL. If URL not given, look for it."
- (interactive (list (or (jao-url-around-point)
- (jao-rss--find-url)
- (read-string "Feed URL: "))))
- (let* ((url+title (ensure-list url))
- (url (car url+title))
- (title (cdr url+title)))
- (unless url (error "No feeds found"))
- (let ((url (if (string-match "^feed:" url) (substring url 5) url)))
- (when (y-or-n-p (format "Subscribe to <%s>? " url))
- (let* ((name (read-string "Feed name: " title))
- (cats (cons "prog" (jao-notmuch--subtags "feeds")))
- (cat (completing-read "Category: " cats nil t))
- (subs (format "r2e add %s '%s' feeds.%s@localhost"
- name url cat)))
- ;; (jao-rss2e-append name url cat)
- (shell-command-to-string subs)
- (shell-command (format "r2e run %s" name)))))))
+(jao-when-linux
+ (require 'jao-custom-browse)
+ (require 'jao-custom-eww))
;;; PDFs and other docs
-;;;; open pdfs
-(use-package jao-pdf :demand t)
-
-(use-package saveplace-pdf-view
- :ensure t
- :demand t
- :after doc-view)
-
-(setq jao-open-doc-fun 'jao-find-or-open)
-(setq jao-org-open-pdf-fun 'jao-find-or-open)
-
-(defun jao-zathura-open (file page)
- (let ((id (jao-x11-search-window (jao-pdf-zathura-title-rx file))))
- (if (string-blank-p id)
- (progn
- (when jao-xmonad-enabled (jao-x11-goto-ws 2))
- (jao-shell-exec (jao-pdf-zathura-open-cmd file page)))
- (let* ((page (if page (format " && xdotool type %dg" page) ""))
- (cmd (format "xdotool windowactivate %s%s" id page)))
- (jao-shell-exec cmd t)))))
-
-(defun jao-x11-zathura-goto-org (&optional title no-ask)
- (let ((title (or title (jao-shell-string "xdotool"
- "getactivewindow"
- "getwindowname"))))
- (jao-org-open-from-zathura title no-ask)))
-
-(defun jao-find-or-open (file &optional page height)
- (cond ((and jao-browse-doc-use-emacs-p window-system)
- (let* ((buffs (buffer-list))
- (b (catch 'done
- (while buffs
- (when (string-equal (buffer-file-name (car buffs)) file)
- (throw 'done (car buffs)))
- (setq buffs (cdr buffs))))))
- (jao-afio-goto-docs)
- (if b (pop-to-buffer b) (find-file file))
- (when page (jao-doc-view-goto-page page height))))
- (jao-river-enabled (jao-river-open-with-zathura file page))
- (jao-sway-enabled (jao-sway-open-with-zathura file page))
- (t (jao-zathura-open file page))))
-
-(defun jao-open-doc (&optional file page height)
- (interactive)
- (when-let (file (or file
- (read-file-name "Document: "
- (concat jao-org-dir "/doc/"))))
- (funcall jao-open-doc-fun file page height)))
-(defun jao-select-pdf ()
- (interactive)
- (jao-buffer-same-mode '(pdf-view-mode doc-view-mode)
- #'jao-afio-goto-docs))
+;;;; doc view &co.
-(defun jao-open-with-zathura ()
- (interactive)
- (when-let (f buffer-file-name)
- (let ((p (jao-doc-view-current-page)))
- (cond (jao-river-enabled (jao-river-open-with-zathura f p))
- (jao-sway-enabled (jao-sway-open-with-zathura f p))
- (t (jao-zathura-open f p))))))
-
-;; doc:// links for browse-url
-(defun jao-open-doc-url (url &rest _)
- (when (string-match "doc://\\([^?]+\\)\\(\\?.*\\)?" url)
- (let ((file (match-string 1 url))
- (page (when-let* ((qs (match-string 2 url))
- (long (> (length qs) 1))
- (ps (url-parse-query-string (substring qs 1)))
- (pn (cadr (assoc "page" ps))))
- (string-to-number pn))))
- (jao-open-doc (expand-file-name (concat "doc/" file) jao-org-dir) page))))
-
-(add-to-list 'browse-url-handlers (cons "^doc://.+" 'jao-open-doc-url))
-
-;;;; doc-view
-(use-package doc-view
- :init
- (setq doc-view-cache-directory "~/.emacs.d/cache/docview"
- doc-view-resolution 110
- doc-view-continuous t
- doc-view-conversion-refresh-interval 1
- doc-view-mupdf-use-svg t)
- :hook ((doc-view-mode . jao-doc-session-mark))
- :bind (:map doc-view-mode-map
- ("j" . doc-view-next-line-or-next-page)
- ("J" . doc-view-scroll-up-or-next-page)
- ("k" . doc-view-previous-line-or-previous-page)
- ("K" . doc-view-scroll-down-or-previous-page)
- ("z" . jao-open-with-zathura)))
-
-(use-package jao-doc-session :demand t)
-
-(use-package jao-doc-view
- :demand t
- :bind (:map doc-view-mode-map
- ("b" . jao-doc-view-back)
- ("B" . jao-doc-view-forward)
- ("S" . jao-doc-session-save)
- ("u" . jao-doc-view-visit-url)))
+(jao-when-linux (require 'jao-custom-pdf))
;;;; epub
(use-package nov
@@ -1571,47 +1340,8 @@
(jao-doc-session-mark nov-file-name))
(add-hook 'nov-mode-hook #'jao-nov-register-session))
-;;;; transient
-(defun jao-org-pdf-goto-org-linking ()
- (interactive)
- (jao-org-pdf-goto-org 4))
-
-(jao-transient-major-mode doc-view
- ["Notes"
- ("o" "notes file" jao-org-pdf-goto-org)
- ("O" "notes file, linking" jao-org-pdf-goto-org-linking)]
- ["Navigation"
- ("b" "back jump" jao-doc-view-back)
- ("B" "forward jump" jao-doc-view-back)
- ("u" "visit URL" jao-doc-view-visit-url)]
- ["Slices"
- ("cb" "bounding box" doc-view-set-slice-from-bounding-box)
- ("cm" "using mouse" doc-view-set-slice-using-mouse)]
- ["Session"
- ("s" "load session" jao-afio-open-pdf-session)
- ("S" "save session" jao-doc-session-save)
- ("d" "visit cache directory" doc-view-dired-cache)]
- ["External viewers"
- ("z" "open with zathura" jao-open-with-zathura)])
-
-(with-eval-after-load "pdf-view"
- (jao-transient-major-mode pdf-view
- ["Notes"
- ("o" "notes file" jao-org-pdf-goto-org)
- ("O" "notes file, linking" jao-org-pdf-goto-org-linking)]
- ["Navigation"
- ("b" "back jump" pdf-history-backward)
- ("f" "forward jump" pdf-history-forward)]
- ["Session"
- ("s" "load session" jao-afio-open-pdf-session)
- ("S" "save session" jao-doc-session-save)]
- ["External viewers"
- ("z" "open with zathura" jao-open-with-zathura)]))
-
-;; (transient-get-suffix 'jao-transient-pdf-view '(0 -1))
-
;;; Email
-(require 'jao-custom-email)
+(jao-when-linux (require 'jao-custom-email))
;;; Shells and terms
;;;; shell modes
@@ -1773,17 +1503,11 @@
(use-package eshell-autojump :ensure t)
;;;;; completion
-(defun jao-eshell-completion-capf ()
- (let* ((b (save-excursion (eshell-bol) (point)))
- (c (bash-completion-dynamic-complete-nocomint b (point) t)))
- (when (and c (listp c))
- (append c '(:exclusive no)))))
(defun jao-eshell--set-up-completion ()
- (setq-local completion-styles '(basic partial-completion)
- completion-at-point-functions
- '(jao-eshell-completion-capf
- pcomplete-completions-at-point t)))
+ (setq-local completion-styles '(basic partial-completion))
+ (add-hook 'completion-at-point-functions
+ 'bash-completion-capf-nonexclusive nil t))
(use-package bash-completion
:ensure t
@@ -1799,11 +1523,11 @@
;;;;; workarounds
;; at some point, bash completion started insertig the TAB
;; after the commands ends
-(defun jao-eshell--clean-prompt ()
- (eshell-bol)
- (ignore-errors (kill-line)))
+;; (defun jao-eshell--clean-prompt ()
+;; (eshell-bol)
+;; (ignore-errors (kill-line)))
-(add-hook 'eshell-after-prompt-hook 'jao-eshell--clean-prompt)
+;; (add-hook 'eshell-after-prompt-hook 'jao-eshell--clean-prompt)
;;;;; keybindings
(defun jao-eshell--kbds ()
@@ -1842,6 +1566,13 @@
:ensure t
:commands magit-status
:init
+ (setq magit-repository-directories
+ (jao-d-l
+ '(("/Users/jao/Projects" 3))
+ '(("/home/jao/usr/bigml" . 2)
+ ("/home/jao/usr/jao" . 3)
+ ("/usr/local/src" . 1))))
+
(setq magit-status-initial-section nil
magit-define-global-key-bindings nil
magit-completing-read-function 'magit-builtin-completing-read
@@ -1853,10 +1584,6 @@
magit-omit-untracked-dir-contents t
magit-process-connection-type nil
magit-push-always-verify nil
- magit-repository-directories
- '(("/home/jao/usr/bigml" . 2)
- ("/home/jao/usr/jao" . 3)
- ("/usr/local/src" . 1))
magit-save-repository-buffers 'dontask
magit-section-visibility-indicator '("…" . t)
magit-status-buffer-switch-function 'switch-to-buffer
@@ -1870,539 +1597,24 @@
(setq forge-topic-list-limit (cons 100 -1)
forge-pull-notifications nil)
:config
- (add-hook 'magit-status-sections-hook #'forge-insert-assigned-pullreqs t)
- (add-hook 'magit-status-sections-hook #'forge-insert-assigned-issues t)
(use-package embark-vc :ensure t)
:bind ((:map forge-topic-mode-map ("M-w" . copy-region-as-kill))))
-
-;;;; code reviews
-(use-package code-review
- :disabled t
- :ensure t
- :after forge
- :bind (:map magit-status-mode-map
- ("C-c C-r" . code-review-forge-pr-at-point)))
-
;;;; other git packages
(use-package git-timemachine :ensure t)
-(use-package consult-git-log-grep
- :ensure t
- :custom (consult-git-log-grep-open-function #'magit-show-commit)
- :bind (("C-c K" . consult-git-grep)))
+;; (use-package consult-git-log-grep
+;; :ensure t
+;; :custom (consult-git-log-grep-open-function #'magit-show-commit)
+;; :bind (("C-c K" . consult-git-grep)))
;; git config --local git-link.remote / git-link.branch
(use-package git-link :ensure t)
(use-package git-modes :ensure t)
-;;;; jenkins
-(use-package jenkins
- :ensure t
- :init
- ;; one also needs jenkins-api-token, jenkins-username and jenkins-url
- ;; optionally: jenkins-colwidth-id, jenkins-colwidth-last-status
- (setq jenkins-colwidth-name 35)
- :config
- (defun jao-jenkins-first-job (&rest _)
- (interactive)
- (goto-char (point-min))
- (when (re-search-forward "^- Job" nil t)
- (goto-char (match-beginning 0))))
- (add-hook 'jenkins-job-view-mode-hook #'jao-jenkins-first-job)
- (advice-add 'jenkins-job-render :after #'jao-jenkins-first-job)
-
- (defun jenkins-refresh-console-output ()
- (interactive)
- (let ((n (buffer-name)))
- (when (string-match "\\*jenkins-console-\\([^-]+\\)-\\(.+\\)\\*$" n)
- (jenkins-get-console-output (match-string 1 n) (match-string 2 n))
- (goto-char (point-max)))))
-
- :bind (:map jenkins-job-view-mode-map
- (("n" . next-line)
- ("p" . previous-line)
- ("f" . jao-jenkins-first-job)
- ("RET" . jenkins--show-console-output-from-job-screen))
- :map jenkins-console-output-mode-map
- (("n" . next-line)
- ("p" . previous-line)
- ("g" . jenkins-refresh-console-output))))
-
;;; Programming
-;;;; automatic modes
-(add-to-list 'auto-mode-alist '("\\.mix\\'" . hexl-mode))
-(add-to-list 'auto-mode-alist '("\\.m4\\'" . m4-mode))
-(add-to-list 'auto-mode-alist '("\\.am\\'" . makefile-mode))
-(add-to-list 'auto-mode-alist '("\\.pl\\'\\|\\.pm\\'" . cperl-mode))
-
-;;;; symbol overlay
-(use-package symbol-overlay
- :ensure t
- :config
- (defun jao-symbol-reveal (&rest _)
- (when outline-minor-mode (outline-show-entry)))
- (advice-add 'symbol-overlay-basic-jump :after 'jao-symbol-reveal)
-
- (defun jao-symbol-put-and-next ()
- (interactive)
- (symbol-overlay-put)
- (symbol-overlay-jump-next))
-
- (defun jao-symbol-put-and-prev ()
- (interactive)
- (symbol-overlay-put)
- (symbol-overlay-jump-prev))
-
- :bind (:map prog-mode-map (("M-i" . symbol-overlay-put)
- ("M-n" . jao-symbol-put-and-next)
- ("M-p" . jao-symbol-put-and-prev)))
- :hook (prog-mode . symbol-overlay-mode)
- :diminish " ^")
-
-;;;; eglot
-(use-package eglot
- :bind (:map eglot-mode-map (("C-h ." . jao-eldoc-toggle))))
-
-;;;; paredit and parens
-(require 'paren)
-(show-paren-mode t)
-(setq show-paren-context-when-offscreen t
- show-paren-when-point-inside-paren nil)
-
-(use-package paredit
- :ensure t
- :commands paredit-mode
- :hook ((pie-mode . paredit-mode)
- (scheme-mode . paredit-mode)
- (clojure-mode . paredit-mode)
- (emacs-lisp-mode . paredit-mode)
- ;; (eval-expression-minibuffer-setup . paredit-mode)
- (lisp-interaction-mode . disable-paredit-mode))
- :diminish ((paredit-mode . " þ")))
-
-;;;; diff/ediff
-(setq ediff-split-window-function 'split-window-horizontally)
-(setq ediff-make-buffers-readonly-at-startup nil)
-(setq ediff-window-setup-function 'ediff-setup-windows-plain)
-(setq ediff-keep-variants nil)
-
-;;;; compilation
-;;;;; compilation mode options
-(require 'compile)
-(setq compilation-scroll-output t)
-(setq compilation-error-regexp-alist
- (remove 'omake compilation-error-regexp-alist))
-;; (add-hook 'compilation-mode-hook #'visual-line-mode)
-
-;;;;; mode line (no "Compiling"!)
-(require 'compile)
-(diminish 'compilation-minor-mode " ‡")
-(when (< emacs-major-version 27)
- (setcdr (assq 'compilation-in-progress minor-mode-alist) '(" ‡")))
-(when (> emacs-major-version 26)
- (setcdr (assq 'compilation-in-progress mode-line-modes) '("‡ ")))
-
-;;;;; colorizing compilation buffer
-(setq compilation-message-face 'default)
-(require 'ansi-color)
-(defun endless/colorize-compilation ()
- "Colorize from `compilation-filter-start' to `point'."
- (let ((inhibit-read-only t))
- (ansi-color-apply-on-region
- compilation-filter-start (point))))
-
-(add-hook 'compilation-filter-hook #'endless/colorize-compilation)
-
-;;;;; compilation commands
-(use-package jao-compilation
- :commands jao-compilation-setup
- :bind (("C-c C" . compile)
- ("C-c c" . jao-compile)))
-(jao-compilation-setup)
-
-;;;;; next error
-(setq next-error-find-buffer-function
- #'next-error-buffer-on-selected-frame
- next-error-verbose t)
-
-;;;; flymake
-(use-package flymake
- :ensure t
- :custom ((flymake-mode-line-format '(" " flymake-mode-line-counters)))
- :config
- (jao-define-attached-buffer "^\\*Flymake diagnostics .*\\*\\'")
-
- (transient-define-prefix jao-transient-flymake ()
- ["Flymake"
- ("d" "show diagnostics" flymake-show-buffer-diagnostics)
- ("i" "show diagnostic" flymake-show-diagnostic)
- ("n" "next error" flymake-goto-next-error)
- ("p" "previous error" flymake-goto-prev-error)
- ("c" "consult flymake" consult-flymake)])
-
- :bind (:map flymake-mode-map (("M-m" . jao-transient-flymake))))
-
-;;;; workarounds
-(setq c-type-finder-time-slot nil)
-
-;;;; outline minor mode
-(use-package outline
- :init (setq outline-minor-mode-use-buttons nil
- outline-minor-mode-use-margins nil
- outline-minor-mode-cycle t))
-
-(defvar-local jao-outline-folded nil)
-(dolist (v '(4 5 outline-show-only-headings))
- (add-to-list 'safe-local-variable-values `(outline-default-state . ,v)))
-
-(defun jao-outline-minor-mode-hide-all (&optional arg)
- (interactive "P")
- (outline-hide-sublevels (if arg 5 4)))
-
-(defun jao-outline-minor-expand-all ()
- (when jao-outline-minor-mode (outline-show-all)))
-
-(defun jao-outline-minor-mode-toogle-fold (&optional arg)
- (interactive "P")
- (if (setq jao-outline-folded (not jao-outline-folded))
- (jao-outline-minor-mode-hide-all arg)
- (jao-outline-minor-expand-all)))
-
-(use-package outline-minor-faces
- :ensure t
- :after outline)
-
-(define-minor-mode jao-outline-minor-mode
- "Minor outline mode for programming languages"
- :lighter ""
- :keymap `((,(kbd "C-c C-n") . outline-next-visible-heading)
- (,(kbd "C-c C-p") . outline-previous-visible-heading)
- (,(kbd "C-c o") . consult-outline)
- (,(kbd "<f3>") . jao-outline-minor-mode-toogle-fold))
- (if jao-outline-minor-mode
- (progn (setq-local outline-level #'outline-level
- outline-regexp (format "[%s]\\{3,\\} " comment-start))
- (outline-minor-mode 1)
- (outline-minor-faces-mode 1))
- (outline-minor-mode -1)
- (outline-minor-faces-mode -1)))
-
-(add-hook 'find-function-after-hook #'jao-outline-minor-expand-all)
-
-;;; Programming languages
-;;;; Elisp
-(add-hook 'emacs-lisp-mode-hook #'jao-outline-minor-mode)
-
-(use-package edit-list :ensure t)
-(use-package package-lint :ensure t)
-;; (use-package tree-inspector :ensure t)
-
-(defun elisp-disassemble (function)
- (interactive (list (function-called-at-point)))
- (disassemble function))
-
-(defun elisp-pp (sexp)
- (with-output-to-temp-buffer "*Pp Eval Output*"
- (pp sexp)
- (with-current-buffer standard-output
- (emacs-lisp-mode))))
-
-(defun elisp-macroexpand (form)
- (interactive (list (form-at-point 'sexp)))
- (elisp-pp (macroexpand form)))
-
-(defun elisp-macroexpand-all (form)
- (interactive (list (form-at-point 'sexp)))
- (elisp-pp (macroexpand-all form)))
-
-(defun elisp-find-definition (name)
- (interactive (list (thing-at-point 'symbol)))
- (cond (name
- (let ((symbol (intern-soft name))
- (search (lambda (fun sym)
- (let* ((r (save-excursion (funcall fun sym)))
- (buffer (car r))
- (point (cdr r)))
- (cond ((not point)
- (error "Found no definition for %s in %s"
- name buffer))
- (t
- (switch-to-buffer buffer)
- (goto-char point)
- (recenter 1)))))))
- (cond ((fboundp symbol)
- (xref-push-marker-stack)
- (funcall search 'find-function-noselect symbol))
- ((boundp symbol)
- (xref-push-marker-stack)
- (funcall search 'find-variable-noselect symbol))
- (t
- (message "Symbol not bound: %S" symbol)))))
- (t (message "No symbol at point"))))
-
-
-(defun elisp-bytecompile-and-load ()
- (interactive)
- (or buffer-file-name
- (error "The buffer must be saved in a file first"))
- (require 'bytecomp)
- ;; Recompile if file or buffer has changed since last compilation.
- (when (and (buffer-modified-p)
- (y-or-n-p (format "save buffer %s first? " (buffer-name))))
- (save-buffer))
- (let ((filename (expand-file-name buffer-file-name)))
- (with-temp-buffer
- (byte-compile-file filename))))
-
-(use-package elisp-mode
- :bind (:map emacs-lisp-mode-map
- (("C-c C-M" . emacs-lisp-macroexpand)
- ("C-c C-m" . elisp-macroexpand-all)
- ("C-c C-k" . elisp-bytecompile-and-load)
- ;; ("C-c C-p" . pp-eval-last-sexp)
- ("M-." . elisp-find-definition)
- ("M-," . pop-tag-mark)
- ("C-c <" . lc-show-package-summary))))
-
-;;;; Clojure
-(use-package clojure-mode
- :ensure t
- :config
- (defun jao-clojure--fix-things ()
- (setq-local completion-styles '(basic partial-completion emacs22))
- (eldoc-mode 1)
- (setq mode-name "λ"))
- :hook (clojure-mode . jao-clojure--fix-things))
-
-(use-package cider
- :ensure t
- :commands cider-mode
- :init (setq cider-annotate-completion-candidates t
- cider-auto-select-error-buffer nil
- cider-auto-select-test-report-buffer nil
- cider-eldoc-display-for-symbol-at-point t
- cider-eldoc-ns-function #'identity ;; #'cider-last-ns-segment
- cider-enrich-classpath nil
- cider-lein-parameters "repl :headless :host localhost"
- cider-mode-line " ÷"
- cider-prompt-for-symbol nil
- cider-repl-history-file
- (expand-file-name "~/.emacs.d/cache/cider.history")
- cider-repl-pop-to-buffer-on-connect nil
- cider-repl-use-pretty-printing t
- cider-show-error-buffer 'except-in-repl
- cider-test-show-report-on-success nil
- cider-use-fringe-indicators nil
- cider-use-overlays nil
- clojure-docstring-fill-column 72
- 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
- (lambda () (frame-parameter nil 'background-color)))
- (setq cider-test-items-background-color
- (frame-parameter nil 'background-color)))
-
-(use-package cider-macroexpansion
- :after cider
- :diminish " µ")
-
-;;;; Geiser
-(defun jao-org--set-geiser-impl () (setq-local geiser-repl--impl 'guile))
-(add-hook 'org-mode-hook #'jao-org--set-geiser-impl)
-
-(jao-load-path "geiser")
-(use-package geiser
- :init
- (setq geiser-repl-history-filename "~/.emacs.d/cache/geiser-history"
- geiser-repl-startup-time 20000
- geiser-debug-auto-display-images t
- geiser-log-verbose t)
- :config
- (dolist (m '(geiser-repl-mode geiser-doc-mode geiser-debug-mode))
- (jao-define-attached-buffer `(major-mode . ,m) 0.4)))
-
-(jao-load-path "geiser-guile")
-(use-package geiser-guile)
-
-(jao-load-path "geiser-chez")
-(use-package geiser-chez)
-
-;; (jao-load-path "geiser/mit")
-;; (use-package geiser-mit)
-;; (jao-load-path "geiser/chicken")
-;; (use-package geiser-chicken)
-
-;; (jao-load-path "geiser/chibi")
-;; (use-package geiser-chibi)
-
-;; (jao-load-path "geiser/gambit")
-;; (use-package geiser-gambit)
-
-;; (jao-load-path "geiser/gauche")
-;; (use-package geiser-gauche)
-
-;;;; Haskell
-;;;;; packages
-;; (jao-load-path "haskell-mode")
-
-(use-package haskell-mode
- :ensure t
- :custom
- ((inferior-haskell-find-project-root t)
- (haskell-check-remember-last-command-p nil)
- (haskell-completing-read-function 'completing-read)
- (haskell-font-lock-symbols nil)
- (haskell-hoogle-command "hoogle")
- (haskell-interactive-popup-errors t)
- (haskell-process-auto-import-loaded-modules t)
- (haskell-process-log t)
- (haskell-process-suggest-remove-import-lines t)
- (haskell-process-suggest-hoogle-imports t)
- (haskell-process-type 'cabal-repl)
- (haskell-process-use-presentation-mode t)
- (haskell-stylish-on-save nil)
- (haskell-tags-on-save t))
-
- :init
- ;; For use with M-x align
- (require 'align)
- (add-to-list 'align-rules-list
- '(haskell-types
- (regexp . "\\(\\s-+\\)\\(::\\|∷\\)\\s-+")
- (modes quote (haskell-mode haskell-literate-mode))))
- (add-to-list 'align-rules-list
- '(haskell-assignment
- (regexp . "\\(\\s-+\\)=\\s-+")
- (modes quote (haskell-mode haskell-literate-mode))))
- (add-to-list 'align-rules-list
- '(haskell-arrows
- (regexp . "\\(\\s-+\\)\\(->\\|→\\)\\s-+")
- (modes quote (haskell-mode haskell-literate-mode))))
- (add-to-list 'align-rules-list
- '(haskell-left-arrows
- (regexp . "\\(\\s-+\\)\\(<-\\|←\\)\\s-+")
- (modes quote (haskell-mode haskell-literate-mode))))
-
- :config
- (defun jao-haskell-hoogle (no-info)
- (interactive "P")
- (haskell-hoogle (format "%s" (haskell-ident-at-point)) (not no-info)))
-
- (put 'haskell-process-args-cabal-repl
- 'safe-local-variable
- (apply-partially #'seq-every-p #'stringp))
-
- (defun jao-haskell-eldoc (cb)
- (let ((msg (or (haskell-doc-current-info--interaction t)
- (haskell-doc-sym-doc (haskell-ident-at-point))
- "")))
- (funcall cb (replace-regexp-in-string "[\n ]+" " " msg))))
-
- (setq tags-revert-without-query t)
-
- (defun jao-haskell-mode ()
- (require 'haskell-doc)
- (setq-local eldoc-documentation-function 'eldoc-documentation-default
- eldoc-documentation-functions '(jao-haskell-eldoc))
- (eldoc-mode))
-
- (dolist (h '(jao-haskell-mode
- haskell-decl-scan-mode
- haskell-indentation-mode
- interactive-haskell-mode))
- (add-hook 'haskell-mode-hook h))
-
- (add-hook 'haskell-presentation-mode-hook (lambda () (whitespace-mode -1)))
-
- :bind (:map haskell-mode-map
- (("C-c C-d" . jao-haskell-hoogle)
- ("C-c C-s" . haskell-session-change-target)
- ("C-c h" . haskell-hoogle)
- ("C-c t" . haskell-doc-show-type)
- ("C-c C-e" . haskell-command-insert-language-pragma)
- ("C-M-n" . flymake-goto-next-error)
- ("C-M-p" . flymake-goto-prev-error)
- ("<f3>" . haskell-session-kill))))
-
-(use-package hlint-refactor
- :ensure t
- :after haskell-mode
- :hook ((haskell-mode . hlint-refactor-mode))
- :bind (:map haskell-mode-map (("C-M-h" . 'hlint-refactor-refactor-at-point)
- ("C-M-S-h" . 'hlint-refactor-refactor-buffer)))
- :diminish)
-
-(use-package flymake-hlint
- :ensure t
- :after haskell-mode
- :hook ((haskell-mode . flymake-hlint-load)))
-
-
-(use-package consult-hoogle
- :ensure t)
-
-(require 'haskell)
-
-(diminish 'interactive-haskell-mode " λ")
-(diminish 'haskell-doc-mode)
-(diminish 'haskell-decl-scan-mode)
-
-(jao-define-attached-buffer "\\*hoogle\\*.*")
-(jao-define-attached-buffer '(major-mode . haskell-interactive-mode) 0.33)
-(jao-define-attached-buffer '(major-mode . haskell-presentation-mode) 0.25)
-
-;;;;; transient
-(jao-transient-major-mode haskell
- ["Imports"
- ("in" "Navigate imports" haskell-navigate-imports)
- ("if" "Format imports" haskell-mode-format-imports)
- ("is" "Sort imports" haskell-sort-imports)
- ("ia" "Align imports" haskell-align-imports)]
- ["Session"
- ("s" "Change the session's target" haskell-session-change-target)]
- ["Code"
- ("e" "insert language pragma" haskell-command-insert-language-pragma)
- ("v" "visit cabal file" haskell-cabal-visit-file)
- ("h" "hoogle" jao-haskell-hoogle)
- ("t" "show type" haskell-doc-show-type)]
- ["Flymake"
- ("n" "next error" flymake-goto-next-error)
- ("p" "previous error" flymake-goto-prev-error)])
-
-;;;; Pie
-(jao-load-path "pie")
-(use-package pie
- :demand t
- :commands (pie-mode))
-
-;;;; Prolog
-;; (use-package ediprolog :ensure t)
-
-(use-package prolog
- :ensure t
- :commands (run-prolog prolog-mode mercury-mode)
- :init (progn
- (setq prolog-system 'swi)
- (add-to-list 'auto-mode-alist '("\\.pl$" . prolog-mode))
- (setq prolog-consult-string '((t "[%f].")))
- (setq prolog-program-name
- '(((getenv "EPROLOG") (eval (getenv "EPROLOG")))
- (eclipse "eclipse")
- (mercury nil)
- (sicstus "sicstus")
- (swi "swipl")
- (t "prolog")))))
-
-;;;; Python
-(use-package virtualenvwrapper
- :ensure t
- :config
- (venv-initialize-eshell)
- (jao-compilation-env "VIRTUAL_ENV"))
+(require 'jao-custom-programming)
;;; Text/data formats
;;;; json
@@ -2425,20 +1637,17 @@
;;; Network
;;;; nm applet
-(jao-shell-def-exec jao-nm-applet "nm-applet")
+(jao-when-linux
+ (jao-shell-def-exec jao-nm-applet "nm-applet")
-(defun jao-toggle-nm-applet ()
- (interactive)
- (or (jao-shell-kill-p "nm-applet") (jao-nm-applet)))
+ (defun jao-toggle-nm-applet ()
+ (interactive)
+ (or (jao-shell-kill-p "nm-applet") (jao-nm-applet))))
;;;; bluetooth
-(use-package bluetooth :ensure t)
-
-;;;; vpn
-(use-package jao-mullvad :demand t)
+(jao-when-linux (use-package bluetooth :ensure t))
;;;; ssh
-(use-package tramp)
(defun jao-tramp-hosts ()
(seq-uniq
(mapcan (lambda (x)
@@ -2446,746 +1655,36 @@
(tramp-get-completion-function "ssh"))
#'string=))
-(defun jao-ssh ()
- (interactive)
+(defun jao-ssh (&optional scratch)
+ (interactive "P")
(let ((h (completing-read "Host: " (jao-tramp-hosts))))
- (jao-afio-goto-scratch)
+ (when scratch (jao-afio-goto-scratch))
(jao-exec-in-term (format "ssh %s" h) (format "*ssh %s*" h))))
;;; Chats
-;;;; circe
-(defvar jao-libera-channels ())
-(defvar jao-oftc-channels ())
-(defvar jao-bitlbee-channels ())
-(defvar jao-slack-channels ())
-
-(use-package circe
- :ensure t
- :bind (:map circe-channel-mode-map
- (("C-c C-a" . lui-track-jump-to-indicator)))
- :init
- (setq circe-chat-buffer-name "{target}"
- circe-default-realname "https://jao.io"
- circe-default-part-message ""
- circe-default-quit-message ""
- circe-ignore-list nil
- circe-server-coding-system '(undecided . undecided)
- circe-server-killed-confirmation 'ask-and-kill-all
- circe-server-auto-join-default-type :after-auth
- circe-format-say "({nick}) {body}"
- circe-format-self-say "(jao) {body}"
- circe-new-buffer-behavior 'ignore
- circe-new-buffer-behavior-ignore-auto-joins t
- circe-nickserv-ghost-style 'after-auth
- circe-prompt-string ": "
- circe-completion-suffix ", "
- circe-reduce-lurker-spam t
-
- circe-lagmon-mode-line-format-string "" ;; "%.0f "
- circe-lagmon-mode-line-unknown-lag-string "" ;; "? "
- circe-lagmon-timer-tick 120
- circe-lagmon-reconnect-interval 180
-
- lui-max-buffer-size 30000
- lui-fill-column 80
- lui-time-stamp-position 'right
- lui-time-stamp-format "%H:%M"
- lui-flyspell-p nil
-
- lui-track-indicator (if window-system 'fringe 'bar)
- lui-track-behavior 'before-tracking-next-buffer)
- :config
-
- (defsubst jao-circe-nick-no () (length (circe-channel-nicks)))
-
- (define-minor-mode jao-circe-user-number-mode ""
- :lighter (:eval (format " [%s]" (jao-circe-nick-no))))
-
- (defun jao-circe-channel-hook ()
- ;; (setq header-line-format
- ;; '(" %b" (:eval (format " - %s nicks" (jao-circe-nick-no)))))
- (jao-circe-user-number-mode 1))
-
- (add-hook 'circe-channel-mode-hook #'jao-circe-channel-hook)
-
- (defun circe-command-RECOVER (&rest _ignore)
- "Recover nick"
- (jao-with-auth "freenode" u p
- (circe-command-MSG "nickserv" (format "IDENTIFY %s %s" u p))
- (circe-command-MSG "nickserv" (format "GHOST %s" u))
- (circe-command-MSG "nickserv" (format "RELEASE %s" u))
- (circe-command-NICK u)))
-
- (defun circe-command-NNICKS (&rest _)
- "Echo number of nicks"
- (circe-display-server-message
- (format "%d nicks in this channel" (jao-circe-nick-no))))
-
- (defun circe-command-SENDFILE (line)
- "/sendfile for localslackirc"
- (circe-command-QUOTE (format "sendfile %s" line)))
-
- (advice-add 'circe-command-NAMES :after #'circe-command-NNICKS)
-
- (setq circe-network-options
- (list (jao-with-auth "libera" u p
- (list "Libera Chat" :nick u :channels jao-libera-channels
- :tls t :sasl-username u :sasl-password p))
- (jao-with-auth "oftc" u p
- (list "OFTC"
- :nick u :channels jao-oftc-channels :nickserv-password p
- :tls t :sasl-username u :sasl-password p))
- (jao-with-auth "bitlbee" u p
- (list "Bitlbee" :host "127.0.0.1" :nick u
- :channels jao-bitlbee-channels :lagmon-disabled t
- :nickserv-password u :user p))
- (list "localslack" :host "127.0.0.1" :nick "jao"
- :channels jao-slack-channels :port 9007
- :lagmon-disabled t)))
-
- (jao-shorten-modes 'circe-channel-mode
- 'circe-server-mode
- 'circe-query-mode)
-
- (enable-circe-display-images)
- (enable-lui-track)
- (circe-lagmon-mode))
-
-;;;; telegram
-(use-package telega
- :ensure t
- :custom
- (telega-use-tracking-for '(unmuted) ;; '(or unmuted mention)
- telega-rainbow-color-custom-for nil
- telega-msg-rainbow-title nil
- telega-sticker-set-download t
- telega-symbol-checkmark "·"
- telega-symbol-heavy-checkmark "×"
- telega-symbol-verified "*")
- :config
- (define-key global-map (kbd "C-c C-t") telega-prefix-map)
- (setq telega-chat-show-avatars nil
- telega-chat-prompt-insexp '(telega-ins "> ")
- telega-completing-read-function #'completing-read
- telega-root-show-avatars nil
- telega-emoji-use-images nil
- telega-temp-dir "/tmp/telega"
- telega-symbol-horizontal-bar
- (propertize "-" 'face 'jao-themes-f00)
- telega-symbol-vertical-bar
- (propertize "| " 'face 'jao-themes-dimm)
- telega-mode-line-string-format
- '(:eval (telega-mode-line-unread-unmuted))
- telega-use-images (display-graphic-p)
- telega-open-file-function #'jao--see
- telega-open-message-as-file
- (unless (display-graphic-p) '(photo video animation)))
- (with-eval-after-load "tracking"
- (jao-shorten-modes 'telega-chat-mode)
- (jao-tracking-faces 'telega-tracking))
- (telega-mode-line-mode 1))
-
-(defun jao-telega ()
- (interactive)
- (jao-tracking-go-to-chats)
- (if (get-buffer telega-root-buffer-name)
- (pop-to-buffer telega-root-buffer-name)
- (telega)))
-
-;;;; ement
-(use-package ement
- :disabled t
- :ensure t
- :init (setq ement-save-sessions t
- ement-sessions-file (locate-user-emacs-file "cache/ement.el")
- ement-room-avatars nil
- ement-notify-dbus-p nil
- ement-room-left-margin-width 0
- ement-room-right-margin-width 11
- ement-room-timestamp-format "%H:%M"
- ement-room-timestamp-header-format "­­--------")
-
- :custom ((ement-room-message-format-spec "(%S) %B%r%R %t"))
-
- :config
- (defun jao-ement-track (event room session)
- (when (ement-notify--room-unread-p event room session)
- (when-let ((n (ement-room--buffer-name room))
- (b (get-buffer n)))
- (tracking-add-buffer b))))
-
- (add-hook 'ement-event-hook #'jao-ement-track)
- (jao-shorten-modes 'ement-room-mode)
- (jao-tracking-cleaner "^\\*Ement Room: \\(.+\\)\\*" "@\\1"))
-
-;;;; mastodon
-(use-package mastodon
- :ensure t
- :init
- (setq mastodon-instance-url "https://emacs.ch"
- mastodon-active-user "mail@jao.io"
- mastodon-tl-position-after-update nil
- mastodon-toot-display-orig-in-reply-buffer t)
- :config
- ;; (defun jao-mastodon--setup ()
- ;; (setq-local scroll-margin 12))
-
- ;; (add-hook 'mastodon-mode-hook #'jao-mastodon--setup)
- (with-eval-after-load "ewww"
- (define-key eww-mode-map (kbd "T") #'jao-mastodon-toot-url)))
-
-(defun jao-mastodon-toot-url ()
- (interactive)
- (when-let (url (jao-url-around-point t))
- (jao-tracking-go-to-chats)
- (mastodon-toot--compose-buffer nil nil nil url)))
-
-(defun jao-mastodon ()
- (interactive)
- (jao-afio-goto-chats)
- (mastodon))
-
-;;;; startup
-(defun jao-chats (&optional p)
- (interactive "P")
- (when (or p (y-or-n-p "Connect to telegram? "))
- (telega))
- (when (and (fboundp 'ement-connect) (or p (y-or-n-p "Connect to matrix? ")))
- (unless (get-buffer "*Ement Rooms*")
- (jao-with-auth "matrix.org" u p (ement-connect :user-id u :password p))))
- (when (and (fboundp 'mastodon) (or p (y-or-n-p "Connect to mastodon? ")))
- (mastodon))
- (when (or p (y-or-n-p "Connect to libera? "))
- (unless (get-buffer "irc.libera.chat:6697")
- (circe "Libera Chat")))
- (when (or p (y-or-n-p "Connect to localslack? "))
- (unless (get-buffer "127.0.0.1:9007")
- (circe "localslack"))))
-
-(defun jao-all-chats ()
- (interactive)
- (when jao-tracking-use-scratch
- (jao-afio-goto-chats)
- (delete-other-windows))
- (jao-chats t))
-
-(defun jao-chats-telega ()
- (interactive)
- (jao-buffer-same-mode '(telega-root-mode telega-chat-mode)))
-(defun jao-chats-slack ()
- (interactive)
- (jao-buffer-same-mode 'slack-message-buffer-mode))
+(jao-when-linux (require 'jao-custom-chats))
-(defun jao-chats-irc ()
- (interactive)
- (jao-buffer-same-mode '(circe-channel-mode circe-query-mode erc-mode)))
-
-;;;; consult narrowing
-(defvar jao-chat-buffer-source
- (list :name "chats"
- :category 'buffer
- :action (lambda (b) (jao-afio-pop-to-buffer 0 b))
- :hidden t
- :narrow (cons ?c "chats")
- :items (jao-consult--mode-buffers 'erc-mode
- 'circe-channel-mode
- 'circe-query-mode
- 'signel-chat-mode
- 'slack-message-buffer-mode
- 'slack-thread-message-buffer-mode
- 'telega-root-mode
- 'telega-chat-mode
- 'ement-room-mode
- 'ement-room-list-mode)))
-(with-eval-after-load "consult"
- (jao-consult-add-buffer-source 'jao-chat-buffer-source))
;;; Multimedia
-;;;; mixer
-(defun jao-mixer-get-level (&optional dev nomsg)
- (interactive)
- (let* ((dev (or dev "Master"))
- (s (shell-command-to-string (format "amixer sget %s" dev)))
- (s (car (last (split-string s "\n" t)))))
- (when (string-match ".*Front .*\\[\\([0-9]+\\)%\\] .*" s)
- (let ((level (match-string 1 s)))
- (unless nomsg (message "%s level: %s%%" dev level))
- (string-to-number level)))))
-
-(defun jao-mixer-set (dev v)
- (jao-shell-exec* t "amixer" "sset" dev v)
- (jao-mixer-get-level dev))
-
-(defun jao-mixer-master-toggle ()
- (interactive)
- (jao-mixer-set "Master" "toggle"))
-
-(defun jao-mixer-master-up ()
- (interactive)
- (jao-mixer-set "Master" "10%+"))
-
-(defun jao-mixer-master-down ()
- (interactive)
- (jao-mixer-set "Master" "10%-"))
-
-(defun jao-mixer-capture-up ()
- (interactive)
- (jao-mixer-set "Capture" "10%+"))
-
-(defun jao-mixer-capture-down ()
- (interactive)
- (jao-mixer-set "Capture" "10%-"))
-
-(jao-shell-def-exec jao-audio-applet "pasystray")
-
-(defun jao-toggle-audio-applet ()
- (interactive)
- (or (jao-shell-kill-p "paystray") (jao-audio-applet)))
-
-(global-set-key (kbd "<f4>") #'jao-toggle-audio-applet)
-
-;;;; streaming aliases
-(defalias 'jao-streaming-list #'ignore)
-(defalias 'jao-streaming-like #'ignore)
-(defalias 'jao-streaming-dislike #'ignore)
-(defalias 'jao-streaming-toggle-shuffle #'ignore)
-(defalias 'jao-streaming-lyrics #'ignore)
-(defalias 'jao-streaming-toggle #'ignore)
-(defalias 'jao-streaming-next #'ignore)
-(defalias 'jao-streaming-prev #'ignore)
-(defalias 'jao-streaming-current #'ignore)
-(defalias 'jao-streaming-seek #'ignore)
-(defalias 'jao-streaming-seek-back #'ignore)
-(defalias 'jao-streaming-volume #'ignore)
-(defalias 'jao-streaming-volume-down #'ignore)
-
-;;;; mpris
-(defun jao-mpris-lyrics (&optional force)
- (interactive "P")
- (jao-show-lyrics force #'jao-mpris-artist-title))
-(defun jao-mpc-mopidy-playlist ()
- (interactive)
- (jao-mpc-show-playlist jao-mopidy-port))
-
-(use-package jao-mpris :demand t)
-
-(defun jao-mpris-setup-aliases ()
- (setq espotify-play-uri-function #'espotify-play-uri-with-dbus)
- ;; (setq jao-mpris-player "mopidy")
- (defalias 'jao-streaming-list #'jao-mpc-mopidy-playlist)
- (defalias 'jao-streaming-lyrics #'jao-mpris-lyrics)
- (defalias 'jao-streaming-toggle #'jao-mpris-play-pause)
- (defalias 'jao-streaming-next #'jao-mpris-next)
- (defalias 'jao-streaming-prev #'jao-mpris-previous)
- (defalias 'jao-streaming-current #'jao-mpris-show-osd)
- (defalias 'jao-streaming-seek #'jao-mpris-seek)
- (defalias 'jao-streaming-seek-back #'jao-mpris-seek-back)
- (defalias 'jao-streaming-volume #'jao-mpris-vol)
- (defalias 'jao-streaming-volume-down #'jao-mpris-vol-down))
-
-;; (jao-mpris-register "playerctld"
-;; :session (if jao-mode-line-in-minibuffer -10 70))
-;; (jao-mpris-register "mopidy" :session 70)
-
-;;;; mpc
-(use-package jao-mpc
- :demand t
- :commands jao-mpc-setup)
-
-(defvar jao-mopidy-port 6669)
-(defvar jao-mpc-last-port jao-mpc-port)
-
-(defun jao-mpc-toggle-port ()
- (interactive)
- (setq jao-mpc-port
- (if (equal jao-mpc-port jao-mopidy-port) 6600 jao-mopidy-port)
- jao-mpc-last-port jao-mpc-port))
-
-(defsubst jao-mpc-mopidy-p () (equal jao-mpc-last-port jao-mopidy-port))
-
-(jao-mpc-setup jao-mopidy-port 70)
-
-(defun jao-mpc-pport (&optional mop)
- (cond ((or mop (jao-mpc-playing-p jao-mopidy-port)) jao-mopidy-port)
- ((jao-mpc-playing-p) 6600)
- (t jao-mpc-last-port)))
-
-(defmacro jao-defun-play (name &optional mpc-name)
- (let ((arg (gensym)))
- `(defun ,(intern (format "jao-player-%s" name)) (&optional ,arg)
- (interactive "P")
- (,(intern (format "jao-mpc-%s" (or mpc-name name)))
- (setq jao-mpc-last-port (jao-mpc-pport ,arg))))))
-
-(jao-defun-play toggle)
-(jao-defun-play next)
-(jao-defun-play previous)
-(jao-defun-play stop)
-(jao-defun-play echo echo-current-times)
-(jao-defun-play list show-playlist)
-(jao-defun-play info lyrics-track-data)
-(jao-defun-play browse show-albums)
-(jao-defun-play select-album)
-
-(defun jao-player-seek (delta) (jao-mpc-seek delta (jao-mpc-pport)))
-
-(defalias 'jao-player-connect 'jao-mpc-connect)
-(defalias 'jao-player-play 'jao-mpc-play)
-
-;;;; spotify
-(jao-load-path "espotify")
-
-(use-package espotify
- :demand t
- :init (setq espotify-service-name "mopidy"))
-
-(use-package consult-spotify :demand t)
-
-(defalias 'jao-streaming-album #'consult-spotify-album)
-(defalias 'jao-streaming-track #'consult-spotify-track)
-(defalias 'jao-streaming-artist #'consult-spotify-artist)
-(defalias 'jao-streaming-playlist #'consult-spotify-playlist)
-
-(jao-def-exec-in-term "ncmpcpp" "ncmpcpp" (jao-afio-goto-scratch))
-
-;;;; spt
-(use-package jao-spt
- :demand t
- :config
- (defun jao-spt-setup-aliases ()
- (setq espotify-play-uri-function #'jao-spt-play-uri)
- (defalias 'jao-streaming-list #'jao-term-spt)
- (defalias 'jao-streaming-lyrics #'jao-spt-show-lyrics)
- (defalias 'jao-streaming-toggle #'jao-spt-toggle)
- (defalias 'jao-streaming-next #'jao-spt-next)
- (defalias 'jao-streaming-prev #'jao-spt-previous)
- (defalias 'jao-streaming-current #'jao-spt-echo-current)
- (defalias 'jao-streaming-seek #'jao-spt-seek)
- (defalias 'jao-streaming-seek-back #'jao-spt-seek-back)
- (defalias 'jao-streaming-volume #'jao-spt-vol)
- (defalias 'jao-streaming-volume-down #'jao-spt-vol-down)
- (defalias 'jao-streaming-like #'jao-spt-like)
- (defalias 'jao-streaming-dislike #'jao-spt-dislike)
- (defalias 'jao-streaming-toggle-shuffle #'jao-spt-toggle-shuffle)))
-
-(jao-def-exec-in-term "spt" "spt" (jao-afio-goto-scratch))
-
-(defvar jao-spt-on t)
-
-(defun jao-streaming-toggle-player ()
- (interactive)
- (if jao-spt-on
- (progn (setq jao-mpris-player "playerctld")
- (require 'jao-mpris)
- (jao-mpris-setup-aliases))
- (jao-spt-setup-aliases)
- (setq jao-mpris-player "spt"))
- (setq jao-spt-on (not jao-spt-on))
- (message "%s activated " jao-mpris-player))
-
-(jao-streaming-toggle-player)
-
-;;;; music transients
-(require 'jao-lyrics)
-(setq jao-lyrics-info-function #'jao-player-info)
-
-(defun jao-player-seek-10 () (interactive) (jao-player-seek 10))
-(defun jao-player-seek--10 () (interactive) (jao-player-seek -10))
-
-(defun jao-streaming-clear () (interactive) (jao-mpc-clear jao-mopidy-port))
-
-(defun jao-streaming-echo-current ()
- (interactive)
- (jao-mpc-echo-current jao-mopidy-port))
-
-(defun jao-streaming-show-playlist ()
- (interactive)
- (jao-mpc-show-playlist jao-mopidy-port))
-
-(use-package jao-random-album :demand t)
-
-(jao-def-exec-in-term "aptitude" "aptitude" (jao-afio-goto-scratch))
-
-(defun jao-toggle-pasystray-applet ()
- (interactive)
- (or (jao-shell-kill-p "pasystray") (jao-shell-exec "pasystray")))
-
-(transient-define-prefix jao-transient-streaming ()
- [:description
- (lambda () (format "Streaming using %s" jao-mpris-player))
- ["Search"
- ("a" "album" jao-streaming-album)
- ("A" "artist" jao-streaming-artist)
- ("t" "track" jao-streaming-track)
- ("P" "playlist" jao-streaming-playlist)]
- ["Play"
- ("s" "toggle" jao-streaming-toggle)
- ("n" "next" jao-streaming-next)
- ("p" "previous" jao-streaming-prev)]
- ["Seek & shout"
- ("f" "seek fwd" jao-streaming-seek :transient t)
- ("F" "seek bwd" jao-streaming-seek-back :transient t)
- ("u" "up" jao-streaming-volume :transient t)
- ("d" "down" jao-streaming-volume-down :transient t)]
- ["Browse"
- ("l" "playing list" jao-streaming-list)
- ("L" "lyrics" jao-streaming-lyrics)
- ("w" "currently playing" jao-streaming-current)]
- ["Act"
- ("k" "like" jao-streaming-like)
- ("K" "dislike" jao-streaming-dislike)
- ("S" "toggle shuffle" jao-streaming-toggle-shuffle)
- ("T" "toggle player" jao-streaming-toggle-player)]])
-
-(transient-define-prefix jao-transient-media ()
- [["Play"
- ("m" "toggle" jao-player-toggle)
- ("n" "next" jao-player-next)
- ("p" "previous" jao-player-previous)
- ("s" "select album" jao-player-select-album)]
- ["Seek and search"
- ("f" "seek fwd" jao-player-seek-10 :transient t)
- ("F" "seek bwd" jao-player-seek--10 :transient t)
- ("a" "search album" jao-mpc-select-album)
- ("S" "play stream" jao-mpc-play-stream)]
- ["Browse"
- ("b" "browse" jao-player-browse)
- ("l" "show play list" jao-player-list)
- ("L" "show lyrics" jao-show-lyrics)
- ("w" "now playing" jao-player-echo)]
- [:description
- (lambda ()
- (message "%s %s"
- (if (jao-mpc-mopidy-p) "mopidy" "mpd")
- (if (jao-mpc-playing-p)
- (jao-mpc--current-timestr t)
- (jao-mpc--current-str)))
- (format "Master %s%%" (jao-mixer-get-level nil t)))
- ("d" "down" jao-mixer-master-down :transient t)
- ("u" "up" jao-mixer-master-up :transient t)
- ("M" "toggle" jao-mixer-master-toggle)]
- [:description
- (lambda () (format "Capture %s%%" (jao-mixer-get-level "Capture" t)))
- ("D" "down" jao-mixer-capture-down :transient t)
- ("U" "up" jao-mixer-capture-up :transient t)]
- ["Utilities"
- ("c" "reconnect to mpd" jao-player-connect)
- ("N" "next random album" jao-random-album-next)
- ("r" (lambda ()
- (concat (if jao-random-album-active "dis" "en") "able random album"))
- jao-random-album-toggle)
- ;; ("P" (lambda () (concat "Toggle to " (if (jao-mpc-mopidy-p) "mpd" "mopidy")))
- ;; jao-mpc-toggle-port)
- ("P" "pasystray" jao-toggle-pasystray-applet)]])
-
-(global-set-key (kbd "s-m") #'jao-transient-media)
+(jao-when-linux (require 'jao-custom-multimedia))
;;; Graphical window system
-;;;; x11 utils
-(defun jao-xdotool (arg-or-wait &rest args)
- (apply 'jao-shell-exec*
- (if (stringp arg-or-wait) "xdotool" arg-or-wait)
- (if (stringp arg-or-wait) arg-or-wait "xdotool")
- args))
-
-(defsubst jao-xdotool-string (&rest args)
- (apply 'jao-shell-string "xdotool" args))
-
-(defsubst jao-x11-focused-id () (jao-xdotool-string "getwindowfocus"))
-
-(defsubst jao-x11-window-name (&optional wid)
- (jao-xdotool-string "getwindowname" (or wid (jao-x11-focused-id))))
-
-(defsubst jao-x11-search-window (title)
- (jao-xdotool-string "search" "--name" title))
-
-(defsubst jao-x11-goto-ws (n) (jao-xdotool t "set_desktop" (format "%s" n)))
-
-;;;; exwm
-(defvar jao-exwm-enabled nil)
-(defun jao-exwm-enabled-p () jao-exwm-enabled)
-
-(defun jao-exwm-enable ()
- (require 'jao-custom-exwm)
- (setq jao-exwm-enabled t)
- (display-time-mode -1)
- (jao-ednc-setup 95)
- (exwm-enable)
- (x-change-window-property "_XMONAD_TRAYPAD" "" nil nil nil nil 0)
- (jao-mode-line-add-to-minibuffer-left 90)
- (jao-xmobar-restart)
- (jao-trisect t))
-
-;;;; xmonad
-(defvar jao-xmonad-enabled (string= "xmonad" (or (getenv "wm") "")))
-(defun jao-xmonad-enabled-p () jao-xmonad-enabled)
-
-(defun jao-xmonad-enable ()
- (setq jao-browse-doc-use-emacs-p (display-graphic-p))
- (setq jao-mode-line-in-minibuffer nil)
- (display-battery-mode -1)
- (jao-trisect)
- (message "Welcome to xmonad"))
-
-(when jao-xmonad-enabled
- (add-hook 'after-init-hook #'jao-xmonad-enable))
-
-;;;; wayland
-
-(use-package jao-wayland :demand t)
-
-(defun jao-wayland-enable ()
- (interactive)
- (defalias 'x-change-window-property #'ignore)
- (jao-trisect)
- (message "Welcome to wayland"))
-
-(defun jao-river-enable ()
- (jao-wayland-enable)
- (when (jao-shell-running-p "i3bar-river")
- (jao-tracking-set-log ""))
- (message "Welcome to river"))
-
-(when jao-river-enabled
- (add-hook 'after-init-hook #'jao-river-enable t))
-(when jao-sway-enabled
- (add-hook 'after-init-hook #'jao-wayland-enable t))
-
-;;;; wallpaper
-(defvar jao-wallpaper-dir "~/.wallpapers/")
-
-(defvar jao-wallpaper-random-candidates
- '("wallpaper.jpg" "wallpaper2.jpg"))
-
-(defvar jao-wallpaper-random-candidates-light
- '("wallpaper.jpg" "wallpaper2.jpg"))
-
-(defvar jao-wallpaper-random-wake t
- "Set to t for getting a new wallpaper on awaking from sleep")
-
-(defun jao-set-wallpaper (&optional path)
- (interactive)
- (let ((current (format "~/.wallpaper.%s" (jao-colors-scheme))))
- (when-let ((f (or (and path (expand-file-name path))
- (read-file-name "Image: "
- jao-wallpaper-dir
- (file-symlink-p current)
- t))))
- (make-symbolic-link f current t)
- (cond (jao-river-enabled (jao-river-set-wallpaper f))
- (jao-sway-enabled (jao-sway-set-wallpaper f))
- (t (shell-command-to-string (format "xwallpaper --zoom %s" f)))))))
-
-(defun jao-set-random-wallpaper ()
- (interactive)
- (when (or (called-interactively-p 'interactive)
- jao-wallpaper-random-wake)
- (let* ((ws (if (jao-colors-scheme-dark-p)
- jao-wallpaper-random-candidates
- jao-wallpaper-random-candidates-light))
- (f (seq-random-elt ws)))
- (jao-set-wallpaper (expand-file-name f jao-wallpaper-dir))
- (message "%s" f))))
-
-(add-to-list 'jao-sleep-awake-functions #'jao-set-random-wallpaper)
-
-;;;; screensaver and lock
-(defun jao-screensaver-enabled ()
- (string= (jao-shell-string "xdg-screensaver status") "enabled"))
-
-(defvar jao-screensaver--wid nil)
-(defun jao-screensaver-toggle ()
- (interactive)
- (if (jao-screensaver-enabled)
- (let ((wid (jao-x11-focused-id)))
- (setq jao-screensaver--wid wid)
- (jao-shell-exec* t "xdg-screensaver" "suspend" wid))
- (jao-shell-exec* t "xdg-screensaver" "resume" jao-screensaver--wid)
- (setq jao-screensaver--wid nil))
- (jao-notify (format "Screensaver %s"
- (jao-shell-string "xdg-screensaver status"))))
-
-(jao-shell-def-exec jao-xlock-screen "xdg-screensaver" "activate")
-(jao-shell-def-exec jao-suspend "sudo" "systemctl" "suspend")
-(jao-shell-def-exec jao-poweroff "sudo" "systemctl" "poweroff")
-
-(defun jao-lock-screen ()
- (interactive)
- (if jao-wayland-enabled
- (shell-command "swaylock -i ~/.lockimage")
- (jao-xlock-screen)))
-
-(transient-define-prefix jao-transient-sleep ()
- ["Sleep"
- ("l" "lock screen" jao-lock-screen)
- ("z" "sleep" jao-suspend)
- ("u" (lambda ()
- (if (jao-screensaver-enabled) "suspend screensaver" "resume screensaver"))
- jao-screensaver-toggle)
- ("poof" "power-off" jao-poweroff)])
-
-;;;; X clipboard
-(setq select-enable-clipboard t
- select-enable-primary t
- selection-timeout 100
- xterm-select-active-regions t)
-
-(use-package xclip
- :ensure t
- :init (setq xclip-method (if jao-wayland-enabled 'wl-copy 'xclip)))
-
-(unless (display-graphic-p) (xclip-mode 1))
-
-;;;; pop-up frames
-(defun jao-open-in-x-frame (&optional width height)
- (interactive)
- (make-frame `((window-system . x)
- (name . "emacs popup")
- (width . ,(or width (window-width)))
- (height . ,(or height (window-height)))))
- (define-key (current-local-map) "q" #'delete-frame))
-
-;;;; xmobar
-(defun jao-xmobar-kill ()
- (interactive)
- (shell-command "killall xmobar-single"))
-
-(defun jao-xmobar-restart ()
- (interactive)
- (jao-xmobar-kill)
- (start-process "" nil "xmobar-single" "-d"))
-
-(use-package tab-bar
- :init (setq tab-bar-close-button-show nil
- tab-bar-show (> emacs-major-version 28)
- tab-bar-format ()))
-
-(use-package xmobar
- :init (setq xmobar-tab-bar t
- xmobar-tab-split "*"
- xmobar-tab-bar-format
- (if window-system
- '(xmobar-left-string
- tab-bar-format-align-right
- xmobar-right-string)
- '(xmobar-left-string
- xmobar-elastic-space
- xmobar-right-string))
- xmobar-command
- (if window-system '("xmobar-emacs" "-TAnsi") "xmobar-emacs")))
+(jao-when-linux (require 'jao-custom-window-system))
;;; Global transients
(defun jao-list-packages ()
(interactive)
- (jao-afio-goto-scratch)
+ (jao-when-linux (jao-afio-goto-scratch))
(package-list-packages))
(defun jao-window-system-p ()
- (or jao-exwm-enabled jao-xmonad-enabled jao-wayland-enabled))
+ (or (not (jao-is-linux))
+ jao-exwm-enabled jao-xmonad-enabled jao-wayland-enabled))
-(defun jao-x11-p () (or jao-exwm-enabled jao-xmonad-enabled))
+(defun jao-x11-p ()
+ (jao-when-linux (or jao-exwm-enabled jao-xmonad-enabled)))
(defun jao-reveal ()
(interactive)
@@ -3193,52 +1692,77 @@
(outline-show-entry))
((derived-mode-p 'org-mode) (org-reveal))))
+(jao-def-exec-in-term "aptitude" "aptitude" (jao-afio-goto-scratch))
(jao-def-exec-in-term "htop" "htop" (jao-afio-goto-scratch))
-(transient-define-prefix jao-transient-utils ()
- "Global operations."
- [["Notes"
- ("n" "create new note" jao-org-notes-create)
- ("/" "open note" jao-org-notes-open)
- ("\\" "open note by tags" jao-org-notes-consult-tags)
- ("g" "ripgrep notes" jao-org-notes-consult-ripgrep)]
- ["Documents"
- ("dd" "go to doc" jao-select-pdf :if display-graphic-p)
- ("do" "open doc" jao-open-doc)
- ("dr" "search docs with recoll" jao-recoll-consult-docs)]
- ["Monitors"
- ("p" "htop" jao-term-htop)
- ("P" "pasytray" jao-toggle-pasystray-applet)
- ("x" "restart i3bar" jao-river-restart-i3bar :if jao-river-enabled-p)
- ("x" "restart xmobar" jao-xmobar-restart :if jao-exwm-enabled-p)
- ("x" "kill xmobar" jao-xmobar-kill :if jao-xmonad-enabled-p)]
- ["Network"
- ("S" "ssh" jao-ssh)
- ("b" "bluetooth" bluetooth-list-devices)
- ("c" "connect chats" jao-all-chats)
- ("m" "proton bridge" run-proton-bridge)
- ("v" "view video" jao-view-video)]
- ["Chats"
- ("t" "telegram" jao-chats-telega)
- ("s" "slack" jao-chats-slack)
- ("i" "irc" jao-chats-irc)
- ("M" "mastodon" jao-mastodon)
- ("T" "telegram rooster" jao-telega)]
- ["Window system" :if jao-window-system-p
- ("w" "set wallpaper" jao-set-wallpaper)
- ("W" "set radom wallpaper" jao-set-random-wallpaper)
- ("B u" (lambda ()
- (let ((b (jao-brightness)))
- (format "bright up %s" (and (string-match ".*\\((.+)\\).*" b)
- (match-string 1 b)))))
- jao-bright-up :transient t)
- ("B d" "bright down" jao-bright-down :transient t)]
- ["Helpers"
- ("a" "aptitude" jao-term-aptitude)
- ("l" "packages" jao-list-packages)
- ("r" "reveal" jao-reveal)
- ("k" (lambda () (concat "keyboard" (when (jao-kb-toggled-p) "*")))
- jao-kb-toggle :if jao-x11-p)]])
+(jao-d-l
+ (transient-define-prefix jao-transient-utils ()
+ "Global operations."
+ [["Notes"
+ ("n" "create new note" jao-org-notes-create)
+ ("/" "open note" jao-org-notes-open)
+ ("\\" "open note by tags" jao-org-notes-consult-tags)
+ ("g" "ripgrep notes" jao-org-notes-consult-ripgrep)]
+ ["Timers"
+ ("t t" "set new" tmr)
+ ("t c" "cancel" tmr-cancel)
+ ("t l" "list" tmr-list-timers)]
+ ["Network"
+ ("s" "ssh" jao-ssh)]
+ ["Utilities"
+ ("l" "packages" jao-list-packages)
+ ("r" "translate" reverso)
+ ("f" "copy buffer file name" copy-buffer-file-name-as-kill)]])
+ (transient-define-prefix jao-transient-utils ()
+ "Global operations."
+ [["Notes"
+ ("n" "create new note" jao-org-notes-create)
+ ("/" "open note" jao-org-notes-open)
+ ("\\" "open note by tags" jao-org-notes-consult-tags)
+ ("g" "ripgrep notes" jao-org-notes-consult-ripgrep)]
+ ["Documents"
+ ("dd" "go to doc" jao-select-pdf :if display-graphic-p)
+ ("do" "open doc" jao-open-doc)
+ ("dr" "search docs with recoll" jao-recoll-consult-docs)]
+ ["Monitors"
+ ("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)
+ ("x" "restart xmobar" jao-xmobar-restart :if jao-exwm-enabled-p)
+ ("x" "kill xmobar" jao-xmobar-kill :if jao-xmonad-enabled-p)]
+ ["Network"
+ ("s" "ssh" jao-ssh)
+ ("b" "bluetooth" bluetooth-list-devices)
+ ("c" "connect chats" jao-all-chats)
+ ("m" "proton bridge" run-proton-bridge)]
+ ["Chats"
+ ("i" "irc" jao-chats-irc)
+ ("M" "mastodon" jao-mastodon)
+ ("T" "telegram rooster" jao-telega)]
+ ["Window system" :if jao-window-system-p
+ ("w" "set wallpaper" jao-set-wallpaper)
+ ("W" "set radom wallpaper" jao-set-random-wallpaper)
+ ("B u" (lambda ()
+ (let ((b (jao-brightness)))
+ (format "bright up %s" (and (string-match ".*\\((.+)\\).*" b)
+ (match-string 1 b)))))
+ jao-bright-up :transient t)
+ ("B d" "bright down" jao-bright-down :transient t)]
+ ["Utilities"
+ ("a" "aptitude" jao-term-aptitude)
+ ("l" "packages" jao-list-packages)
+ ("v" "view video" jao-view-video)]
+ ["Timers"
+ ("t t" "set new" tmr)
+ ("t c" "cancel" tmr-cancel)
+ ("t l" "list" tmr-list-timers)]
+ ["Helpers"
+ ;; ("r" "reveal" jao-reveal)
+ ("r" "translate" reverso)
+ ("f" "copy buffer file name" copy-buffer-file-name-as-kill)
+ ("k" (lambda () (concat "keyboard" (when (jao-kb-toggled-p) "*")))
+ jao-kb-toggle :if jao-x11-p)]]))
(global-set-key (kbd "s-w") #'jao-transient-utils)
diff --git a/lib/doc/jao-org-notes.el b/lib/doc/jao-org-notes.el
index bd82543..bd45723 100644
--- a/lib/doc/jao-org-notes.el
+++ b/lib/doc/jao-org-notes.el
@@ -1,6 +1,6 @@
;;; jao-org-notes.el --- A simple system for org note taking -*- lexical-binding: t; -*-
-;; Copyright (C) 2020, 2021, 2022, 2024 jao
+;; Copyright (C) 2020, 2021, 2022, 2024, 2025 jao
;; Author: jao <mail@jao.io>
;; Keywords: tools
@@ -57,7 +57,11 @@
(string-to-number (cadr m))))
(defun jao-org-notes--matches (lines)
- (mapcar (lambda (l) (jao-org-notes--clean-match (split-string l "\0" t))) lines))
+ (seq-keep (lambda (l)
+ (let ((m (split-string (or l "") "\0" t)))
+ (when (and (car m) (cadr m))
+ (jao-org-notes--clean-match m))))
+ lines))
(defun jao-org-notes--grep-rx (rx &rest rg-args)
(let ((default-directory jao-org-notes-dir))
@@ -71,14 +75,15 @@
(and (string-match-p "^[^:]+ + :" m) "tags")
"titles"))
-(defun jao-org-notes--consult-rg (prompt &optional cat no-req cmd)
+(defun jao-org-notes--consult-rg (prompt &optional cat no-req cmd initial)
(let ((default-directory (expand-file-name (or cat "") jao-org-notes-dir)))
(consult--read
- (consult--async-command #'jao-org-notes--rg-title-or-tags
- (consult--async-transform jao-org-notes--matches))
+ (consult--async-pipeline
+ (consult--process-collection #'jao-org-notes--rg-title-or-tags)
+ (consult--async-transform #'jao-org-notes--matches))
:prompt prompt
- :initial (consult--async-split-initial "")
- :add-history (concat (consult--async-split-initial (thing-at-point 'symbol)))
+ :initial (or initial "")
+ :add-history (thing-at-point 'symbol)
:require-match (not no-req)
:category 'jao-org-notes-lookup
:group 'jao-org-notes--consult-group
@@ -94,9 +99,10 @@
(cond ((file-exists-p (expand-file-name cat jao-org-notes-dir)) cat)
((yes-or-no-p "New category, create?") cat))))
-(defun jao-org-notes--insert-title ()
+(defun jao-org-notes--insert-title (&optional title)
(let* ((cat (jao-org-notes--cat))
- (title (file-name-base (jao-org-notes--consult-rg "Title: " cat t)))
+ (note (jao-org-notes--consult-rg "Title: " cat t nil title))
+ (title (file-name-base note))
(title (replace-regexp-in-string "^#" "" title)))
(when (not (string-empty-p title))
(let* ((base (replace-regexp-in-string " +" "-" (downcase title)))
@@ -160,16 +166,16 @@
(interactive)
(consult-ripgrep (expand-file-name (or cat "") jao-org-notes-dir) initial))
-(defun jao-org-notes-create ()
+(defun jao-org-notes-create (&optional title)
"Create a new note file, matching tags and titles with completion."
(interactive)
- (when (jao-org-notes--insert-title)
+ (when (jao-org-notes--insert-title title)
(org-insert-time-stamp (current-time) t t "#+date: " "\n")
(insert "#+tags: :"
(mapconcat #'identity (jao-org-notes--read-tags) ":")
":\n"))
(save-buffer)
- (buffer-file-name))
+ (current-buffer))
(defun jao-org-notes-backlinks ()
"Show a list of note files linking to the current one."
@@ -210,7 +216,8 @@
(defun jao-org-notes-setup (mnemonic)
"Set up the notes system, providing a mnemonic character for its org template."
(setq org-capture-templates
- (add-to-list 'org-capture-templates (jao-org-notes--template mnemonic))
+ (add-to-list 'org-capture-templates
+ (jao-org-notes--template mnemonic))
jao-org-notes--tags (jao-org-notes-all-tags))
(when (fboundp 'org-capture-upgrade-templates)
(org-capture-upgrade-templates org-capture-templates)))
diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index b588989..10e9115 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -1,6 +1,6 @@
;;; jao-afio.el --- workspaces in just one frame -*- lexical-binding: t; -*-
-;; Copyright (C) 2020, 2021, 2022, 2024 jao
+;; Copyright (C) 2020, 2021, 2022, 2024, 2025 jao
;; Author: jao <mail@jao.io>
;; Keywords: frames
@@ -228,7 +228,7 @@
(defun jao-afio-goto-scratch (&optional one-win)
(interactive "P")
- (jao-afio--goto-frame ?s nil)
+ (jao-afio--goto-frame ?s one-win)
(when one-win (delete-other-windows)))
(defun jao-afio-goto-chats (&optional reset)
diff --git a/lib/eos/jao-dirmon.el b/lib/eos/jao-dirmon.el
index 9d748d1..6a897d3 100644
--- a/lib/eos/jao-dirmon.el
+++ b/lib/eos/jao-dirmon.el
@@ -1,6 +1,6 @@
;;; jao-dirmon.el --- little utility to monitor disk usage -*- lexical-binding: t; -*-
-;; Copyright (C) 2022 jao
+;; Copyright (C) 2022, 2024, 2025 jao
;; Author: jao <mail@jao.io>
;; Keywords: tools
@@ -25,12 +25,18 @@
;;; Code:
(require 'multisession)
+(require 'view)
(require 'jao-shell)
(define-multisession-variable jao-dirmon-last '())
+(defvar jao-dirmon-roots '("/var/local" "~"))
+
(defun jao-dirmon-dirs ()
- (jao-shell-cmd-lines "find ~ -mindepth 2 -maxdepth 3 -type d"))
+ (mapcan (lambda (d)
+ (jao-shell-cmd-lines
+ (format "find %s -mindepth 2 -maxdepth 3 -type d" d)))
+ jao-dirmon-roots))
(defun jao-dirmon-sizes ()
(mapcar (lambda (f)
@@ -40,9 +46,12 @@
(defvar jao-dirmon-threshold 100)
(defvar jao-dirmon-last-delta nil)
+(defvar jao-dirmon-buffer "*jao-dirmon")
(defun jao-dirmon--show-deltas (old current deltas)
- (with-temp-buffer
+ (with-current-buffer (get-buffer-create jao-dirmon-buffer)
+ (view-mode-disable)
+ (delete-region (point-min) (point-max))
(insert "High deltas since " (car old) "\n\n")
(dolist (d (seq-sort-by #'cdr #'> deltas))
(insert (format "- %s: %s Mb\n" (car d) (cdr d))))
@@ -52,6 +61,7 @@
(seq-sort-by #'cdr #'> current)))
(insert (format "- %s: %s Mb\n" (car c) (cdr c)))))
(beginning-of-buffer)
+ (view-mode-enable)
(pop-to-buffer (current-buffer) nil t)
(when (y-or-n-p "Save current state?")
(setf (multisession-value jao-dirmon-last)
@@ -66,7 +76,7 @@
(dolist (c current)
(let ((d (- (cdr c) (alist-get (car c) old 0 nil #'string=))))
(when (> (abs d) jao-dirmon-threshold)
- (push c high))))
+ (push (cons (car c) d) high))))
(setq jao-dirmon-last-delta high)
(jao-dirmon--show-deltas old current jao-dirmon-last-delta)
jao-dirmon-last-delta))
diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el
index 77bd49a..6cd5b24 100644
--- a/lib/eos/jao-minibuffer.el
+++ b/lib/eos/jao-minibuffer.el
@@ -1,6 +1,6 @@
;;; jao-minibuffer.el --- using the minibuffer to report status -*- lexical-binding: t; -*-
-;; Copyright (C) 2020, 2021, 2022, 2024 jao
+;; Copyright (C) 2020, 2021, 2022, 2024, 2025 jao
;; Author: jao <mail@jao.io>
;; Keywords: extensions
@@ -40,7 +40,7 @@
(defun jao-minibuffer--trim (s w)
(if (< (string-width (or s "")) w)
(format (format "%%%ds" (if jao-minibuffer-align-right w (- w))) s)
- (substring s 0 w)))
+ (substring s 0 (min w (string-width s)))))
(defun jao-minibuffer--width ()
(cond ((numberp jao-minibuffer-frame-width) jao-minibuffer-frame-width)
@@ -97,7 +97,7 @@
info))
(sep (if msg " - " ""))
(pref (when info
- (let ((len (+ (length info) (length sep))))
+ (let ((len (+ (string-width info) (string-width sep))))
(format (format "\n%%%ds" len) ""))))
(msg (if (and msg pref)
(replace-regexp-in-string "\n" pref msg)
diff --git a/lib/media/jao-mpc.el b/lib/media/jao-mpc.el
index 0f000da..4f5081c 100644
--- a/lib/media/jao-mpc.el
+++ b/lib/media/jao-mpc.el
@@ -311,8 +311,7 @@
(setq jao-lyrics-info-function #'jao-mpc-lyrics-track-data)
(jao-random-album-setup #'jao-mpc--album-buffer
#'jao-mpc--add-and-play
- #'jao-mpc-stop
- jao-notify-audio-icon)
+ #'jao-mpc-stop)
(let ((jao-random-album-active nil)) (jao-mpc-connect))
(when secondary-port (jao-mpc-connect secondary-port))
(when priority
diff --git a/lib/media/jao-mpris.el b/lib/media/jao-mpris.el
index 3bb2636..80d0675 100644
--- a/lib/media/jao-mpris.el
+++ b/lib/media/jao-mpris.el
@@ -1,6 +1,6 @@
;;; jao-mpris.el --- mpris players control -*- lexical-binding: t; -*-
-;; Copyright (C) 2020, 2021, 2022, 2024 jao
+;; Copyright (C) 2020, 2021, 2022, 2024, 2025 jao
;; Author: jao <mail@jao.io>
;; Keywords: multimedia
@@ -158,25 +158,25 @@
(defun jao-mpris--handler (iname properties &rest _args)
(let ((inhibit-message t))
- (message "Received properties: %S from %s" properties iname))
- (when-let (md (caadr (assoc "Metadata" properties)))
- (let ((tno (caadr (assoc "xesam:trackNumber" md)))
- (tlt (caadr (assoc "xesam:title" md)))
- (art (caadr (assoc "xesam:artist" md)))
- (alb (caadr (assoc "xesam:album" md)))
- (len (caadr (assoc "mpris:length" md))))
- (if (string= (or tlt "") "TIDAL")
- (jao-mpris-reset)
+ (message "Received properties: %S from %s" properties iname)
+ (when-let (md (caadr (assoc "Metadata" properties)))
+ (let ((tno (caadr (assoc "xesam:trackNumber" md)))
+ (tlt (caadr (assoc "xesam:title" md)))
+ (art (caadr (assoc "xesam:artist" md)))
+ (alb (caadr (assoc "xesam:album" md)))
+ (len (caadr (assoc "mpris:length" md))))
(jao-mpris--set-current 'track tno)
(jao-mpris--set-current 'title tlt)
(jao-mpris--set-current 'artist art)
(jao-mpris--set-current 'album alb)
- (jao-mpris--set-current 'length len))))
- (when-let (st (caadr (assoc "PlaybackStatus" properties)))
- (jao-mpris--set-current 'status st)
- (when (string= st "Stopped")
- (dolist (k '(track title artist album length))
- (jao-mpris--del-current k))))
+ (jao-mpris--set-current 'length len)))
+ (when-let (st (caadr (assoc "PlaybackStatus" properties)))
+ (jao-mpris--set-current 'status st)
+ (when (string= st "Stopped")
+ (dolist (k '(track title artist album length))
+ (jao-mpris--del-current k))))
+ ;; (message "Current is: %S" jao-mpris--current)
+ )
(jao-mpris--track jao-mpris--current))
;;;###autoload
diff --git a/lib/media/jao-random-album.el b/lib/media/jao-random-album.el
index 5b10308..3b2915b 100644
--- a/lib/media/jao-random-album.el
+++ b/lib/media/jao-random-album.el
@@ -18,13 +18,10 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-(require 'jao-notify)
-
(defvar jao-random-album-active t)
(defvar jao-random-lines nil)
(defvar jao-random-lines-file (expand-file-name "~/.emacs.d/random-lines"))
-(defvar jao-random-album-notify t)
-(defvar jao-random-album-notify-icon jao-notify-audio-icon)
+(defvar jao-random-album-notify nil)
(defvar jao-random-album-skip-lines 2)
(defun jao-random-lines ()
@@ -81,18 +78,17 @@
(let ((album (string-trim (thing-at-point 'line))))
(funcall jao-random-album-add-tracks-and-play album)
(when jao-random-album-notify
- (jao-notify album "Next album" jao-random-album-notify-icon)))))
+ (funcall jao-random-album-notify album)))))
(defun jao-random-album-reset ()
(interactive)
(setq jao-random-lines nil)
(jao-random-lines-save))
-(defun jao-random-album-setup (album-buffer add-and-play stop &optional icon)
+(defun jao-random-album-setup (album-buffer add-and-play stop)
(setq jao-random-album-buffer album-buffer
jao-random-album-add-tracks-and-play add-and-play
- jao-random-album-stop stop
- jao-random-album-notify-icon icon))
+ jao-random-album-stop stop))
(provide 'jao-random-album)
diff --git a/lib/net/jao-notmuch-gnus.el b/lib/net/jao-notmuch-gnus.el
new file mode 100644
index 0000000..5cd42fa
--- /dev/null
+++ b/lib/net/jao-notmuch-gnus.el
@@ -0,0 +1,246 @@
+;;; jao-notmuch-gnus.el --- notmuch-gnus interoperability -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022, 2024, 2025 jao
+
+;; Author: jao <mail@jao.io>
+;; Keywords: mail
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Helper functions to work in Gnus with mail indexed by notmuch.
+
+;;; Code:
+
+(require 'gnus)
+(require 'ol-gnus)
+(require 'notmuch-show)
+
+;;; Tagging in notmuch from Gnus buffers
+
+(defun jao-notmuch-gnus--notmuch-id (id)
+ (when id (if (string-match "<\\(.+\\)>" id) (match-string 1 id) id)))
+
+(defun jao-notmuch-gnus-message-id (&optional no-show)
+ "Find the id of currently selected message in Gnus or notmuch."
+ (when (and (not no-show) (derived-mode-p 'gnus-summary-mode))
+ (save-window-excursion (gnus-summary-show-article)))
+ (cond (gnus-original-article-buffer
+ (with-current-buffer gnus-original-article-buffer
+ (jao-notmuch-gnus--notmuch-id (message-field-value "message-id"))))
+ ((derived-mode-p 'notmuch-show-mode 'notmuch-tree-mode)
+ (notmuch-show-get-message-id))))
+
+(defun jao-notmuch-gnus-message-tags (id)
+ "Ask notmuch for the tags of a message with the given ID."
+ (let ((cmd (format "notmuch search --output=tags 'id:%s'" id)))
+ (split-string (shell-command-to-string cmd))))
+
+(defun jao-notmuch-gnus-tag-message (&optional id tags no-log)
+ "Interactively add or remove tags to the current message."
+ (interactive)
+ (let* ((id (or id (jao-notmuch-gnus-message-id)))
+ (current (or tags (jao-notmuch-gnus-message-tags id)))
+ (prompt (format "Change tags %s" (string-join current "/")))
+ (tags (or tags (notmuch-read-tag-changes current prompt))))
+ (notmuch-tag (concat "id:" id) tags)
+ (unless no-log
+ (message "%s -> %s" current (jao-notmuch-gnus-message-tags id)))))
+
+(defun jao-notmuch-gnus-show-tags ()
+ "Display in the echo area the tags of the current message."
+ (interactive)
+ (when-let (id (jao-notmuch-gnus-message-id))
+ (message "%s" (string-join (jao-notmuch-gnus-message-tags id) " "))))
+
+(jao-transient-major-mode+ gnus-summary
+ ["Tags"
+ ("s" "show message tags" jao-notmuch-gnus-show-tags)
+ ("t" "tag message" jao-notmuch-gnus-tag-message)])
+
+(defun jao-notmuch-gnus-toggle-tags (tags &optional id current)
+ "Toggle the given TAGS list for the current Gnus message."
+ (let* ((id (or id (jao-notmuch-gnus-message-id)))
+ (current (or current (jao-notmuch-gnus-message-tags id)))
+ (tags (mapcar (lambda (x)
+ (concat (if (member x current) "-" "+") x))
+ tags)))
+ (notmuch-tag (concat "id:" id) tags)
+ (message "New tags: %s" (jao-notmuch-gnus-message-tags id))))
+
+(defun jao-notmuch-gnus-tag-mark ()
+ "Remove the new and unread tags for an article when it's marked as seen by Gnus."
+ (when-let (id (jao-notmuch-gnus-message-id t))
+ (jao-notmuch-gnus-tag-message id '("-new" "-unread") t)))
+
+(add-hook 'gnus-mark-article-hook #'jao-notmuch-gnus-tag-mark)
+
+(defun jao-notmuch-gnus--group-tags (group)
+ (when (string-match ".+:\\(.+\\)" group)
+ (split-string (match-string 1 group) "\\.")))
+
+(defun jao-notmuch-gnus-tag-on-move (op headers from to _d)
+ (when-let* ((to-tags (when to (jao-notmuch-gnus--group-tags to)))
+ (id (jao-notmuch-gnus--notmuch-id (mail-header-id headers))))
+ (if (eq op 'delete)
+ (let ((cur (seq-difference (jao-notmuch-gnus--group-tags from) to-tags)))
+ (jao-notmuch-gnus-toggle-tags (append cur to-tags) id cur))
+ (notmuch-tag (concat "id:" id)
+ (mapcar (lambda (x) (concat "+" x)) to-tags)))))
+
+(defun jao-notmuch-gnus-auto-tag ()
+ (add-hook 'gnus-summary-article-move-hook #'jao-notmuch-gnus-tag-on-move)
+ (add-hook 'gnus-summary-article-expire-hook #'jao-notmuch-gnus-tag-on-move))
+
+;;; Gnus search using notmuch
+
+(require 'gnus-search)
+
+(add-to-list 'gnus-search-expandable-keys "list")
+
+(cl-defmethod gnus-search-transform-expression ((engine gnus-search-notmuch)
+ (expr (head list)))
+ (format "List:%s" (gnus-search-transform-expression engine (cdr expr))))
+
+
+;;; Displaying search results in Gnus
+
+(defvar jao-notmuch-gnus-server "nnml"
+ "Name of the target Gnus server, e.g. nnml+mail.")
+
+(defvar jao-notmuch-gnus-mail-directory (expand-file-name "~/var/mail/gnus")
+ "Directory where Gnus stores its mail.")
+
+(defvar jao-notmuch-gnus-leafnode-directory (expand-file-name "~/var/mail/news")
+ "Directory where leafnode stores its messages as seen by notmuch.")
+
+(defun jao-notmuch-gnus-file-to-group (file &optional maildir newsdir)
+ "Compute the Gnus group name from the given file name.
+Example:
+
+ IN: /home/jao/var/mail/jao/foo/cur/1259184569.M4818P3384.localhost,W=6921:2,S
+ OUT: nnml:jao.foo
+
+ IN: /home/jao/.emacs.d/gnus/Mail/jao.trove/32, /home/jao/.emacs.d/gnus/Mail/
+ OUT: nnml:jao.trove
+
+ IN: /home/jao/var/mail/gmane/foo/bar/100
+ OUT: nntp:gmane.foo.bar
+
+ IN: /home/jao/var/mail/bigml/cur/1259176906.M17483P24679.localhost,W=2488:2,S
+ OUT:nnimap:bigml/inbox"
+ (let* ((maildir (or maildir jao-notmuch-gnus-mail-directory))
+ (newsdir (or newsdir jao-notmuch-gnus-leafnode-directory))
+ (g (directory-file-name (file-name-directory file)))
+ (g (replace-regexp-in-string (file-name-as-directory maildir) "" g))
+ (g (replace-regexp-in-string (file-name-as-directory newsdir) "" g))
+ (nntp (string-match-p "^\\(gmane\\|gwene\\)/" g))
+ (g (cond (nntp (concat "nntp:" g))
+ ((file-name-directory g)
+ (replace-regexp-in-string "^\\([^/]+\\)/"
+ (concat jao-notmuch-gnus-server
+ ":\\1/")
+ (file-name-directory g) t))
+ (t (concat jao-notmuch-gnus-server ":" g))))
+ (g (replace-regexp-in-string "/" "." g))
+ (g (replace-regexp-in-string "[/.]$" "" g)))
+ (cond ((string-match ":$" g) (concat g "inbox"))
+ (nntp g)
+ (t (replace-regexp-in-string ":\\." ":" g)))))
+
+(defun jao-notmuch-gnus-id-to-file (id)
+ (when id
+ (let ((cmd (format "notmuch search --output=files %s" id)))
+ (string-trim (shell-command-to-string cmd)))))
+
+(defun jao-notmuch-gnus-goto-message (&optional msg-id filename)
+ "Open a summary buffer containing the current notmuch article."
+ (interactive)
+ (let* ((filename (or filename
+ (jao-notmuch-gnus-id-to-file msg-id)
+ (notmuch-show-get-filename)))
+ (group (when filename (jao-notmuch-gnus-file-to-group filename)))
+ (msg-id (or msg-id (notmuch-show-get-message-id)))
+ (msg-id (when msg-id (replace-regexp-in-string "^id:" "" msg-id))))
+ (if (and group msg-id)
+ (org-gnus-follow-link group msg-id)
+ (message "Couldn't get relevant infos for switching to Gnus."))))
+
+(defun jao-notmuch-gnus-engine (prefix config)
+ (let ((prefix (file-name-as-directory (expand-file-name prefix "~")))
+ (config (expand-file-name config gnus-home-directory)))
+ `(gnus-search-engine gnus-search-notmuch
+ (remove-prefix ,prefix)
+ (config-file ,config))))
+
+;;; Org links
+(defun jao-notmuch-gnus--fname (id)
+ (let ((cmd (format "notmuch search --output=files id:%s" id)))
+ (car (split-string (shell-command-to-string cmd)))))
+
+(defun jao-notmuch-gnus-org-follow (id)
+ (when-let* ((fname (jao-notmuch-gnus--fname id))
+ (group (jao-notmuch-gnus-file-to-group fname)))
+ (org-gnus-follow-link group id)))
+
+(defun jao-notmuch-gnus-org-store ()
+ (when-let (d (or (when (derived-mode-p 'notmuch-show-mode 'notmuch-tree-mode)
+ (cons (notmuch-show-get-message-id)
+ (notmuch-show-get-subject)))
+ (when (derived-mode-p 'gnus-summary-mode 'gnus-article-mode)
+ (cons (jao-notmuch-gnus-message-id)
+ (gnus-summary-article-subject)))))
+ (org-link-store-props :type "mail"
+ :link (concat "mail:" (car d))
+ :description (concat "Mail: " (cdr d)))))
+
+(org-link-set-parameters "mail"
+ :follow #'jao-notmuch-gnus-org-follow
+ :store #'jao-notmuch-gnus-org-store)
+
+(org-link-set-parameters "gnus" :store #'ignore)
+(org-link-set-parameters "notmuch" :store #'ignore)
+
+;;; consult-notmuch
+
+(with-eval-after-load "consult-notmuch"
+ (defun jao-notmuch-gnus--open-candidate (candidate)
+ "Open a notmuch-search completion candidate email in Gnus."
+ (message "candidate: %S" candidate)
+ (jao-notmuch-gnus-goto-message (consult-notmuch--candidate-id candidate)))
+
+ (defun jao-gnus-consult-notmuch ()
+ "Run a consult-notmuch query that opens candidates in Gnus."
+ (interactive)
+ (jao-notmuch-gnus--open-candidate (consult-notmuch--search)))
+
+ (consult-customize jao-gnus-consult-notmuch :preview-key 'any))
+
+;;; tags and flags
+
+(defun jao-notmuch-gnus-flag-current (&rest _)
+ (jao-notmuch-gnus-tag-message nil '("+flagged") t))
+
+(defun jao-notmuch-gnus-unflag-current (&rest _)
+ (jao-notmuch-gnus-tag-message nil '("-flagged") t))
+
+(advice-add 'gnus-summary-tick-article-forward
+ :before #'jao-notmuch-gnus-flag-current)
+(advice-add 'gnus-summary-mark-as-read-forward
+ :before #'jao-notmuch-gnus-unflag-current)
+
+;;; .
+(provide 'jao-notmuch-gnus)
+;;; jao-notmuch-gnus.el ends here
diff --git a/lib/net/randomsig.el b/lib/net/randomsig.el
index cb37694..05b95ab 100644
--- a/lib/net/randomsig.el
+++ b/lib/net/randomsig.el
@@ -1,6 +1,6 @@
;;; randomsig.el --- insert a randomly selected signature
-;; Copyright (C) 2001, 2002, 2013, 2020, 2021 Hans-Jrgen Ficker
+;; Copyright (C) 2001, 2002, 2013, 2020, 2021, 2024 Hans-Jrgen Ficker
;; Emacs Lisp Archive Entry
;; Author: Hans-Juergen Ficker <hj@backmes.de>
@@ -277,8 +277,11 @@ You probably want to have a newline at the end of it."
(defun randomsig-prompt (&optional prompt)
;; Prompt for a signature file.
(let ((files (randomsig-files-to-list randomsig-files)))
- (completing-read (if prompt prompt "signature: ")
- (mapcar 'list files) nil t nil randomsig-history (car files))))
+ (if (cdr files)
+ (completing-read (if prompt prompt "signature: ")
+ (mapcar 'list files) nil t nil
+ randomsig-history (car files))
+ (car files))))
(defun randomsig-read-signatures-to-buffer (buffer-name &optional files)
;; read the signatures into the signature buffer
diff --git a/lib/prog/jao-compilation.el b/lib/prog/jao-compilation.el
index c099701..e15c1e1 100644
--- a/lib/prog/jao-compilation.el
+++ b/lib/prog/jao-compilation.el
@@ -1,6 +1,6 @@
;;; jao-compilation.el --- utilities to lauch compilations -*- lexical-binding: t; -*-
-;; Copyright (C) 2020, 2021, 2022 jao
+;; Copyright (C) 2020, 2021, 2022, 2025 jao
;; Author: jao <mail@jao.io>
;; Keywords: convenience
@@ -109,7 +109,7 @@
(defun jao-compilation-setup ()
(jao-compilation-add-dominating
"Makefile" "makefile" "configure.ac" "bootstrap.sh" "aclocal.m4"
- "project.clj" "build.xml" "pom.xml" "setup.py" "stack.yaml")
+ "deps.edn" "project.clj" "build.xml" "pom.xml" "setup.py" "stack.yaml")
(with-eval-after-load "project"
(add-to-list 'project-find-functions #'jao-find-compilation-root t)))
diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el
index a172f84..659b6bb 100644
--- a/lib/themes/jao-light-theme.el
+++ b/lib/themes/jao-light-theme.el
@@ -115,6 +115,7 @@
(shr-link (~ link) (ul light-gray))
(shr-code (c blue nil))
(success (c green))
+ (variable-pitch :family "Iosevka Etoile" :height 90)
(vertical-border (c "grey70" nil))
(vterm-color-yellow (c "darkgoldenrod4" yellow))
(widget-button (~ default) nit (ul "grey80"))))
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index b1aa265..f529842 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -314,7 +314,7 @@
(ansi-color-green (c "darkseagreen4" "darkseagreen4"))
(ansi-color-magenta (c "lightpink3" "lightpink3"))
(ansi-color-yellow (c "lightgoldenrod3" "lightgoldenrod3"))
- (avy-lead-face (c "red" "grey90") bf :height 1.2)
+ (avy-lead-face (c "red" "grey90") bf :height 1.0)
(avy-lead-face-0 (~ avy-lead-face) bf)
(avy-lead-face-1 (~ avy-lead-face)))
`((bbdb-company)
@@ -597,7 +597,10 @@
(font-lock-type-face (p type))
(font-lock-variable-name-face (p variable-name))
(font-lock-warning-face (p warning))
+ (forge-pullreq-merged (p dimm))
(forge-pullreq-open (c nil nil))
+ (forge-pullreq-rejected (~ forge-pullreq-merged) st)
+ (forge-topic-pending (c nil nil))
(forge-topic-label bx)
(fringe (p dimm))
(fuel-font-lock-debug-error (p error) nul)