git: use fugitive Gvdiff for mergetool + don't ask

[dotfiles.git] / dwb / settings

diff --git a/dwb/settings b/dwb/settings
index d02384873d8ef11a3823e20380e1ddf1899d4d40..73e8af5dce27cec973f6a9c6e5702ee2792a9e41 100644 (file)
--- a/dwb/settings
+++ b/dwb/settings
@@ -1,6 +1,6 @@
 [default]
 javascript-can-access-clipboard=false
 [default]
 javascript-can-access-clipboard=false

-complete-userscripts=false
+complete-userscripts=true

 file-sync-interval=120
 download-gradient-end=#00aa00
 status-allowed-color=#00ff00
 file-sync-interval=120
 download-gradient-end=#00aa00
 status-allowed-color=#00ff00


@@ -23,7 +23,7 @@ default-height=600
 scrollbars=false
 hint-bg-color=#222222
 show-single-tab=true
 scrollbars=false
 hint-bg-color=#222222
 show-single-tab=true

-private-color=#505050
+private-color=#404040

 enable-developer-extras=true
 complete-bookmarks=true
 zoom-level=1.00
 enable-developer-extras=true
 complete-bookmarks=true
 zoom-level=1.00


@@ -38,10 +38,10 @@ new-tab-position-policy=right
 auto-shrink-images=true
 print-backgrounds=true
 enable-caret-browsing=false
 auto-shrink-images=true
 print-backgrounds=true
 enable-caret-browsing=false

-enable-scripts=true
+enable-scripts=false

 adblocker-filterlist=/home/ramsi/.config/dwb/adblock_lists
 proxy=false
 adblocker-filterlist=/home/ramsi/.config/dwb/adblock_lists
 proxy=false

-user-agent=
+user-agent=Mozilla/5.0 (Linux) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.912.77 Safari/535.7

 full-content-zoom=false
 editor=xterm -e vim dwb_uri
 enable-accelerated-compositing=true
 full-content-zoom=false
 editor=xterm -e vim dwb_uri
 enable-accelerated-compositing=true


@@ -50,16 +50,16 @@ enable-private-browsing=false
 enable-favicon=true
 hint-active-color=#00ff00
 resizable-text-areas=true
 enable-favicon=true
 hint-active-color=#00ff00
 resizable-text-areas=true

-javascript-schemes=true
+javascript-schemes=false

 load-on-focus=true
 download-gradient-start=#0000aa
 hint-normal-color=#ffff99
 load-on-focus=true
 download-gradient-start=#0000aa
 hint-normal-color=#ffff99

-spell-checking-languages=
+spell-checking-languages=en,de,fr

 cookies-accept-policy=always
 font-nofocus=
 status-blocked-color=#ffffff
 cookies-accept-policy=always
 font-nofocus=
 status-blocked-color=#ffffff

-download-fg-color=#ffffff
-enable-plugins=true
+download-fg-color=#d4d2cf
+enable-plugins=false

 enable-frame-flattening=false
 ssl-use-system-ca-file=true
 cookies-store-policy=session
 enable-frame-flattening=false
 ssl-use-system-ca-file=true
 cookies-store-policy=session


@@ -72,16 +72,16 @@ hint-highlight-links=false
 active-completion-bg-color=#000000
 enable-spell-checking=true
 font-hidden-statusbar=normal 10px helvetica
 active-completion-bg-color=#000000
 enable-spell-checking=true
 font-hidden-statusbar=normal 10px helvetica

-tab-normal-fg-color-2=#dddddd
-tab-normal-fg-color-1=#cccccc
+tab-normal-fg-color-2=#d0d0d0
+tab-normal-fg-color-1=#c0c0c0

 default-monospace-font-size=10
 save-session=true
 tabbar-visible=2.00
 auto-insert-mode=false
 default-monospace-font-size=10
 save-session=true
 tabbar-visible=2.00
 auto-insert-mode=false

-tab-normal-bg-color-2=#707070
-tab-normal-bg-color-1=#505050
+tab-normal-bg-color-2=#808080
+tab-normal-bg-color-1=#606060

 serif-font-family=serif
 serif-font-family=serif

-accept-language=
+accept-language=en,de,fr

 enable-html5-local-storage=true
 tab-protected-color=#ff0000
 hint-letter-seq=UEOAPYIKJFCRLMBDGNTH
 enable-html5-local-storage=true
 tab-protected-color=#ff0000
 hint-letter-seq=UEOAPYIKJFCRLMBDGNTH


