diff --git a/home-pc.nix b/home-pc.nix
index 13b3279..3143fd3 100644
--- a/home-pc.nix
+++ b/home-pc.nix
@@ -6,7 +6,7 @@
     ./hardware/gpu-amd.nix
     ./hardware/steam.nix
     ./hardware/ledger.nix
-    ./system
+    ./system/desktop.nix
     ./system/gaming.nix
     ./desktop
     ./virtualisation/libvirt.nix
diff --git a/rpi4.nix b/rpi4.nix
index 6dd93e1..dcaa9e5 100644
--- a/rpi4.nix
+++ b/rpi4.nix
@@ -12,10 +12,7 @@ in with builtins; {
   imports = [
     # ./hardware/base.nix
     ./hardware/gpu-rpi4.nix
-    # ./system
-    ./system/nix.nix
-    ./system/i18n.nix
-    ./system/networking.nix
+    ./system/server.nix
     ./modules/emailNotify.nix
     ./services/mail.nix
     ./services/restic/rpi4.nix
diff --git a/system/common.nix b/system/common.nix
new file mode 100644
index 0000000..c78ab85
--- /dev/null
+++ b/system/common.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./i18n.nix ./nix.nix ./networking.nix ./hardened.nix ];
+
+  environment.systemPackages = with pkgs; [ wget curl openssl neovim ];
+}
diff --git a/system/desktop.nix b/system/desktop.nix
new file mode 100644
index 0000000..3e0688c
--- /dev/null
+++ b/system/desktop.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./common.nix ./fonts.nix ./sound.nix ./vpn.nix ];
+
+  services.printing.enable = true;
+  services.fwupd.enable = true;
+}
diff --git a/system/default.nix b/system/fonts.nix
similarity index 77%
rename from system/default.nix
rename to system/fonts.nix
index fb3733f..fab2f07 100644
--- a/system/default.nix
+++ b/system/fonts.nix
@@ -1,17 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./hardened.nix
-    ./sound.nix
-    ./i18n.nix
-    ./nix.nix
-    ./networking.nix
-    ./vpn.nix
-  ];
-
-  environment.systemPackages = with pkgs; [ wget curl openssl neovim ];
-
   # TODO once nerdfonts 2.2.0 is released switch to NerdFontsSymbolsOnly
   # Also needs to be added to known fonts in nixpkgs:
   # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/data/fonts/nerdfonts/shas.nix
@@ -32,7 +21,4 @@
     monospace = [ "Fira Code" "Noto Color Emoji" "FiraCode Nerd Font" ];
     emoji = [ "Noto Color Emoji" "FiraCode Nerd Font" ];
   };
-
-  services.printing.enable = true;
-  services.fwupd.enable = true;
 }
diff --git a/system/server.nix b/system/server.nix
new file mode 100644
index 0000000..9a7db85
--- /dev/null
+++ b/system/server.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./common.nix ];
+}