collapse wayland programs.nix into the desktop

hosts/Parzival-Mobile/default.nix

@@ -16,7 +16,6 @@
   desktop.sway.enable = true;
 
   module.gui.enable = true;
-  module.wayland.enable = true;
   module.programming.enable = true;
   module.hacking.enable = true;
   module.mudding.enable = true;

hosts/Parzival/default.nix

@@ -19,7 +19,6 @@
   module.gui.enable = true;
   module.programming.enable = true;
   module.hacking.enable = true;
-  module.wayland.enable = true;
   module.x11.enable = true;
   module.mudding.enable = true;
   module.gaming.enable = true;

modules/desktops/wayland/sway.nix

@@ -5,13 +5,26 @@
   config,
   ...
 }: {
-  config = {
-    programs.sway = lib.mkIf config.desktop.sway.enable {
-      enable = true;
-      xwayland.enable = true;
-    };
-    programs.dconf.enable = true;
+  config.programs.sway = lib.mkIf config.desktop.sway.enable {
+    enable = true;
+    xwayland.enable = true;
+    extraPackages = with pkgs;
+    [
+        foot
+        wofi
+        swaynotificationcenter
+        udiskie
+        polkit_gnome
+        swayidle
+        sway-audio-idle-inhibit
+        swaylock-effects
+        sway-contrib.grimshot
+        waybar
+        wl-clipboard
+        xorg.xrandr
+    ];
   };
+  programs.dconf.enable = true;
 
   config.environment = lib.mkIf config.desktop.sway.enable {
     sessionVariables = {

modules/options.nix

@@ -9,7 +9,6 @@
       enable = lib.mkEnableOption "enables packages";
       core.enable = lib.mkEnableOption "enables required packages";
       gui.enable = lib.mkEnableOption "enables gui+DE packages";
-      wayland.enable = lib.mkEnableOption "enables wayland packages";
       x11.enable = lib.mkEnableOption "enables x11 packages";
       programming.enable = lib.mkEnableOption "enables programming packages";
       hacking.enable = lib.mkEnableOption "enables hacking packages";
@@ -54,7 +53,6 @@
       core.enable = lib.mkDefault true;
       gui.enable = lib.mkDefault false;
       programming.enable = lib.mkDefault false;
-      wayland.enable = lib.mkDefault false;
       x11.enable = lib.mkDefault false;
       hacking.enable = lib.mkDefault false;
       mudding.enable = lib.mkDefault false;

modules/software/programs.nix

@@ -63,25 +63,6 @@
       ]
       else []
     )
-    ++ (
-      if config.module.wayland.enable
-      then [
-        foot
-        wofi
-        swaynotificationcenter
-        udiskie
-        polkit_gnome
-        swayidle
-        sway-audio-idle-inhibit
-        swaylock-effects
-        sway-contrib.grimshot
-        glfw-wayland-minecraft
-        waybar
-        wl-clipboard
-        xorg.xrandr
-      ]
-      else []
-    )
     ++ (
       if config.module.x11.enable
       then [