mbsync/.mbsyncrc

@@ -3,7 +3,7 @@ IMAPAccount ryuslash
 Host imap-ryuslash.alwaysdata.net
 User tom@ryuslash.org
 PassCmd "secret-tool lookup application mbsync account ryuslash"
-TLSType IMAPS
+SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore ryuslash-remote
@@ -27,7 +27,7 @@ IMAPAccount gmail
 Host imap.gmail.com
 User ryuslash@gmail.com
 PassCmd "secret-tool lookup application mbsync account gmail"
-TLSType IMAPS
+SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore gmail-remote
@@ -59,7 +59,7 @@ Channel gmail-inbox
 # Host imap.gmail.com
 # User tom@picturefix.nl
 # PassCmd "~/usr/bin/get-mail-password picturefix"
-# TLSType IMAPS
+# SSLType IMAPS
 # CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 # IMAPStore picturefix-remote
@@ -96,7 +96,7 @@ Channel gmail-inbox
 # Host mail.ninthfloor.org
 # User ryuslash
 # PassCmd "~/usr/bin/get-mail-password ninthfloor"
-# TLSType STARTTLS
+# SSLType STARTTLS
 # CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 # IMAPStore ninthfloor-remote

oni/home/config/data.scm

@@ -86,8 +86,7 @@
                           emacs-oni-tramp
                           emacs-oni-embrace
                           emacs-oni-git-commit
-                          emacs-oni-python
-                          emacs-oni-yaml))
+                          emacs-oni-python))
   ;; #:use-module (oni packages hlwm-run-or-raise)
   #:use-module (oni packages pick-random-wallpaper)
   #:use-module (oni packages sawfish)
@@ -154,8 +153,7 @@
                  emacs-oni-shr
                  emacs-oni-tramp
                  emacs-oni-git-commit
-                 emacs-oni-python
-                 emacs-oni-yaml))
+                 emacs-oni-python))
 
  (services
   (list