diff --git a/flake.nix b/flake.nix
index df4e2f6..9440474 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,8 @@
           {
             networking.hostName = "nova";
           }
-          ./system
+          ./system/server.nix
+          ./system/desktop.nix
           ./system/hardware-nova.nix
           ./system/gnome.nix
           ./system/btrbk.nix
@@ -33,7 +34,8 @@
           {
             networking.hostName = "tron";
           }
-          ./system
+          ./system/server.nix
+          ./system/desktop.nix
           ./system/hardware-tron.nix
           ./system/gnome.nix
           ./system/btrbk.nix
@@ -52,7 +54,8 @@
             programs.sway.enable = true;
             security.rtkit.enable = true;
           }
-          ./system
+          ./system/server.nix
+          ./system/desktop.nix
           ./system/hardware-romulus.nix
         ];
       };
diff --git a/system/default.nix b/system/default.nix
index 2ee052e..80d21cb 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./interception-tools.nix
-    ];
-
   nix = {
     settings.experimental-features = [ "nix-command" "flakes" ];
     gc.automatic = true;
@@ -13,101 +8,33 @@
     optimise.automatic = true;
   };
 
-  zramSwap.enable = true;
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.networkmanager.enable = true;
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [ 4000 ];
-  };
-
   time.timeZone = "Europe/Berlin";
-  i18n.extraLocaleSettings = {
-    LC_TIME = "en_GB.UTF-8";
-    LC_CTYPE = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-  };
 
   users.users.till = {
     isNormalUser = true;
     description = "Till";
     extraGroups = [
       "wheel"
-      "networkmanager"
     ];
-    shell = pkgs.fish;
-  };
-
-  programs.steam = {
-    enable = true;
-  };
-
-  # sound
-  hardware.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  nixpkgs.config.allowUnfree = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    pinentryPackage = pkgs.pinentry-curses;
-  };
-
-  programs.fish.enable = true;
-
-  environment.sessionVariables = {
-    XDG_CONFIG_HOME = "$HOME/.config";
-    XDG_CACHE_HOME = "$HOME/.cache";
-    XDG_DATA_HOME = "$HOME/.local/share";
   };
 
   environment.systemPackages = with pkgs; [
     dig.dnsutils
     file
-    firefox
-    foot
     git
     htop
     killall
     neovim
-    pciutils
     pwgen
     tree
     unzip
-    # libguestfs
-    # guestfs-tools
-    virtiofsd
     wget
   ];
 
-  nixpkgs.config.joypixels.acceptLicense = true;
-  fonts.packages = with pkgs; [
-    jetbrains-mono
-    joypixels
-  ];
-
   services = {
-    dbus.enable = true;
-    flatpak.enable = true;
-    fwupd.enable = true;
-    mullvad-vpn.enable = true;
-    mullvad-vpn.package = pkgs.mullvad-vpn;
     ntp.enable = true;
     openssh.enable = true;
-    printing.enable = true;
   };
 
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
-  programs.dconf.enable = true;
-
   system.stateVersion = "22.11";
 }
diff --git a/system/desktop.nix b/system/desktop.nix
new file mode 100644
index 0000000..8405ff9
--- /dev/null
+++ b/system/desktop.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [
+      ./interception-tools.nix
+    ];
+
+  zramSwap.enable = true;
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.networkmanager.enable = true;
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 4000 ];
+  };
+
+  i18n.extraLocaleSettings = {
+    LC_TIME = "en_GB.UTF-8";
+    LC_CTYPE = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+  };
+
+  users.users.till = {
+    extraGroups = [
+      "networkmanager"
+    ];
+    shell = pkgs.fish;
+  };
+
+  programs.steam = {
+    enable = true;
+  };
+
+  hardware.pulseaudio.enable = false;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-curses;
+  };
+
+  programs.fish.enable = true;
+
+  environment.sessionVariables = {
+    XDG_CONFIG_HOME = "$HOME/.config";
+    XDG_CACHE_HOME = "$HOME/.cache";
+    XDG_DATA_HOME = "$HOME/.local/share";
+  };
+
+  environment.systemPackages = with pkgs; [
+    firefox
+    foot
+    pciutils
+    tree
+    virtiofsd
+  ];
+
+  nixpkgs.config.joypixels.acceptLicense = true;
+  fonts.packages = with pkgs; [
+    jetbrains-mono
+    joypixels
+  ];
+
+  services = {
+    dbus.enable = true;
+    flatpak.enable = true;
+    fwupd.enable = true;
+    mullvad-vpn.enable = true;
+    mullvad-vpn.package = pkgs.mullvad-vpn;
+    printing.enable = true;
+  };
+
+  virtualisation.libvirtd.enable = true;
+  programs.virt-manager.enable = true;
+  programs.dconf.enable = true;
+
+}
diff --git a/system/server.nix b/system/server.nix
deleted file mode 100644
index 80d21cb..0000000
--- a/system/server.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  nix = {
-    settings.experimental-features = [ "nix-command" "flakes" ];
-    gc.automatic = true;
-    gc.dates = "weekly";
-    optimise.automatic = true;
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  users.users.till = {
-    isNormalUser = true;
-    description = "Till";
-    extraGroups = [
-      "wheel"
-    ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    dig.dnsutils
-    file
-    git
-    htop
-    killall
-    neovim
-    pwgen
-    tree
-    unzip
-    wget
-  ];
-
-  services = {
-    ntp.enable = true;
-    openssh.enable = true;
-  };
-
-  system.stateVersion = "22.11";
-}
diff --git a/system/web-server.nix b/system/web-server.nix
new file mode 100644
index 0000000..0c948a1
--- /dev/null
+++ b/system/web-server.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  services.jenkins.enable = true;
+}