From 230d216cb35051fe5f3aed59200b012551d16af1 Mon Sep 17 00:00:00 2001 From: isaacST08 Date: Mon, 10 Mar 2025 10:00:26 -0600 Subject: [PATCH] Started work to resolve infrec error --- .../languages/tex/pdfViewer/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/plugins/languages/tex/pdfViewer/default.nix b/modules/plugins/languages/tex/pdfViewer/default.nix index 18d5bd58..6d6dcd7e 100644 --- a/modules/plugins/languages/tex/pdfViewer/default.nix +++ b/modules/plugins/languages/tex/pdfViewer/default.nix @@ -5,7 +5,15 @@ }: let defaultPdfViewerName = "okular"; - inherit (builtins) filter isAttrs hasAttr attrNames length elemAt; + inherit + (builtins) + filter + isAttrs + hasAttr + attrNames + length + elemAt + ; inherit (lib.modules) mkIf; inherit (lib.options) mkOption; inherit (lib.types) str package listOf; @@ -24,13 +32,9 @@ pdfViewerNamesList ? ( filter ( x: let - y = viewerCfg.${x}; + y = viewerCfg."${x}"; in ( - isAttrs y - && hasAttr "enable" y - && hasAttr "package" y - && hasAttr "executable" y - && hasAttr "args" y + isAttrs y && hasAttr "enable" y && hasAttr "package" y && hasAttr "executable" y && hasAttr "args" y ) ) (attrNames viewerCfg) ), @@ -40,7 +44,7 @@ currentPdfViewerName = elemAt pdfViewerNamesList index; # Get the current pdf viewer object - currentPdfViewer = viewerCfg.${currentPdfViewerName}; + currentPdfViewer = viewerCfg."${currentPdfViewerName}"; # Get the index that will be used for the next iteration nextIndex = index + 1; @@ -77,7 +81,7 @@ }; in (getEnabledPdfViewersInfo {}); - enabledPdfViewerCfg = viewerCfg.${enabledPdfViewersInfo.enabledViewerName}; + enabledPdfViewerCfg = viewerCfg."${enabledPdfViewersInfo.enabledViewerName}"; in { imports = [ ./custom.nix