mirror of
https://github.com/nix-community/home-manager
synced 2025-01-30 21:05:02 +01:00
hyprland: make package nullable (#5742)
This commit is contained in:
parent
ba3338ab99
commit
7636b24867
1 changed files with 7 additions and 5 deletions
|
@ -56,7 +56,11 @@ in {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
package = lib.mkPackageOption pkgs "hyprland" { };
|
package = lib.mkPackageOption pkgs "hyprland" {
|
||||||
|
nullable = true;
|
||||||
|
extraDescription =
|
||||||
|
"Set this to null if you use the NixOS module to install Hyprland.";
|
||||||
|
};
|
||||||
|
|
||||||
portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { };
|
portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { };
|
||||||
|
|
||||||
|
@ -234,10 +238,8 @@ in {
|
||||||
"You have enabled hyprland.systemd.enable or listed plugins in hyprland.plugins but do not have any configuration in hyprland.settings or hyprland.extraConfig. This is almost certainly a mistake.";
|
"You have enabled hyprland.systemd.enable or listed plugins in hyprland.plugins but do not have any configuration in hyprland.settings or hyprland.extraConfig. This is almost certainly a mistake.";
|
||||||
in lib.optional inconsistent warning;
|
in lib.optional inconsistent warning;
|
||||||
|
|
||||||
home.packages = lib.concatLists [
|
home.packages = lib.mkIf (cfg.package != null)
|
||||||
(lib.optional (cfg.package != null) cfg.finalPackage)
|
([ cfg.finalPackage ] ++ lib.optional cfg.xwayland.enable pkgs.xwayland);
|
||||||
(lib.optional (cfg.xwayland.enable) pkgs.xwayland)
|
|
||||||
];
|
|
||||||
|
|
||||||
xdg.configFile."hypr/hyprland.conf" = let
|
xdg.configFile."hypr/hyprland.conf" = let
|
||||||
shouldGenerate = cfg.systemd.enable || cfg.extraConfig != ""
|
shouldGenerate = cfg.systemd.enable || cfg.extraConfig != ""
|
||||||
|
|
Loading…
Add table
Reference in a new issue