Merge remote-tracking branch 'gitorious/master' into phoenix

.gitignore

@@ -99,3 +99,8 @@ tmp/
 usr/
 var/
 xhtml-loader.rnc
+.unison/
+.pencil/
+.emacs.d/
+.cuyo
+.lgames

.guile

@@ -0,0 +1,2 @@
+(use-modules (ice-9 readline))
+(activate-readline)

.hgrc

@@ -0,0 +1,4 @@
+[ui]
+username = Tom Willemsen <tom@ryuslash.org>
+[extensions]
+hgext.bookmarks =

.screenrc

@@ -0,0 +1,4 @@
+startup_message off
+vbell off
+
+hardstatus alwayslastline "%{= d}%{r}screen%{g}%H %{r}>> %{g}${USER}@%H: %L>%1`%? %?%{.g}%u%? %-18=%?%{m} %{g}%-=%{g}%-w%{r}%n %t%{g}%+w %{g}|%C"

.tmux.conf

@@ -0,0 +1,3 @@
+set -g default-terminal "screen-256color"
+set-option -g status-bg 2
+set-option -g status-fg 7

.urlview

@@ -0,0 +1,2 @@
+REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):]
+COMMAND conkeror %s

.w3m/.gitignore

@@ -0,0 +1 @@
+history

.w3m/config

@@ -0,0 +1,141 @@
+simple_preserve_space 0
+gb18030_as_ucs 0
+strict_iso2022 1
+use_jisx0213 0
+use_jisx0212 0
+use_jisx0201k 0
+use_jisc6226 0
+use_jisx0201 0
+use_gb12345_map 0
+fix_width_conv 1
+search_conv 1
+pre_conv 0
+ucs_conv 1
+use_language_tag 1
+east_asian_width 0
+use_combining 1
+use_wide 1
+ext_halfdump 0
+follow_locale 1
+system_charset UTF-8
+auto_detect 2
+document_charset UTF-8
+display_charset UTF-8
+cookie_avoid_wrong_number_of_dots 
+cookie_accept_domains 
+cookie_reject_domains 
+accept_bad_cookie 0
+accept_cookie 0
+show_cookie 1
+use_cookie 0
+ssl_ca_file 
+ssl_ca_path 
+ssl_key_file 
+ssl_cert_file 
+ssl_verify_server 0
+ssl_forbid_method 
+no_cache 0
+noproxy_netaddr 1
+no_proxy 
+ftp_proxy 
+https_proxy 
+http_proxy 
+use_proxy 1
+max_news 50
+nntpmode 
+nntpserver 
+dns_order 0
+meta_refresh 0
+follow_redirection 10
+default_url 0
+retry_http 1
+argv_is_url 0
+accept_media text/html, text/*;q=0.5, image/*
+accept_encoding gzip, compress, bzip, bzip2, deflate
+accept_language en;q=1.0
+no_referer 0
+user_agent 
+pre_form_file ~/.w3m/pre_form
+ftppass_hostnamegen 1
+ftppasswd 
+disable_secret_security_check 0
+passwd_file ~/.w3m/passwd
+use_lessopen 0
+bgextviewer 1
+extbrowser3 
+extbrowser2 
+extbrowser /usr/bin/mozilla
+mailer /usr/bin/mail
+mailto_options 1
+editor /usr/bin/vi
+urimethodmap ~/.w3m/urimethodmap, /usr/etc/w3m/urimethodmap
+mailcap ~/.w3m/mailcap, /usr/etc/w3m/mailcap
+mime_types ~/.mime.types, /usr/etc/mime.types
+index_file 
+cgi_bin 
+personal_document_root 
+document_root 
+keymap_file keymap
+preserve_timestamp 1
+auto_uncompress 0
+decode_cte 0
+clear_buffer 1
+ignorecase_search 1
+wrap_search 0
+mark_all_pages 0
+vi_prec_num 0
+emacs_like_lineedit 0
+mark 0
+close_tab_back 0
+confirm_qq 1
+save_hist 1
+history 100
+use_history 1
+pagerline 10000
+visited_color magenta
+visited_anchor 0
+active_color cyan
+active_style 0
+bg_color terminal
+mark_color cyan
+form_color red
+image_color green
+anchor_color blue
+basic_color terminal
+color 1
+nextpage_topline 0
+label_topline 0
+show_srch_str 1
+show_lnum 0
+fold_line 0
+image_map_list 1
+imgdisplay w3mimgdisplay
+image_scale 100
+ext_image_viewer 1
+max_load_image 4
+auto_image 1
+pseudo_inlines 1
+display_image 1
+view_unseenobject 0
+ignore_null_img_alt 1
+display_ins_del 1
+fold_textarea 0
+graphic_char 0
+alt_entity 1
+multicol 0
+dictcommand file:///$LIB/w3mdict.cgi
+use_dictcommand 0
+dirlist_cmd file:///$LIB/dirlist.cgi
+ext_dirlist 1
+display_lineinfo 0
+decode_url 1
+display_link_number 1
+display_link 1
+open_tab_dl_list 0
+open_tab_blank 0
+target_self 0
+frame 0
+pixel_per_line 17
+pixel_per_char 8
+indent_incr 4
+tabstop 8

.xsession

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec /bin/bash --login -i "$HOME/.xinitrc"

bin/kill_tag

@@ -0,0 +1,10 @@
+#!/bin/zsh
+
+TAGS=( $(herbstclient tag_status 0 | tr ":\!.+#" " ") )
+FOO=$(for i in "${TAGS[@]}"; do echo $i; done | dmenu)
+
+if [[ "${TAGS[@]}" == *"$FOO"* ]]; then
+    herbstclient merge_tag $FOO
+else
+    notify-send "Unknown tag: $FOO"
+fi

bin/switch_tags

@@ -0,0 +1,10 @@
+#!/bin/zsh
+
+TAGS=( $(herbstclient tag_status 0 | tr ":\!.+#" " ") )
+FOO=$(for i in "${TAGS[@]}"; do echo $i; done | dmenu)
+
+if [[ "${TAGS[@]}" != *"$FOO"* ]]; then
+    herbstclient add $FOO
+fi
+
+herbstclient use $FOO

diary

@@ -0,0 +1 @@
+&%%(org-diary :scheduled :timestamp :deadline)