Spacemacs erc config updates

[~bandali/configs] / spacemacs / .emacs.d / private / aminb / packages.el

diff --git a/spacemacs/.emacs.d/private/aminb/packages.el b/spacemacs/.emacs.d/private/aminb/packages.el
index 997de0b..0ff24e0 100644 (file)
--- a/spacemacs/.emacs.d/private/aminb/packages.el
+++ b/spacemacs/.emacs.d/private/aminb/packages.el
@@ -17,17 +17,29 @@
 ;;; Code:
 
 (defconst aminb-packages
-  '(creamsody-theme
+  '(counsel
+    creamsody-theme
     crux
     ;; mu4e has to be installed manually,
     ;; and make sure it's in load-path
     (mu4e :location site)
-    (mu4e-contrib :location site)
     smtpmail
     writeroom-mode
     znc)
   "The list of Lisp packages required by the aminb layer.")
 
+(defun aminb/post-init-counsel ()
+  (use-package counsel
+    :defer t
+    :config
+    (progn
+      (spacemacs/set-leader-keys-for-major-mode 'eshell-mode
+        "," 'counsel-esh-history)
+      (add-hook 'eshell-mode-hook
+                '(lambda () (define-key eshell-mode-map
+                              (kbd "M-l") 'counsel-esh-history)))
+      )))
+
 (defun aminb/init-creamsody-theme ())
 
 (defun aminb/init-crux ()
@@ -58,6 +70,38 @@
       ;; Restore channel buffers from logs
       (setq erc-log-insert-log-on-open t)
 
+      ;;; (BEGIN) work around log restoration bug
+      ;;  taken from https://www.emacswiki.org/emacs/ErcLogging
+
+      ;; ;;; Original version in the Emacs sources:
+      ;; (defun erc-log-all-but-server-buffers (buffer)
+      ;;   "Returns t if logging should be enabled in BUFFER.
+      ;; Returns nil if `erc-server-buffer-p' returns t."
+      ;;   (save-excursion
+      ;;     (save-window-excursion
+      ;;       (set-buffer buffer)
+      ;;       (not (erc-server-buffer-p)))))
+
+      ;; My version:
+      (defun erc-log-all-but-server-buffers (buffer)
+        (with-current-buffer buffer
+          (not (erc-server-buffer-p))))
+      ;;
+      ;; ;;; Anyway, a more direct modification also works fine:
+      ;; (defun erc-log-all-but-server-buffers (buffer)
+      ;;  (set-buffer buffer)
+      ;;  (not (erc-server-buffer-p)))
+      ;;; (END)
+
+      (require 'notifications)
+      (defun erc-global-notify (match-type nick message)
+        "Notify when a message is recieved."
+        (notifications-notify
+         :title nick
+         :body message
+         ;; :app-icon (concat spacemacs-assets-directory "spacemacs.svg")
+         :urgency 'normal))
+
       (defun vbe:znc-add-server (server port user networks)
         "Add a server to the list of ZNC servers.
 We use SSL inconditionaly. Moreover, we don't store the password
@@ -164,6 +208,7 @@ erc-modified-channels-alist. Should be executed on window change."
             mu4e-trash-folder "/amin/Trash"
             user-full-name "Amin Bandali"
             user-mail-address "amin@aminb.org"
+            mu4e-view-html-plaintext-ratio-heuristic most-positive-fixnum
             mu4e-context-policy 'pick-first
             mu4e-contexts
               (list (make-mu4e-context
@@ -218,7 +263,10 @@ erc-modified-channels-alist. Should be executed on window change."
 
   (use-package gnus-dired
     ;; A special version of the gnus-dired-mail-buffers function
-    ;; that understands mu4e buffers as well
+    ;; that understands mu4e buffers as well.
+    ;; Usage: mark the file(s) in dired and press C-c RET C-a,
+    ;; then will be asked whether to attach them to an existing
+    ;; message, or create a new one.
     :defer t
     :config
     (progn
@@ -248,14 +296,6 @@ erc-modified-channels-alist. Should be executed on window change."
     "am" 'mu4e)
   )
 
-(defun aminb/init-mu4e-contrib ()
-  (use-package mu4e-contrib
-    :defer t
-    :config
-    (setq mu4e-html2text-command 'mu4e-shr2text
-          mu4e-view-html-plaintext-ratio-heuristic 10
-          mu4e-view-prefer-html t)))
-
 (defun aminb/init-smtpmail ()
   (use-package smtpmail
     :defer t