2 files changed, 7 insertions, 16 deletions

diff --git a/home-config/aerc/accounts.conf b/home-config/aerc/accounts.conf
index 91a75c3..fd3a4dd 100644
--- a/home-config/aerc/accounts.conf
+++ b/home-config/aerc/accounts.conf
@@ -1,24 +1,14 @@
 [Personal]
-source   = imaps://ryan%40rschanz.org@mail.rschanz.org:993
+source   = jmap://ryan%40rschanz.org@mail.rschanz.org/jmap/session
 source-cred-cmd = pass emails/personal 2>/dev/null | tr -d '\n'
-outgoing = smtps://ryan%40rschanz.org@mail.rschanz.org:465
-outgoing-cred-cmd = pass emails/personal 2>/dev/null | tr -d '\n'
-default  = INBOX
+outgoing = jmap://
+default  = Inbox
 from     = Ryan Schanzenbacher <ryan@rschanz.org>
 copy-to  = Sent
 signature-file = ~/.config/aerc/signature_personal
-check-mail = 5m
+#check-mail = 5m
 aliases = Ryan S <ryan+ritlugdemo@rschanz.org>, Ryan Schanzenbacher <ryan+guixdevel@rschanz.org>
-
-[Development]
-source  = imaps://ryan_devel%40rschanz.org@mail.rschanz.org:993
-source-cred-cmd = pass emails/development 2>/dev/null | tr -d '\n'
-outgoing = smtps://ryan_devel%40rschanz.org@mail.rschanz.org:465
-outgoing-cred-cmd = pass emails/development 2>/dev/null | tr -d '\n'
-default = INBOX
-from = Ryan <ryan_devel@rschanz.org>
-copy-to = Sent
-check-mail = 5m
+pgp-self-encrypt = true
 
 [School]
 source  = imaps+oauthbearer://rjs1877%40rit.edu@imap.gmail.com:993?token_endpoint=https%3A%2F%2Faccounts.google.com%2Fo%2Foauth2%2Ftoken&client_id=667738788924-0rdfvaq9ijfo1vk4474eb3quf8206h2t.apps.googleusercontent.com&client_secret=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
@@ -30,3 +20,4 @@ signature-file = ~/.config/aerc/signature_rit_personal
 check-mail = 5m
 default = INBOX
 copy-to = [Gmail]/Sent Mail
+pgp-self-encrypt = true
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index bfa7ccb..b32894c 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -125,7 +125,7 @@
                                                     "python:tk"
                                                     "file"
                                                     "python-lsp-server"
-                                                    "kdenlive"
+                                                    ;"kdenlive"
                                                     "sqlite"
                                                     ;"mpv" ; Now a nix pkg for MESA stuff
                                                     "qbittorrent"