From 9c76fbf20ff48f8d08ebe12e564c86e9ebd4a9b3 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Sat, 5 Sep 2020 18:12:07 -0400 Subject: [PATCH] Disable taking control of ~/Applications folder Programs like Steam add applications to ~/Applications and such. This commit disables linking ~/Applications to nix-darwin Applications in the /nix/store and makes nix-darwin use a subfolder within ~/Applications. --- modules/system/applications.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/system/applications.nix b/modules/system/applications.nix index 8183e0a..dcfd7a4 100644 --- a/modules/system/applications.nix +++ b/modules/system/applications.nix @@ -24,12 +24,12 @@ in # Set up applications. echo "setting up ~/Applications..." >&2 - if [ ! -e ~/Applications -o -L ~/Applications ]; then - ln -sfn ${cfg.build.applications}/Applications ~/Applications - elif [ ! -e ~/Applications/Nix\ Apps -o -L ~/Applications/Nix\ Apps ]; then + mkdir -p ~/Applications + + if [ ! -e ~/Applications/Nix\ Apps -o -L ~/Applications/Nix\ Apps ]; then ln -sfn ${cfg.build.applications}/Applications ~/Applications/Nix\ Apps else - echo "warning: ~/Applications and ~/Applications/Nix Apps are directories, skipping App linking..." >&2 + echo "warning: ~/Applications/Nix Apps is not owned by nix-darwin, skipping App linking..." >&2 fi '';