diff --git a/hosts/RyanMac/configuration.nix b/hosts/RyanMac/configuration.nix
index aa91f91..2c629bc 100644
--- a/hosts/RyanMac/configuration.nix
+++ b/hosts/RyanMac/configuration.nix
@@ -173,7 +173,7 @@ in {
];
persistent-others = [
{ folder = { path = "/Users/${username}/Downloads"; showas = "grid"; arrangement = "date-created"; }; }
- { folder = { path = "/Applications"; showas = "grid"; arrangement = "name"; }; }
+ { folder = { path = "/Users/${username}/Applications"; showas = "grid"; arrangement = "name"; }; }
];
show-recents = false;
};
diff --git a/users/ryan/home.nix b/users/ryan/home.nix
index 9154066..33aa292 100644
--- a/users/ryan/home.nix
+++ b/users/ryan/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
{
# This value determines the Home Manager release that your configuration is
@@ -89,12 +89,12 @@
yt-dlp
aerc
gdu
- mpv
taskwarrior3
delta
bat
pass
pandoc
+ iina # Media player (frontend to mpv essentially)
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -112,6 +112,24 @@
# '';
};
+ # Install User apps to subdir for dock stuff
+ targets.darwin.linkApps.directory = "Applications/User Apps";
+
+ # Symlink System apps into the user apps "system" dir
+ home.activation.linkSystemApps = lib.hm.dag.entryAfter ["writeBoundary"] ''
+ if [[ -z "$HOME" ]]; then
+ echo "ERROR: HOME was not defined. This should not happen. Bailing! ">&2
+ exit 1
+ fi
+
+ $DRY_RUN_CMD mkdir -p "$HOME/Applications/System Apps"
+
+ $DRY_RUN_CMD rm -rf "$HOME/Applications/System Apps/"*.app
+
+ $DRY_RUN_CMD find /Applications /System/Applications -maxdepth 2 -name "*.app" \
+ -prune -exec ln -sf {} "$HOME/Applications/System Apps/" \;
+ '';
+
xdg.configFile."aerc" = {
source = ./aerc;
recursive = true;