diff --git a/systems/muninn/default.nix b/systems/muninn/default.nix
index 551011c..e16f948 100644
--- a/systems/muninn/default.nix
+++ b/systems/muninn/default.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
 {
   imports = [
     ../../users/richie
     ../../common/global
+    ../../common/optional/desktop.nix
     ../../common/optional/steam.nix
     ../../common/optional/systemd-boot.nix
     ../../common/optional/update.nix
@@ -26,15 +26,7 @@
 
   security.rtkit.enable = true;
 
-  boot = {
-    kernelPackages = pkgs.linuxPackages_zen;
-    zfs.package = pkgs.zfs_unstable;
-  };
-
-  programs.sway.enable = true;
-
   services = {
-    desktopManager.plasma6.enable = true;
     displayManager = {
       enable = true;
       autoLogin.user = "richie";