@@ -96,7 +96,7 @@ max-visible-completions=11
 hint-border=1px solid #000000
 widget-packing=twds
 ssl-trusted-color=#00ff00
 hint-border=1px solid #000000
 widget-packing=twds
 ssl-trusted-color=#00ff00

-enable-java-applet=true
+enable-java-applet=false

 hints-key-lock=250
 navigation-history-max=500
 hint-style=letter
 hints-key-lock=250
 navigation-history-max=500
 hint-style=letter


@@ -109,7 +109,7 @@ plugin-blocker=true
 startpage=dwb:bookmarks
 normal-completion-bg-color=#151515
 cursive-font-family=serif
 startpage=dwb:bookmarks
 normal-completion-bg-color=#151515
 cursive-font-family=serif

-default-encoding=
+default-encoding=utf8

 error-color=#ff0000
 searchengine-submit-pattern=
 hint-opacity=0.80
 error-color=#ff0000
 searchengine-submit-pattern=
 hint-opacity=0.80


@@ -117,9 +117,9 @@ font-entry=
 proxy-url=
 font=monospace 8
 monospace-font-family=monospace
 proxy-url=
 font=monospace 8
 monospace-font-family=monospace

-addressbar-dns-lookup=false
+addressbar-dns-lookup=true

 enable-universal-access-from-file-uris=true
 enable-universal-access-from-file-uris=true

-background-color=#000000
+background-color=#2d2d2d

 do-not-track=true
 progress-bar-empty-color=#ffffff
 default-width=800
 do-not-track=true
 progress-bar-empty-color=#ffffff
 default-width=800


@@ -133,10 +133,10 @@ adblocker=true
 download-external-command=xterm -e wget dwb_uri -O dwb_output --load-cookies dwb_cookies
 user-stylesheet-uri=
 auto-load-images=true
 download-external-command=xterm -e wget dwb_uri -O dwb_output --load-cookies dwb_cookies
 user-stylesheet-uri=
 auto-load-images=true

-tab-active-fg-color=#ffffff
+tab-active-fg-color=#dddddd

 history-length=500
 history-length=500

-tab-active-bg-color=#000000
-download-bg-color=#000000
+tab-active-bg-color=#282828
+download-bg-color=#202020

 download-no-confirm=false
 enable-file-access-from-file-uris=true
 complete-history=true
 download-no-confirm=false
 enable-file-access-from-file-uris=true
 complete-history=true


@@ -144,8 +144,8 @@ tab-key-cycles-through-elements=true
 enforce-96-dpi=false
 ssl-strict=false
 scroll-step=0.00
 enforce-96-dpi=false
 ssl-strict=false
 scroll-step=0.00

-close-last-tab-policy=ignore
-foreground-color=#ffffff
+close-last-tab-policy=clear
+foreground-color=#d4d2cf

 message-delay=2
 scheme-handler=/usr/bin/mimeo
 default-font-size=12
 message-delay=2
 scheme-handler=/usr/bin/mimeo
 default-font-size=12


@@ -154,7 +154,7 @@ hint-offset-top=0
 javascript-api=automatic
 mouse-cycles-through-tabs=true
 tab-orientation=horizontal
 javascript-api=automatic
 mouse-cycles-through-tabs=true
 tab-orientation=horizontal

-maximum-tabs=0
+maximum-tabs=20

 cookie-expiration=0
 tab-width=100
 hint-offset-left=0
 cookie-expiration=0
 tab-width=100
 hint-offset-left=0


@@ -162,6 +162,10 @@ enable-ipc=true
 block-insecure-content=false
 adblocker-element-hider=true
 
 block-insecure-content=false
 adblocker-element-hider=true
 

+tabbar-height=0
+statusbar-height=0
+favicon-size=0
+

 [mail]
 load-on-focus=false
 adblocker-filterlist=/home/ramsi/.config/dwb/adblock_lists
 [mail]
 load-on-focus=false
 adblocker-filterlist=/home/ramsi/.config/dwb/adblock_lists


@@ -323,3 +327,7 @@ message-delay=2
 scheme-handler=
 default-font-size=12
 enable-offline-web-application-cache=true
 scheme-handler=
 default-font-size=12
 enable-offline-web-application-cache=true

+
+tabbar-height=0
+statusbar-height=0
+favicon-size=0