From f3b7a6a33588ad425de02c4b841df19f30733e44 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Mon, 9 Jun 2025 19:43:34 +0000 Subject: reorganize programs, move functions to library, and remove the rest of hyprland (all sway now) --- lib/cfgWrapper.nix | 63 ------------------------------------------------------ 1 file changed, 63 deletions(-) delete mode 100644 lib/cfgWrapper.nix (limited to 'lib/cfgWrapper.nix') diff --git a/lib/cfgWrapper.nix b/lib/cfgWrapper.nix deleted file mode 100644 index 2e57656..0000000 --- a/lib/cfgWrapper.nix +++ /dev/null @@ -1,63 +0,0 @@ -{pkgs}: { - pkg, - binName ? pkg.meta.mainProgram, - extraFlags ? [], - extraWrapperFlags ? [], - extraPkgs ? [], - extraEnv ? {}, - postBuild ? "", - hidePkgs ? false, - reducePath ? false, -}: let - extraFlagsArgs = pkgs.lib.pipe extraFlags [ - (builtins.map (x: ''--add-flags "${x}" '')) - (builtins.concatStringsSep " ") - ]; - - extraWrapperFlagsArgs = builtins.concatStringsSep " " extraWrapperFlags; - - pathArg = - if (extraPkgs != []) - then ''--prefix PATH : "${pkgs.lib.makeBinPath extraPkgs}"'' - else ""; - - # Looks like { - # VAR = "value"; - # VAR2 = "value_again"; - # } - envArgs = pkgs.lib.pipe extraEnv [ - (builtins.mapAttrs (k: v: ''--set ${k} "${v}"'')) - builtins.attrValues - (builtins.concatStringsSep " ") - ]; - - extraPkgs2 = - if reducePath - then - (pkgs.symlinkJoin { - name = "${binName}-extra-pkgs"; - paths = extraPkgs; - }) - else extraPkgs; - - wrapped-program = pkgs.symlinkJoin { - name = "${binName}-wrapped-program"; - paths = [pkg] ++ extraPkgs2; - - buildInputs = [pkgs.makeWrapper]; - postBuild = '' - ${postBuild} - - wrapProgram $out/bin/${binName} ${extraFlagsArgs} ${pathArg} ${envArgs} ${extraWrapperFlagsArgs} - ''; - }; -in - if hidePkgs - then - (pkgs.linkFarm "${binName}-only-bin" [ - { - name = "bin/${binName}"; - path = "${wrapped-program}/bin/${binName}"; - } - ]) - else wrapped-program -- cgit v1.3.1