Merge branch 'master' of https://github.com/Ambrevar/home-config

.Xresources

@@ -1,6 +1,6 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! Xresources
-!! 2012-08-16
+!! 2012-10-31
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 !! TODO: set up charclass.
@@ -20,25 +20,22 @@
 !! plugins.
 
 ! URxvt*modifier: alt
+! URxvt.iso14755: False
 URxvt*saveLines: 5000
 URxvt*scrollBar: false
 
 !! URL Support
-URxvt.perl-ext:             default,url-select
+URxvt.perl-ext:             url-select
-URxvt.keysym.C-M-u:           perl:url-select:select_next
+URxvt.keysym.C-M-u:         perl:url-select:select_next
-URxvt.url-select.launcher:  /usr/bin/luakit
+URxvt.url-select.launcher:  luakit
 URxvt.url-select.underline: true
 
-URxvt.perl-ext-common  : keyboard-select,clipboard
+URxvt.perl-ext-common:      keyboard-select,clipboard
-
+URxvt.keysym.C-M-Escape:    perl:keyboard-select:activate
-URxvt.keysym.C-M-v:   perl:clipboard:paste
+URxvt.keysym.C-M-v:         perl:clipboard:paste
-URxvt.keysym.C-M-c: perl:clipboard:paste_escaped
+URxvt.keysym.C-M-c:         perl:clipboard:paste_escaped
+URxvt.clipboard.pastecmd:   xclip -o -selection clipboard -quiet -d locahost:0
 ! URxvt.clipboard.copycmd:  xclip -i -selection clipboard
-! URxvt.clipboard.pastecmd: xclip -o -selection clipboard
-
-!! Keyboard-Select
-URxvt.keysym.M-Escape:  perl:keyboard-select:activate
-! URxvt.keysym.M-s:       perl:keyboard-select:search
 
 !! Font
 URxvt*font       : xft:Dejavu Sans Mono:pixelsize=14

.emacs.d/main.el

@@ -27,9 +27,10 @@
 
 ;; Copy/Paste to/from clipboard.
 ;; (define-key my-keys-minor-mode-map (kbd "M-p") (kbd "C-u M-! xclip <SPC> -o"))
-(define-key my-keys-minor-mode-map (kbd "C-<f6>") (kbd "M-| xsel <SPC> -p <SPC> -i"))
+;; (define-key my-keys-minor-mode-map (kbd "C-<f6>") (kbd "M-| xsel <SPC> -p <SPC> -i"))
-(define-key my-keys-minor-mode-map (kbd "C-<f7>") (kbd "C-u M-! xsel <SPC> -o"))
+(define-key my-keys-minor-mode-map (kbd "C-<f6>") (kbd "M-| xclip"))
-(define-key my-keys-minor-mode-map (kbd "C-<f8>") (kbd "C-u M-! xsel <SPC> -o -b"))
+(define-key my-keys-minor-mode-map (kbd "C-<f7>") (kbd "C-u M-! xclip <SPC> -o"))
+(define-key my-keys-minor-mode-map (kbd "C-<f8>") (kbd "C-u M-! xclip <SPC> -o <SPC> -selection <SPC> clipboard"))
 
 ;; Compilation
 (define-key my-keys-minor-mode-map (kbd "C-<f9>") 'compile)

.netinit

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/zsh
 ################################################################################
 ## Custom network initialization script.
 ## 2012-10-29

.shell.d/main_rc

@@ -43,7 +43,8 @@ fi
 
 ## Terminal
 ## WARNING: this is always a bad idea!
-if [[ "$TERM" = *rxvt* ]]; then 
+## TODO: check how to do this properly.
+if [ ! "$OSTYPE" = "linux-gnu" ] && [[ "$TERM" = *rxvt* ]]; then 
     export TERM="rxvt-unicode-256color"
 fi
 

README

@@ -200,6 +200,7 @@ doxygen
 dropbox
 dtach
 dvtm
+dwb
 emacs
 expac
 fbpdf