From 403962fad96fa0378f01ef96c5125a7bbdcecddf Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 18 Jan 2017 22:26:14 -0600 Subject: [PATCH] add compositer, qutebrowser config update, some vim changes, add some config'ing aliases, change some defaults around --- browser/qutebrowser/keys.conf | 81 +++-- browser/qutebrowser/qsettings/QtProject.conf | 8 + browser/qutebrowser/qutebrowser.conf | 335 +++++++++++++------ browser/qutebrowser/user-styles.css | 1 + editor/nvim/config/init.vim | 2 + env/sh/aliases | 1 + env/sh/bashrc | 2 +- env/wm/extras/bar/variables.bash | 2 +- env/x/xinitrc | 1 + env/x/xresources | 2 +- 10 files changed, 296 insertions(+), 139 deletions(-) create mode 100644 browser/qutebrowser/qsettings/QtProject.conf create mode 100644 browser/qutebrowser/user-styles.css diff --git a/browser/qutebrowser/keys.conf b/browser/qutebrowser/keys.conf index 9ebed88..a3843c7 100644 --- a/browser/qutebrowser/keys.conf +++ b/browser/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 -# `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: @@ -40,7 +39,7 @@ [!normal] -clear-keychain ;; leave-mode +leave-mode @@ -234,40 +233,40 @@ yank yank -s yY -yank -t +yank title yt -yank -ts +yank title -s yT -yank -d +yank domain yd -yank -ds +yank domain -s yD -yank -p +yank pretty-url yp -yank -ps +yank pretty-url -s yP -paste +open -- {clipboard} pp -paste -s +open -- {primary} pP -paste -t +open -t -- {clipboard} Pp -paste -ts +open -t -- {primary} PP -paste -w +open -w -- {clipboard} wp -paste -ws +open -w -- {primary} wP quickmark-save @@ -303,7 +302,7 @@ set-cmd-text -s :set set-cmd-text -s :set -t sl -set-cmd-text -s :set keybind +set-cmd-text -s :bind sk zoom-out @@ -432,6 +431,21 @@ follow-selected -t repeat-command . +set-cmd-text / + / + +set-cmd-text ? + ? + +set-cmd-text : + : + +record-macro + q + +run-macro + @ + [insert] # Keybindings for insert mode. # Since normal keypresses are passed through, only special keys are @@ -443,7 +457,7 @@ repeat-command open-editor -paste-primary +insert-text {primary} [hint] @@ -477,8 +491,7 @@ hint all tab-bg # 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-prev`: Select previous item in completion. -# * `completion-item-next`: Select next item in completion. +# * `completion-item-focus`: Select another item in completion. # * `command-accept`: Execute the command currently in the commandline. command-history-prev @@ -487,11 +500,11 @@ command-history-prev command-history-next -completion-item-prev +completion-item-focus prev -completion-item-next +completion-item-focus next @@ -506,6 +519,12 @@ command-accept +completion-item-focus next-category + + +completion-item-focus prev-category + + [prompt] # Keybindings for prompts in the status line. # You can bind normal keys in this mode, but they will be only active @@ -513,8 +532,8 @@ command-accept # 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 @@ -524,15 +543,23 @@ prompt-accept -prompt-yes +prompt-accept yes y -prompt-no +prompt-accept no n prompt-open-download +prompt-item-focus prev + + + +prompt-item-focus next + + + [command,prompt] rl-backward-char @@ -632,10 +659,10 @@ move-to-start-of-document move-to-end-of-document G -yank-selected -p +yank selection -s Y -yank-selected +yank selection y diff --git a/browser/qutebrowser/qsettings/QtProject.conf b/browser/qutebrowser/qsettings/QtProject.conf new file mode 100644 index 0000000..e089795 --- /dev/null +++ b/browser/qutebrowser/qsettings/QtProject.conf @@ -0,0 +1,8 @@ +[FileDialog] +history=file:///usr/share/fonts/misc +lastVisited=file:///usr/share/fonts/misc +qtVersion=5.7.1 +shortcuts=file:, file:///home/daniel/usr +sidebarWidth=90 +treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xec\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0?\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0n\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff) +viewMode=Detail diff --git a/browser/qutebrowser/qutebrowser.conf b/browser/qutebrowser/qutebrowser.conf index 7167f87..69cb5db 100644 --- a/browser/qutebrowser/qutebrowser.conf +++ b/browser/qutebrowser/qutebrowser.conf @@ -34,9 +34,21 @@ # smart: Search case-sensitively if there are capital chars # Default: smart # -# startpage (List): +# startpage (List of String): # The default page(s) to open at the start, separated by commas. -# Default: https://duckduckgo.com +# Default: https://start.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-open-dispatcher (String): +# The default program used to open downloads. Set to an empty string +# to use the default internal handler. +# Any {} in the string will be expanded to the filename, else the +# filename will be appended. +# Default: # # default-page (FuzzyUrl): # The page to open if :open -t/-b/-w is used without URL. Use @@ -80,7 +92,8 @@ # developer-extras (Bool): # Enable extra tools for Web developers. # This needs to be enabled for `:inspector` to work and also adds an -# _Inspect_ entry to the context menu. +# _Inspect_ entry to the context menu. For QtWebEngine, see +# 'qutebrowser --help' instead. # Valid values: true, false # Default: false # @@ -125,6 +138,17 @@ # window: Open in a new window. # Default: tab # +# new-instance-open-target.window (String): +# Which window to choose when opening links as new tabs. +# first-opened: Open new tabs in the first (oldest) opened +# window. +# last-opened: Open new tabs in the last (newest) opened window. +# last-focused: Open new tabs in the most recently focused +# window. +# last-visible: Open new tabs in the most recently visible +# window. +# Default: last-focused +# # log-javascript-console (String): # How to log javascript console messages. # none: Don't log messages. @@ -149,6 +173,8 @@ # Default: path,query ignore-case = smart startpage = https://duckduckgo.com +yank-ignored-url-parameters = ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content +default-open-dispatcher = default-page = ${startpage} auto-search = naive auto-save-config = true @@ -162,6 +188,7 @@ xss-auditing = false site-specific-quirks = true default-encoding = new-instance-open-target = tab +new-instance-open-target.window = last-focused log-javascript-console = debug save-session = true session-default-name = @@ -170,7 +197,7 @@ url-incdec-segments = path,query [ui] # General options related to the user interface. # -# zoom-levels (PercList): +# zoom-levels (List of Perc): # The available zoom levels, separated by commas. # Default: # 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500% @@ -219,11 +246,15 @@ url-incdec-segments = path,query # Valid values: true, false # Default: false # -# user-stylesheet (UserStyleSheet): -# 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; } +# user-stylesheet (File): +# User stylesheet to use (absolute filename or filename relative to +# the config directory). Will expand environment variables. +# Default: +# +# hide-scrollbar (Bool): +# Hide the main scrollbar. +# Valid values: true, false +# Default: true # # css-media-type (String): # Set the CSS media type. @@ -259,13 +290,9 @@ url-incdec-segments = path,query # * `{id}`: The internal window ID of this window. # * `{scroll_pos}`: The page scroll position. # * `{host}`: The host of the current web page. +# * `{backend}`: Either 'webkit' or 'webengine' # Default: {perc}{title}{title_sep}qutebrowser # -# hide-mouse-cursor (Bool): -# Whether to hide the mouse cursor. -# Valid values: true, false -# Default: false -# # modal-js-dialog (Bool): # Use standard JavaScript modal dialog for alert() and confirm() # Valid values: true, false @@ -276,11 +303,20 @@ url-incdec-segments = path,query # Valid values: true, false # Default: false # -# keyhint-blacklist (List): +# keyhint-blacklist (List of String): # Keychains that shouldn't be shown in the keyhint dialog # Globs are supported, so ';*' will blacklist all keychainsstarting # with ';'. Use '*' to disable keyhints # Default: +# +# prompt-radius (Int): +# The rounding radius for the edges of prompts. +# Default: 8 +# +# prompt-filebrowser (Bool): +# Show a filebrowser in upload/download prompts. +# Valid values: true, false +# Default: true zoom-levels = 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500% default-zoom = 100% downloads-position = top @@ -290,17 +326,19 @@ message-unfocused = false confirm-quit = always zoom-text-only = false frame-flattening = false -user-stylesheet = html::-webkit-scrollbar { display: none !important; } +user-stylesheet = ./user-styles.css +hide-scrollbar = true css-media-type = smooth-scrolling = true remove-finished-downloads = -1 hide-statusbar = true statusbar-padding = 5,5,5,5 window-title-format = {perc}{title}{title_sep}qutebrowser -hide-mouse-cursor = false modal-js-dialog = false hide-wayland-decoration = false keyhint-blacklist = +prompt-radius = 8 +prompt-filebrowser = true [network] # Settings related to the network. @@ -353,6 +391,11 @@ keyhint-blacklist = # 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 referer-header = same-domain @@ -362,14 +405,17 @@ proxy-dns-requests = true ssl-strict = ask dns-prefetch = true custom-headers = +netrc-file = [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. @@ -382,11 +428,6 @@ custom-headers = # 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. @@ -421,10 +462,9 @@ custom-headers = # 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 -show = true height = 50% cmd-history-max-items = 100 web-history-max-items = 1000 @@ -437,13 +477,13 @@ scrollbar-padding = 2 # Options related to input modes. # # timeout (Int): -# Timeout for ambiguous key bindings. +# Timeout (in milliseconds) for ambiguous key bindings. # If the current input forms both a complete match and a partial # match, the complete match will be executed after this time. # Default: 500 # # partial-timeout (Int): -# Timeout for partially typed key bindings. +# Timeout (in milliseconds) for partially typed key bindings. # If the current input forms only partial matches, the keystring # will be cleared after this time. # Default: 5000 @@ -519,25 +559,27 @@ mouse-zoom-divider = 512 # # select-on-remove (SelectOnRemove): # Which tab to select when the focused tab is removed. -# left: Select the tab on the left. -# right: Select the tab on the right. -# previous: Select the previously selected tab. -# Default: right +# prev: Select the tab which came before the closed one (left in +# horizontal, above in vertical). +# next: Select the tab which came after the closed one (right in +# horizontal, below in vertical). +# last-used: Select the previously selected tab. +# Default: next # # new-tab-position (NewTabPosition): # How new tabs are positioned. -# left: On the left of the current tab. -# right: On the right of the current tab. -# first: At the left end. -# last: At the right end. -# Default: right +# prev: Before the current tab. +# next: After the current tab. +# first: At the beginning. +# last: At the end. +# Default: next # # new-tab-position-explicit (NewTabPosition): # How new tabs opened explicitly are positioned. -# left: On the left of the current tab. -# right: On the right of the current tab. -# first: At the left end. -# last: At the right end. +# prev: Before the current tab. +# next: After the current tab. +# first: At the beginning. +# last: At the end. # Default: last # # last-close (String): @@ -615,6 +657,7 @@ mouse-zoom-divider = 512 # * `{id}`: The internal tab ID of this tab. # * `{scroll_pos}`: The page scroll position. # * `{host}`: The host of the current web page. +# * `{backend}`: Either 'webkit' or 'webengine' # Default: {index}: {title} # # title-alignment (TextAlignment): @@ -635,8 +678,8 @@ mouse-zoom-divider = 512 # Padding for indicators (top, bottom, left, right). # Default: 2,2,0,4 background-tabs = false -select-on-remove = right -new-tab-position = right +select-on-remove = next +new-tab-position = next new-tab-position-explicit = last last-close = close show = switching @@ -684,7 +727,7 @@ indicator-padding = 0,0,0,5 # http://webkit.org/blog/427/webkit-page-cache-i-the-basics/ # Default: # -# object-cache-capacities (WebKitBytesList): +# object-cache-capacities (List of WebKitBytes): # The capacities for the global memory cache for dead objects such # as stylesheets or scripts. Syntax: cacheMinDeadCapacity, # cacheMaxDead, totalCapacity. @@ -762,7 +805,8 @@ cache-size = 52428800 # Default: false # # webgl (Bool): -# Enables or disables WebGL. +# Enables or disables WebGL. For QtWebEngine, Qt/PyQt >= 5.7 is +# required for this setting. # Valid values: true, false # Default: false # @@ -786,8 +830,14 @@ cache-size = 52428800 # Valid values: true, false, ask # Default: ask # -# javascript-can-open-windows (Bool): -# Whether JavaScript programs can open new windows. +# media-capture (BoolAsk): +# Allow websites to record audio/video. +# Valid values: true, false, ask +# Default: ask +# +# javascript-can-open-windows-automatically (Bool): +# Whether JavaScript programs can open new windows without user +# interaction. # Valid values: true, false # Default: false # @@ -837,7 +887,7 @@ cache-size = 52428800 # Valid values: true, false # Default: true # -# host-block-lists (UrlList): +# host-block-lists (List of Url): # List of URLs of lists which contain hosts to block. # The file can be in one of the following formats: # - An '/etc/hosts'-like file @@ -845,14 +895,14 @@ cache-size = 52428800 # - A zip-file of any of the above, with either only one file, or a # file named 'hosts' (with any extension). # Default: -# http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext +# https://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext # # host-blocking-enabled (Bool): # Whether host blocking is enabled. # Valid values: true, false # Default: true # -# host-blocking-whitelist (List): +# host-blocking-whitelist (List of String): # List of domains that should always be loaded, despite being # ad-blocked. # Domains may contain * and ? wildcards and are otherwise required @@ -874,7 +924,8 @@ css-regions = true hyperlink-auditing = false geolocation = ask notifications = ask -javascript-can-open-windows = true +media-capture = ask +javascript-can-open-windows-automatically = true javascript-can-close-windows = true javascript-can-access-clipboard = true ignore-javascript-prompt = false @@ -895,10 +946,6 @@ enable-pdfjs = true # CSS border value for hints. # Default: 1px solid #E3BE23 # -# opacity (Float): -# Opacity for hints. -# Default: 0.7 -# # mode (String): # Mode to use for hints. # number: Use numeric hints. @@ -930,23 +977,32 @@ enable-pdfjs = true # The dictionary file to be used by the word hints. # Default: /usr/share/dict/words # -# auto-follow (Bool): -# Follow a hint immediately when the hint text is completely -# matched. -# Valid values: true, false -# Default: true +# auto-follow (String): +# Controls when a hint can be automatically followed without the +# user pressing Enter. +# always: Auto-follow whenever there is only a single hint on a +# page. +# unique-match: Auto-follow whenever there is a unique non-empty +# match in either the hint string (word mode) or filter (number +# mode). +# full-match: Follow the hint when the user typed the whole hint +# (letter, word or number mode) or the element's text (only in +# number mode). +# never: The user will always need to press Enter to follow a +# hint. +# Default: unique-match # # auto-follow-timeout (Int): -# A timeout to inhibit normal-mode key bindings after a -# successfulauto-follow. +# A timeout (in milliseconds) to inhibit normal-mode key bindings +# after a successful auto-follow. # Default: 0 # -# next-regexes (RegexList): +# next-regexes (List of Regex): # A comma-separated list of regexes to use for 'next' links. # Default: # \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b # -# prev-regexes (RegexList): +# prev-regexes (List of Regex): # A comma-separated list of regexes to use for 'prev' links. # Default: \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b # @@ -954,20 +1010,25 @@ enable-pdfjs = true # Which implementation to use to find elements to hint. # javascript: Better but slower # python: Slightly worse but faster -# Default: javascript +# Default: python +# +# hide-unmatched-rapid-hints (Bool): +# Controls hiding unmatched hints in rapid mode. +# Valid values: true, false +# Default: true border = 1px solid #E3BE23 -opacity = 0.9 mode = letter chars = asdfghjkl min-chars = 1 scatter = true uppercase = false 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 find-implementation = javascript +hide-unmatched-rapid-hints = true [searchengines] # Definitions of search engines which can be used via the address bar. @@ -987,7 +1048,7 @@ g = ${google} # Aliases for commands. # By default, no aliases are defined. Example which adds a new command # `:qtb` to open qutebrowsers website: -# `qtb = open http://www.qutebrowser.org/` +# `qtb = open https://www.qutebrowser.org/` [colors] # Colors used in the UI. @@ -1069,30 +1130,6 @@ g = ${google} # 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.bg.prompt (QssColor): -# Background color of the statusbar if there is a prompt. -# Default: darkblue -# # statusbar.fg.insert (QssColor): # Foreground color of the statusbar in insert mode. # Default: ${statusbar.fg} @@ -1212,16 +1249,17 @@ g = ${google} # none: Don't show a gradient. # Default: rgb # -# hints.fg (CssColor): +# hints.fg (QssColor): # Font color for hints. # Default: black # -# hints.bg (CssColor): -# Background color for hints. -# Default: -webkit-gradient(linear, left top, left bottom, -# color-stop(0%,#FFF785), color-stop(100%,#FFC542)) +# hints.bg (QssColor): +# Background color for hints. Note that you can use a `rgba(...)` +# value for transparency. +# Default: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, +# 247, 133, 0.8), stop:1 rgba(255, 197, 66, 0.8)) # -# hints.fg.match (CssColor): +# hints.fg.match (QssColor): # Font color for the matched part of hints. # Default: green # @@ -1285,6 +1323,54 @@ g = ${google} # 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 +# +# prompts.fg (QssColor): +# Foreground color for prompts. +# Default: white +# +# prompts.bg (QssColor): +# Background color for prompts. +# Default: darkblue +# +# prompts.selected.bg (QssColor): +# Background color for the selected item in filename prompts. +# Default: #308cc6 completion.fg = #ffffff completion.bg = #111111 completion.alternate-bg = #333333 @@ -1301,12 +1387,6 @@ completion.scrollbar.fg = ${completion.fg} completion.scrollbar.bg = ${completion.bg} statusbar.fg = white statusbar.bg = #111111 -statusbar.fg.error = ${statusbar.fg} -statusbar.bg.error = #f92672 -statusbar.fg.warning = ${statusbar.fg} -statusbar.bg.warning = #f4bf75 -statusbar.fg.prompt = ${statusbar.fg} -statusbar.bg.prompt = #333333 statusbar.fg.insert = ${statusbar.fg} statusbar.bg.insert = #333333 statusbar.fg.command = ${statusbar.fg} @@ -1336,7 +1416,7 @@ tabs.indicator.stop = #a6e22e tabs.indicator.error = #f92672 tabs.indicator.system = rgb hints.fg = #111111 -hints.bg = -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFF785), color-stop(100%,#FFC542)) +hints.bg = qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 247, 133, 0.8), stop:1 rgba(255, 197, 66, 0.8)) hints.fg.match = #a6e22e downloads.bg.bar = #111111 downloads.fg.start = white @@ -1351,6 +1431,18 @@ webpage.bg = white keyhint.fg = #FFFFFF keyhint.fg.suffix = #fd971f keyhint.bg = rgba(0, 0, 0, 80%) +messages.fg.error = ${statusbar.fg} +messages.bg.error = #f92672 +messages.border.error = #bb0000 +messages.fg.warning = ${statusbar.fg} +messages.bg.warning = #f4bf75 +messages.border.warning = #d47300 +messages.fg.info = white +messages.bg.info = black +messages.border.info = #333333 +prompts.fg = ${statusbar.fg} +prompts.bg = #333333 +prompts.selected.bg = #308cc6 [fonts] # Fonts used for the UI, with optional style/weight/size. @@ -1368,6 +1460,10 @@ keyhint.bg = rgba(0, 0, 0, 80%) # Font used in the completion widget. # Default: 8pt ${_monospace} # +# completion.category (Font): +# Font used in the completion categories. +# Default: bold ${completion} +# # tabbar (QtFont): # Font used in the tab bar. # Default: 8pt ${_monospace} @@ -1382,7 +1478,7 @@ keyhint.bg = rgba(0, 0, 0, 80%) # # hints (Font): # Font used for the hints. -# Default: bold 13px Monospace +# Default: bold 13px ${_monospace} # # debug-console (QtFont): # Font used for the debugging console. @@ -1431,12 +1527,29 @@ keyhint.bg = rgba(0, 0, 0, 80%) # 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} +# +# prompts (Font): +# Font used for prompts. +# Default: 8pt sans-serif _monospace = lemon, Terminus, Monaco, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal completion = 8pt ${_monospace} +completion.category = bold ${completion} tabbar = 8pt ${_monospace} statusbar = 8pt ${_monospace} downloads = 8pt ${_monospace} -hints = bold 13px Monospace +hints = bold 13px ${_monospace} debug-console = 8pt ${_monospace} web-family-standard = web-family-fixed = Terminus @@ -1449,3 +1562,7 @@ web-size-minimum-logical = web-size-default = web-size-default-fixed = keyhint = 8pt ${_monospace} +messages.error = 8pt ${_monospace} +messages.warning = 8pt ${_monospace} +messages.info = 8pt ${_monospace} +prompts = 8pt sans-serif diff --git a/browser/qutebrowser/user-styles.css b/browser/qutebrowser/user-styles.css new file mode 100644 index 0000000..eb30a80 --- /dev/null +++ b/browser/qutebrowser/user-styles.css @@ -0,0 +1 @@ +html::-webkit-scrollbar { display: none !important; } diff --git a/editor/nvim/config/init.vim b/editor/nvim/config/init.vim index 27b8e76..3b51b4b 100644 --- a/editor/nvim/config/init.vim +++ b/editor/nvim/config/init.vim @@ -204,6 +204,7 @@ fun! DistractionFreeModeFunc() VimroomToggle if s:distractionFreeMode == 0 let s:distractionFreeMode = 1 + set nocursorline set laststatus=0 set noshowmode set noruler @@ -212,6 +213,7 @@ fun! DistractionFreeModeFunc() hi NonText ctermfg=black guifg=black else let s:distractionFreeMode = 0 + set cursorline set showmode set ruler set laststatus=2 diff --git a/env/sh/aliases b/env/sh/aliases index 25256e0..6ca6c9d 100644 --- a/env/sh/aliases +++ b/env/sh/aliases @@ -20,6 +20,7 @@ alias tree='tree -Csuh' alias c="cd $HOME/.." alias cd..="cd .." alias cdd="cd \"$DOTFILES_PATH\"" +alias cdc="cd ~/.config" alias ..="cd .." alias ...="cd ../.." alias ....="cd ../../.." diff --git a/env/sh/bashrc b/env/sh/bashrc index 7783c91..77d1cc7 100644 --- a/env/sh/bashrc +++ b/env/sh/bashrc @@ -28,7 +28,7 @@ if [ -t 0 ]; then # allow a per-device script that is pulled in if [ -a "$HOME/.bashrc_env" ]; then - . "$HOME/.bashrc_env" + source "$HOME/.bashrc_env" fi # this bashrc assumes a home directory like /home/username/usr in order to diff --git a/env/wm/extras/bar/variables.bash b/env/wm/extras/bar/variables.bash index 5abe54a..3fa3e2e 100644 --- a/env/wm/extras/bar/variables.bash +++ b/env/wm/extras/bar/variables.bash @@ -7,7 +7,7 @@ export BAR_PATH="$DOTFILES_PATH/env/wm/extras/bar" export BAR_PID_FILE="$BAR_PATH/wm_bar.pid" # whether or not to start the bar when X starts -export BAR_ON_XINIT=1 +export BAR_ON_XINIT=0 # the path to the bar's FIFO export BAR_FIFO="$BAR_PATH/wm_bar_fifo.lock" diff --git a/env/x/xinitrc b/env/x/xinitrc index 9312f45..db71527 100644 --- a/env/x/xinitrc +++ b/env/x/xinitrc @@ -30,6 +30,7 @@ fi # fire up wm unclutter & +compton & exec "$DOTFILES_PATH/env/wm/wmstart" diff --git a/env/x/xresources b/env/x/xresources index a0481e0..53ff7dc 100755 --- a/env/x/xresources +++ b/env/x/xresources @@ -33,7 +33,7 @@ emacs.font: emacspfont *depth: 32 -URxvt.internalBorder: 8 +URxvt.internalBorder: 24 Xcursor.theme: human