From ec9ad1e01930955f0c6f9064faa136b30c0f73e2 Mon Sep 17 00:00:00 2001 From: Nickolaj Jepsen Date: Tue, 25 Feb 2025 22:58:44 +0100 Subject: [PATCH] chore: simplify primary name statement --- modules/desktop/fireproof-shell.nix | 9 ++------- modules/desktop/hyprland/default.nix | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/desktop/fireproof-shell.nix b/modules/desktop/fireproof-shell.nix index 3c4723f..7037018 100644 --- a/modules/desktop/fireproof-shell.nix +++ b/modules/desktop/fireproof-shell.nix @@ -3,18 +3,13 @@ inputs, pkgs, ... -}: let - primaryMonitorName = - if builtins.length config.monitors > 0 - then (builtins.elemAt config.monitors 0).name - else ""; -in { +}: { environment.systemPackages = [ inputs.fireproof-shell.packages.${pkgs.system}.fireproof-shell ]; programs.fireproof-shell = { enable = true; systemd = true; - monitor.primary = primaryMonitorName; + monitor.primary = (builtins.head config.monitors).name or ""; }; } diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix index 1afb5b8..5d417e0 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/desktop/hyprland/default.nix @@ -7,10 +7,7 @@ }: with lib; let cfg = config.fireproof; - primaryMonitorName = - if builtins.length config.monitors > 0 - then (builtins.elemAt config.monitors 0).name - else ""; + primaryMonitorName = (builtins.head config.monitors).name or ""; hyprPkgs = { inherit (inputs.hyprland.packages.${pkgs.system}) hyprland;