qutebrowser config merge

qutebrowser/config.py

@@ -1,11 +1,10 @@
-## Autogenerated config.py
 ## Documentation:
 ##   qute://help/configuring.html
 ##   qute://help/settings.html
 
 ## This is here so configs done via the GUI are still loaded.
 ## Remove it to not load settings done via the GUI.
-# config.load_autoconfig()
+config.load_autoconfig()
 
 ## Aliases for commands. The keys of the given dictionary are the
 ## aliases, while the values are the commands they map to.
@@ -32,7 +31,7 @@
 ## Valid values:
 ##   - webengine: Use QtWebEngine (based on Chromium)
 ##   - webkit: Use QtWebKit (based on WebKit, similar to Safari)
-# c.backend = 'webengine'
+c.backend = 'webengine'
 
 ## This setting can be used to map keys to other keys. When the key used
 ## as dictionary-key is pressed, the binding for the key used as
@@ -403,7 +402,7 @@
 ## Shrink the completion to be smaller than the configured size if there
 ## are no scrollbars.
 ## Type: Bool
-# c.completion.shrink = False
+c.completion.shrink = True
 
 ## How to format timestamps (e.g. for the history completion).
 ## Type: TimestampTemplate
@@ -468,7 +467,7 @@
 ## menu. For QtWebEngine, see `--enable-webengine-inspector` in
 ## `qutebrowser --help` instead.
 ## Type: Bool
-# c.content.developer_extras = False
+c.content.developer_extras = True
 
 ## Try to pre-fetch DNS entries to speed up browsing.
 ## Type: Bool
@@ -584,7 +583,7 @@
 
 ## Whether locally loaded documents are allowed to access remote urls.
 ## Type: Bool
-# c.content.local_content_can_access_remote_urls = False
+c.content.local_content_can_access_remote_urls = True
 
 ## Whether support for HTML 5 local storage and Web SQL is enabled.
 ## Type: Bool
@@ -664,12 +663,12 @@
 ## inspector's JavaScript console. Enabling this feature might have an
 ## impact on performance.
 ## Type: Bool
-# c.content.xss_auditing = False
+c.content.xss_auditing = True
 
 ## The directory to save downloads to. If unset, a sensible os-specific
 ## default is used.
 ## Type: Directory
-# c.downloads.location.directory = None
+c.downloads.location.directory = '~/downloads'
 
 ## Prompt the user for the download location. If set to false,
 ## `downloads.location.directory` will be used.
@@ -686,7 +685,7 @@
 ##   - path: Show only the download path.
 ##   - filename: Show only download filename.
 ##   - both: Show download path and filename.
-# c.downloads.location.suggestion = 'path'
+c.downloads.location.suggestion = 'both'
 
 ## The default program used to open downloads. If null, the default
 ## internal handler is used. Any `{}` in the string will be expanded to
@@ -709,7 +708,7 @@
 ## The editor (and arguments) to use for the `open-editor` command. `{}`
 ## gets replaced by the filename of the file to be edited.
 ## Type: ShellCommand
-# c.editor.command = ['gvim', '-f', '{}']
+c.editor.command = ['urxvt', '-e', 'emacs', '{}']
 
 ## Encoding to use for the editor.
 ## Type: Encoding
@@ -829,7 +828,7 @@
 
 ## Chars used for hint strings.
 ## Type: UniqueCharString
-# c.hints.chars = 'asdfghjkl'
+# c.hints.chars = 'aoeuidhtns'
 
 ## The dictionary file to be used by the word hints.
 ## Type: File
@@ -840,7 +839,7 @@
 ## Valid values:
 ##   - javascript: Better but slower
 ##   - python: Slightly worse but faster
-# c.hints.find_implementation = 'python'
+c.hints.find_implementation = 'javascript'
 
 ## Hide unmatched hints in rapid mode.
 ## Type: Bool
@@ -1011,7 +1010,7 @@
 ## Enable smooth scrolling for web pages. Note smooth scrolling does not
 ## work with the `:scroll-px` command.
 ## Type: Bool
-# c.scrolling.smooth = False
+c.scrolling.smooth = True
 
 ## The name of the session to save by default. If this is set to null,
 ## the session which was last loaded is saved.
@@ -1115,11 +1114,11 @@
 ##   - startpage: Load the start page.
 ##   - default-page: Load the default page.
 ##   - close: Close the window.
-# c.tabs.last_close = 'ignore'
+c.tabs.last_close = 'blank'
 
 ## Switch between tabs using the mouse wheel.
 ## Type: Bool
