summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md4
-rw-r--r--Cargo.lock115
-rw-r--r--Cargo.toml4
-rw-r--r--resources/default-conf/conf.hjson344
-rw-r--r--resources/default-conf/dark-blue-skin.hjson190
-rw-r--r--resources/default-conf/dark-gruvbox.hjson133
-rw-r--r--resources/default-conf/dark-orange-skin.hjson178
-rw-r--r--resources/default-conf/solarized-dark.hjson110
-rw-r--r--resources/default-conf/solarized-light.hjson204
-rw-r--r--resources/default-conf/verbs.hjson218
-rw-r--r--resources/default-conf/white-skin.hjson126
11 files changed, 810 insertions, 816 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4487f70..e9638a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
-### next
+### v1.18.0 - 2022-12-21
+<a name="v1.18.0"></a>
+- Hjson configuration file can now omit outside braces (it's "braceless Hjson"), making it much cleaner
- allow opening the help screen with just the `?` key on Windows (as for other systems)
- fix a crash in some cases of input being cleaned with a selection - Fix #643
diff --git a/Cargo.lock b/Cargo.lock
index ffe7a8f..3a127ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -46,18 +46,18 @@ dependencies = [
[[package]]
name = "ansi_colours"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e651ecf8c45e2d8ceb4b61473bf0a15bd8e6d83455031bb7e79175de024ebba"
+checksum = "7db9d9767fde724f83933a716ee182539788f293828244e9d999695ce0f7ba1e"
dependencies = [
"rgb",
]
[[package]]
name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
[[package]]
name = "argh"
@@ -94,7 +94,7 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
"libc",
"winapi",
]
@@ -140,7 +140,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "broot"
-version = "1.17.2-dev"
+version = "1.18.0"
dependencies = [
"ahash 0.7.6",
"ansi_colours",
@@ -542,9 +542,9 @@ checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6"
[[package]]
name = "cxx"
-version = "1.0.83"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -554,9 +554,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.83"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
dependencies = [
"cc",
"codespan-reporting",
@@ -569,15 +569,15 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
-version = "1.0.83"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.83"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
dependencies = [
"proc-macro2",
"quote",
@@ -586,9 +586,9 @@ dependencies = [
[[package]]
name = "deser-hjson"
-version = "1.0.2"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f486ff51f3ecdf9364736375a4b358b6eb9f02555d5324fa4837c00b5aa23f5"
+checksum = "799b522307619917536ae2c26e60dab657998dea8f3feaf827e9dc8daeb404bf"
dependencies = [
"serde",
]
@@ -860,6 +860,15 @@ dependencies = [
]
[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
+[[package]]
name = "iana-time-zone"
version = "0.1.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -973,9 +982,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
[[package]]
name = "jobserver"
@@ -1102,9 +1111,9 @@ dependencies = [
[[package]]
name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
dependencies = [
"cc",
]
@@ -1251,11 +1260,11 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
"libc",
]
@@ -1476,15 +1485,15 @@ dependencies = [
[[package]]
name = "proc-macro-hack"
-version = "0.5.19"
+version = "0.5.20+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
dependencies = [
"unicode-ident",
]
@@ -1509,9 +1518,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.21"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
dependencies = [
"proc-macro2",
]
@@ -1646,9 +1655,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
[[package]]
name = "safemem"
@@ -1679,9 +1688,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
[[package]]
name = "secular"
@@ -1694,18 +1703,18 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.150"
+version = "1.0.151"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
+checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.150"
+version = "1.0.151"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
+checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
dependencies = [
"proc-macro2",
"quote",
@@ -1714,11 +1723,11 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
dependencies = [
- "itoa 1.0.4",
+ "itoa 1.0.5",
"ryu",
"serde",
]
@@ -1767,9 +1776,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "snafu"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ba99b054b22972ee794cf04e5ef572da1229e33b65f3c57abbff0525a454"
+checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045"
dependencies = [
"doc-comment",
"snafu-derive",
@@ -1777,9 +1786,9 @@ dependencies = [
[[package]]
name = "snafu-derive"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5e79cdebbabaebb06a9bdbaedc7f159b410461f63611d4d0e3fb0fab8fed850"
+checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2"
dependencies = [
"heck",
"proc-macro2",
@@ -1834,9 +1843,9 @@ checksum = "e72d8b19ab05827afefcca66bf47040c1e66a0901eb814784c77d4ec118bd309"
[[package]]
name = "syn"
-version = "1.0.105"
+version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
dependencies = [
"proc-macro2",
"quote",
@@ -1940,18 +1949,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
@@ -1995,7 +2004,7 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [
- "itoa 1.0.4",
+ "itoa 1.0.5",
"serde",
"time-core",
"time-macros",
@@ -2054,9 +2063,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
[[package]]
name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
[[package]]
name = "unicode-normalization"
diff --git a/Cargo.toml b/Cargo.toml
index ed537bb..6624b7d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "broot"
-version = "1.17.2-dev"
+version = "1.18.0"
authors = ["dystroy <denys.seguret@gmail.com>"]
repository = "https://github.com/Canop/broot"
homepage = "https://dystroy.org/broot"
@@ -32,7 +32,7 @@ cli-log = "2.0"
crokey = "0.4.3"
crossbeam = "0.8"
custom_error = "1.6"
-deser-hjson = "1.0.2"
+deser-hjson = "1.1"
directories = "4.0"
file-size = "1.0.3"
fnv = "1.0.7"
diff --git a/resources/default-conf/conf.hjson b/resources/default-conf/conf.hjson
index e4b0f7f..7dfa7e2 100644
--- a/resources/default-conf/conf.hjson
+++ b/resources/default-conf/conf.hjson
@@ -14,178 +14,176 @@
# properties are commented out. To enable them, remove the `#`.
#
###############################################################
-{
-
- ###############################################################
- # Default flags
- # You can set up flags you want broot to start with by
- # default, for example `default_flags="ihp"` if you usually want
- # to see hidden and gitignored files and the permissions (then
- # if you don't want the hidden files you can launch `br -H`)
- # A popular flag is the `g` one which displays git related info.
- #
- # default_flags:
-
- ###############################################################
- # Date/Time format
- # If you want to change the format for date/time, uncomment the
- # following line and change it according to
- # https://docs.rs/chrono/0.4.11/chrono/format/strftime/index.html
- #
- # date_time_format: %Y/%m/%d %R
-
- ###############################################################
- # uncomment to activate modal mode
- #
- # (you really should read https://dystroy.org/broot/modal/
- # before as it may not suit everybody even among vim users)
- #
- # modal: true
-
- ###############################################################
- # Whether to mark the selected line with a triangle
- #
- show_selection_mark: true
-
- ###############################################################
- # Column order
- # cols_order, if specified, must be a permutation of the following
- # array. You should keep the name column at the end as it has a
- # variable length.
- #
- # cols_order: [
- # mark
- # git
- # size
- # permission
- # date
- # count
- # branch
- # name
- # ]
-
- ###############################################################
- # True Colors
- # If this parameter isn't set, broot tries to automatically
- # determine whether true colors (24 bits) are available.
- # As this process is unreliable, you may uncomment this setting
- # and set it to false or true if you notice the colors in
- # previewed images are too off.
- #
- # true_colors: false
-
- ###############################################################
- # Icons
- # If you want to display icons in broot, uncomment this line
- # (see https://dystroy.org/broot/icons for installation and
- # troubleshooting)
- #
- # icon_theme: vscode
-
- ###############################################################
- # Special paths
- # If some paths must be handled specially, uncomment (and change
- # this section as per the examples)
- #
- special_paths: {
- "/media" : "no-enter" // comment it if desired
- # "/media/slow-backup-disk" : no-enter
- # "/home/dys/useless" : hide
- # "/home/dys/my-link-I-want-to-explore" : enter
- }
- ###############################################################
- # Quit on last cancel
- # You can usually cancel the last state change on escape.
- # If you want the escape key to quit broot when there's nothing
- # to cancel (for example when you just opened broot), uncomment
- # this parameter
- #
- # quit_on_last_cancel: true
-
- ###############################################################
- # Search modes
- #
- # broot allows many search modes.
- # A search mode is defined by
- # - the way to search: 'fuzzy', 'exact', 'regex', or 'tokens'.
- # - where to search: file 'name', 'path', or file 'content'
- # A search pattern may for example be "fuzzy path" (default),
- # "regex content" or "exact path".
- #
- # The search mode is selected from its prefix. For example, if
- # you type "abc", the default mode is "fuzzy path". If you type
- # "/abc", the mode is "regex path". If you type "rn/abc", the mode
- # is "regex name".
- #
- # This mapping may be modified. You may want to dedicate the
- # empty prefix (the one which doesn't need a '/') to the
- # search mode you use most often. The example below makes it
- # easy to search on name rather than on the subpath.
- #
- # More information on
- # https://dystroy.org/broot/input/#the-filtering-pattern
- #
- # search_modes: {
- # <empty>: fuzzy name
- # /: regex name
- # }
-
- ###############################################################
- # File Extension Colors
- #
- # uncomment and modify the next section if you want to color
- # file name depending on their extension
- #
- # ext_colors: {
- # png: rgb(255, 128, 75)
- # rs: yellow
- # }
-
- ###############################################################
- # Max file size for content search
- #
- # Bigger files are ignored when searching their content. You
- # can specify this size either in ISO units (eg 5GB) or in
- # the old binary units (eg 44Kib)
- content_search_max_file_size: 10MB
-
- ###############################################################
- # Max Panels Count
- #
- # Change this if you sometimes want to have more than 2 panels
- # open
- # max_panels_count: 2
-
- ###############################################################
- # Imports
- #
- # While it's possible to have all configuration in one file,
- # it's more convenient to split it in several ones.
- # Importing also allows to set a condition on the terminal's
- # color, which makes it possible to have a different skin
- # chosen when your terminal has a light background and when
- # it has a light one.
- imports: [
-
- # Verbs are better configured in verbs.hjson. But you
- # can also add another files for your personal verbs
- verbs.hjson
-
- # This file contains the skin to use when the terminal
- # is dark (or when this couldn't be determined)
- {
- luma: [
- dark
- unknown
- ]
- file: dark-blue-skin.hjson
- }
-
- # This skin is imported when your terminal is light
- {
- luma: light
- file: white-skin.hjson
- }
- ]
+###############################################################
+# Default flags
+# You can set up flags you want broot to start with by
+# default, for example `default_flags="ihp"` if you usually want
+# to see hidden and gitignored files and the permissions (then
+# if you don't want the hidden files you can launch `br -H`)
+# A popular flag is the `g` one which displays git related info.
+#
+# default_flags:
+
+###############################################################
+# Date/Time format
+# If you want to change the format for date/time, uncomment the
+# following line and change it according to
+# https://docs.rs/chrono/0.4.11/chrono/format/strftime/index.html
+#
+# date_time_format: %Y/%m/%d %R
+
+###############################################################
+# uncomment to activate modal mode
+#
+# (you really should read https://dystroy.org/broot/modal/
+# before as it may not suit everybody even among vim users)
+#
+# modal: true
+
+###############################################################
+# Whether to mark the selected line with a triangle
+#
+show_selection_mark: true
+
+###############################################################
+# Column order
+# cols_order, if specified, must be a permutation of the following
+# array. You should keep the name column at the end as it has a
+# variable length.
+#
+# cols_order: [
+# mark
+# git
+# size
+# permission
+# date
+# count
+# branch
+# name
+# ]
+
+###############################################################
+# True Colors
+# If this parameter isn't set, broot tries to automatically
+# determine whether true colors (24 bits) are available.
+# As this process is unreliable, you may uncomment this setting
+# and set it to false or true if you notice the colors in
+# previewed images are too off.
+#
+# true_colors: false
+
+###############################################################
+# Icons
+# If you want to display icons in broot, uncomment this line
+# (see https://dystroy.org/broot/icons for installation and
+# troubleshooting)
+#
+# icon_theme: vscode
+
+###############################################################
+# Special paths
+# If some paths must be handled specially, uncomment (and change
+# this section as per the examples)
+#
+special_paths: {
+ "/media" : "no-enter" // comment it if desired
+ # "/media/slow-backup-disk" : no-enter
+ # "/home/dys/useless" : hide
+ # "/home/dys/my-link-I-want-to-explore" : enter
}
+
+###############################################################
+# Quit on last cancel
+# You can usually cancel the last state change on escape.
+# If you want the escape key to quit broot when there's nothing
+# to cancel (for example when you just opened broot), uncomment
+# this parameter
+#
+# quit_on_last_cancel: true
+
+###############################################################
+# Search modes
+#
+# broot allows many search modes.
+# A search mode is defined by
+# - the way to search: 'fuzzy', 'exact', 'regex', or 'tokens'.
+# - where to search: file 'name', 'path', or file 'content'
+# A search pattern may for example be "fuzzy path" (default),
+# "regex content" or "exact path".
+#
+# The search mode is selected from its prefix. For example, if
+# you type "abc", the default mode is "fuzzy path". If you type
+# "/abc", the mode is "regex path". If you type "rn/abc", the mode
+# is "regex name".
+#
+# This mapping may be modified. You may want to dedicate the
+# empty prefix (the one which doesn't need a '/') to the
+# search mode you use most often. The example below makes it
+# easy to search on name rather than on the subpath.
+#
+# More information on
+# https://dystroy.org/broot/input/#the-filtering-pattern
+#
+# search_modes: {
+# <empty>: fuzzy name
+# /: regex name
+# }
+
+###############################################################
+# File Extension Colors
+#
+# uncomment and modify the next section if you want to color
+# file name depending on their extension
+#
+# ext_colors: {
+# png: rgb(255, 128, 75)
+# rs: yellow
+# }
+
+###############################################################
+# Max file size for content search
+#
+# Bigger files are ignored when searching their content. You
+# can specify this size either in ISO units (eg 5GB) or in
+# the old binary units (eg 44Kib)
+content_search_max_file_size: 10MB
+
+###############################################################
+# Max Panels Count
+#
+# Change this if you sometimes want to have more than 2 panels
+# open
+# max_panels_count: 2
+
+###############################################################
+# Imports
+#
+# While it's possible to have all configuration in one file,
+# it's more convenient to split it in several ones.
+# Importing also allows to set a condition on the terminal's
+# color, which makes it possible to have a different skin
+# chosen when your terminal has a light background and when
+# it has a light one.
+imports: [
+
+ # Verbs are better configured in verbs.hjson. But you
+ # can also add another files for your personal verbs
+ verbs.hjson
+
+ # This file contains the skin to use when the terminal
+ # is dark (or when this couldn't be determined)
+ {
+ luma: [
+ dark
+ unknown
+ ]
+ file: dark-blue-skin.hjson
+ }
+
+ # This skin is imported when your terminal is light
+ {
+ luma: light
+ file: white-skin.hjson
+ }
+]
diff --git a/resources/default-conf/dark-blue-skin.hjson b/resources/default-conf/dark-blue-skin.hjson
index 73d4486..288800e 100644
--- a/resources/default-conf/dark-blue-skin.hjson
+++ b/resources/default-conf/dark-blue-skin.hjson
@@ -7,102 +7,100 @@
#
# Doc at https://dystroy.org/broot/skins/
###############################################################
-{
- ###############################################################
- # Skin
- # If you want to change the colors of broot,
- # uncomment the following block and start messing
- # with the various values.
- # A skin entry value is made of two parts separated with a '/':
- # The first one is the skin for the active panel.
- # The second one, optional, is the skin for non active panels.
- # You may find explanations and other skins on
- # https://dystroy.org/broot/skins
- ###############################################################
- skin: {
- default: gray(22) none / gray(20) none
- tree: gray(8) None / gray(4) None
- parent: gray(18) None / gray(13) None
- file: gray(22) None / gray(15) None
- directory: ansi(110) None bold / ansi(110) None
- exe: Cyan None
- link: Magenta None
- pruning: gray(12) None Italic
- perm__: gray(5) None
- perm_r: ansi(94) None
- perm_w: ansi(132) None
- perm_x: ansi(65) None
- owner: ansi(138) None
- group: ansi(131) None
- count: ansi(138) gray(4)
- dates: ansi(66) None
- sparse: ansi(214) None
- content_extract: ansi(29) None
- content_match: ansi(34) None
- device_id_major: ansi(138) None
- device_id_sep: ansi(102) None
- device_id_minor: ansi(138) None
- git_branch: ansi(178) None
- git_insertions: ansi(28) None
- git_deletions: ansi(160) None
- git_status_current: gray(5) None
- git_status_modified: ansi(28) None
- git_status_new: ansi(94) None bold
- git_status_ignored: gray(17) None
- git_status_conflicted: ansi(88) None
- git_status_other: ansi(88) None
- selected_line: None gray(6) / None gray(4)
- char_match: Green None
- file_error: Red None
- flag_label: gray(15) gray(2)
- flag_value: ansi(178) gray(2) bold
- input: White gray(2) / gray(15) None
- status_error: gray(22) ansi(124)
- status_job: ansi(220) gray(5)
- status_normal: gray(20) gray(4) / gray(2) gray(2)
- status_italic: ansi(178) gray(4) / gray(2) gray(2)
- status_bold: ansi(178) gray(4) bold / gray(2) gray(2)
- status_code: ansi(229) gray(4) / gray(2) gray(2)
- status_ellipsis: gray(19) gray(1) / gray(2) gray(2)
- purpose_normal: gray(20) gray(2)
- purpose_italic: ansi(178) gray(2)
- purpose_bold: ansi(178) gray(2) bold
- purpose_ellipsis: gray(20) gray(2)
- scrollbar_track: gray(7) None / gray(4) None
- scrollbar_thumb: gray(22) None / gray(14) None
- help_paragraph: gray(20) None
- help_bold: ansi(178) None bold
- help_italic: ansi(229) None
- help_code: gray(21) gray(3)
- help_headers: ansi(178) None
- help_table_border: ansi(239) None
- preview: gray(20) gray(1) / gray(18) gray(2)
- preview_title: gray(23) gray(2) / gray(21) gray(2)
- preview_line_number: gray(12) gray(3)
- preview_match: None ansi(29)
- hex_null: gray(8) None
- hex_ascii_graphic: gray(18) None
- hex_ascii_whitespace: ansi(143) None
- hex_ascii_other: ansi(215) None
- hex_non_ascii: ansi(167) None
- staging_area_title: gray(22) gray(2) / gray(20) gray(3)
- mode_command_mark: gray(5) ansi(204) bold
-
- }
-
- ###############################################################
- # Syntax Theme
- #
- # If you want to choose the them used for preview, uncomment
- # one of the following lines:
- #
- # syntax_theme: GitHub
- # syntax_theme: SolarizedDark
- # syntax_theme: SolarizedLight
- syntax_theme: MochaDark
- # syntax_theme: MochaDark
- # syntax_theme: OceanDark
- # syntax_theme: OceanLight
+###############################################################
+# Skin
+# If you want to change the colors of broot,
+# uncomment the following block and start messing
+# with the various values.
+# A skin entry value is made of two parts separated with a '/':
+# The first one is the skin for the active panel.
+# The second one, optional, is the skin for non active panels.
+# You may find explanations and other skins on
+# https://dystroy.org/broot/skins
+###############################################################
+skin: {
+ default: gray(22) none / gray(20) none
+ tree: gray(8) None / gray(4) None
+ parent: gray(18) None / gray(13) None
+ file: gray(22) None / gray(15) None
+ directory: ansi(110) None bold / ansi(110) None
+ exe: Cyan None
+ link: Magenta None
+ pruning: gray(12) None Italic
+ perm__: gray(5) None
+ perm_r: ansi(94) None
+ perm_w: ansi(132) None
+ perm_x: ansi(65) None
+ owner: ansi(138) None
+ group: ansi(131) None
+ count: ansi(138) gray(4)
+ dates: ansi(66) None
+ sparse: ansi(214) None
+ content_extract: ansi(29) None
+ content_match: ansi(34) None
+ device_id_major: ansi(138) None
+ device_id_sep: ansi(102) None
+ device_id_minor: ansi(138) None
+ git_branch: ansi(178) None
+ git_insertions: ansi(28) None
+ git_deletions: ansi(160) None
+ git_status_current: gray(5) None
+ git_status_modified: ansi(28) None
+ git_status_new: ansi(94) None bold
+ git_status_ignored: gray(17) None
+ git_status_conflicted: ansi(88) None
+ git_status_other: ansi(88) None
+ selected_line: None gray(6) / None gray(4)
+ char_match: Green None
+ file_error: Red None
+ flag_label: gray(15) gray(2)
+ flag_value: ansi(178) gray(2) bold
+ input: White gray(2) / gray(15) None
+ status_error: gray(22) ansi(124)
+ status_job: ansi(220) gray(5)
+ status_normal: gray(20) gray(4) / gray(2) gray(2)
+ status_italic: ansi(178) gray(4) / gray(2) gray(2)
+ status_bold: ansi(178) gray(4) bold / gray(2) gray(2)
+ status_code: ansi(229) gray(4) / gray(2) gray(2)
+ status_ellipsis: gray(19) gray(1) / gray(2) gray(2)
+ purpose_normal: gray(20) gray(2)
+ purpose_italic: ansi(178) gray(2)
+ purpose_bold: ansi(178) gray(2) bold
+ purpose_ellipsis: gray(20) gray(2)
+ scrollbar_track: gray(7) None / gray(4) None
+ scrollbar_thumb: gray(22) None / gray(14) None
+ help_paragraph: gray(20) None
+ help_bold: ansi(178) None bold
+ help_italic: ansi(229) None
+ help_code: gray(21) gray(3)
+ help_headers: ansi(178) None
+ help_table_border: ansi(239) None
+ preview: gray(20) gray(1) / gray(18) gray(2)
+ preview_title: gray(23) gray(2) / gray(21) gray(2)
+ preview_line_number: gray(12) gray(3)
+ preview_match: None ansi(29)
+ hex_null: gray(8) None
+ hex_ascii_graphic: gray(18) None
+ hex_ascii_whitespace: ansi(143) None
+ hex_ascii_other: ansi(215) None
+ hex_non_ascii: ansi(167) None
+ staging_area_title: gray(22) gray(2) / gray(20) gray(3)
+ mode_command_mark: gray(5) ansi(204) bold
}
+
+###############################################################
+# Syntax Theme
+#
+# If you want to choose the them used for preview, uncomment
+# one of the following lines:
+#
+# syntax_theme: GitHub
+# syntax_theme: SolarizedDark
+# syntax_theme: SolarizedLight
+syntax_theme: MochaDark
+# syntax_theme: MochaDark
+# syntax_theme: OceanDark
+# syntax_theme: OceanLight
+
diff --git a/resources/default-conf/dark-gruvbox.hjson b/resources/default-conf/dark-gruvbox.hjson
index c4a5371..8d6c3fb 100644
--- a/resources/default-conf/dark-gruvbox.hjson
+++ b/resources/default-conf/dark-gruvbox.hjson
@@ -8,73 +8,70 @@
#
# Doc at https://dystroy.org/broot/skins/
###############################################################
-{
-
- skin: {
- default: rgb(235, 219, 178) none / rgb(189, 174, 147) none
- tree: rgb(168, 153, 132) None / rgb(102, 92, 84) None
- parent: rgb(235, 219, 178) none / rgb(189, 174, 147) none Italic
- file: None None / None None Italic
- directory: rgb(131, 165, 152) None Bold / rgb(131, 165, 152) None
- exe: rgb(184, 187, 38) None
- link: rgb(104, 157, 106) None
- pruning: rgb(124, 111, 100) None Italic
- perm__: None None
- perm_r: rgb(215, 153, 33) None
- perm_w: rgb(204, 36, 29) None
- perm_x: rgb(152, 151, 26) None
- owner: rgb(215, 153, 33) None Bold
- group: rgb(215, 153, 33) None
- count: rgb(69, 133, 136) rgb(50, 48, 47)
- dates: rgb(168, 153, 132) None
- sparse: rgb(250, 189,47) None
- content_extract: ansi(29) None Italic
- content_match: ansi(34) None Bold
- git_branch: rgb(251, 241, 199) None
- git_insertions: rgb(152, 151, 26) None
- git_deletions: rgb(190, 15, 23) None
- git_status_current: rgb(60, 56, 54) None
- git_status_modified: rgb(152, 151, 26) None
- git_status_new: rgb(104, 187, 38) None Bold
- git_status_ignored: rgb(213, 196, 161) None
- git_status_conflicted: rgb(204, 36, 29) None
- git_status_other: rgb(204, 36, 29) None
- selected_line: None rgb(60, 56, 54) / None rgb(50, 48, 47)