diff options
| author | David Peter <sharkdp@users.noreply.github.com> | 2024-02-23 21:59:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-23 21:59:32 +0100 |
| commit | 1ae9e843edf0798cce915556780e8476a9204b31 (patch) | |
| tree | 3d4267038a7c0687caa8c3391db9e77e6dbda4a9 /src | |
| parent | 74d666f5c04e49113309e05b20cc048b89e2af46 (diff) | |
| parent | dbe4cfb7634c06d8812dc77ff15db02dd817daf5 (diff) | |
Merge branch 'master' into skip-highlighting-when-no-color
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/bat/clap_app.rs | 2 | ||||
| -rw-r--r-- | src/syntax_mapping/builtins/common/50-aws-credentials.toml | 2 | ||||
| -rw-r--r-- | src/syntax_mapping/builtins/common/50-json.toml (renamed from src/syntax_mapping/builtins/common/50-jsonl.toml) | 2 | ||||
| -rw-r--r-- | src/syntax_mapping/builtins/common/xonsh.toml | 3 | ||||
| -rw-r--r-- | src/syntax_mapping/builtins/linux/50-containers.toml | 8 | ||||
| -rw-r--r-- | src/syntax_mapping/builtins/linux/50-podman-quadlet.toml | 7 |
6 files changed, 23 insertions, 1 deletions
diff --git a/src/bin/bat/clap_app.rs b/src/bin/bat/clap_app.rs index 6ceed784..d3cb9276 100644 --- a/src/bin/bat/clap_app.rs +++ b/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 \ diff --git a/src/syntax_mapping/builtins/common/50-aws-credentials.toml b/src/syntax_mapping/builtins/common/50-aws-credentials.toml new file mode 100644 index 00000000..a16e6e8f --- /dev/null +++ b/src/syntax_mapping/builtins/common/50-aws-credentials.toml @@ -0,0 +1,2 @@ +[mappings] +"INI" = ["**/.aws/credentials", "**/.aws/config"] diff --git a/src/syntax_mapping/builtins/common/50-jsonl.toml b/src/syntax_mapping/builtins/common/50-json.toml index 4b70a4d0..e604868a 100644 --- a/src/syntax_mapping/builtins/common/50-jsonl.toml +++ b/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"] diff --git a/src/syntax_mapping/builtins/common/xonsh.toml b/src/syntax_mapping/builtins/common/xonsh.toml new file mode 100644 index 00000000..8e472b41 --- /dev/null +++ b/src/syntax_mapping/builtins/common/xonsh.toml @@ -0,0 +1,3 @@ +# Xonsh shell (https://xon.sh/) +[mappings] +"Python" = ["*.xsh", "*.xonshrc"] diff --git a/src/syntax_mapping/builtins/linux/50-containers.toml b/src/syntax_mapping/builtins/linux/50-containers.toml new file mode 100644 index 00000000..b7170b87 --- /dev/null +++ b/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", +] diff --git a/src/syntax_mapping/builtins/linux/50-podman-quadlet.toml b/src/syntax_mapping/builtins/linux/50-podman-quadlet.toml new file mode 100644 index 00000000..add74188 --- /dev/null +++ b/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}", +] |