diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix
index de9e089..f0d3f49 100644
--- a/hosts/envy/default.nix
+++ b/hosts/envy/default.nix
@@ -49,23 +49,12 @@ inputs.nixpkgs.lib.nixosSystem {
       home-manager.backupFileExtension = "backup";
       hardware.bluetooth.enable = true;
       hardware.bluetooth.powerOnBoot = 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;
-        # 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;
-      };
+      # Enable hardware features
+      audio.enable = true;
+      gui.enable = true;
 
+      # Make sure OpenSSH is using a proper ed25519 key.
       services.openssh = {
         enable = true;
         hostKeys = [
diff --git a/hosts/envy/gui.nix b/hosts/envy/gui.nix
deleted file mode 100644
index d89d294..0000000
--- a/hosts/envy/gui.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  gui.enable = true;
-
-  services.xserver.enable = true;
-  services.displayManager.sddm.enable = true;
-  services.xserver = {
-    desktopManager.plasma5.enable = true;
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
-  };
-  networking.networkmanager.enable = true;
-}
diff --git a/hosts/kim/gui.nix b/hosts/kim/gui.nix
deleted file mode 100644
index d89d294..0000000
--- a/hosts/kim/gui.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  gui.enable = true;
-
-  services.xserver.enable = true;
-  services.displayManager.sddm.enable = true;
-  services.xserver = {
-    desktopManager.plasma5.enable = true;
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
-  };
-  networking.networkmanager.enable = true;
-}