summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--init.el16
-rw-r--r--lib/media/jao-mpris.el1
2 files changed, 10 insertions, 7 deletions
diff --git a/init.el b/init.el
index 7e43240..b38c370 100644
--- a/init.el
+++ b/init.el
@@ -1136,13 +1136,12 @@
:hook (markdown-mode . outline-minor-mode)
:config
(dolist (u '("doc" "message" "notmuch"))
- (add-to-list 'markdown-uri-types u)))
+ (add-to-list 'markdown-uri-types u))
+ (use-package markdown-toc :ensure t))
;; used by markdown mode to edit code blocks
(use-package edit-indirect :ensure t)
-(use-package markdown-toc :ensure t)
-
(dolist (ext '("\\.md$" "\\.markdown$"))
(add-to-list 'auto-mode-alist (cons ext 'markdown-mode)))
@@ -2196,7 +2195,7 @@
;;;; Haskell
;;;;; packages
-(jao-load-path "haskell-mode")
+;; (jao-load-path "haskell-mode")
(use-package haskell-mode
:ensure t
@@ -2218,6 +2217,7 @@
:init
;; For use with M-x align
+ (require 'align)
(add-to-list 'align-rules-list
'(haskell-types
(regexp . "\\(\\s-+\\)\\(::\\|∷\\)\\s-+")
@@ -2600,7 +2600,8 @@
:ensure t
:init
(setq mastodon-instance-url "https://emacs.ch"
- mastodon-active-user "mail@jao.io")
+ mastodon-active-user "mail@jao.io"
+ mastodon-tl-position-after-update 'last-old-toot)
:config
:bind (:map eww-mode-map ("T" . jao-mastodon-toot-url)))
@@ -2625,6 +2626,8 @@
(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"))))
@@ -2975,7 +2978,6 @@
(defun jao-xmonad-enable ()
(setq jao-browse-doc-use-emacs-p (display-graphic-p))
- (setq jao-wallpaper-random-wake t)
(setq jao-mode-line-in-minibuffer nil)
(display-battery-mode -1)
(jao-trisect)
@@ -3015,7 +3017,7 @@
(defvar jao-wallpaper-random-candidates-light
'("wallpaper.jpg" "wallpaper2.jpg"))
-(defvar jao-wallpaper-random-wake t
+(defvar jao-wallpaper-random-wake nil
"Set to t for getting a new wallpaper on awaking from sleep")
(defun jao-set-wallpaper (&optional path)
diff --git a/lib/media/jao-mpris.el b/lib/media/jao-mpris.el
index 47a35a7..e98709b 100644
--- a/lib/media/jao-mpris.el
+++ b/lib/media/jao-mpris.el
@@ -130,6 +130,7 @@
(defun jao-mpris--track (&optional info)
(let ((info (or info (jao-playerctl--status))))
+ (setq jao-mpris--current info)
(if (string= "Playing" (jao-mpris--get 'status info))
(setq jao-mpris-track-string (jao-mpris--format info))
(setq jao-mpris-track-string "")))