From 211d4b9661f86f2638be4278401c7fb56a64f10c Mon Sep 17 00:00:00 2001 From: Martin Larsson Date: Thu, 25 Dec 2025 13:42:30 +0100 Subject: [PATCH] Comment out solution for mkappalias on darwin, dont think its needed anymore --- nix/home/darwin.nix | 14 +++++------ nix/system/darwin.nix | 16 ++++++------ nix/utils.nix | 58 +++++++++++++++++++++---------------------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/nix/home/darwin.nix b/nix/home/darwin.nix index a246609..8925dc0 100644 --- a/nix/home/darwin.nix +++ b/nix/home/darwin.nix @@ -29,12 +29,12 @@ in ]; file = utils.mk_symlinks { inherit config dotfiles; }; - activation.applications = utils.mkAppAliasHome { - derivationName = "home-applications"; - appsPath = config.home.packages; - outputDir = "${config.home.homeDirectory}/Applications/Nix"; - pkgs = pkgs; - lib = lib; - }; + # activation.applications = utils.mkAppAliasHome { + # derivationName = "home-applications"; + # appsPath = config.home.packages; + # outputDir = "${config.home.homeDirectory}/Applications/Nix"; + # pkgs = pkgs; + # lib = lib; + # }; }; } diff --git a/nix/system/darwin.nix b/nix/system/darwin.nix index 001d944..7cb0313 100644 --- a/nix/system/darwin.nix +++ b/nix/system/darwin.nix @@ -70,13 +70,13 @@ in }; hitoolbox.AppleFnUsageType = "Show Emoji & Symbols"; }; - - activationScripts.applications.text = utils.mkAppAliasSystem { - derivationName = "system-applications"; - appsPath = config.environment.systemPackages; - outputDir = "/Applications/Nix"; - pkgs = pkgs; - lib = lib; - }; + # + # activationScripts.applications.text = utils.mkAppAliasSystem { + # derivationName = "system-applications"; + # appsPath = config.environment.systemPackages; + # outputDir = "/Applications/Nix"; + # pkgs = pkgs; + # lib = lib; + # }; }; } diff --git a/nix/utils.nix b/nix/utils.nix index 7219c9b..82f76b1 100644 --- a/nix/utils.nix +++ b/nix/utils.nix @@ -14,38 +14,38 @@ rec { }) dotfiles ); - mkAppAliasSystem = args: args.pkgs.lib.mkForce (mkAppAliasScriptContent args); - mkAppAliasHome = - args: args.lib.hm.dag.entryAfter [ "writeBoundary" ] (mkAppAliasScriptContent args); + # mkAppAliasSystem = args: args.pkgs.lib.mkForce (mkAppAliasScriptContent args); + # mkAppAliasHome = + # args: args.lib.hm.dag.entryAfter [ "writeBoundary" ] (mkAppAliasScriptContent args); # Darwin System / Home Manager expects activation scripts in different formats # This only return the script body, use the other two functions in the config. - mkAppAliasScriptContent = - { - derivationName, - appsPath, - outputDir, - pkgs, - lib, - }: - let - env = pkgs.buildEnv { - name = derivationName; - paths = appsPath; - pathsToLink = "/Applications"; - }; - in - '' - echo "Setting up macOS .app aliases..." >&2 - rm -rf "${outputDir}" - mkdir -p "${outputDir}" - - find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + | - while read -r src; do - app_name=$(basename "$src") - ${pkgs.mkalias}/bin/mkalias "$src" "${outputDir}/$app_name" - done - ''; + # mkAppAliasScriptContent = + # { + # derivationName, + # appsPath, + # outputDir, + # pkgs, + # lib, + # }: + # let + # env = pkgs.buildEnv { + # name = derivationName; + # paths = appsPath; + # pathsToLink = "/Applications"; + # }; + # in + # '' + # echo "Setting up macOS .app aliases..." >&2 + # rm -rf "${outputDir}" + # mkdir -p "${outputDir}" + # + # find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + | + # while read -r src; do + # app_name=$(basename "$src") + # ${pkgs.mkalias}/bin/mkalias "$src" "${outputDir}/$app_name" + # done + # ''; mkFswatchService = {