diff --git a/modules/emacs.nix b/modules/emacs.nix
index ca17359..5a3ca7a 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -7,7 +7,7 @@ with lib;
     package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages 
       (epkgs: with epkgs; [
         vterm
-        magit
+        melpaPackages.magit
         pdf-tools
         consult-eglot
         org
@@ -29,8 +29,8 @@ with lib;
         # tree-sitter
         # tree-sitter-langs
         rustic
-        evil
-        evil-collection
+        melpaPackages.evil
+        melpaPackages.evil-collection
         general
         evil-escape
         evil-surround
@@ -45,7 +45,7 @@ with lib;
         org-re-reveal-citeproc
         ox-reveal
         oer-reveal
-        ox-spectacle
+        # ox-spectacle
         unicode-fonts
         emojify
         undo-tree
@@ -53,18 +53,19 @@ with lib;
         toc-org
         pulsar
         vertico
-        consult
-        marginalia
+        melpaPackages.consult
+        melpaPackages.marginalia
         all-the-icons-completion
-        embark
-        embark-consult
+        melpaPackages.embark
+        melpaPackages.embark-consult
         corfu
-        orderless
-        cape
+        melpaPackages.orderless
+        melpaPackages.cape
         devdocs
         yasnippet
         wgrep
-        tempel
+        melpaPackages.tempel
+        melpaPackages.tempel-collection
         projectile
         simple-httpd
         avy
@@ -81,7 +82,7 @@ with lib;
         yaml-mode
         typescript-mode
         docker
-        docker-tramp
+        # docker-tramp
         fish-mode
         markdown-mode
         qml-mode
@@ -105,7 +106,6 @@ with lib;
         calfw-ical
         org-caldav
         org-wild-notifier
-        magit
         sly
         nov
         elfeed
diff --git a/user/home.nix b/user/home.nix
index f59db70..9b2bfc1 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -22,42 +22,42 @@
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  accounts.email.accounts = {
-    personal = {
-      address = "chris@cochrun.xyz";
-      mbsync.enable = true;
-      create =  "maildir";
-      mu.enable = true;
-      flavor = "plain";
-      imap = {
-        host = "mail.cochrun.xyz";
-        port = 993;
-        tls.enable = true;
-      };
-      smtp = {
-        host = "mail.cochrun.xyz";
-        port = 25;
-        tls.enable = true;
-      };
-    };
-    work = {
-      address = "chris@tfcconnection.org";
-      mbsync.enable = true;
-      create =  "maildir";
-      mu.enable = true;
-      flavor = "outlook.office365.com";
-      imap = {
-        host = "outlook.office365.com";
-        port = 993;
-        tls.enable = true;
-      };
-      smtp = {
-        host = "mail.cochrun.xyz";
-        port = 25;
-        tls.enable = true;
-      };
-    };
-  };
+  # accounts.email.accounts = {
+  #   personal = {
+  #     address = "chris@cochrun.xyz";
+  #     mbsync.enable = true;
+  #     create =  "maildir";
+  #     mu.enable = true;
+  #     flavor = "plain";
+  #     imap = {
+  #       host = "mail.cochrun.xyz";
+  #       port = 993;
+  #       tls.enable = true;
+  #     };
+  #     smtp = {
+  #       host = "mail.cochrun.xyz";
+  #       port = 25;
+  #       tls.enable = true;
+  #     };
+  #   };
+  #   work = {
+  #     address = "chris@tfcconnection.org";
+  #     mbsync.enable = true;
+  #     create =  "maildir";
+  #     mu.enable = true;
+  #     flavor = "outlook.office365.com";
+  #     imap = {
+  #       host = "outlook.office365.com";
+  #       port = 993;
+  #       tls.enable = true;
+  #     };
+  #     smtp = {
+  #       host = "mail.cochrun.xyz";
+  #       port = 25;
+  #       tls.enable = true;
+  #     };
+  #   };
+  # };
 
   programs.git = {
     enable = true;