diff --git a/flake.nix b/flake.nix
index ece4fc80..66ba6723 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,7 +75,7 @@
         serviceModules =
           [ ./services/sshd/default.nix ./services/syncthing/default.nix ];
         homeModules = [
-          ./home/accounts/service.nix
+          ./home/accounts/default.nix
           ./home/alacritty/default.nix
           ./home/emacs/default.nix
           ./home/firefox/default.nix
diff --git a/home/accounts/default.nix b/home/accounts/default.nix
index cdfc62b4..2bd4f702 100644
--- a/home/accounts/default.nix
+++ b/home/accounts/default.nix
@@ -36,8 +36,7 @@
           auth = "login";
         };
       };
-      notmuch.enable = true;
-      astroid.enable = true;
+      mu.enable = true;
     };
     icloud = rec {
       inherit realName;
@@ -54,8 +53,7 @@
         subFolders = "Verbatim";
       };
       msmtp.enable = true;
-      notmuch.enable = true;
-      astroid.enable = true;
+      mu.enable = true;
     };
     ukaea = let
       host = "127.0.0.1";
@@ -88,8 +86,7 @@
           auth = "login";
         };
       };
-      notmuch.enable = true;
-      astroid.enable = true;
+      mu.enable = true;
     };
   };
   home.packages = with pkgs; [ protonmail-bridge davmail vdirsyncer ];
@@ -97,17 +94,11 @@
     mbsync.enable = true;
     msmtp.enable = true;
     # vdirsyncer = { enable = true; };
-    notmuch = {
-      enable = true;
-      maildir.synchronizeFlags = true;
-      new.ignore = [ ".nnmaildir" ];
-    };
-    afew.enable = true;
-    astroid = {
-      enable = true;
-      pollScript = "mbsync -a";
-      externalEditor = "emacsclient -q -a 'emacs' -c %1";
-    };
+    mu.enable = true;
+  };
+  services.mbsync = {
+    enable = true;
+    frequency = "*-*-* *:0/15:00";
   };
   xdg.configFile."vdirsyncer/config".text =
     import ./config/vdirsyncer.nix { inherit pkgs; };
diff --git a/home/accounts/service.nix b/home/accounts/service.nix
deleted file mode 100644
index 71ab577d..00000000
--- a/home/accounts/service.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  imports = [ ./default.nix ];
-  # services.mbsync = {
-  #   enable = true;
-  #   frequency = "*-*-* *:0/15:00";
-  # };
-}
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index bced5db2..6b3965a2 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -7,7 +7,10 @@ let
 in {
   xdg.configFile.emacs.source = doom-emacs;
   systemd.user = { inherit sessionVariables; };
-  programs.emacs.enable = true;
+  programs.emacs = {
+    enable = true;
+    package = pkgs.emacs29-pgtk;
+  };
   services.emacs = {
     enable = true;
     package = config.programs.emacs.package;
@@ -20,9 +23,9 @@ in {
     sessionPath = [ "$HOME/.config/emacs/bin" "$HOME/.emacs.d/bin" ];
     packages = with pkgs; [
       # Emacs dependencies
+      emacsPackages.mu4e
       coreutils
       gnutls
-      # git-with-svn
       ripgrep
       cmake
       fd
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 5e563b8c..182507f5 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -18,7 +18,6 @@
     zotero
   ];
   programs = {
-    emacs.package = pkgs.emacs29-pgtk;
     firefox.package = pkgs.firefox-wayland;
     rofi = {
       package = pkgs.rofi-wayland;