diff options
| -rw-r--r-- | attic/elisp/misc.el | 6 | ||||
| -rw-r--r-- | custom/jao-custom-completion.el | 2 | ||||
| -rw-r--r-- | custom/jao-custom-exwm.el | 2 | ||||
| -rw-r--r-- | custom/jao-custom-gnus.el | 2 | ||||
| -rw-r--r-- | custom/jao-custom-org.el | 6 | ||||
| -rw-r--r-- | init.el | 149 |
6 files changed, 117 insertions, 50 deletions
diff --git a/attic/elisp/misc.el b/attic/elisp/misc.el index 6484310..2f1bcb0 100644 --- a/attic/elisp/misc.el +++ b/attic/elisp/misc.el @@ -892,6 +892,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." diff --git a/custom/jao-custom-completion.el b/custom/jao-custom-completion.el index b44f9b6..9524e23 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) diff --git a/custom/jao-custom-exwm.el b/custom/jao-custom-exwm.el index dbad1da..e5c67f8 100644 --- a/custom/jao-custom-exwm.el +++ b/custom/jao-custom-exwm.el @@ -151,7 +151,7 @@ (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))) diff --git a/custom/jao-custom-gnus.el b/custom/jao-custom-gnus.el index e5a1762..0d75b43 100644 --- a/custom/jao-custom-gnus.el +++ b/custom/jao-custom-gnus.el @@ -590,7 +590,7 @@ ("nnml:bigml\\.bugs" "b" jao-themes-error) ("nnml:bigml\\.support" "S" default) ("nnml:jao\\.\\(inbox\\|trove\\)" "I" jao-themes-f01) - ("nnml:bigml\\.[^ibs]" "W" jao-themes-dimm) + ("nnml:bigml\\.[^aibs]" "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) diff --git a/custom/jao-custom-org.el b/custom/jao-custom-org.el index 02e7a03..4d2e622 100644 --- a/custom/jao-custom-org.el +++ b/custom/jao-custom-org.el @@ -167,9 +167,9 @@ '("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) +;; (use-package ox-pandoc +;; :after org +;; :ensure t) ;;; Babel and literate programming (setq org-src-window-setup 'other-window) ;; current-window @@ -143,7 +143,7 @@ (put 'list-timers 'disabled nil) ;;;; tramp -(setq tramp-mode nil) +(inhibit-remote-files) ;;;; sleep/awake (use-package jao-sleep) @@ -299,19 +299,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 @@ -476,12 +467,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 @@ -535,17 +525,10 @@ battery-mode-line-format " 🔋%b%p% ")) (with-eval-after-load "jao-minibuffer" - (unless jao-mode-line-in-minibuffer + (when 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)) - ;;;; jao-notify (use-package jao-notify :demand t @@ -572,7 +555,7 @@ (use-package ednc :ensure t - :diminish) + :diminish nil) (use-package jao-ednc :demand t @@ -740,7 +723,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) @@ -1359,9 +1342,9 @@ '("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")) + '("github.com" "gitlab.com" "slack.com" "spotify.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\\(/.*\\)?" @@ -1870,8 +1853,6 @@ (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)))) @@ -2541,7 +2522,9 @@ :nickserv-password u :user p)) (list "localslack" :host "127.0.0.1" :nick "jao" :channels jao-slack-channels :port 9007 - :lagmon-disabled t))) + :lagmon-disabled t) + (list "recoveryou" :host "127.0.0.1" :nick "jao" + :port 9008 :lagmon-disabled t))) (jao-shorten-modes 'circe-channel-mode 'circe-server-mode @@ -2645,6 +2628,77 @@ (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") @@ -2660,7 +2714,10 @@ (circe "Libera Chat"))) (when (or p (y-or-n-p "Connect to localslack? ")) (unless (get-buffer "127.0.0.1:9007") - (circe "localslack")))) + (circe "localslack"))) + (when (or p (y-or-n-p "Connect to recoveryou? ")) + (unless (get-buffer "127.0.0.1:9008") + (circe "recoveryou")))) (defun jao-all-chats () (interactive) @@ -2701,6 +2758,9 @@ (with-eval-after-load "consult" (jao-consult-add-buffer-source 'jao-chat-buffer-source)) ;;; Multimedia +;;;; video +(use-package ready-player :ensure t) +(ready-player-mode 1) ;;;; mixer (defun jao-mixer-get-level (&optional dev nomsg) (interactive) @@ -2764,6 +2824,8 @@ (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)) @@ -2784,8 +2846,7 @@ (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 "playerctld" :session 70) ;; (jao-mpris-register "mopidy" :session 70) ;;;; mpc @@ -2914,7 +2975,7 @@ (transient-define-prefix jao-transient-streaming () [:description (lambda () (format "Streaming using %s" jao-mpris-player)) - ["Search" + ["Search" :if jao-mpris-mopidy-p ("a" "album" jao-streaming-album) ("A" "artist" jao-streaming-artist) ("t" "track" jao-streaming-track) @@ -2922,21 +2983,21 @@ ["Play" ("s" "toggle" jao-streaming-toggle) ("n" "next" jao-streaming-next) - ("p" "previous" jao-streaming-prev)] + ("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) + ("l" "playing list" jao-streaming-list :if jao-mpris-mopidy-p) ("L" "lyrics" jao-streaming-lyrics) ("w" "currently playing" jao-streaming-current)] - ["Act" + ["Act" :if jao-mpris-mopidy-p ("k" "like" jao-streaming-like) ("K" "dislike" jao-streaming-dislike) - ("S" "toggle shuffle" jao-streaming-toggle-shuffle) - ("T" "toggle player" jao-streaming-toggle-player)]]) + ("S" "toggle shuffle" jao-streaming-toggle-shuffle)]]) (transient-define-prefix jao-transient-media () [["Play" |