programs: assorted: convert /mnt/servo "extraPaths" into "extraHomePaths" where possible

hosts/common/programs/assorted.nix

@@ -303,13 +303,11 @@ in
     gimp.sandbox.wrapperType = "wrappedDerivation";
     gimp.sandbox.extraHomePaths = [
       "Pictures"
+      "Pictures/servo-macros"
       "dev"
       "ref"
       "tmp"
     ];
-    gimp.sandbox.extraPaths = [
-      "/mnt/servo/media/Pictures"
-    ];
     gimp.sandbox.autodetectCliPaths = true;
 
     "gnome.gnome-calculator".sandbox.method = "bwrap";

hosts/common/programs/cozy.nix

@@ -6,10 +6,9 @@
     sandbox.wrapperType = "wrappedDerivation";
     sandbox.extraHomePaths = [
       "Books"
+      "Books/servo"
     ];
-    sandbox.extraPaths = [
-      "/mnt/servo/media/Books"
-    ];
+
     # cozy uses a sqlite db for its config and exposes no CLI options other than --help and --debug
     persist.byStore.plaintext = [
       ".local/share/cozy"  # sqlite db (config & index?)

hosts/common/programs/firefox.nix

@@ -240,6 +240,7 @@ in
           "dev"  # for developing anything web-related
           "tmp"
           "Pictures"
+          "Pictures/servo-macros"
         ] ++ lib.optionals cfg.addons.browserpass-extension.enable [
           # browserpass needs these paths:
           # - private/knowledge/secrets/accounts: where the encrypted account secrets live
@@ -253,11 +254,6 @@ in
           # ".config/sops"
           "private/knowledge/secrets/accounts"
         ];
-        sandbox.extraPaths = [
-          # ~/Pictures/servo-macros links to here.
-          # TODO: consider a bind-mount, so that access to ~/Pictures also gives access to here.
-          "/mnt/servo/media/Pictures/macros"
-        ];
         fs.".config/sops".dir = lib.mkIf cfg.addons.browserpass-extension.enable {};  #< needs to be created, not *just* added to the sandbox
 
         suggestedPrograms = [

hosts/common/programs/go2tv.nix

@@ -41,10 +41,10 @@ in
     sandbox.extraHomePaths = [
       "Music"
       "Videos"
+      "Videos/servo"
     ];
     sandbox.extraPaths = [
       "/mnt/servo/media/Music"
-      "/mnt/servo/media/Videos"
     ];
   };
   # for serving local files

hosts/common/programs/handbrake.nix

@@ -6,13 +6,11 @@
     sandbox.extraHomePaths = [
       "Music"
       "Pictures"  # i have some videos in there too.
+      "Pictures/servo-macros"
       "Videos"
+      "Videos/servo"
       "tmp"
     ];
-    sandbox.extraPaths = [
-      "/mnt/servo/media/Pictures"
-      "/mnt/servo/media/Videos"
-    ];
     sandbox.autodetectCliPaths = true;
 
     # disable expensive sambda dependency; i don't use it.

hosts/common/programs/kdenlive.nix

@@ -6,13 +6,11 @@
     sandbox.extraHomePaths = [
       "Music"
       "Pictures"  # i have some videos in there too.
+      "Pictures/servo-macros"
       "Videos"
+      "Videos/servo"
       "tmp"
     ];
-    sandbox.extraPaths = [
-      "/mnt/servo/media/Pictures"
-      "/mnt/servo/media/Videos"
-    ];
     sandbox.whitelistDri = true;
     packageUnwrapped = pkgs.kdenlive.override {
       ffmpeg-full = pkgs.ffmpeg-full.override {

hosts/common/programs/koreader/default.nix

@@ -51,9 +51,7 @@ in {
     sandbox.whitelistDri = true;  # reduces startup time and subjective page flip time
     sandbox.extraHomePaths = [
       "Books"
-    ];
-    sandbox.extraPaths = [
-      "/mnt/servo/media/Books"
+      "Books/servo"
     ];
     # koreader applies these lua "patches" at boot:
     # - <https://github.com/koreader/koreader/wiki/User-patches>

hosts/common/programs/loupe.nix

@@ -5,16 +5,14 @@
     sandbox.wrapperType = "wrappedDerivation";
     sandbox.extraHomePaths = [
       "Pictures"
+      "Pictures/servo-macros"
       "Videos"
+      "Videos/servo"
       "dev"
       "records"
       "ref"
       "tmp"
     ];
-    sandbox.extraPaths = [
-      "/mnt/servo/media/Pictures"
-      "/mnt/servo/media/Videos"
-    ];
     mime.associations = {
       "image/gif" = "org.gnome.Loupe.desktop";
       "image/heif" = "org.gnome.Loupe.desktop";  # apple codec