From fa4cacd136ac578e3ea505d527587ef73ffff0fc Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 14 Nov 2024 23:47:26 +0530 Subject: [PATCH] nixos/hyprland: format with nixfmt rfc style (cherry picked from commit 48da44a4810038833578630cb10f135a38eefb1f) --- nixos/modules/programs/wayland/hyprland.nix | 129 ++++++++++++-------- 1 file changed, 75 insertions(+), 54 deletions(-) diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index 6e69c1730e57..2a1948d52294 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.programs.hyprland; @@ -13,29 +18,39 @@ in A configuration file will be generated in {file}`~/.config/hypr/hyprland.conf`. See for more information''; - package = lib.mkPackageOption pkgs "hyprland" { - extraDescription = '' - If the package is not overridable with `enableXWayland`, then the module option - {option}`xwayland` will have no effect. - ''; - } // { - apply = p: wayland-lib.genFinalPackage p { - enableXWayland = cfg.xwayland.enable; + package = + lib.mkPackageOption pkgs "hyprland" { + extraDescription = '' + If the package is not overridable with `enableXWayland`, then the module option + {option}`xwayland` will have no effect. + ''; + } + // { + apply = + p: + wayland-lib.genFinalPackage p { + enableXWayland = cfg.xwayland.enable; + }; }; - }; - portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { - extraDescription = '' - If the package is not overridable with `hyprland`, then the Hyprland package - used by the portal may differ from the one set in the module option {option}`package`. - ''; - } // { - apply = p: wayland-lib.genFinalPackage p { - hyprland = cfg.package; + portalPackage = + lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { + extraDescription = '' + If the package is not overridable with `hyprland`, then the Hyprland package + used by the portal may differ from the one set in the module option {option}`package`. + ''; + } + // { + apply = + p: + wayland-lib.genFinalPackage p { + hyprland = cfg.package; + }; }; - }; - xwayland.enable = lib.mkEnableOption "XWayland" // { default = true; }; + xwayland.enable = lib.mkEnableOption "XWayland" // { + default = true; + }; systemd.setPath.enable = lib.mkEnableOption null // { default = lib.versionOlder cfg.package.version "0.41.2"; @@ -49,46 +64,52 @@ in }; }; - config = lib.mkIf cfg.enable (lib.mkMerge [ - { - environment.systemPackages = [ cfg.package ]; + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + environment.systemPackages = [ cfg.package ]; - # To make a Hyprland session available if a display manager like SDDM is enabled: - services.displayManager.sessionPackages = [ cfg.package ]; + # To make a Hyprland session available if a display manager like SDDM is enabled: + services.displayManager.sessionPackages = [ cfg.package ]; - xdg.portal = { - enable = true; - extraPortals = [ cfg.portalPackage ]; - configPackages = lib.mkDefault [ cfg.package ]; - }; + xdg.portal = { + enable = true; + extraPortals = [ cfg.portalPackage ]; + configPackages = lib.mkDefault [ cfg.package ]; + }; - systemd = lib.mkIf cfg.systemd.setPath.enable { - user.extraConfig = '' - DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH" - ''; - }; - } + systemd = lib.mkIf cfg.systemd.setPath.enable { + user.extraConfig = '' + DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH" + ''; + }; + } - (import ./wayland-session.nix { - inherit lib pkgs; - enableXWayland = cfg.xwayland.enable; - enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed - }) - ]); + (import ./wayland-session.nix { + inherit lib pkgs; + enableXWayland = cfg.xwayland.enable; + enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed + }) + ] + ); imports = [ - (lib.mkRemovedOptionModule - [ "programs" "hyprland" "xwayland" "hidpi" ] - "XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland" - ) - (lib.mkRemovedOptionModule - [ "programs" "hyprland" "enableNvidiaPatches" ] - "Nvidia patches are no longer needed" - ) - (lib.mkRemovedOptionModule - [ "programs" "hyprland" "nvidiaPatches" ] - "Nvidia patches are no longer needed" - ) + (lib.mkRemovedOptionModule [ + "programs" + "hyprland" + "xwayland" + "hidpi" + ] "XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland") + (lib.mkRemovedOptionModule [ + "programs" + "hyprland" + "enableNvidiaPatches" + ] "Nvidia patches are no longer needed") + (lib.mkRemovedOptionModule [ + "programs" + "hyprland" + "nvidiaPatches" + ] "Nvidia patches are no longer needed") ]; meta.maintainers = with lib.maintainers; [ fufexan ];