Various updates

4 files changed, 47 insertions, 34 deletions

diff --git a/.bashrc b/.bashrc
index 76b0178..236cb9f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -155,7 +155,7 @@ alias mpva="mpv --ytdl-format=bestaudio"
 # mail
 alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc'
 alias getmail='getmail --getmaildir "$XDG_CONFIG_HOME"/getmail --rcfile getmailrc'
-alias m="mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail"
+alias m="mbsync kelar; getmail"
 # theme
 alias da='change-theme dark'
 alias li='change-theme light'
diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc
index 7b8a89e..dba818c 100644
--- a/.config/isync/mbsyncrc
+++ b/.config/isync/mbsyncrc
@@ -30,54 +30,57 @@ Near :kelar-local:
 Patterns *
 
 ######
-IMAPAccount shemshak
-Host mail.shemshak.org
-User bandali@shemshak.org
-PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/shemshak.gpg"
-SSLType IMAPS
+IMAPAccount gnub-local
+Host 127.0.0.1
+Port 143
+User bandali@gnu.local
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub-local.gpg"
+SSLType None
 
-IMAPStore shemshak-remote
-Account shemshak
+IMAPStore gnub-local
+Account gnub-local
 
-IMAPAccount shemshak-local
+IMAPAccount gnub-tunnel
 Host 127.0.0.1
-Port 143
-User bandali@shemshak.local
-PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/shemshak-local.gpg"
+Port 1143
+User bandali@gnu.local
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub-local.gpg"
 SSLType None
+Timeout 420
 
-IMAPStore shemshak-local
-Account shemshak-local
+IMAPStore gnub-tunnel
+Account gnub-tunnel
 
-Channel shemshak
-Far :shemshak-remote:
-Near :shemshak-local:
+Channel gnub-tunnel
+Far :gnub-tunnel:
+Near :gnub-local:
 Patterns *
 
 ######
-IMAPAccount gnub
-Host mail.shemshak.org
-User gnu@bndl.org
-PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub.gpg"
-SSLType IMAPS
+IMAPAccount deb-tunnel
+Host 127.0.0.1
+Port 1143
+User bandali@debian.local
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/debian-local.gpg"
+SSLType None
 Timeout 420
 
-IMAPStore gnub-remote
-Account gnub
+IMAPStore deb-tunnel
+Account deb-tunnel
 
-IMAPAccount gnub-local
+IMAPAccount deb-local
 Host 127.0.0.1
 Port 143
-User bandali@gnu.local
-PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub-local.gpg"
+User bandali@debian.local
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/debian-local.gpg"
 SSLType None
 
-IMAPStore gnub-local
-Account gnub-local
+IMAPStore deb-local
+Account deb-local
 
-Channel gnub
-Far :gnub-remote:
-Near :gnub-local:
+Channel deb-tunnel
+Far :deb-tunnel:
+Near :deb-local:
 Patterns *
 
 ######
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias
index a324d78..450b8e2 100644
--- a/.emacs.d/eshell/alias
+++ b/.emacs.d/eshell/alias
@@ -17,4 +17,4 @@ alias vi find-file $1
 alias vim find-file $1
 alias mbsync mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc $*
 alias getmail getmail --getmaildir $XDG_CONFIG_HOME/getmail --rcfile getmailrc $*
-alias m mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail
+alias m mbsync kelar; getmail
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e852f1c..f1b8bf9 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -219,7 +219,8 @@ plain variables.  This means that `setopt' will execute any
 (run-with-idle-timer 0.1 nil #'require 'battery)
 (with-eval-after-load 'battery
   (setopt battery-mode-line-format (format " [%s]" b/battery-format))
-  (display-battery-mode))
+  ;; (display-battery-mode -1)
+  )
 
 (run-with-idle-timer 0.5 nil #'require 'winner)
 (with-eval-after-load 'winner
@@ -407,6 +408,14 @@ for all frames."
     (when (fboundp #'exwm-systemtray--refresh-background-color)
       (exwm-systemtray--refresh-background-color 'remap))))
 
+(defun b/unfill-paragraph-or-region (&optional beg end)
+  "Unfill paragraph, or region (if active)."
+  (interactive "r")
+  (let ((fill-column most-positive-fixnum))
+    (if (use-region-p)
+        (fill-region beg end)
+      (fill-paragraph))))
+
 
 ;;; General key bindings
 
@@ -417,6 +426,7 @@ for all frames."
          ("C-S-j"   . b/join-line-top)
          ("C-c s c" . b/*scratch*)
          ("C-c v"   . b/invert-default-face)
+         ("C-c q"   . b/unfill-paragraph-or-region)
          ;; evaling and macro-expanding
          ("C-c e b" . eval-buffer)
          ("C-c e e" . eval-last-sexp)