diff --git a/machines/workstation/configuration.nix b/machines/workstation/configuration.nix
index 96083b5..b4420d7 100644
--- a/machines/workstation/configuration.nix
+++ b/machines/workstation/configuration.nix
@@ -8,6 +8,7 @@
       ../../system/services/cups.nix
       ../../system/services/ssh.nix
       ../../system/services/polkit.nix
+      ../../system/services/flatpak.nix
       ../../system/hardware/kernel.nix
       ../../system/hardware/nvidia.nix
       ../../system/hardware/opengl.nix
diff --git a/system/hardware/opengl.nix b/system/hardware/opengl.nix
index 6b738e5..906b45a 100644
--- a/system/hardware/opengl.nix
+++ b/system/hardware/opengl.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
-  hardware.opengl.enable = true;
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.graphics.enable = true;
+  hardware.graphics.extraPackages = with pkgs; [
     mesa
   ];
 }
diff --git a/system/wm/plasma.nix b/system/wm/plasma.nix
new file mode 100644
index 0000000..057ed70
--- /dev/null
+++ b/system/wm/plasma.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+{
+  imports = [
+    ./dbus.nix
+  ];
+  services.displayManager.plasma6.enable = true;
+
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+    plasma-browser-integration
+  ];
+}
diff --git a/system/wm/sddm.nix b/system/wm/sddm.nix
index 943a980..f5434e3 100644
--- a/system/wm/sddm.nix
+++ b/system/wm/sddm.nix
@@ -6,6 +6,7 @@
     ./gnome-keyring.nix
     ./xmonad.nix
     ./sway.nix
+    ./plasma.nix
   ];
 
   environment.systemPackages = with pkgs; [
diff --git a/system/wm/x11.nix b/system/wm/x11.nix
deleted file mode 100644
index 755dd52..0000000
--- a/system/wm/x11.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./fonts.nix
-    ./dbus.nix
-    ./gnome-keyring.nix
-  ];
-
-  services.xserver = {
-    enable = true;
-    layout = "us";
-    xkbVariant = "";
-    xkbOptions = "";
-    excludePackages = [ pkgs.xterm ];
-    displayManager.sddm = {
-      enable = true;
-      wayland.enable = false;
-      package = pkgs.sddm;
-    };
-  };
-}