From 6b68a6275a86af95cb4159e735f5df6b7fa645dd Mon Sep 17 00:00:00 2001 From: Ambrevar Date: Thu, 29 Nov 2012 13:01:25 +0100 Subject: [PATCH] Dwb: configuration and integration. Luakit: fiwed imdb serach engine bug. --- .Xresources | 2 +- .config/awesome/rc.lua | 4 +- .config/dwb/searchengines | 17 +++++ .config/dwb/settings | 144 ++++++++++++++++++++++++++++++++++++ .config/luakit/globals.lua | 2 +- .config/ranger/apps.py | 4 +- .emacs.d/main.el | 2 +- .homeinit | 42 +++++------ .pkg-arch-aur-peteramd | 4 +- .pkg-arch-explicit-peteramd | 14 ++-- .pkg-arch-official-peteramd | 51 +++++-------- .save | 4 + .shell.d/main_rc | 4 +- 13 files changed, 221 insertions(+), 73 deletions(-) create mode 100644 .config/dwb/searchengines create mode 100644 .config/dwb/settings diff --git a/.Xresources b/.Xresources index a98bf97a..acbb5a9e 100644 --- a/.Xresources +++ b/.Xresources @@ -27,7 +27,7 @@ URxvt*scrollBar: false !! URL Support URxvt.perl-ext: url-select URxvt.keysym.C-M-u: perl:url-select:select_next -URxvt.url-select.launcher: luakit +URxvt.url-select.launcher: dwb URxvt.url-select.underline: true URxvt.perl-ext-common: keyboard-select,clipboard diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index aee744c2..23eb6431 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -326,8 +326,8 @@ globalkeys = awful.util.table.join( awful.key({ }, "XF86Mail", function () awful.util.spawn(termcmd .. "mutt") end), -- Web browser - awful.key({ modkey, }, "w", function () awful.util.spawn_with_shell("luakit 2>>/tmp/luakit.log") end), - awful.key({ }, "XF86WWW", function () awful.util.spawn_with_shell("luakit 2>>/tmp/luakit.log") end), + awful.key({ modkey, }, "w", function () awful.util.spawn_with_shell("dwb 2>>/tmp/dwb.log") end), + awful.key({ }, "XF86WWW", function () awful.util.spawn_with_shell("dwb 2>>/tmp/dwb.log") end), -- Music player awful.key({ modkey, }, "a", function () awful.util.spawn(termcmd .. "cmus") end), diff --git a/.config/dwb/searchengines b/.config/dwb/searchengines new file mode 100644 index 00000000..a59463e4 --- /dev/null +++ b/.config/dwb/searchengines @@ -0,0 +1,17 @@ +g http://google.com/search?q=%s +arch http://wiki.archlinux.org/index.php?title=Special%%3ASearch&search=%s&go=Go +aur https://aur.archlinux.org/packages.php?O=0&K=%s&do_Search=Go +ctan http://www.ctan.org/search/?search=%s&search_type=description +gm https://maps.google.com/maps?q=%s +gt http://translate.google.com/#en/fr/%s +imdb http://www.imdb.com/find?q=%s&s=all +torrent http://torrentz.eu/search?f=%s +w http://en.wikipedia.org/wiki/Special:Search?search=%s +wb http://en.wikibooks.org/wiki/Special:Search?search=%s +wbf http://fr.wikibooks.org/wiki/Special:Search?search=%s +wf http://fr.wikipedia.org/wiki/Special:Search?search=%s +wk http://en.wiktionary.org/wiki/Special:Search?search=%s +wkf http://fr.wiktionary.org/wiki/Special:Search?search=%s +wr http://www.wordreference.com/enfr/%s +yt http://www.youtube.com/results?search_query=%s + diff --git a/.config/dwb/settings b/.config/dwb/settings new file mode 100644 index 00000000..ac304dd7 --- /dev/null +++ b/.config/dwb/settings @@ -0,0 +1,144 @@ +[default] +javascript-can-access-clipboard=false +complete-userscripts=false +file-sync-interval=120 +download-gradient-end=#00aa00 +status-allowed-color=#00ff00 +tab-number-color=#7ac5cd +enable-default-context-menu=true +editable=false +background-tabs=false +enable-webgl=true +minimum-logical-font-size=5 +enable-page-cache=false +cache-model=webbrowser +sans-serif-font-family=sans-serif +prompt-color=#00ff00 +complete-searchengines=true +update-search-delay=200 +fantasy-font-family=serif +hint-fg-color=#000000 +sync-files=all +default-height=600 +scrollbars=false +hint-bg-color=#ffffff +show-single-tab=true +enable-developer-extras=false +complete-bookmarks=true +zoom-level=1.00 +download-use-external-program=false +enable-xss-auditor=true +custom-encoding= +normal-completion-fg-color=#eeeeee +close-tab-focus-policy=left +enable-dns-prefetching=true +new-tab-position-policy=right +auto-shrink-images=true +print-backgrounds=false +enable-caret-browsing=false +enable-scripts=true +adblocker-filterlist= +proxy=false +user-agent= +full-content-zoom=false +editor=urxvt -e vim dwb_uri +enable-accelerated-compositing=false +enable-private-browsing=false +enable-favicon=true +hint-active-color=#00ff00 +resizable-text-areas=true +javascript-schemes=true +download-gradient-start=#0000aa +hint-normal-color=#ffff99 +spell-checking-languages= +cookies-accept-policy=always +font-nofocus= +status-blocked-color=#ffffff +download-fg-color=#ffffff +enable-plugins=true +enable-frame-flattening=false +ssl-use-system-ca-file=true +cookies-store-policy=session +bars-padding=0 +active-completion-fg-color=#53868b +hint-font=bold 10px monospace +progress-bar-full-color=#ffffff +tabbed-browsing=true +hint-highlight-links=false +active-completion-bg-color=#000000 +enable-spell-checking=false +font-hidden-statusbar=normal 10px helvetica +tab-normal-fg-color-2=#dddddd +tab-normal-fg-color-1=#cccccc +default-monospace-font-size=10 +save-session=true +tabbar-visible=2 +auto-insert-mode=true +tab-normal-bg-color-2=#707070 +tab-normal-bg-color-1=#505050 +serif-font-family=serif +enable-html5-local-storage=true +tab-protected-color=#ff0000 +hint-letter-seq=FDSARTGBVECWXQYIOPMNHZULKJ +progress-bar-style=default +use-ntlm=false +enable-html5-database=true +hint-autofollow=true +enable-dom-paste=false +javascript-can-open-windows-automatically=false +hint-border=1px solid #000000 +widget-packing=dtws +ssl-trusted-color=#00ff00 +enable-java-applet=true +navigation-history-max=500 +hint-style=letter +enable-site-specific-quirks=false +auto-resize-window=false +zoom-step=0.10 +default-font-family=sans-serif +ssl-untrusted-color=#ff0000 +plugin-blocker=true +startpage=dwb:bookmarks +normal-completion-bg-color=#151515 +cursive-font-family=serif +default-encoding= +error-color=#ff0000 +searchengine-submit-pattern=%s +hint-opacity=0.80 +font-entry= +proxy-url= +font=sans 10 +monospace-font-family=monospace +addressbar-dns-lookup=false +enable-universal-access-from-file-uris=true +background-color=#000000 +do-not-track=true +progress-bar-empty-color=#ffffff +default-width=800 +single-instance=true +auto-completion=true +minimum-font-size=5 +font-completion= +enable-spatial-navigation=false +download-directory=~/temp +adblocker=true +download-external-command=urxvt -e wget dwb_uri -O dwb_output --load-cookies dwb_cookies +user-stylesheet-uri= +auto-load-images=true +tab-active-fg-color=#ffffff +history-length=500 +tab-active-bg-color=#000000 +download-bg-color=#000000 +download-no-confirm=true +enable-file-access-from-file-uris=true +complete-history=true +tab-key-cycles-through-elements=true +enforce-96-dpi=false +ssl-strict=true +scroll-step=0.00 +close-last-tab-policy=ignore +foreground-color=#ffffff +message-delay=2 +scheme-handler= +default-font-size=12 +enable-offline-web-application-cache=true diff --git a/.config/luakit/globals.lua b/.config/luakit/globals.lua index c2f49095..e58413eb 100644 --- a/.config/luakit/globals.lua +++ b/.config/luakit/globals.lua @@ -59,7 +59,7 @@ search_engines = { g = "http://google.com/search?q=%s", gm = "https://maps.google.com/maps?q=%s", gt = "http://translate.google.com/#en/fr/%s", - imdb = "http://imdb.com/find?s=all&q=%s", -- Note that imdb is messy with spaces. + imdb = "http://www.imdb.com/find?s=all&q=%s", torrent = "http://torrentz.eu/search?f=%s", w = "http://en.wikipedia.org/wiki/Special:Search?search=%s", wb = "http://en.wikibooks.org/wiki/Special:Search?search=%s", diff --git a/.config/ranger/apps.py b/.config/ranger/apps.py index 692f5a23..27519557 100644 --- a/.config/ranger/apps.py +++ b/.config/ranger/apps.py @@ -56,7 +56,7 @@ class CustomApplications(DefaultApps): if f.extension in ('html', 'htm', 'xhtml') or f.extension == 'swf': c.flags += 'd' handler = self.either(c, - 'luakit', 'uzbl', 'vimprobable', 'vimprobable2', 'jumanji', + 'dwb', 'luakit', 'uzbl', 'vimprobable', 'vimprobable2', 'jumanji', 'firefox', 'seamonkey', 'iceweasel', 'opera', 'surf', 'midori', 'epiphany', 'konqueror') # Only return if some program was found: @@ -127,7 +127,7 @@ class CustomApplications(DefaultApps): # Forked applications CustomApplications.generic( - 'luakit', 'uzbl', 'vimprobable', 'vimprobable2', 'jumanji', + 'dwb', 'luakit', 'uzbl', 'vimprobable', 'vimprobable2', 'jumanji', 'firefox', 'seamonkey', 'iceweasel', 'opera', 'surf', 'midori', 'epiphany', 'konqueror', 'evince', 'zathura', 'apvlv', 'okular', 'epdfview', 'mupdf', 'llpp', diff --git a/.emacs.d/main.el b/.emacs.d/main.el index 995d4957..dd38ffdf 100644 --- a/.emacs.d/main.el +++ b/.emacs.d/main.el @@ -142,7 +142,7 @@ (windmove-default-keybindings)) ;; Browser -(setq browse-url-generic-program (executable-find "luakit") +(setq browse-url-generic-program (executable-find "dwb") browse-url-browser-function 'browse-url-generic) ;; Default ispell dictionnay diff --git a/.homeinit b/.homeinit index 02c5b857..7732e2a9 100755 --- a/.homeinit +++ b/.homeinit @@ -45,30 +45,26 @@ echo "==> rtorrent" mkdir -p "${HOME}/.session" echo -## Luakit -- Fetch Adblock list. -## This is handy to update lists regularly. -echo "==> Luakit" +## Luakit -- Update the adblock modules +type luakist >/dev/null +if [ $? ]; then + echo "==> Luakit" + git clone https://github.com/Plaque-fcc/luakit-adblock/ "${HOME}/luakit-adblock" + cp -fv ~/luakit-adblock/*.lua "$XDG_CONFIG_HOME/luakit" + rm -rvf "$HOME/luakit-adblock" -# Update the adblock modules -git clone https://github.com/Plaque-fcc/luakit-adblock/ "${HOME}/luakit-adblock" -cp -fv ~/luakit-adblock/*.lua "$XDG_CONFIG_HOME/luakit" -rm -rvf "$HOME/luakit-adblock" - -# Update the adblock lists -mkdir -p "$XDG_DATA_HOME/luakit/adblock" -wget https://easylist-downloads.adblockplus.org/easylist.txt \ - https://easylist-downloads.adblockplus.org/easyprivacy.txt \ - https://easylist-downloads.adblockplus.org/easylistgermany.txt \ - http://lian.info.tm/liste_fr.txt \ - -P "$XDG_DATA_HOME/luakit/adblock" -# https://adblock-chinalist.googlecode.com/svn/trunk/adblock.txt # ChinaList -# https://easylist-downloads.adblockplus.org/easylistitaly.txt -# https://dutchadblockfilters.googlecode.com/svn/trunk/AdBlock_Dutch_hide.txt -# http://stanev.org/abp/adblock_bg.txt # Bulgarian List -# https://indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt # AB Pindo (Indonesian) + ## Update the adblock lists + mkdir -p "$XDG_DATA_HOME/luakit/adblock" + wget https://easylist-downloads.adblockplus.org/easylist.txt \ + https://easylist-downloads.adblockplus.org/easyprivacy.txt \ + https://easylist-downloads.adblockplus.org/easylistgermany.txt \ + http://lian.info.tm/liste_fr.txt \ + -P "$XDG_DATA_HOME/luakit/adblock" + echo +fi ## Bookmarks -ln -sf "${SOURCEDIR}/BOOKMARKS/bookmarks.db" "$XDG_DATA_HOME/luakit/bookmarks.db" -ln -sf "${SOURCEDIR}/BOOKMARKS/quickmarks" "$XDG_DATA_HOME/luakit/quickmarks" - +echo "==> Bookmarks" +ln -sf "${SOURCEDIR}/BOOKMARKS/bookmarks" "$XDG_DATA_HOME/$BROWSER/" +ln -sf "${SOURCEDIR}/BOOKMARKS/quickmarks" "$XDG_DATA_HOME/$BROWSER/" echo diff --git a/.pkg-arch-aur-peteramd b/.pkg-arch-aur-peteramd index fbed56c9..156e027d 100644 --- a/.pkg-arch-aur-peteramd +++ b/.pkg-arch-aur-peteramd @@ -3,11 +3,9 @@ dropbox dropbox-cli emacs-mediawiki-bzr emacs-yasnippet -firefox-extension-video-downloadhelper fortune-mod-tbbt gitso google-talkplugin -libpng12 linux-rt linux-rt-docs linux-rt-headers @@ -17,6 +15,8 @@ package-query pacman-color rxvt-unicode-patched submarine +supermeatboy swi-prolog trash-cli +worldofgoo yaourt diff --git a/.pkg-arch-explicit-peteramd b/.pkg-arch-explicit-peteramd index df07be9c..77e1c91e 100644 --- a/.pkg-arch-explicit-peteramd +++ b/.pkg-arch-explicit-peteramd @@ -7,6 +7,7 @@ apvlv arch-wiki-lite aspell-en aspell-fr +astyle atool at-spi2-atk at-spi2-core @@ -17,6 +18,7 @@ awesome bash bash-completion bashmount +binutils bison bzip2 calc @@ -52,15 +54,13 @@ feh file filesystem findutils -firefox -firefox-extension-video-downloadhelper flashplugin flex fortune-mod fortune-mod-tbbt -gaupol gawk -gcc-multilib +gcc +gcc-libs gcolor2 gdb gettext @@ -138,7 +138,6 @@ movgrab mpg123 mplayer2 mtools -mumble mutt-android-patch namcap nano @@ -150,6 +149,7 @@ ngrep ntfs-3g ntfsprogs numlockx +odt2txt openssh oss p7zip @@ -185,6 +185,7 @@ splint strace submarine sudo +supermeatboy swi-prolog sxiv sysfsutils @@ -219,11 +220,14 @@ util-linux valgrind vi vicious +vim vlock w3m wget which wipe +wmname +worldofgoo wpa_supplicant wv xclip diff --git a/.pkg-arch-official-peteramd b/.pkg-arch-official-peteramd index 8ada6c6b..5cd20dbf 100644 --- a/.pkg-arch-official-peteramd +++ b/.pkg-arch-official-peteramd @@ -7,14 +7,13 @@ acpi alsa-lib alsa-utils antiword -apr -apr-util apvlv archlinux-keyring arch-wiki-lite aspell aspell-en aspell-fr +astyle ati-dri atk atkmm @@ -30,7 +29,7 @@ babl bash bash-completion bc -binutils-multilib +binutils bison boost-libs bzip2 @@ -72,8 +71,6 @@ diffutils dirmngr djvulibre dnssec-anchors -docbook-xml -docbook-xsl dosfstools dwb e2fsprogs @@ -92,7 +89,6 @@ ffmpeg file filesystem findutils -firefox fixesproto flac flashplugin @@ -107,11 +103,10 @@ freeglut freetype2 fribidi fuse -gaupol gawk gc -gcc-libs-multilib -gcc-multilib +gcc +gcc-libs gcolor2 gconf gd @@ -139,18 +134,16 @@ gnumeric gnupg gnuplot gnutls -gobject-introspection goffice gpgme gpm +graphite grep groff gsettings-desktop-schemas gsfonts gsl gsm -gst-plugins-base-libs -gstreamer gstreamer0.10 gstreamer0.10-base gstreamer0.10-ugly @@ -190,7 +183,6 @@ iproute2 iptables iputils isl -iso-codes jack jasper jfsutils @@ -209,8 +201,6 @@ lcms2 ldns less lesspipe -lib32-gcc-libs -lib32-glibc libarchive libart-lgpl libass @@ -235,7 +225,6 @@ libebml libedit libegl libev -libevent libexif libffi libfontenc @@ -247,14 +236,12 @@ libgl libglade libglapi libgpg-error -libgphoto2 libgsf libgssglue libgusb libice libid3tag libidn -libieee1284 libirman libjpeg-turbo libksba @@ -264,6 +251,7 @@ libltdl libmad libmatroska libmediainfo +libmikmod libmms libmng libmpc @@ -275,8 +263,11 @@ libpcap libpciaccess libpipeline libpng +libpng12 libproxy libpulse +libquvi +libquvi-scripts librsvg libsamplerate libsasl @@ -361,6 +352,7 @@ man-pages mcpp mdadm mediainfo +mesa mime-types mkinitcpio mkinitcpio-busybox @@ -372,13 +364,11 @@ mpg123 mplayer2 mtdev mtools -mumble namcap nano nawk ncdu ncurses -neon netcfg net-snmp nettle @@ -390,6 +380,8 @@ nss-myhostname ntfs-3g ntfsprogs numlockx +odt2txt +openal opencore-amr openjpeg openssh @@ -413,8 +405,6 @@ pcre perl perl-digest-sha1 perl-error -perl-test-pod -perl-yaml-syck pinentry pixman pkg-config @@ -431,30 +421,22 @@ ppl ppp printproto procps-ng -protobuf psmisc pth pwgen pyalpm pygobject2-devel -pygobject-devel pygtk python python2 -python2-beaker python2-cairo python2-dbus python2-distribute python2-gobject2 -python2-mako -python2-markupsafe python2-notify -python-cairo python-dbus-common -python-gobject python-pyelftools qpdf -qt randrproto ranger readline @@ -466,23 +448,23 @@ rsync rtmpdump rtorrent run-parts -sane schroedinger scrnsaverproto scrot sdl +sdl_mixer sed sg3_utils shadow shared-color-profiles shared-mime-info slock +smpeg speex splint sqlite startup-notification strace -subversion sudo sxiv sysfsutils @@ -510,7 +492,6 @@ ttf-liberation tzdata udiskie udisks -unixodbc unrar unrtf unzip @@ -523,12 +504,15 @@ valgrind vi vicious videoproto +vim +vim-runtime vlock w3m webkitgtk2 wget which wipe +wmname wpa_supplicant wv wxgtk @@ -553,7 +537,6 @@ xfsprogs xineramaproto xkeyboard-config xmlrpc-c -xmlto xorg-bdftopcf xorg-fonts-alias xorg-fonts-encodings diff --git a/.save b/.save index c9b23c6c..93e280c8 100755 --- a/.save +++ b/.save @@ -159,6 +159,10 @@ FILELIST=(${FILELIST[*]} ".config/awesome/themes/custom/theme.lua") ## cmus FILELIST=(${FILELIST[*]} ".cmus/rc") +## DWB +FILELIST=(${FILELIST[*]} ".config/dwb/searchengines") +FILELIST=(${FILELIST[*]} ".config/dwb/settings") + ## Emacs FILELIST=(${FILELIST[*]} ".emacs") FILELIST=(${FILELIST[*]} ".emacs.d/abbrev_defs") diff --git a/.shell.d/main_rc b/.shell.d/main_rc index 2b351f7d..32f5dc52 100644 --- a/.shell.d/main_rc +++ b/.shell.d/main_rc @@ -79,8 +79,8 @@ fi export EDITOR ## Internet Browser -type luakit > /dev/null -[ $? ] && export BROWSER="luakit" +type dwb > /dev/null +[ $? ] && export BROWSER="dwb" ## Title ## If this is an xterm set the title to user@host:dir