summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/init.el41
-rw-r--r--.emacs.d/lisp/bandali-message.el9
2 files changed, 16 insertions, 34 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 251319a..97ad750 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -135,26 +135,19 @@ This sets each user option VAR's value to the corresponding VALUE.
;; (package-generate-description-file d "refinery-theme-pkg.el"))
(run-with-idle-timer 0.01 nil #'require 'package)
(with-eval-after-load 'package
- (when (= (length package-archives) 1)
- (csetq
- package-archives
- `(,@package-archives
- ;; ("bndl" . "https://p.bndl.org/elpa/")
- ("org" . "https://orgmode.org/elpa/"))
- package-load-list
- '(;; GNU ELPA
- (debbugs "0.26")
- (delight "1.7")
- (orgalist "1.13")
- (rt-liberation "1.31")
- (yasnippet "0.14.0")
- (expand-region "0.11.0")
- (emms "6.2")
- ;; bndl
- ;; (refinery-theme "0.1.1")
- ;; Org ELPA
- (org-plus-contrib "20201109"))))
- (package-initialize))
+ (csetq
+ ;; package-archives
+ ;; `(,@package-archives
+ ;; ("bndl" . "https://p.bndl.org/elpa/"))
+ package-load-list
+ '(;; GNU ELPA
+ (debbugs "0.29")
+ (delight "1.7")
+ (emms "7.7")
+ (expand-region "0.11.0")
+ (rt-liberation "2.4")
+ (yasnippet "0.14.0")))
+(package-initialize))
(csetq package-archive-upload-base "/ssh:caffeine:~/www/p/elpa")
@@ -434,11 +427,6 @@ This sets each user option VAR's value to the corresponding VALUE.
;; this will fail if gpg>=2.1 is not available
epg-pinentry-mode 'loopback)
-;; (require 'pinentry)
-;; workaround for systemd-based distros:
-;; (setq pinentry--socket-dir server-socket-dir)
-;; (pinentry-start)
-
;; auth-source
(csetq
auth-sources '("~/.authinfo.gpg")
@@ -982,6 +970,9 @@ Make N (default: 1) copies of the current line or region."
;; po-mode
(require 'bandali-po)
+(with-eval-after-load 'emms
+ (csetq emms-directory (b/var "emms")))
+
;;; Post initialization
diff --git a/.emacs.d/lisp/bandali-message.el b/.emacs.d/lisp/bandali-message.el
index f4e7f74..9715d5b 100644
--- a/.emacs.d/lisp/bandali-message.el
+++ b/.emacs.d/lisp/bandali-message.el
@@ -75,15 +75,6 @@
;; footnote-end-tag ""
;; footnote-style 'unicode))
- ;; orgalist
- (add-hook 'message-mode-hook
- (lambda ()
- ;; work around incompatibility between
- ;; orgalist and yasnippet
- (yas-minor-mode -1)
- (orgalist-mode 1)
- (yas-minor-mode 1)))
-
;; custom newline & reformat function
(defun b/message-newline-or-asterism (arg)
"Create newlines per my liking or insert asterism if ARG is