Unverified Commit 94c30e54 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

Merge pull request #335115 from SuperSandro2000/graphical-desktop 

nixos/graphical-desktop: add enable option, nixos/wayland-session: use graphical-desktop option and remove implicit defaults
parents 3f08237c 4f34325b

nixos/modules/programs/wayland/cardboard.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ in 
      # To make a cardboard session available for certain DMs like SDDM

      services.displayManager.sessionPackages = [ cfg.package ];

    }

    (import ./wayland-session.nix { inherit lib pkgs; })

    (import ./wayland-session.nix { inherit lib; })

  ]);

}

nixos/modules/programs/wayland/hyprland.nix

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ in 
    }



    (import ./wayland-session.nix {

      inherit lib pkgs;

      inherit lib;

      enableXWayland = cfg.xwayland.enable;

      enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed

    })

nixos/modules/programs/wayland/labwc.nix

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ in 
      # To make a labwc session available for certain DMs like SDDM

      services.displayManager.sessionPackages = [ cfg.package ];

    }

    (import ./wayland-session.nix { inherit lib pkgs; })

    (import ./wayland-session.nix { inherit lib; })

  ]);

}

nixos/modules/programs/wayland/miracle-wm.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ in 
      }



      (import ./wayland-session.nix {

        inherit lib pkgs;

        inherit lib;

        # Hardcoded path in Mir, not really possible to disable

        enableXWayland = true;

        # No portal support yet: https://github.com/mattkae/miracle-wm/issues/164

nixos/modules/programs/wayland/river.nix

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ in 
    }



    (import ./wayland-session.nix {

      inherit lib pkgs;

      inherit lib;

      enableXWayland = cfg.xwayland.enable;

    })

  ]);