diff --git a/machines/cray/configuration.nix b/machines/cray/configuration.nix
index 565e96e..0d4fe1a 100644
--- a/machines/cray/configuration.nix
+++ b/machines/cray/configuration.nix
@@ -10,14 +10,7 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../modules/fonts.nix
-    ../../modules/sound.nix
-    ../../modules/opengl.nix
-    ../../modules/ssh.nix
-    ../../modules/remote-builder.nix
-    ../../modules/earlyoom.nix
-    ../../users/fleaz.nix
-    ../../home-manager/default.nix
+    ../../roles/all.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/machines/jimbo/configuration.nix b/machines/jimbo/configuration.nix
index 8dd8fb4..925c3c3 100644
--- a/machines/jimbo/configuration.nix
+++ b/machines/jimbo/configuration.nix
@@ -11,14 +11,7 @@ in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../home-manager/default.nix
-    ../../modules/earlyoom.nix
-    ../../modules/fonts.nix
-    ../../modules/opengl.nix
-    ../../modules/remote-builder.nix
-    ../../modules/sound.nix
-    ../../modules/ssh.nix
-    ../../users/fleaz.nix
+    ../../roles/all.nix
   ];
 
 
diff --git a/roles/all.nix b/roles/all.nix
new file mode 100644
index 0000000..ee32477
--- /dev/null
+++ b/roles/all.nix
@@ -0,0 +1,13 @@
+{ 
+  imports = [
+    ../home-manager/default.nix
+    ../modules/earlyoom.nix
+    ../modules/fonts.nix
+    ../modules/opengl.nix
+    ../modules/remote-builder.nix
+    ../modules/sound.nix
+    ../modules/ssh.nix
+    ../users/fleaz.nix
+  ];
+ }
+