diff --git a/machines/jimbo/configuration.nix b/machines/jimbo/configuration.nix
index b19a558..ebf9052 100644
--- a/machines/jimbo/configuration.nix
+++ b/machines/jimbo/configuration.nix
@@ -56,12 +56,6 @@ in
   networking.networkmanager.enable = true;
   programs.nm-applet.enable = true;
 
-  services.avahi = {
-    nssmdns = true;
-    enable = true;
-    ipv4 = true;
-    ipv6 = true;
-  };
 
   hardware.opengl = {
     enable = true;
diff --git a/modules/avahi.nix b/modules/avahi.nix
new file mode 100644
index 0000000..6fd877b
--- /dev/null
+++ b/modules/avahi.nix
@@ -0,0 +1,8 @@
+{
+  services.avahi = {
+    nssmdns = true;
+    enable = true;
+    ipv4 = true;
+    ipv6 = true;
+  };
+}
\ No newline at end of file
diff --git a/roles/all.nix b/roles/all.nix
index 3ebdb6f..12a0484 100644
--- a/roles/all.nix
+++ b/roles/all.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ../home-manager/default.nix
+    ../modules/avahi.nix
     ../modules/earlyoom.nix
     ../modules/fonts.nix
     ../modules/opengl.nix