-# c.tabs.mousewheel_switching = True
+c.tabs.mousewheel_switching = False
 
 ## How new tabs opened from another tab are positioned.
 ## Type: NewTabPosition
@@ -1227,7 +1226,7 @@
 ## The page to open if :open -t/-b/-w is used without URL. Use
 ## `about:blank` for a blank page.
 ## Type: FuzzyUrl
-# c.url.default_page = 'https://start.duckduckgo.com/'
+c.url.default_page = 'about:blank'
 
 ## The URL segments where `:navigate increment/decrement` will search for
 ## a number.
@@ -1248,11 +1247,16 @@
 ## used by prepending the search engine name to the search term, e.g.
 ## `:open google qutebrowser`.
 ## Type: Dict
-# c.url.searchengines = {'DEFAULT': 'https://duckduckgo.com/?q={}'}
+c.url.searchengines = {
+    'DEFAULT': 'https://duckduckgo.com/?q={}',
+    'aur': 'https://aur.archlinux.org/packages/?K={}',
+}
 
 ## The page(s) to open at the start.
 ## Type: List of FuzzyUrl, or FuzzyUrl
-# c.url.start_pages = 'https://start.duckduckgo.com'
+c.url.start_pages = [
+    'https://calendar.google.com/',
+]
 
 ## The URL parameters to strip with `:yank url`.
 ## Type: List of String
@@ -1275,7 +1279,7 @@
 
 ## The default zoom level.
 ## Type: Perc
-# c.zoom.default = '100%'
+c.zoom.default = '125%'
 
 ## The available zoom levels.
 ## Type: List of Perc

qutebrowser/keys.conf

