qutebrowser: update config files

diff --git a/qutebrowser/keys.conf b/qutebrowser/keys.conf
index 534a729a9da45c689566b7974179a3acb43aad4b..2ef0f3564971b09f9980e3c93e338b5f2529550a 100644 (file)
--- a/qutebrowser/keys.conf
+++ b/qutebrowser/keys.conf
@@ -27,8 +27,7 @@
 #
 # For simple keys (no `<>`-signs), a capital letter means the key is pressed
 # with Shift. For special keys (with `<>`-signs), you need to explicitly add
 #
 # For simple keys (no `<>`-signs), a capital letter means the key is pressed
 # with Shift. For special keys (with `<>`-signs), you need to explicitly add

-# `Shift-` to match a key pressed with shift.  You can bind multiple commands
-# by separating them with `;;`.
+# `Shift-` to match a key pressed with shift.

 #
 # Note that default keybindings are always bound, and need to be explicitly
 # unbound if you wish to remove them:
 #
 # Note that default keybindings are always bound, and need to be explicitly
 # unbound if you wish to remove them:


@@ -287,7 +286,7 @@ set-cmd-text -s :set
 set-cmd-text -s :set -t
     sl
 
 set-cmd-text -s :set -t
     sl
 

-set-cmd-text -s :set keybind
+set-cmd-text -s :bind

     sk
 
 zoom-out
     sk
 
 zoom-out


@@ -532,8 +531,8 @@ completion-item-focus prev-category
 # bind special keys.
 # Useful hidden commands to map in this section:
 #  * `prompt-accept`: Confirm the entered value.
 # bind special keys.
 # Useful hidden commands to map in this section:
 #  * `prompt-accept`: Confirm the entered value.

-#  * `prompt-yes`: Answer yes to a yes/no question.
-#  * `prompt-no`: Answer no to a yes/no question.
+#  * `prompt-accept yes`: Answer yes to a yes/no question.
+#  * `prompt-accept no`: Answer no to a yes/no question.

 
 prompt-accept
     <return>
 
 prompt-accept
     <return>


@@ -543,10 +542,10 @@ prompt-accept
     <enter>
     <shift-enter>
 
     <enter>
     <shift-enter>
 

-prompt-yes
+prompt-accept yes

     y
 
     y
 

-prompt-no
+prompt-accept no

     n
 
 prompt-open-download
     n
 
 prompt-open-download

diff --git a/qutebrowser/qutebrowser.conf b/qutebrowser/qutebrowser.conf
index 7eb7f851a4f18ec2d8780efbad49794f13c37046..0069283d0214bf9b154f58ce77ed0d7286cfc0f2 100644 (file)
--- a/qutebrowser/qutebrowser.conf
+++ b/qutebrowser/qutebrowser.conf
@@ -38,6 +38,11 @@
 #     The default page(s) to open at the start, separated by commas.
 #     Default: https://duckduckgo.com
 #
 #     The default page(s) to open at the start, separated by commas.
 #     Default: https://duckduckgo.com
 #

+# yank-ignored-url-parameters (List of String):
+#     The URL parameters to strip with :yank url, separated by commas.
+#     Default:
+#     ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content
+#

 # default-page (FuzzyUrl):
 #     The page to open if :open -t/-b/-w is used without URL. Use
 #     `about:blank` for a blank page.
 # default-page (FuzzyUrl):
 #     The page to open if :open -t/-b/-w is used without URL. Use
 #     `about:blank` for a blank page.


@@ -160,6 +165,7 @@
 #     Default: path,query
 ignore-case = smart
 startpage = https://duckduckgo.com/?t=chakra
 #     Default: path,query
 ignore-case = smart
 startpage = https://duckduckgo.com/?t=chakra

+yank-ignored-url-parameters = ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content

 default-page = ${startpage}
 auto-search = naive
 auto-save-config = true
 default-page = ${startpage}
 auto-search = naive
 auto-save-config = true


@@ -235,7 +241,7 @@ url-incdec-segments = path,query
 #     User stylesheet to use (absolute filename, filename relative to
 #     the config directory or CSS string). Will expand environment
 #     variables.
 #     User stylesheet to use (absolute filename, filename relative to
 #     the config directory or CSS string). Will expand environment
 #     variables.

-#     Default: ::-webkit-scrollbar { width: 0px; height: 0px; }
+#     Default: html > ::-webkit-scrollbar { width: 0px; height: 0px; }

 #
 # css-media-type (String):
 #     Set the CSS media type.
 #
 # css-media-type (String):
 #     Set the CSS media type.


@@ -359,6 +365,11 @@ keyhint-blacklist =
 # custom-headers (HeaderDict):
 #     Set custom headers for qutebrowser HTTP requests.
 #     Default:
 # custom-headers (HeaderDict):
 #     Set custom headers for qutebrowser HTTP requests.
 #     Default:

