diff --git a/roles/desktop-common.nix b/roles/desktop-common.nix
new file mode 100644
index 0000000..1f99694
--- /dev/null
+++ b/roles/desktop-common.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ...}:
+
+{
+  imports = [
+    ./base.nix
+    ../fragments/sound.nix
+    ../fragments/multimedia.nix
+    ../fragments/software/syncthing.nix
+    ../fragments/hardware/bluetooth.nix
+  ];
+  
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    arc-theme
+  ];
+
+  # Enable flatpak
+  services.flatpak.enable = true;
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  users.users.nullbite = {
+    packages = with pkgs; [
+      firefox
+    ];
+  };
+}
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 33160e7..2c584d1 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -2,32 +2,9 @@
 
 {
   imports = [
-    ./base.nix
-    ../fragments/sound.nix
-    ../fragments/multimedia.nix
-    ../fragments/software/syncthing.nix
-    ../fragments/hardware/bluetooth.nix
+    ./desktop-common.nix
   ];
-  
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
 
   services.xserver.displayManager.sddm.enable = true;
   services.xserver.desktopManager.plasma5.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    arc-theme
-  ];
-
-  # Enable flatpak
-  services.flatpak.enable = true;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  users.users.nullbite = {
-    packages = with pkgs; [
-      firefox
-    ];
-  };
 }