From 0bb39c4f15cd42af21ef088ce10d36433b9aa231 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Mon, 8 Jul 2024 20:09:34 +0200
Subject: [PATCH] mail: remove ugent email

---
 flake.lock                         | 50 ------------------------------
 flake.nix                          | 10 +-----
 modules/graphical/mail/default.nix | 22 +------------
 3 files changed, 2 insertions(+), 80 deletions(-)

diff --git a/flake.lock b/flake.lock
index 32b06421..9ec2bd80 100644
--- a/flake.lock
+++ b/flake.lock
@@ -402,30 +402,6 @@
         "type": "github"
       }
     },
-    "mfauth": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1656592749,
-        "narHash": "sha256-7Rzjvegv6wb6LLWrNUvFkDmbYIhiBNH6zTcNgtOEWqk=",
-        "owner": "rien",
-        "repo": "mfauth",
-        "rev": "b88b9f431449495737f0cb43860fdc78756156ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rien",
-        "repo": "mfauth",
-        "type": "github"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -589,7 +565,6 @@
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
-        "mfauth": "mfauth",
         "nix-index-database": "nix-index-database",
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs",
@@ -623,31 +598,6 @@
         "type": "github"
       }
     },
-    "rust-overlay_2": {
-      "inputs": {
-        "flake-utils": [
-          "mfauth",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "mfauth",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1656567145,
-        "narHash": "sha256-2xlv+g7kIb3f+1QdHlqpHPFfFw4myXUCC+cWk+6C4aE=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "3e95d6696b51f88b3ebfc7a21aefaeeb70a245bd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index cb350d53..158cafcc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,13 +55,6 @@
       url = "github:nix-community/lanzaboote/v0.3.0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    mfauth = {
-      url = "github:rien/mfauth";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
     nixos-mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -90,7 +83,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, lanzaboote, mfauth, nix-index-database, nixos-mailserver, nur, tetris, www-chvp-be }:
+  outputs = inputs@{ self, nixpkgs, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, lanzaboote, nix-index-database, nixos-mailserver, nur, tetris, www-chvp-be }:
     let
       patches = builtins.map (patch: ./patches + "/${patch}") (builtins.filter (x: x != ".keep") (builtins.attrNames (builtins.readDir ./patches)));
       # Avoid IFD if there are no patches
@@ -111,7 +104,6 @@
         devshell.overlays.default
         emacs-overlay.overlay
         (self: super: {
-          mfauth = mfauth.packages.${self.system}.mfauth;
           tetris = tetris.packages.${self.system}.default;
         })
         nur.overlay
diff --git a/modules/graphical/mail/default.nix b/modules/graphical/mail/default.nix
index 8b0326b3..18f9180d 100644
--- a/modules/graphical/mail/default.nix
+++ b/modules/graphical/mail/default.nix
@@ -157,7 +157,7 @@ in
                 (setq mu4e-contexts (list ${lib.concatStringsSep "\n" (map mkAccountConfig (lib.attrValues hmConfig.accounts.email.accounts))}))
                 (add-to-list
                  'mu4e-bookmarks
-                  '(:name "Combined inbox" :query "maildir:/personal/INBOX or maildir:/work/INBOX or maildir:/posteo/INBOX or maildir:/rodekruis-eerstehulp/INBOX" :key ?i :favorite t)
+                  '(:name "Combined inbox" :query "maildir:/personal/INBOX or maildir:/posteo/INBOX or maildir:/rodekruis-eerstehulp/INBOX" :key ?i :favorite t)
                  )
                 (defun chvp--mu4e-dodona-cc-reply-to ()
                   "Add dodona@ugent.be in cc and reply-to headers."
@@ -215,16 +215,6 @@ in
       };
     };
     home-manager.users.charlotte = { ... }: {
-      home.packages = [ pkgs.mfauth ];
-      xdg.configFile."mfauth/config.toml".text = ''
-        # Public thunderbird secrets
-        [accounts.work]
-        client_id = "08162f7c-0fd2-4200-a84a-f25a4db0b584"
-        client_secret = "TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82"
-        authorize_url = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize"
-        token_url = "https://login.microsoftonline.com/common/oauth2/v2.0/token"
-        scope = "https://outlook.office365.com/IMAP.AccessAsUser.All https://outlook.office365.com/POP.AccessAsUser.All https://outlook.office365.com/SMTP.Send offline_access"
-      '';
       accounts.email = {
         maildirBasePath = "/home/charlotte/mail";
         accounts = {
@@ -238,16 +228,6 @@ in
               primary = true;
             };
           };
-          work = makeAccount {
-            name = "work";
-            address = "charlotte.vanpetegem@ugent.be";
-            host = "outlook.office365.com";
-            smtpHost = "smtp.office365.com";
-            secretToolId = "work-mail";
-            useStartTls = true;
-            oauth = true;
-            extraConfig.folders = { drafts = "Drafts"; inbox = "INBOX"; sent = "INBOX"; trash = "Deleted Items"; };
-          };
           posteo = makeAccount {
             name = "posteo";
             address = "chvp@posteo.net";