+#
+# netrc-file (File):
+#     Set location of a netrc-file for HTTP authentication. If empty,
+#     ~/.netrc is used.
+#     Default:

 do-not-track = true
 accept-language = en-US,en,de,fr
 referer-header = same-domain
 do-not-track = true
 accept-language = en-US,en,de,fr
 referer-header = same-domain


@@ -368,14 +379,17 @@ proxy-dns-requests = true
 ssl-strict = ask
 dns-prefetch = true
 custom-headers = 
 ssl-strict = ask
 dns-prefetch = true
 custom-headers = 

+netrc-file = 

 
 [completion]
 # Options related to completion and command history.
 #
 
 [completion]
 # Options related to completion and command history.
 #

-# auto-open (Bool):
-#     Automatically open completion when typing.
-#     Valid values: true, false
-#     Default: true
+# show (String):
+#     When to show the autocompletion window.
+#         always: Whenever a completion is available.
+#         auto: Whenever a completion is requested.
+#         never: Never.
+#     Default: always

 #
 # download-path-suggestion (String):
 #     What to display in the download filename input.
 #
 # download-path-suggestion (String):
 #     What to display in the download filename input.


@@ -388,11 +402,6 @@ custom-headers =
 #     How to format timestamps (e.g. for history)
 #     Default: %Y-%m-%d
 #
 #     How to format timestamps (e.g. for history)
 #     Default: %Y-%m-%d
 #

-# show (Bool):
-#     Whether to show the autocompletion window.
-#     Valid values: true, false
-#     Default: true
-#

 # height (PercOrInt):
 #     The height of the completion, in px or as percentage of the
 #     window.
 # height (PercOrInt):
 #     The height of the completion, in px or as percentage of the
 #     window.


@@ -427,10 +436,9 @@ custom-headers =
 # scrollbar-padding (Int):
 #     Padding of scrollbar handle in completion window (in px).
 #     Default: 2
 # scrollbar-padding (Int):
 #     Padding of scrollbar handle in completion window (in px).
 #     Default: 2

-auto-open = true
+show = always

 download-path-suggestion = path
 timestamp-format = %Y-%m-%d
 download-path-suggestion = path
 timestamp-format = %Y-%m-%d

-show = true

 height = 150
 cmd-history-max-items = 100
 web-history-max-items = 1000
 height = 150
 cmd-history-max-items = 100
 web-history-max-items = 1000


@@ -793,8 +801,9 @@ cache-size = 52428800
 #     Valid values: true, false, ask
 #     Default: ask
 #
 #     Valid values: true, false, ask
 #     Default: ask
 #

-# javascript-can-open-windows (Bool):
-#     Whether JavaScript programs can open new windows.
+# javascript-can-open-windows-automatically (Bool):
+#     Whether JavaScript programs can open new windows without user
+#     interaction.

 #     Valid values: true, false
 #     Default: false
 #
 #     Valid values: true, false
 #     Default: false
 #


@@ -881,7 +890,7 @@ css-regions = true
 hyperlink-auditing = false
 geolocation = ask
 notifications = ask
 hyperlink-auditing = false
 geolocation = ask
 notifications = ask

-javascript-can-open-windows = false
+javascript-can-open-windows-automatically = false

 javascript-can-close-windows = false
 javascript-can-access-clipboard = false
 ignore-javascript-prompt = false
 javascript-can-close-windows = false
 javascript-can-access-clipboard = false
 ignore-javascript-prompt = false


@@ -979,7 +988,7 @@ min-chars = 2
 scatter = true
 uppercase = true
 dictionary = /usr/share/dict/words
 scatter = true
 uppercase = true
 dictionary = /usr/share/dict/words

-auto-follow = true
+auto-follow = unique-match

 auto-follow-timeout = 0
 next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b
 prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b
 auto-follow-timeout = 0
 next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b
 prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b


@@ -1094,22 +1103,6 @@ exit = quit
 #     Background color of the statusbar.
 #     Default: black
 #
 #     Background color of the statusbar.
 #     Default: black
 #

-# statusbar.fg.error (QssColor):
-#     Foreground color of the statusbar if there was an error.
-#     Default: ${statusbar.fg}
-#
-# statusbar.bg.error (QssColor):
-#     Background color of the statusbar if there was an error.
-#     Default: red
-#
-# statusbar.fg.warning (QssColor):
-#     Foreground color of the statusbar if there is a warning.
-#     Default: ${statusbar.fg}
-#
-# statusbar.bg.warning (QssColor):
-#     Background color of the statusbar if there is a warning.
-#     Default: darkorange
-#

 # statusbar.fg.prompt (QssColor):
 #     Foreground color of the statusbar if there is a prompt.
 #     Default: ${statusbar.fg}
 # statusbar.fg.prompt (QssColor):
 #     Foreground color of the statusbar if there is a prompt.
 #     Default: ${statusbar.fg}