@@ -1,696 +0,0 @@
-# vim: ft=conf
-#
-# In this config file, qutebrowser's key bindings are configured.
-# The format looks like this:
-#
-# [keymode]
-#
-# command
-#   keychain
-#   keychain2
-#   ...
-#
-# All blank lines and lines starting with '#' are ignored.
-# Inline-comments are not permitted.
-#
-# keymode is a comma separated list of modes in which the key binding should be
-# active. If keymode starts with !, the key binding is active in all modes
-# except the listed modes.
-#
-# For special keys (can't be part of a keychain), enclose them in `<`...`>`.
-# For modifiers, you can use either `-` or `+` as delimiters, and these names:
-#
-#  * Control: `Control`, `Ctrl`
-#  * Meta:    `Meta`, `Windows`, `Mod4`
-#  * Alt:     `Alt`, `Mod1`
-#  * Shift:   `Shift`
-#
-# 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.
-#
-# Note that default keybindings are always bound, and need to be explicitly
-# unbound if you wish to remove them:
-#
-# <unbound>
-#   keychain
-#   keychain2
-#   ...
-
-[!normal]
-
-leave-mode
-    <escape>
-    <ctrl-[>
-
-[normal]
-# Keybindings for normal mode.
-
-clear-keychain ;; search ;; fullscreen --leave
-    <escape>
-
-set-cmd-text -s :open
-    o
-
-set-cmd-text :open {url}
-    go
-
-set-cmd-text -s :open -t
-    O
-
-set-cmd-text :open -t {url}
-    gO
-
-set-cmd-text -s :open -b
-    xo
-
-set-cmd-text :open -b {url}
-    xO
-
-set-cmd-text -s :open -w
-    wo
-
-set-cmd-text :open -w {url}
-    wO
-
-open -t
-    ga
-    <ctrl-t>
-
-tab-close
-    d
-    <ctrl-w>
-
-tab-close -o
-    D
-
-tab-only
-    co
-
-tab-focus
-    J
-    gt
-
-tab-move
-    gm
-
-tab-move -
-    gh
-
-tab-move +
-    gl
-
-tab-prev
-    K
-    gT
-
-tab-clone
-    gC
-
-reload
-    r
-
-reload -f
-    R
-
-back
-    H
-
-back -t
-    th
-
-back -w
-    wh
-
-forward
-    L
-
-forward -t
-    tl
-
-forward -w
-    wl
-
-fullscreen
-    <f11>
-
-hint
-    f
-
-hint all window
-    wf
-
-hint all tab-bg
-    ;b
-    F
-
-hint all tab-fg
-    ;f
-
-hint all hover
-    ;h
-
-hint images
-    ;i
-
-hint images tab
-    ;I
-
-hint images tab-bg
-    .i
-
-hint links fill :open {hint-url}
-    ;o
-
-hint links fill :open -t {hint-url}
-    ;O
-
-hint links fill :open -b {hint-url}
-    .o
-
-hint links yank
-    ;y
-
-hint links yank-primary
-    ;Y
-
-hint --rapid links tab-bg
-    ;r
-
-hint --rapid links window
-    ;R
-
-hint links download
-    ;d
-
-scroll left
-    h
-
-scroll down
-    j
-
-scroll up
-    k
-
-scroll right
-    l
-
-undo
-    u
-    <ctrl-shift-t>
-
-scroll-perc 0
-    gg
-
-scroll-perc
-    G
-
-search-next
-    n
-
-search-prev
-    N
-
-enter-mode insert
-    i
-
-enter-mode caret
-    v
-
-yank
-    yy
-
-yank -s
-    yY
-
-yank title
-    yt
-
-yank title -s
-    yT
-
-yank domain
-    yd
-
-yank domain -s
-    yD
-
-open -- {clipboard}
-    pp
-
-open -- {primary}
-    pP
-
-open -t -- {clipboard}
-    Pp
-
-open -t -- {primary}
-    PP
-
-open -w -- {clipboard}
-    wp
-
-open -w -- {primary}
-    wP
-
-quickmark-save
-    m
-
-set-cmd-text -s :quickmark-load
-    b
-
-set-cmd-text -s :quickmark-load -t
-    B
-
-set-cmd-text -s :quickmark-load -w
-    wb
-
-bookmark-add
-    M
-
-set-cmd-text -s :bookmark-load
-    gb
-
-set-cmd-text -s :bookmark-load -t
-    gB
-
-set-cmd-text -s :bookmark-load -w
-    wB
-
-save
-    sf
-
-set-cmd-text -s :set
-    ss
-
-set-cmd-text -s :set -t
-    sl
-
-set-cmd-text -s :bind
-    sk
-
-zoom-out
-    -
-
-zoom-in
-    +
-
-zoom
-    =
-
-navigate prev
-    [[
-
-navigate next
-    ]]
-
-navigate prev -t
-    {{
-
-navigate next -t
-    }}
-
-navigate up
-    gu
-
-navigate up -t
-    gU
-
-navigate increment
-    <ctrl-a>
-
-navigate decrement
-    <ctrl-x>
-
-inspector
-    wi
-
-download
-    gd
-
-download-cancel
-    ad
-
-download-clear
-    cd
-
-view-source
-    gf
-
-tab-focus last
-    <ctrl-tab>
-
-enter-mode passthrough
-    <ctrl-v>
-
-quit
-    <ctrl-q>
-
-scroll-page 0 1
-    <ctrl-f>
-
-scroll-page 0 -1
-    <ctrl-b>
-
-scroll-page 0 0.5
-    <ctrl-d>
-
-scroll-page 0 -0.5
-    <ctrl-u>
-
-tab-focus 1
-    <alt-1>
-
-tab-focus 2
-    <alt-2>
-
-tab-focus 3
-    <alt-3>
-
-tab-focus 4
-    <alt-4>
-
-tab-focus 5
-    <alt-5>
-
-tab-focus 6
-    <alt-6>
-
-tab-focus 7
-    <alt-7>
-
-tab-focus 8
-    <alt-8>
-
-tab-focus 9
-    <alt-9>
-
-home
-    <ctrl-h>
-
-stop
-    <ctrl-s>
-
-print
-    <ctrl-alt-p>
-
-open qute:settings
-    Ss
-
-follow-selected
-    <return>
-    <ctrl-m>
-    <ctrl-j>
-    <shift-return>
-    <enter>
-    <shift-enter>
-
-follow-selected -t
-    <ctrl-return>
-    <ctrl-enter>
-
-open -w
-    <ctrl-n>
-
-enter-mode set_mark
-    `
-
-enter-mode jump_mark
-    '
-
-yank pretty-url
-    yp
-
-yank pretty-url -s
-    yP
-
-hint inputs
-    ;t
-
-repeat-command
-    .
-
-set-cmd-text /
-    /
-
-set-cmd-text ?
-    ?
-
-set-cmd-text :
-    :
-
-tab-next
-    <ctrl-pgdown>
-
-record-macro
-    q
-
-run-macro
-    @
-
-wq
-    ZZ
-
-tab-focus -1
-    g$
-
-tab-pin
-    <ctrl-p>
-
-[insert]
-# Keybindings for insert mode.
-# Since normal keypresses are passed through, only special keys are
-# supported in this mode.
-# Useful hidden commands to map in this section:
-#  * `open-editor`: Open a texteditor with the focused field.
-#  * `paste-primary`: Paste primary selection at cursor position.
-
-open-editor
-    <ctrl-e>
-
-insert-text {primary}
-    <shift-ins>
-
-[hint]
-# Keybindings for hint mode.
-# Since normal keypresses are passed through, only special keys are
-# supported in this mode.
-# Useful hidden commands to map in this section:
-#  * `follow-hint`: Follow the currently selected hint.
-
-follow-hint
-    <return>
-    <ctrl-m>
-    <ctrl-j>
-    <shift-return>
-    <enter>
-    <shift-enter>
-
-hint --rapid links tab-bg
-    <ctrl-r>
-
-hint links
-    <ctrl-f>
-
-hint all tab-bg
-    <ctrl-b>
-
-[command]
-# Keybindings for command mode.
-# Since normal keypresses are passed through, only special keys are
-# supported in this mode.
-# Useful hidden commands to map in this section:
-#  * `command-history-prev`: Switch to previous command in history.
-#  * `command-history-next`: Switch to next command in history.
-#  * `completion-item-focus`: Select another item in completion.
-#  * `command-accept`: Execute the command currently in the commandline.
-
-command-history-prev
-    <ctrl-p>
-
-command-history-next
-    <ctrl-n>
-
-completion-item-focus prev
-    <shift-tab>
-    <up>
-
-completion-item-focus next
-    <tab>
-    <down>
-
-completion-item-del
-    <ctrl-d>
-
-command-accept
-    <return>
-    <ctrl-m>
-    <ctrl-j>
-    <shift-return>
-    <enter>
-    <shift-enter>
-
-completion-item-focus next-category
-    <ctrl-tab>
-
-completion-item-focus prev-category
-    <ctrl-shift-tab>
-
-[prompt]
-# Keybindings for prompts in the status line.
-# You can bind normal keys in this mode, but they will be only active
-# when a yes/no-prompt is asked. For other prompt modes, you can only
-# bind special keys.
-# Useful hidden commands to map in this section:
-#  * `prompt-accept`: Confirm the entered value.
-#  * `prompt-accept yes`: Answer yes to a yes/no question.
-#  * `prompt-accept no`: Answer no to a yes/no question.
-
-prompt-accept
-    <return>
-    <ctrl-m>
-    <ctrl-j>
-    <shift-return>
-    <enter>
-    <shift-enter>
-
-prompt-accept yes
-    y
-
-prompt-accept no
-    n
-
-prompt-open-download
-    <ctrl-x>
-
-prompt-item-focus prev
-    <shift-tab>
-    <up>
-
-prompt-item-focus next
-    <tab>
-    <down>
-
-[command,prompt]
-
-rl-backward-char
-    <ctrl-b>
-
-rl-forward-char
-    <ctrl-f>
-
-rl-backward-word
-    <alt-b>
-
-rl-forward-word
-    <alt-f>
-
-rl-beginning-of-line
-    <ctrl-a>
-
-rl-end-of-line
-    <ctrl-e>
-
-rl-unix-line-discard
-    <ctrl-u>
-
-rl-kill-line
-    <ctrl-k>
-
-rl-kill-word
-    <alt-d>
-
-rl-unix-word-rubout
-    <ctrl-w>
-    <alt-backspace>
-
-rl-yank
-    <ctrl-y>
-
-rl-delete-char
-    <ctrl-?>
-
-rl-backward-delete-char
-    <ctrl-h>
-
-[caret]
-
-toggle-selection
-    v
-    <space>
-
-drop-selection
-    <ctrl-space>
-
-enter-mode normal
-    c
-
-move-to-next-line
-    j
-
-move-to-prev-line
-    k
-
-move-to-next-char
-    l
-
-move-to-prev-char
-    h
-
-move-to-end-of-word
-    e
-
-move-to-next-word
-    w
-
-move-to-prev-word
-    b
-
-move-to-start-of-next-block
-    ]
-
-move-to-start-of-prev-block
-    [
-
-move-to-end-of-next-block
-    }
-
-move-to-end-of-prev-block
-    {
-
-move-to-start-of-line
-    0
-
-move-to-end-of-line
-    $
-
-move-to-start-of-document
-    gg
-
-move-to-end-of-document
-    G
-
-yank selection -s
-    Y
-
-yank selection
-    y
-    <return>
-    <ctrl-m>
-    <ctrl-j>
-    <shift-return>
-    <enter>
-    <shift-enter>
-
-scroll left
-    H
-
-scroll down
-    J
-
-scroll up
-    K
-
-scroll right
-    L
-