diff --git a/home/default.nix b/home/default.nix
index 1334323..34e8dd1 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -28,97 +28,95 @@ let
   extraSpecialArgs = globalArgs;
 in
 {
-  flake.homeConfigurations =
-    let
-
-    in
-    {
-      natto-laptop = inputs.home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs;
-        modules = [
-          ./natto
-          { isLaptop = true; }
-        ]
-        ++ common;
-        pkgs = mkPkgs "x86_64-linux";
-      };
-
-      natto = inputs.home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs;
-        modules = [ ./natto ];
-        pkgs = mkPkgs "x86_64-linux";
-      };
-
-    }
-
-    // {
-      spark = inputs.home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs;
-        modules = [
-          {
-            home = {
-              homeDirectory = "/home/spark";
-              username = "spark";
-              stateVersion = "23.05";
-            };
-          }
-        ]
-        ++ common;
-        pkgs = mkPkgs "aarch64-linux";
-      };
-
-      bat = inputs.home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs;
-        modules = [
-          {
-            home = {
-              homeDirectory = "/home/bat";
-              username = "bat";
-              stateVersion = "23.05";
-            };
-          }
-        ]
-        ++ common;
-        pkgs = mkPkgs "x86_64-linux";
-      };
-
-      spin = inputs.home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs;
-        modules = [
-          {
-            home = {
-              homeDirectory = "/home/spin";
-              username = "spin";
-              stateVersion = "23.05";
-            };
-          }
-        ]
-        ++ common;
-        pkgs = mkPkgs "x86_64-linux";
-      };
-
-      kero = inputs.home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs;
-        modules = [
-          {
-            home = {
-              homeDirectory = "/home/kero";
-              username = "kero";
-              stateVersion = "24.05";
-            };
-          }
-        ]
-        ++ common;
-        pkgs = mkPkgs "aarch64-linux";
-      };
-
-      amneesh = inputs.home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs;
-        modules = [
-          ./amneesh
-        ]
-        ++ common;
-        pkgs = mkPkgs "x86_64-linux";
-      };
+  flake.homeConfigurations = {
+    natto-laptop = inputs.home-manager.lib.homeManagerConfiguration {
+      inherit extraSpecialArgs;
+      modules = [
+        ./natto
+        ./common/fonts
+        { isLaptop = true; }
+      ]
+      ++ common;
+      pkgs = mkPkgs "x86_64-linux";
     };
+
+    natto = inputs.home-manager.lib.homeManagerConfiguration {
+      inherit extraSpecialArgs;
+      modules = [
+        ./natto
+        ./common/fonts
+      ]
+      ++ common;
+      pkgs = mkPkgs "x86_64-linux";
+    };
+
+    spark = inputs.home-manager.lib.homeManagerConfiguration {
+      inherit extraSpecialArgs;
+      modules = [
+        {
+          home = {
+            homeDirectory = "/home/spark";
+            username = "spark";
+            stateVersion = "23.05";
+          };
+        }
+      ]
+      ++ common;
+      pkgs = mkPkgs "aarch64-linux";
+    };
+
+    bat = inputs.home-manager.lib.homeManagerConfiguration {
+      inherit extraSpecialArgs;
+      modules = [
+        {
+          home = {
+            homeDirectory = "/home/bat";
+            username = "bat";
+            stateVersion = "23.05";
+          };
+        }
+      ]
+      ++ common;
+      pkgs = mkPkgs "x86_64-linux";
+    };
+
+    spin = inputs.home-manager.lib.homeManagerConfiguration {
+      inherit extraSpecialArgs;
+      modules = [
+        {
+          home = {
+            homeDirectory = "/home/spin";
+            username = "spin";
+            stateVersion = "23.05";
+          };
+        }
+      ]
+      ++ common;
+      pkgs = mkPkgs "x86_64-linux";
+    };
+
+    kero = inputs.home-manager.lib.homeManagerConfiguration {
+      inherit extraSpecialArgs;
+      modules = [
+        {
+          home = {
+            homeDirectory = "/home/kero";
+            username = "kero";
+            stateVersion = "24.05";
+          };
+        }
+      ]
+      ++ common;
+      pkgs = mkPkgs "aarch64-linux";
+    };
+
+    amneesh = inputs.home-manager.lib.homeManagerConfiguration {
+      inherit extraSpecialArgs;
+      modules = [
+        ./amneesh
+      ]
+      ++ common;
+      pkgs = mkPkgs "x86_64-linux";
+    };
+  };
 }
diff --git a/home/natto/email.nix b/home/natto/email.nix
index 2b25397..5de45e4 100644
--- a/home/natto/email.nix
+++ b/home/natto/email.nix
@@ -2,49 +2,93 @@
   config,
   lib,
   pkgs,
+  inputs,
+  conf,
   ...
 }:
 let
-  key = "53EC089EF230E47A83BA8F8195949BD4B853F559";
-  host = "mail.weirdnatto.in";
   realName = "Amneesh Singh";
-  address = "natto@weirdnatto.in";
 in
 {
   accounts.email = {
     accounts = {
-      natto = rec {
-        inherit address realName;
-        primary = true;
-        userName = address;
-        gpg = {
-          inherit key;
-          signByDefault = true;
+      natto =
+        let
+          domain = conf.network.addresses.domain.natto;
+          address = "natto@${domain}";
+          host = "mail.${domain}";
+        in
+        {
+          inherit realName address;
+          primary = true;
+          userName = address;
+          gpg = {
+            key = "3C4BDBE7BBF45B52C14EA193007257B05FCC86A8";
+            signByDefault = true;
+          };
+          imap = {
+            inherit host;
+            tls.enable = true;
+          };
+          imapnotify.enable = true;
+          smtp = {
+            inherit host;
+            tls.enable = true;
+          };
+          mbsync = {
+            enable = true;
+            create = "both";
+          };
+          passwordCommand = "pass show email/${address}";
+          neomutt = {
+            enable = true;
+            extraMailboxes = [
+              "Sent"
+              "Drafts"
+              "Trash"
+              "Junk"
+            ];
+          };
         };
-        imap = {
-          inherit host;
-          tls.enable = true;
+
+      amneesh =
+        let
+          domain = conf.network.addresses.domain.amneesh;
+          address = "me@${domain}";
+          host = "mail.${domain}";
+        in
+        {
+          inherit address realName;
+          userName = address;
+
+          gpg = {
+            key = "0C2FDA374F2D48D9F9F0F7788EAAB36980C424C2";
+            signByDefault = true;
+          };
+
+          imap = {
+            inherit host;
+            tls.enable = true;
+          };
+          imapnotify.enable = true;
+          smtp = {
+            inherit host;
+            tls.enable = true;
+          };
+          mbsync = {
+            enable = true;
+            create = "both";
+          };
+          passwordCommand = "pass show email/${address}";
+          neomutt = {
+            enable = true;
+            extraMailboxes = [
+              "Sent"
+              "Drafts"
+              "Junk"
+            ];
+          };
         };
-        imapnotify.enable = true;
-        smtp = {
-          inherit host;
-          tls.enable = true;
-        };
-        mbsync = {
-          enable = true;
-          create = "both";
-        };
-        passwordCommand = "pass show email/${address}";
-        neomutt = {
-          enable = true;
-          extraMailboxes = [
-            "Sent"
-            "Drafts"
-            "Trash"
-            "Junk"
-          ];
-        };
-      };
     };
   };
   services = {