From c40a53fb9804545c3d7fe0cebf32244eb6c1bf76 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 9 Sep 2016 14:17:23 +0100 Subject: Integrate qutebrowser upstream changes --- qutebrowser/.config/qutebrowser/keys.conf | 15 ++++++++++++--- qutebrowser/.config/qutebrowser/qutebrowser.conf | 22 +++++++++------------- 2 files changed, 21 insertions(+), 16 deletions(-) (limited to 'qutebrowser/.config') diff --git a/qutebrowser/.config/qutebrowser/keys.conf b/qutebrowser/.config/qutebrowser/keys.conf index e441f4e..d8f070c 100644 --- a/qutebrowser/.config/qutebrowser/keys.conf +++ b/qutebrowser/.config/qutebrowser/keys.conf @@ -168,13 +168,13 @@ hint images tab hint images tab-bg .i -hint links fill ":open {hint-url}" +hint links fill :open {hint-url} ;o -hint links fill ":open -t {hint-url}" +hint links fill :open -t {hint-url} ;O -hint links fill ":open -b {hint-url}" +hint links fill :open -b {hint-url} .o hint links yank @@ -434,6 +434,12 @@ yank -p yank -ps yP +hint inputs + ;t + +repeat-command + . + [insert] # Keybindings for insert mode. # Since normal keypresses are passed through, only special keys are @@ -529,6 +535,9 @@ prompt-yes prompt-no n +prompt-open-download + + [command,prompt] rl-backward-char diff --git a/qutebrowser/.config/qutebrowser/qutebrowser.conf b/qutebrowser/.config/qutebrowser/qutebrowser.conf index f635c74..9944be4 100644 --- a/qutebrowser/.config/qutebrowser/qutebrowser.conf +++ b/qutebrowser/.config/qutebrowser/qutebrowser.conf @@ -34,11 +34,6 @@ # smart: Search case-sensitively if there are capital chars # Default: smart # -# wrap-search (Bool): -# Whether to wrap finding text to the top when arriving at the end. -# Valid values: true, false -# Default: true -# # startpage (List): # The default page(s) to open at the start, separated by commas. # Default: https://duckduckgo.com @@ -153,7 +148,6 @@ # Valid values: host, path, query, anchor # Default: path,query ignore-case = smart -wrap-search = true startpage = about:blank default-page = https://startpage.com auto-search = naive @@ -190,6 +184,11 @@ url-incdec-segments = path,query # Valid values: top, bottom # Default: top # +# status-position (VerticalPosition): +# The position of the status bar. +# Valid values: top, bottom +# Default: bottom +# # message-timeout (Int): # Time (in ms) to show messages in the statusbar for. # Default: 2000 @@ -208,11 +207,6 @@ url-incdec-segments = path,query # never: Never show a confirmation. # Default: never # -# display-statusbar-messages (Bool): -# Whether to display javascript statusbar messages. -# Valid values: true, false -# Default: false -# # zoom-text-only (Bool): # Whether the zoom factor on a frame applies only to the text or to # all content. @@ -264,6 +258,7 @@ url-incdec-segments = path,query # otherwise. # * `{id}`: The internal window ID of this window. # * `{scroll_pos}`: The page scroll position. +# * `{host}`: The host of the current web page. # Default: {perc}{title}{title_sep}qutebrowser # # hide-mouse-cursor (Bool): @@ -289,10 +284,10 @@ url-incdec-segments = path,query zoom-levels = 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500% default-zoom = 100% downloads-position = top +status-position = bottom message-timeout = 2000 message-unfocused = false confirm-quit = never -display-statusbar-messages = false zoom-text-only = false frame-flattening = false user-stylesheet = ::-webkit-scrollbar { width: 0px; height: 0px; } @@ -619,6 +614,7 @@ mouse-zoom-divider = 512 # * `{index}`: The index of this tab. # * `{id}`: The internal tab ID of this tab. # * `{scroll_pos}`: The page scroll position. +# * `{host}`: The host of the current web page. # Default: {index}: {title} # # title-alignment (TextAlignment): @@ -993,7 +989,7 @@ DEFAULT = https://duckduckgo.com/?q={} # Colors used in the UI. # A value can be in one of the following format: # * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` -# * A SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. +# * An SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. # * transparent (no color) # * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or percentages) # * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359) -- cgit v1.2.3 From 6e26873bc1cff72a2e97cad21124c58b2cdcb276 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Mon, 12 Sep 2016 20:34:54 +0100 Subject: [khal] Add work calendar --- khal/.config/khal/khal.conf | 5 +++++ qutebrowser/.config/qutebrowser/qsettings/QtProject.conf | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'qutebrowser/.config') diff --git a/khal/.config/khal/khal.conf b/khal/.config/khal/khal.conf index 27c90ec..2cfb434 100644 --- a/khal/.config/khal/khal.conf +++ b/khal/.config/khal/khal.conf @@ -4,7 +4,12 @@ path = ~/.calendars/home/ color = dark green + [[work]] + path = ~/.calendars/work/ + color = dark blue + [default] default_calendar = home print_new = event timedelta = 7d + highlight_event_days = True diff --git a/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf b/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf index b2a0669..b429b24 100644 --- a/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf +++ b/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf @@ -1,8 +1,8 @@ [FileDialog] -history=file:///home/urbain/Dropbox/toprint -lastVisited=file:///home/urbain/Dropbox/toprint -qtVersion=5.6.0 +history=file:///home/urbain/Dropbox/toprint, file:///home/urbain/Pictures/family +lastVisited=file:///home/urbain/Pictures/family +qtVersion=5.7.0 shortcuts=file:, file:///home/urbain 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) +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 -- cgit v1.2.3