diff --git a/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix
index ee73bb15..2df8c031 100644
--- a/home/opdavies/hosts/t480.nix
+++ b/home/opdavies/hosts/t480.nix
@@ -29,10 +29,4 @@
       }
     ))
   ];
-
-  programs.neomutt = {
-    enable = true;
-
-    vimKeys = true;
-  };
 }
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index fe7f0615..eecd55d9 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -30,6 +30,7 @@
     ../common
     ../../users/opdavies
 
+    ./modules/neomutt.nix
     ./modules/newsboat
     ./modules/notes.nix
   ];
diff --git a/hosts/t480/modules/neomutt.nix b/hosts/t480/modules/neomutt.nix
new file mode 100644
index 00000000..57e3cc43
--- /dev/null
+++ b/hosts/t480/modules/neomutt.nix
@@ -0,0 +1,7 @@
+{
+  programs.neomutt = {
+    enable = true;
+
+    vimKeys = true;
+  };
+}