pistol: revert config path for macOS (#9798)

Author: sybereal

modules/programs/pistol.nix

@@ -10,7 +10,16 @@ let
   cfg = config.programs.pistol;
 
   configDir =
-    if pkgs.stdenv.hostPlatform.isDarwin then "Library/Preferences" else config.xdg.configHome;
+    # NOTE: This intentionally diverges from the documentation
+    # pistol's README claims that the default is Library/Preferences
+    # However, this is part of a default set for XDG_CONFIG_DIRS,
+    # which gets overwritten by, e.g., nix-darwin.
+    # In such cases, the only directory checked is `XDG_CONFIG_HOME`,
+    # which falls back to Library/Application Support/.
+    if pkgs.stdenv.hostPlatform.isDarwin && !config.xdg.enable then
+      "Library/Application Support"
+    else
+      config.xdg.configHome;
 
   configFile = lib.concatStringsSep "\n" (
     map (

tests/modules/programs/pistol/associations.nix

@@ -19,6 +19,8 @@
     ];
   };
 
+  xdg.enable = false;
+
   nmt.script =
     let
       expected = builtins.toFile "config-expected" ''
@@ -27,7 +29,7 @@
         fpath .*.md$ sh: bat --paging=never --color=always %pistol-filename% | head -8'';
       path =
         if pkgs.stdenv.hostPlatform.isDarwin then
-          "home-files/Library/Preferences/pistol/pistol.conf"
+          "home-files/Library/Application Support/pistol/pistol.conf"
         else
           "home-files/.config/pistol/pistol.conf";
     in

tests/modules/programs/pistol/default.nix

@@ -2,5 +2,6 @@
   pistol-associations = ./associations.nix;
   pistol-config = ./config.nix;
   pistol-double-association = ./double-association.nix;
+  pistol-honors-xdg = ./honors-xdg.nix;
   pistol-missing-association = ./missing-association.nix;
 }

tests/modules/programs/pistol/honors-xdg.nix

@@ -0,0 +1,23 @@
+_: {
+  programs.pistol = {
+    enable = true;
+    associations = [
+      {
+        mime = "application/json";
+        command = "bat %pistol-filename%";
+      }
+    ];
+  };
+
+  xdg.enable = true;
+
+  nmt.script =
+    let
+      expected = builtins.toFile "config-expected" "application/json bat %pistol-filename%";
+      path = "home-files/.config/pistol/pistol.conf";
+    in
+    ''
+      assertFileExists '${path}'
+      assertFileContent '${path}' '${expected}'
+    '';
+}