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

.Xdefaults

@@ -1,57 +0,0 @@
-! -*- mode: conf-xdefaults; eval: (rainbow-mode 1); eval: (git-auto-commit-mode 1) -*-
-!! drop in Solarized colorscheme for Xresources/Xdefaults
-
-urxvt.background: #000000
-urxvt.foreground: #ffffff
-urxvt.internalBorder: 0
-
-! General
-urxvt*loginShell:      true
-urxvt*scrollBar:       false
-urxvt*secondaryScroll: true
-urxvt*saveLines:       65535
-urxvt*cursorBlink:     false
-urxvt*cursorUnderline: true
-urxvt*urgentOnBell:    true
-urxvt*termName:        rxvt-256color
-urxvt.visualBell:      true
-
-! Extensions
-urxvt*perl-lib:        /usr/lib/urxvt/perl/
-urxvt*perl-ext-common: default,matcher,searchable-scrollback
-urxvt*urlLauncher:     firefox
-urxvt*matcher.button:  1
-
-! Appearance
-urxvt.font: xft:DejaVu Sans Mono:weight=medium:pixelsize=16
-urxvt.boldFont: xft:DejaVu Sans Mono:weight=black:pixelsize=16
-urxvt.italicFont: xft:DejaVu Sans Mono:slant=italic:pixelsize=16
-urxvt.transparent: true
-
-xterm*faceName: -misc-tamsyn-medium-r-normal-*-17-*-*-*-*-*-iso8859-*
-
-!xft settings
-Xft.antialias: true
-Xft.rgba: rgb
-Xft.hinting: true
-Xft.hintstyle: hintslight
-
-! Emacs settings
-Emacs*menuBar: off
-Emacs*toolbar: off
-Emacs*useXIM: off
-
-xfontsel.sampleText: \
-static void print_sample_message(XWindow *win) {\n\
-  win.label->text = "Sample text 0123456789"\n\
-}
-
-xfontsel.sampleText16: \
-static void print_sample_message(XWindow *win) {\n\
-  win.label->text = "Sample text 0123456789"\n\
-}
-
-xfontsel.sampleTextUCS: \
-static void print_sample_message(XWindow *win) {\n\
-  win.label->text = "Sample text 0123456789"\n\
-}

.Xmodmap

@@ -1,23 +0,0 @@
-! -*- eval: (git-auto-commit-mode 1) -*-
-pointer = 3 2 1
-
-!
-! Swap Caps_Lock and Control_L
-!
-! remove Lock = Caps_Lock
-remove Control = Control_L
-! keysym Control_L = Caps_Lock
-! keysym Caps_Lock = Control_L
-keycode 66 = Control_L
-! add Lock = Caps_Lock
-add Control = Control_L
-
-!
-! Swap Shift_L and Super_L
-!
-! remove Shift = Shift_L
-! remove Mod4 = Super_L
-! keysym Super_L = Shift_L
-! keysym Shift_L = Super_L
-! add Shift = Shift_L
-! add Mod4 = Super_L

.bash_profile

@@ -1,5 +0,0 @@
-# -*- eval: (git-auto-commit-mode 1) -*-
-export BROWSER=firefox
-export EDITOR="emacsclient -c -a emacs"
-export INFOPATH="${HOME}/documents/info:${INFOPATH}"
-export PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"

.beetsconfig

@@ -1,14 +0,0 @@
-# -*- mode: conf-colon; eval: (git-auto-commit-mode 1); -*-
-[beets]
-library: ~/.local/share/beets/library.blb
-directory: /mnt/music/lib/
-plugins: mpdupdate embedart
-
-[paths]
-default: $albumartist/$year - $album/$track - $title
-singleton: Non-Album/$artist - $title
-comp: Compilations/$year - $album/$track - $artist - $title
-
-[mpdupdate]
-host: localhost
-port: 6600

.config/cower/config

@@ -1,4 +0,0 @@
-# -*- eval: (git-auto-commit-mode 1) -*-
-Color = always
-TargetDir = /home/slash/code/aur/
-IgnoreRepo = pegas

.sawfish/rc

@@ -1,11 +0,0 @@
-;; -*- mode: sawfish; eval: (git-auto-commit-mode 1); -*-
-(setq user-apps-menu
-      '(("Emacs" (system "emacsclient -c &"))
-        ("Terminal" (system "urxvt &"))))
-
-(bind-keys global-keymap
-           "C-M-l" '(run-shell-command "i3lock -c \"#000000\"")
-           "Super-e" '(run-shell-command (getenv "EDITOR"))
-           "Super-w" '(run-shell-command (getenv "BROWSER"))
-           "Super-c" '(run-shell-command "urxvt")
-           "Super-TAB" 'cycle-windows)

diary

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