Merge branch 'master' into skip-highlighting-when-no-color

src/bin/bat/clap_app.rs

@@ -432,6 +432,8 @@ pub fn build_app(interactive_output: bool) -> Command {
                      pre-defined style ('full'). To set a default style, add the \
                      '--style=\"..\"' option to the configuration file or export the \
                      BAT_STYLE environment variable (e.g.: export BAT_STYLE=\"..\").\n\n\
+                     By default, the following components are enabled:\n  \
+                        changes, grid, header-filename, numbers, snip\n\n\
                      Possible values:\n\n  \
                      * default: enables recommended style components (default).\n  \
                      * full: enables all available components.\n  \

src/syntax_mapping/builtins/common/50-aws-credentials.toml

@@ -0,0 +1,2 @@
+[mappings]
+"INI" = ["**/.aws/credentials", "**/.aws/config"]

src/syntax_mapping/builtins/common/50-json.toml

@@ -1,3 +1,3 @@
 # JSON Lines is a simple variation of JSON #2535
 [mappings]
-"JSON" = ["*.jsonl"]
+"JSON" = ["*.jsonl", "*.jsonc"]

src/syntax_mapping/builtins/common/xonsh.toml

@@ -0,0 +1,3 @@
+# Xonsh shell (https://xon.sh/)
+[mappings]
+"Python" = ["*.xsh", "*.xonshrc"]

src/syntax_mapping/builtins/linux/50-containers.toml

@@ -0,0 +1,8 @@
+# see https://github.com/containers/image/tree/main/docs
+[mappings]
+"TOML" = [
+    "/usr/share/containers/**/*.conf",
+    "/etc/containers/**/*.conf",
+    "${HOME}/.config/containers/**/*.conf",
+    "${XDG_CONFIG_HOME}/containers/**/*.conf",
+]

src/syntax_mapping/builtins/linux/50-podman-quadlet.toml

@@ -0,0 +1,7 @@
+# see `man quadlet`
+[mappings]
+"INI" = [
+    "**/containers/systemd/*.{container,volume,network,kube,image}",
+    "**/containers/systemd/users/*.{container,volume,network,kube,image}",
+    "**/containers/systemd/users/*/*.{container,volume,network,kube,image}",
+]