diff --git a/machines/universedesktop/desktop/dwl.nix b/machines/universedesktop/desktop/dwl.nix
index 5220964..b21920c 100644
--- a/machines/universedesktop/desktop/dwl.nix
+++ b/machines/universedesktop/desktop/dwl.nix
@@ -9,6 +9,8 @@ in {
   ];
 
   services.displayManager.sessionPackages = [ pkgs.dwl ];
+  #services.gnome.gnome-keyring.enable = lib.mkDefault true;
+  systemd.packages = [ pkgs.dwl ];
 
   nixpkgs.overlays = [
     (final: prev: {
@@ -85,18 +87,30 @@ in {
     GTK_THEME="Adwaita-dark";
   };
   
-  xdg.portal.wlr = {
-    enable = true;
-    settings = {
-      screencast = {
-        output_name = "DP-2";
-        max_fps = 30;
-        chooser_type = "simple";
-        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
-      };
-    };
+  xdg.portal = {
+    enable = lib.mkDefault true;
+    
+    configPackages = [ pkgs.dwl ];
+    
+    # Recommended by upstream, required for screencast support
+    # https://github.com/YaLTeR/niri/wiki/Important-Software#portals
+    extraPortals = [
+      #pkgs.xdg-desktop-portal-gnome
+      #pkgs.xdg-desktop-portal-gtk
+    ];
+
+    wlr.enable = true;
   };
 
+  security = {
+    polkit.enable = true;
+    pam.services.swaylock = { };
+  };
+
+  services.graphical-desktop.enable = true;
+
+  services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true;
+
   environment.systemPackages = with pkgs; [
     dwl
     waybar
diff --git a/machines/universedesktop/desktop/wayland.nix b/machines/universedesktop/desktop/wayland.nix
index b5cd8c6..eedbe49 100644
--- a/machines/universedesktop/desktop/wayland.nix
+++ b/machines/universedesktop/desktop/wayland.nix
@@ -3,14 +3,13 @@
   hardware = {
     graphics.enable = true;
     graphics.enable32Bit = true;
-    graphics.package = config.hardware.nvidia.package;
 
     nvidia = {
       modesetting.enable = true;
       powerManagement.enable = false;
       powerManagement.finegrained = false;
       nvidiaSettings = true;
-      open = true;
+      open = false;
       package = config.boot.kernelPackages.nvidiaPackages.beta;
       #package = let 
       #  rcu_patch = pkgs.fetchpatch {