Alright this ain't finished cause of the home stuff but I don't wanna lose what I've done. Impermanence, disko, lots of changes. TODO: add modularity to home.

modules/system/desktop/sway/default.nix

@@ -2,31 +2,14 @@
 {
   imports = [
     ./greetd
+    ./portals
   ];
 
   programs.sway = {
     enable = true;
-    xwayland.enable = true;
-    extraPackages = with pkgs; [
-      swaylock
-      swaybg
-    ];
+    extraPackages = with pkgs; [ swaylock ];
   };
 
   # Allow swaylock to function
   security.pam.services.swaylock = {};
-
-  xdg.portal = {
-    wlr = {
-      enable = true;
-      settings.screencast = {
-        max_fps = 60;
-        chooser_type = "simple";
-        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or -B 00000066 -b 00000099";
-      };
-    };
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-gtk
-    ];
-  };
 }

modules/system/desktop/sway/greetd/default.nix

@@ -1,34 +1,32 @@
 { pkgs, ... }:
 {
-  services = {
-    # Configure greetd for "auto" login (single user only)
-    greetd = let
-      startSway = pkgs.writeScript "startsway" ''
-        if lspci -k | grep "Kernel driver in use: nvidia" &> /dev/null; then
-          export LIBVA_DRIVER_NAME=nvidia
-          export GBM_BACKEND=nvidia-drm
-          export __GLX_VENDOR_LIBRARY_NAME=nvidia
-        else
-          :
-        fi
+  # Configure greetd for login directly to Sway
+  services.greetd = let
+    startSway = pkgs.writeScript "startsway" ''
+      if ${pkgs.pciutils}/bin/lspci -k | grep "in use: nvidia" &> /dev/null; then
+        export LIBVA_DRIVER_NAME=nvidia
+        export GBM_BACKEND=nvidia-drm
+        export __GLX_VENDOR_LIBRARY_NAME=nvidia
+      else
+        :
+      fi
 
-        export XDG_CURRENT_DESKTOP=sway
-        export QT_QPA_PLATFORM="wayland;xcb"
+      export XDG_CURRENT_DESKTOP=sway
+      export QT_QPA_PLATFORM="wayland;xcb"
 
-        sway --unsupported-gpu
-      '';
-    in {
-      enable = true;
-      restart = true;
-      settings = {
-        terminal = {
-          vt = 2;
-          switch = true;
-        };
-        default_session = {
-          command = "${startSway}";
-          user = "jimbo";
-        };
+      sway --unsupported-gpu
+    '';
+  in {
+    enable = true;
+    restart = true;
+    settings = {
+      terminal = {
+        vt = 2;
+        switch = true;
+      };
+      default_session = {
+        command = "${startSway}";
+        user = "jimbo";
       };
     };
   };

modules/system/desktop/sway/portals/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  xdg.portal = {
+    wlr = {
+      enable = true;
+      settings.screencast = {
+        max_fps = 60;
+        chooser_type = "simple";
+        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or -B 00000066 -b 00000099";
+      };
+    };
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+    ];
+  };
+}

modules/system/desktop/wayland/default.nix

@@ -3,7 +3,6 @@
   programs = {
     dconf.enable = true;
     light.enable = true;
-    xwayland.enable = true;
   };
 
   services = {