@@ -1311,6 +1304,42 @@ exit = quit
 # keyhint.bg (QssColor):
 #     Background color of the keyhint widget.
 #     Default: rgba(0, 0, 0, 80%)
 # keyhint.bg (QssColor):
 #     Background color of the keyhint widget.
 #     Default: rgba(0, 0, 0, 80%)

+#
+# messages.fg.error (QssColor):
+#     Foreground color of an error message.
+#     Default: white
+#
+# messages.bg.error (QssColor):
+#     Background color of an error message.
+#     Default: red
+#
+# messages.border.error (QssColor):
+#     Border color of an error message.
+#     Default: #bb0000
+#
+# messages.fg.warning (QssColor):
+#     Foreground color a warning message.
+#     Default: white
+#
+# messages.bg.warning (QssColor):
+#     Background color of a warning message.
+#     Default: darkorange
+#
+# messages.border.warning (QssColor):
+#     Border color of an error message.
+#     Default: #d47300
+#
+# messages.fg.info (QssColor):
+#     Foreground color an info message.
+#     Default: white
+#
+# messages.bg.info (QssColor):
+#     Background color of an info message.
+#     Default: black
+#
+# messages.border.info (QssColor):
+#     Border color of an info message.
+#     Default: #333333

 completion.fg = white
 completion.bg = #333333
 completion.alternate-bg = #444444
 completion.fg = white
 completion.bg = #333333
 completion.alternate-bg = #444444


@@ -1327,10 +1356,6 @@ completion.scrollbar.fg = ${completion.fg}
 completion.scrollbar.bg = ${completion.bg}
 statusbar.fg = white
 statusbar.bg = black
 completion.scrollbar.bg = ${completion.bg}
 statusbar.fg = white
 statusbar.bg = black

-statusbar.fg.error = ${statusbar.fg}
-statusbar.bg.error = red
-statusbar.fg.warning = ${statusbar.fg}
-statusbar.bg.warning = darkorange

 statusbar.fg.prompt = ${statusbar.fg}
 statusbar.bg.prompt = darkblue
 statusbar.fg.insert = ${statusbar.fg}
 statusbar.fg.prompt = ${statusbar.fg}
 statusbar.bg.prompt = darkblue
 statusbar.fg.insert = ${statusbar.fg}


@@ -1377,6 +1402,15 @@ webpage.bg = white
 keyhint.fg = #FFFFFF
 keyhint.fg.suffix = #FFFF00
 keyhint.bg = rgba(0, 0, 0, 80%)
 keyhint.fg = #FFFFFF
 keyhint.fg.suffix = #FFFF00
 keyhint.bg = rgba(0, 0, 0, 80%)

+messages.fg.error = ${statusbar.fg}
+messages.bg.error = red
+messages.border.error = #bb0000
+messages.fg.warning = ${statusbar.fg}
+messages.bg.warning = darkorange
+messages.border.warning = #d47300
+messages.fg.info = white
+messages.bg.info = black
+messages.border.info = #333333

 
 [fonts]
 # Fonts used for the UI, with optional style/weight/size.
 
 [fonts]
 # Fonts used for the UI, with optional style/weight/size.


@@ -1461,6 +1495,18 @@ keyhint.bg = rgba(0, 0, 0, 80%)
 # keyhint (Font):
 #     Font used in the keyhint widget.
 #     Default: 8pt ${_monospace}
 # keyhint (Font):
 #     Font used in the keyhint widget.
 #     Default: 8pt ${_monospace}

+#
+# messages.error (Font):
+#     Font used for error messages.
+#     Default: 8pt ${_monospace}
+#
+# messages.warning (Font):
+#     Font used for warning messages.
+#     Default: 8pt ${_monospace}
+#
+# messages.info (Font):
+#     Font used for info messages.
+#     Default: 8pt ${_monospace}

 _monospace = Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Liberation Mono", "Courier New", Courier, monospace, Fixed, Consolas, Terminal
 completion = 8pt ${_monospace}
 completion.category = bold ${completion}
 _monospace = Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Liberation Mono", "Courier New", Courier, monospace, Fixed, Consolas, Terminal
 completion = 8pt ${_monospace}
 completion.category = bold ${completion}


@@ -1480,3 +1526,6 @@ web-size-minimum-logical =
 web-size-default = 
 web-size-default-fixed = 
 keyhint = 8pt ${_monospace}
 web-size-default = 
 web-size-default-fixed = 
 keyhint = 8pt ${_monospace}

+messages.error = 8pt ${_monospace}
+messages.warning = 8pt ${_monospace}
+messages.info = 8pt ${_monospace}