diff --git a/flake.lock b/flake.lock
index 8c33832..f6b518f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,11 +24,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1656413262,
-        "narHash": "sha256-I8X1LaW/qoSWeBLK0N8GPOshIuXG9zyNyZUtKZYa0h4=",
+        "lastModified": 1657362523,
+        "narHash": "sha256-hoYYqpCKsuHqYwMnK9lcUYHnuf5OaDFPqCt/RavKsRw=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8772891c73e2809df5e5469d14535ea77e123d3e",
+        "rev": "e1c34ef6f6eb7d966af5011eeeec6342017cd535",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1656065134,
-        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1656065134,
-        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
         "type": "github"
       },
       "original": {
@@ -154,11 +154,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1656367977,
-        "narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=",
+        "lastModified": 1657241847,
+        "narHash": "sha256-/aN3p2LaRNVXf7w92GWgXq9H5f23YRQPOvsm3BrBqzU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1",
+        "rev": "8160b3b45b8457d58d2b3af2aeb2eb6f47042e0f",
         "type": "github"
       },
       "original": {
@@ -304,11 +304,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1656353817,
-        "narHash": "sha256-UJEzMQcft/0Ilu4LWV7UH51mr5UCo28GL06BGO+djv4=",
+        "lastModified": 1656933710,
+        "narHash": "sha256-SVG8EqY1OTJWBRY4hpct2ZR2Rk0L8hCFkug3m0ABoZE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "78e7c2c397b0376526e83162b58de921362e3399",
+        "rev": "3bf48d3587d3f34f745a19ebc968b002ef5b5c5a",
         "type": "github"
       },
       "original": {
@@ -337,8 +337,8 @@
     "nixpkgs": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-nv4FfWWV/dEelByjXJtJkoDPOHIsKfLq50RN3Hqq5Yk=",
-        "path": "/nix/store/lyv9kw3jv8dwp7lr5ik22k3w01rf24w2-source",
+        "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=",
+        "path": "/nix/store/8mik2m5inkjin29v5gv5zc2jji4lab3l-source",
         "type": "path"
       },
       "original": {
@@ -396,11 +396,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1656461576,
-        "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=",
+        "lastModified": 1657265485,
+        "narHash": "sha256-PUQ9C7mfi0/BnaAUX2R/PIkoNCb/Jtx9EpnhMBNrO/o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c",
+        "rev": "b39924fc7764c08ae3b51beef9a3518c414cdb7d",
         "type": "github"
       },
       "original": {
@@ -499,11 +499,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1656611551,
-        "narHash": "sha256-S1GkwCgMimVVU1nrwezTkoOqsoiXvvK1+pu4zplsqwo=",
+        "lastModified": 1657372868,
+        "narHash": "sha256-yXzNQRlQMCYJJn4fA+zZNj3W0t9w+WDeCKG7D86YkTE=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "b58e819d423cc525475b43bd06cf5f999feb5325",
+        "rev": "38f00cf4ee1dab9c10883b1d464486f0c040bb80",
         "type": "github"
       },
       "original": {
diff --git a/hosts/miku.nix b/hosts/miku.nix
index 3709194..9106b26 100644
--- a/hosts/miku.nix
+++ b/hosts/miku.nix
@@ -51,12 +51,12 @@
     spotify-wrapped
     zoom-vm
 
-    lapce
+    #lapce
   ];
 
   ptw = {
     programs = {
-      bluray.enable = true;
+      #bluray.enable = true;
       mpv = {
         primaryScreen = "C27F398";
         enable = true;
@@ -81,15 +81,15 @@
     };
     services = {
       gamemode.enable = true;
-      gnome.enable = true;
+      #gnome.enable = true;
       logiops.enable = true;
       input-remapper = {
         enable = true;
         postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
       };
-      gdm = {
-        enable = true;
-      };
+      #gdm = {
+      #  enable = true;
+      #};
     };
     system = {
       i18n.enable = true;
@@ -183,6 +183,7 @@
   };
 
   # TODO: Move into modules
+  /*
   systemd = {
     services = {
       enable-vendor-reset = {
@@ -217,4 +218,5 @@
       };
     };
   };
+  */
 }
diff --git a/modules/programs/plasma/default.nix b/modules/programs/plasma/default.nix
index e2c2661..90eabcf 100644
--- a/modules/programs/plasma/default.nix
+++ b/modules/programs/plasma/default.nix
@@ -17,11 +17,19 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    security.pam.services = {
+      login.enableKwallet = true;
+      greetd.enableKwallet = true;
+    };
     services.xserver = {
+      displayManager.sddm = {
+        enable = true;
+        autoNumlock = true;
+      };
       desktopManager.plasma5 = {
         enable = true;
-        runUsingSystemd = true;
-        supportDDC = true;
+        #runUsingSystemd = true;
+        #supportDDC = true;
         mobile.enable = cfg.mobile.enable;
 
         /*
diff --git a/overlays/simple.nix b/overlays/simple.nix
index 153c012..3e20bac 100644
--- a/overlays/simple.nix
+++ b/overlays/simple.nix
@@ -98,7 +98,8 @@ final: prev:
     '';
   });
 
-  /*
+  # See https://github.com/NixOS/nixpkgs/issues/171320
+  # Fixes XWayland crashing after a resume.
   xwayland = prev.xwayland.overrideAttrs (old: rec {
     version = "21.1.4";
     src = prev.fetchurl {
@@ -106,7 +107,6 @@ final: prev:
       sha256 = "sha256-GfZ5XzHPqOs1Kx5bPDefIu5gIOmHAf8sxnnajE8RWfc=";
     };
   });
-  */
 
   # See
   # https://github.com/NixOS/nixpkgs/commit/2bf8d8c0162507d08f9fc48e36ce7225f4879bd4