diff --git a/hosts/envy/audio.nix b/hosts/envy/audio.nix
deleted file mode 100644
index 9f149a1..0000000
--- a/hosts/envy/audio.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  # 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;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-  systemd.user.services.pipewire-patching = {
-    enable = true;
-    description = "pipewire patches";
-
-    wantedBy = [ "default.target" ];
-
-    script = ''
-      ${pkgs.pipewire}/bin/pw-link alsa_input.pci-0000_0e_00.4.analog-stereo:capture_FL alsa_output.pci-0000_0e_00.4.iec958-stereo:playback_FL
-      ${pkgs.pipewire}/bin/pw-link alsa_input.pci-0000_0e_00.4.analog-stereo:capture_FR alsa_output.pci-0000_0e_00.4.iec958-stereo:playback_FR
-    '';
-  };
-}
diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index 029a7b7..ddb34f4 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -13,7 +13,6 @@ inputs.nixpkgs.lib.nixosSystem {
     home-manager.nixosModules.home-manager
     sops-nix.nixosModules.sops
     ./hardware-configuration.nix
-    ./gui.nix
     ./audio.nix
     ../../modules/common
     ../../modules/nixos
@@ -55,6 +54,7 @@ inputs.nixpkgs.lib.nixosSystem {
 
       # Enable hardware features
       audio.enable = true;
+      gui.enable = true;
 
       services.openssh.enable = true;
       services.flatpak.enable = true;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 55f22b3..fc48230 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -2,5 +2,6 @@
 {
   imports = [
     ./hardware
+    ./software
   ];
 }
\ No newline at end of file
diff --git a/modules/nixos/software/default.nix b/modules/nixos/software/default.nix
new file mode 100644
index 0000000..dd960b3
--- /dev/null
+++ b/modules/nixos/software/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./gui.nix
+  ];
+}
\ No newline at end of file
diff --git a/modules/nixos/software/gui.nix b/modules/nixos/software/gui.nix
new file mode 100644
index 0000000..21ecd94
--- /dev/null
+++ b/modules/nixos/software/gui.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+{
+  config = lib.mkIf (config.gui.enable) {
+    services.xserver.enable = true;
+    services.displayManager.sddm.enable = true;
+    services.xserver = {
+      desktopManager.plasma5.enable = true;
+      xkb = {
+        layout = "us";
+        variant = "";
+      };
+    };
+    networking.networkmanager.enable = true;
+  };
+}