From 1dd791874a4fdd0b38b7a54d240dd178b36949d9 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Tue, 21 Jun 2022 02:02:04 -0700
Subject: [PATCH] remove himalaya: we're using aerc now

---
 modules/universal/home-manager.nix | 33 ------------------------------
 secrets/universal.yaml             |  5 ++---
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/modules/universal/home-manager.nix b/modules/universal/home-manager.nix
index 724861a7..3bdb9df6 100644
--- a/modules/universal/home-manager.nix
+++ b/modules/universal/home-manager.nix
@@ -31,9 +31,6 @@ in
   };
 
   config = {
-    sops.secrets."colinsane_email_passwd" = {
-      owner = config.users.users.colin.name;
-    };
     sops.secrets."aerc_accounts" = {
       owner = config.users.users.colin.name;
       sopsFile = ../../secrets/universal/aerc_accounts.conf;
@@ -71,39 +68,9 @@ in
       xdg.configFile."aerc/accounts.conf".source =
         config.lib.file.mkOutOfStoreSymlink sysconfig.sops.secrets.aerc_accounts.path;
 
-      accounts.email.accounts.colinsane = {
-        address = "colin@uninsane.org";
-        userName = "colin";
-        imap = {
-          host = "imap.uninsane.org";
-          port = 993;
-        };
-        smtp = {
-          host = "mx.uninsane.org";
-          port = 465;
-        };
-        realName = "Colin Sane";
-        passwordCommand = "cat ${sysconfig.sops.secrets.colinsane_email_passwd.path}";
-
-        primary = true;
-
-        # mailbox synchronization
-        # mbsync = {
-        #   enable = true;
-        #   create = "maildir";
-        # };
-        # msmtp.enable = true;  # mail sender
-        # notmuch.enable = true;  # indexing; used by himalaya
-
-        # docs: https://github.com/soywod/himalaya
-        himalaya.enable = true;  # CLI email client
-      };
-
       programs = {
         home-manager.enable = true;  # this lets home-manager manage dot-files in user dirs, i think
 
-        himalaya.enable = true;  # CLI email client
-
         zsh = {
           enable = true;
           enableSyntaxHighlighting = true;
diff --git a/secrets/universal.yaml b/secrets/universal.yaml
index 119dda4e..404ef203 100644
--- a/secrets/universal.yaml
+++ b/secrets/universal.yaml
@@ -1,5 +1,4 @@
 wg_ovpnd_privkey: ENC[AES256_GCM,data:qmyCOcD5TA7SKqSDCTZOTahkfYVZMJUGuyselmQbqj1uer3e4cBRSMuIiRI=,iv:jnHvGgVu/8HWT8MkI2wtGqlCs6wTu0C8huHpkdDmBYk=,tag:a0r0f/6LTBUuhvLGu+SFug==,type:str]
-colinsane_email_passwd: ENC[AES256_GCM,data:tlsKyFJPnMiYwCQOomRlyznd,iv:UfEKJMUh/sVeOBrRb/A4uzISQzYmRVLdAlSS3dj9HXc=,tag:G2nPbgPb0qJ6+7cU/ryExg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -78,8 +77,8 @@ sops:
             T1ZLaWRwWFJkNE82NC80QTdjZ1l1Zm8K7QhAMCO/65Z0N4coN+sc7WYNVI+BvV01
             q5DXWTtePrPRQ8ZCqT7gWdSQc8iS410HEZ2Nya5IA+ktGxMO9h1EXA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2022-06-10T01:15:42Z"
-    mac: ENC[AES256_GCM,data:nYzWojVAZWgChRpoYq6LOnSYUN3Ja5kW7km//sSrzEhDKQWW8oYV40QNuIDYHhRrEpyieucoxJvjpDLsGg2wqVemYxN+9aPuyO92033wweT/gyZXI4Eq0d5qyXT3Fxcfgo83P0KdNI31rjOUegTW1WGccHOz8LupnmRUpLYeono=,iv:Ri4+GZPREA17URjK8D9abAmD+GqRk7GQcPNyBNyooWg=,tag:l7eYp7Q7EJ8TFvjSxuHFrw==,type:str]
+    lastmodified: "2022-06-21T09:01:02Z"
+    mac: ENC[AES256_GCM,data:G6crbY/fKKHjiCI7m+uOIRHrW2CJFM6DPD598h/vqRwYI0laIkasr7vUMuV72RyqAW52F90kIYyLY5qhu4uTOBqHK5aJHAxNo55knHrpXYQemMMt5UGC3AwgswLWkqze43EhIj7NrA6LTFF4MX+rD3yhFC+IAQOgZ1HiIk9h0sY=,iv:kDDHyNlaCCq9AVSr5qaF1OYZxNAGgxSGL5bxYL3Q79w=,tag:5FNaXMHjTyjyPScOXgep6Q==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3