diff --git a/hosts/main.nix b/hosts/main.nix
index 81c2d7a..faa817e 100644
--- a/hosts/main.nix
+++ b/hosts/main.nix
@@ -7,6 +7,7 @@
     # Include device-specific overrides
     (if builtins.pathExists /etc/nixos/device-configuration.nix then /etc/nixos/device-configuration.nix else null)
     ../nix-os/core.nix
+    ../nix-os/core-desktop.nix
     ../nix-os/nvidia.nix
     ../nix-os/docker.nix
     ../nix-os/razer.nix
diff --git a/nix-os/core-desktop.nix b/nix-os/core-desktop.nix
new file mode 100644
index 0000000..2f5a087
--- /dev/null
+++ b/nix-os/core-desktop.nix
@@ -0,0 +1,28 @@
+{config, lib, pkgs, ... }:
+
+{
+  config = {
+    services.printing.enable = true;
+
+    sound.enable = true;
+    hardware.pulseaudio.enable = false;
+    security.rtkit.enable = true;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+
+      # Enable audio interfaces renaming
+      wireplumber.enable = true;
+    };
+
+    environment.systemPackages = with pkgs; [
+      mpv
+    ];
+
+    services.openssh.extraConfig = ''
+      X11Forwarding yes
+    '';
+  };
+}
\ No newline at end of file
diff --git a/nix-os/core.nix b/nix-os/core.nix
index 663354f..994a483 100644
--- a/nix-os/core.nix
+++ b/nix-os/core.nix
@@ -12,29 +12,8 @@
   # kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
   # Enable networking
   networking.networkmanager.enable = true;
-  
-  # X11 and desktop/display manager is enabled using imported files
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-
-    # Enable audio interfaces renaming
-    wireplumber.enable = true;
-  };
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -46,7 +25,6 @@
     git
     ffmpeg
     yt-dlp
-    mpv
     htop
     btop
     fastfetch
@@ -69,8 +47,5 @@
       22
       8022
     ];
-    extraConfig = ''
-      X11Forwarding yes
-    '';
   };
 }