From 066b96009a357aa56f9acf0961c3a6bca9307ef0 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 5 Jul 2012 22:51:52 +0200
Subject: .ssh/config
---
.ssh/config | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.ssh/config b/.ssh/config
index 00fe09b..eeb6ac6 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -17,3 +17,6 @@ User ryuslash
Host my.aethon.nl
User tom
+
+Host ryuslash.org
+Port 4511
--
cgit v1.2.3-54-g00ecf
From f6758a9a4cbf04a57fee7f1338433ef6c479e5ed Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 11 Jul 2012 09:42:21 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 1 -
1 file changed, 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index e06f216..8307d88 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -3,7 +3,6 @@ http://ryuslash.ninth.su/blog/blog.xml
#-----[ Followed projects ]-------------------------------------------
https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4
http://gitorious.org/~ryuslash/watchlist.atom
-http://www.reddit.com/new/.rss?feed=e0f54f127ad350b1793609fd9428d4b525818d15&user=ryuslash
#-----[ Blogs ]-------------------------------------------------------
http://julien.danjou.info/blog/index.xml blogs
--
cgit v1.2.3-54-g00ecf
From e08e3d3ec46cc5ab88e6f1de57c9242966fb7c00 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 11 Jul 2012 09:53:17 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 8307d88..4551b1e 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -3,6 +3,7 @@ http://ryuslash.ninth.su/blog/blog.xml
#-----[ Followed projects ]-------------------------------------------
https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4
http://gitorious.org/~ryuslash/watchlist.atom
+http://www.reddit.com/new/.rss?feed=e0f54f127ad350b1793609fd9428d4b525818d15&user=ryuslash
#-----[ Blogs ]-------------------------------------------------------
http://julien.danjou.info/blog/index.xml blogs
@@ -16,6 +17,37 @@ http://blog.gitorious.org/feed/ blogs
http://dieter.plaetinck.be/index.rss blogs
http://irreal.org/blog/?feed=rss2
+# Reddit
+
+http://www.reddit.com/r/announcements/new/.rss
+http://www.reddit.com/r/archlinux/new/.rss
+http://www.reddit.com/r/blog/new/.rss
+http://www.reddit.com/r/c_language/new/.rss
+http://www.reddit.com/r/C_Programming/new/.rss
+http://www.reddit.com/r/coding/new/.rss
+http://www.reddit.com/r/commandline/new/.rss
+http://www.reddit.com/r/cpp/new/.rss
+http://www.reddit.com/r/csharp/new/.rss
+http://www.reddit.com/r/django/new/.rss
+http://www.reddit.com/r/emacs/new/.rss
+http://www.reddit.com/r/ExpertProgramming/new/.rss
+http://www.reddit.com/r/Fedora/new/.rss
+http://www.reddit.com/r/git/new/.rss
+http://www.reddit.com/r/golang/new/.rss
+http://www.reddit.com/r/javascript/new/.rss
+http://www.reddit.com/r/linux/new/.rss
+http://www.reddit.com/r/linux_gaming/new/.rss
+http://www.reddit.com/r/LinuxHacking/new/.rss
+http://www.reddit.com/r/maemo/new/.rss
+http://www.reddit.com/r/n900/new/.rss
+http://www.reddit.com/r/opensource/new/.rss
+http://www.reddit.com/r/PHP/new/.rss
+http://www.reddit.com/r/programming/new/.rss
+http://www.reddit.com/r/Python/new/.rss
+http://www.reddit.com/r/scheme/new/.rss
+http://www.reddit.com/r/systems/new/.rss
+http://www.reddit.com/r/wayland/new/.rss
+
#-----[ CVS Changes ]-------------------------------------------------
http://git.naquadah.org/?p=naquadah-theme.git;a=rss cvs
#http://git.naquadah.org/?p=rainbow.git;a=rss cvs
--
cgit v1.2.3-54-g00ecf
From 8f7261692a6d819d3d4625e5565fd9018991e3ec Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 11 Jul 2012 12:42:51 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 1 -
1 file changed, 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 4551b1e..b28955e 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -3,7 +3,6 @@ http://ryuslash.ninth.su/blog/blog.xml
#-----[ Followed projects ]-------------------------------------------
https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4
http://gitorious.org/~ryuslash/watchlist.atom
-http://www.reddit.com/new/.rss?feed=e0f54f127ad350b1793609fd9428d4b525818d15&user=ryuslash
#-----[ Blogs ]-------------------------------------------------------
http://julien.danjou.info/blog/index.xml blogs
--
cgit v1.2.3-54-g00ecf
From b30ce512f427bcb4628757d8d8d9ced1e8837252 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 13 Jul 2012 02:06:58 +0200
Subject: Move hlwm config to newdot
---
.config/herbstluftwm/autostart | 58 ----------------
.config/herbstluftwm/panel.sh | 150 -----------------------------------------
2 files changed, 208 deletions(-)
delete mode 100755 .config/herbstluftwm/autostart
delete mode 100755 .config/herbstluftwm/panel.sh
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
deleted file mode 100755
index 04b6612..0000000
--- a/.config/herbstluftwm/autostart
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/zsh
-
-function hc () {
- herbstclient $@
-}
-
-modkey="Mod4"
-
-# Looks
-hc set frame_bg_normal_color "#0c191c"
-hc set frame_bg_active_color "#000000"
-hc set frame_border_width 0
-hc set window_border_width 1
-hc set window_border_normal_color "#15abc3"
-hc set window_border_active_color "#e0c625"
-hc set focus_stealing_prevention 0
-hc set swap_monitors_to_get_tag 0
-
-# Layout
-hc set default_frame_layout 2
-hc set_layout max
-
-# Monitors
-hc add default2
-hc remove_monitor 1
-hc move_monitor 0 1920x1080+0+0
-hc add_monitor 1680x1050+1920+0 default2
-
-hc pad 0 -5 -5 -5 -5
-hc pad 1 -5 -5 -5 -5
-
-# Keys
-#hc keybind $modkey-t spawn ~/bin/hlwm/capture-todo
-#hc keybind $modkey-Shift-t spawn ~/bin/hlwm/show-todo
-
-# Mouse
-hc mousebind $modkey-Button1 move
-hc mousebind $modkey-Button2 resize
-hc mousebind $modkey-Button3 zoom
-
-# Rules
-hc unrule -F
-hc rule focus=on
-hc rule windowtype=_NET_WM_WINDOW_TYPE_DIALOG focus=on pseudotile=on
-hc rule class=Xephyr pseudotile=on
-hc rule instance=Xine\ Window pseudotile=on
-
-xbindkeys
-
-# Panel
-~/.config/herbstluftwm/panel.sh &
-
-# Prep default
-hc load default "(split horizontal:0.550000:0 (split vertical:0.850000:0 (split horizontal:0.180000:1 (clients max:0) (clients max:0 0x140001a)) (clients max:0)) (clients max:0 0xc00077))"
-
-# Local Variables:
-# eval: (git-auto-commit-mode 1)
-# End:
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
deleted file mode 100755
index 22b46ae..0000000
--- a/.config/herbstluftwm/panel.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/bash
-
-monitor=${1:-0}
-monitor2=1
-geometry=( $(herbstclient monitor_rect "$monitor") )
-if [ -z "$geometry" ] ;then
- echo "Invalid monitor $monitor"
- exit 1
-fi
-# geometry has the format: WxH+X+Y
-x=${geometry[0]}
-width=${geometry[2]}
-height=12
-y=0 #$(expr ${geometry[3]} - $height)
-tag_width=40
-font="-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*"
-
-selcolor='#24c6e0'
-locolor='#657b83'
-bgcolor='#002b36'
-hicolor="#808080"
-urcolor="#e0c625"
-
-function uniq_linebuffered() {
- awk '$0 != l { print ; l=$0 ; fflush(); }' "$@"
-}
-
-function print_tags() {
- # draw tags
- echo -n "$separator"
- for i in "${TAGS[@]}" ; do
- if [[ "${TAGS2[@]}" == *"#${i:1}"* ]]; then
- echo -n "^bg($selcolor)^fg(#000000) ${i:1} ^fg()^bg()"
- elif [[ "${TAGS2[@]}" == *"+${i:1}"* ]]; then
- echo -n "^bg($locolor)^fg(#000000) ${i:1} ^fg()^bg()"
- else
- case ${i:0:1} in
- '#')
- echo -n "^bg($selcolor)^fg(#000000) ${i:1} ^fg()^bg()"
- ;;
- '+')
- echo -n "^bg($locolor)^fg(#000000) ${i:1} ^fg()^bg()"
- ;;
- ':')
- echo -n "^bg($hicolor)^fg(#000000) ${i:1} ^fg()^bg()"
- ;;
- '!')
- echo -n "^bg($urcolor)^fg(#000000) ${i:1} ^fg()^bg()"
- ;;
- *)
- echo -n "^bg($bgcolor)^fg(#ffffff) ${i:1} ^fg()^bg()"
- ;;
- esac
- fi
- echo -n "$separator"
- done
-}
-
-function print_mailboxes() {
- declare -A mailnames
- mailboxes=(ninthfloor gmail aethon ryuslash.org)
- mailnames=(
- [ninthfloor]="9f"
- [gmail]="gm"
- [aethon]="aet"
- [ryuslash.org]="ryu")
- mailtxt=""
- for j in "${mailboxes[@]}"; do
- mailfile="$HOME/documents/mail/$j/inbox/new/"
- mailcnt=$(ls $mailfile | wc -l)
-
- if [ $mailcnt -gt 0 ]; then
- mailsha1=$(echo $j | sha1sum)
- mailcolor="#${mailsha1:0:6}"
- else
- mailcolor=$bgcolor
- fi
-
- mailtxt="$mailtxt${separator}^bg($mailcolor)^fg(#ffffff) ${mailnames[$j]} ^fg()^bg()"
- done
- mailtxt_only=$(echo -n "$mailtxt" | sed 's.\^[^(]*([^)]*)..g')
- let mailtxt_width=$(textwidth "$font" "$mailtxt_only")+10
- echo -n "^p(_RIGHT)^p(-$mailtxt_width)$mailtxt"
-}
-
-function print_services() {
- services=(emacs httpd mysqld dunst xbindkeys mpdscribble sshd mpd)
- servicetxt=""
- for j in "${services[@]}"; do
- servicetxt="$servicetxt$separator$(status $j)"
- done
- servicetxt_only=$(echo -n "$servicetxt" | sed 's.\^[^(]*([^)]*)..g')
- let servicetxt_width=($(textwidth "$font" "$servicetxt_only")+7)/2
-
- echo -n "^p(_CENTER)^p(-$servicetxt_width)$servicetxt"
-}
-
-function status()
-{
- running=$(${1}_running 2>/dev/null || pidof $1)
-
- if [ -n "$running" ]; then
- color="darkgreen"
- else
- color="darkred"
- fi
-
- echo -n "^bg($color)^fg(#ffffff) $1 ^fg()^bg()"
-}
-
-function emacs_running()
-{
- ps ax | awk '{ print $5 " " $6 }' | grep -E "^emacs --daemon"
-}
-
-{
- childpid=$!
- herbstclient --idle
- kill $childpid
-} 2> /dev/null | {
- TAGS=( $(herbstclient tag_status $monitor) )
- TAGS2=( $(herbstclient tag_status $monitor2) )
-
- separator="^fg($bgcolor)^ro(1x$height)^fg()"
- print_tags
- print_services
- print_mailboxes
-
- echo
- # wait for next event
- read line || break
- cmd=( $line )
- # find out event origin
- case "${cmd[0]}" in
- tag*)
- TAGS=( $(herbstclient tag_status $monitor) )
- TAGS2=( $(herbstclient tag_status $monitor2) )
- ;;
- quit_panel)
- exit
- ;;
- esac
-
- sleep 1s
-} 2> /dev/null | dzen2 -w $width -x $x -y $y -fn "$font" -h $height \
- -ta l -bg "$bgcolor"
-
-# Local Variables:
-# eval: (git-auto-commit-mode 1)
-# End:
--
cgit v1.2.3-54-g00ecf
From e07713daff16ac607317fdb48078fd5d21ec57f2 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 22 Jul 2012 12:57:08 +0200
Subject: .zprofile
---
.zprofile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.zprofile b/.zprofile
index 0da982a..0fc5ba9 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,7 +1,7 @@
# -*- eval: (git-auto-commit-mode 1) -*-
export BROWSER=firefox
export EDITOR="emacsclient -c -a emacs"
-export INFOPATH="${HOME}/documents/info:${INFOPATH}"
+export INFOPATH="${HOME}/documents/info:${INFOPATH}:/usr/local/stumpwm/share/info"
PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
PATH="$HOME/code/ext/emacs/trunk/lib-src:$PATH"
--
cgit v1.2.3-54-g00ecf
From d6f8229a302f2d548e83f5a9ce8730be786d72e0 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 22 Jul 2012 16:16:36 +0200
Subject: .config/newsbeuter/config
---
.config/newsbeuter/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/config b/.config/newsbeuter/config
index a4255c3..b3c6c89 100644
--- a/.config/newsbeuter/config
+++ b/.config/newsbeuter/config
@@ -18,7 +18,7 @@ html-renderer "w3m -dump -T text/HTML -cols 80"
text-width 80
# colors
-color listfocus default color0 bold
+color listfocus default red bold
color info color0 white
# highlight
--
cgit v1.2.3-54-g00ecf
From dc6e1604db1fa24c9a197de3308515902a694eaa Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 22 Jul 2012 16:17:06 +0200
Subject: .config/newsbeuter/config
---
.config/newsbeuter/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/config b/.config/newsbeuter/config
index b3c6c89..2867414 100644
--- a/.config/newsbeuter/config
+++ b/.config/newsbeuter/config
@@ -19,7 +19,7 @@ text-width 80
# colors
color listfocus default red bold
-color info color0 white
+color info white black bold
# highlight
highlight article "^(Feed|Title|Author|Link|Date):.*" green default bold
--
cgit v1.2.3-54-g00ecf
From ad2bb5557ab92ffb5051459eb26c604359daf0ab Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 22 Jul 2012 16:17:27 +0200
Subject: .config/newsbeuter/config
---
.config/newsbeuter/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/config b/.config/newsbeuter/config
index 2867414..ad8c0f0 100644
--- a/.config/newsbeuter/config
+++ b/.config/newsbeuter/config
@@ -19,7 +19,7 @@ text-width 80
# colors
color listfocus default red bold
-color info white black bold
+color info white black
# highlight
highlight article "^(Feed|Title|Author|Link|Date):.*" green default bold
--
cgit v1.2.3-54-g00ecf
From 5c12ebca7d1c8acb85ad8aacdfdf8580b1079b69 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 22 Jul 2012 16:18:31 +0200
Subject: .config/newsbeuter/config
---
.config/newsbeuter/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/config b/.config/newsbeuter/config
index ad8c0f0..ae56da0 100644
--- a/.config/newsbeuter/config
+++ b/.config/newsbeuter/config
@@ -19,7 +19,7 @@ text-width 80
# colors
color listfocus default red bold
-color info white black
+color info default black bold
# highlight
highlight article "^(Feed|Title|Author|Link|Date):.*" green default bold
--
cgit v1.2.3-54-g00ecf
From 3bb8a7e56c63d91096bfaa6d5252ab0dcf8bc746 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 22 Jul 2012 16:18:44 +0200
Subject: .config/newsbeuter/config
---
.config/newsbeuter/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/config b/.config/newsbeuter/config
index ae56da0..b751683 100644
--- a/.config/newsbeuter/config
+++ b/.config/newsbeuter/config
@@ -18,7 +18,7 @@ html-renderer "w3m -dump -T text/HTML -cols 80"
text-width 80
# colors
-color listfocus default red bold
+color listfocus default red
color info default black bold
# highlight
--
cgit v1.2.3-54-g00ecf
From f1e52131660508fc6d065eb3c5369c31cd1a2ab9 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 22 Jul 2012 16:36:38 +0200
Subject: Move newsbeuter config to newdot project
---
.config/newsbeuter/config | 28 ----------------------------
1 file changed, 28 deletions(-)
delete mode 100644 .config/newsbeuter/config
diff --git a/.config/newsbeuter/config b/.config/newsbeuter/config
deleted file mode 100644
index b751683..0000000
--- a/.config/newsbeuter/config
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- eval: (git-auto-commit-mode 1) -*-
-auto-reload yes
-browser firefox
-confirm-exit yes
-feedlist-format "%-35t %?d?- %-35d&? %> %u"
-max-items 500
-notify-program notify-send
-notify-beep yes
-reload-threads 3
-reload-time 60
-show-read-feeds no
-show-read-articles no
-articlelist-format "%-4i %f %t"
-feedlist-title-format "%N %V %> %u feeds with new articles"
-articlelist-title-format "%T"
-article-sort-order date-desc
-html-renderer "w3m -dump -T text/HTML -cols 80"
-text-width 80
-
-# colors
-color listfocus default red
-color info default black bold
-
-# highlight
-highlight article "^(Feed|Title|Author|Link|Date):.*" green default bold
-
-# keys
-bind-key i prev-dialog
--
cgit v1.2.3-54-g00ecf
From 0910e79fc956ac0595b969ba48c7d82d76023a78 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 22 Jul 2012 18:35:38 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 4 +-
.conkerorrc/gtk2rc | 11 -
.conkerorrc/keys.js | 1 -
.conkerorrc/modeline.js | 6 -
.conkerorrc/settings.js | 19 --
.conkerorrc/theme.js | 2 -
.../themes/naquadah/conkeror--scrollbars.css | 36 ---
.conkerorrc/themes/naquadah/hints--url-panel.css | 17 --
.conkerorrc/themes/naquadah/minibuffer.css | 52 ----
.conkerorrc/themes/naquadah/mode-line.css | 11 -
.conkerorrc/themes/naquadah/new-tabs.css | 54 ----
.conkerorrc/themes/naquadah/tab-bar.css | 41 ---
.conkerorrc/themes/naquadah/theme.json | 9 -
.conkerorrc/webjumps.js | 33 ---
.conky_box.lua | 311 ---------------------
.conkyrc | 53 ----
.fonts.conf | 34 ---
17 files changed, 2 insertions(+), 692 deletions(-)
delete mode 100644 .conkerorrc/gtk2rc
delete mode 100644 .conkerorrc/keys.js
delete mode 100644 .conkerorrc/modeline.js
delete mode 100644 .conkerorrc/settings.js
delete mode 100644 .conkerorrc/theme.js
delete mode 100644 .conkerorrc/themes/naquadah/conkeror--scrollbars.css
delete mode 100644 .conkerorrc/themes/naquadah/hints--url-panel.css
delete mode 100644 .conkerorrc/themes/naquadah/minibuffer.css
delete mode 100644 .conkerorrc/themes/naquadah/mode-line.css
delete mode 100644 .conkerorrc/themes/naquadah/new-tabs.css
delete mode 100644 .conkerorrc/themes/naquadah/tab-bar.css
delete mode 100644 .conkerorrc/themes/naquadah/theme.json
delete mode 100644 .conkerorrc/webjumps.js
delete mode 100644 .conky_box.lua
delete mode 100644 .conkyrc
delete mode 100644 .fonts.conf
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index b28955e..c45aba0 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -1,8 +1,8 @@
# -*- mode: conf; eval: (git-auto-commit-mode 1) -*-
http://ryuslash.ninth.su/blog/blog.xml
#-----[ Followed projects ]-------------------------------------------
-https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4
-http://gitorious.org/~ryuslash/watchlist.atom
+# https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4
+# http://gitorious.org/~ryuslash/watchlist.atom
#-----[ Blogs ]-------------------------------------------------------
http://julien.danjou.info/blog/index.xml blogs
diff --git a/.conkerorrc/gtk2rc b/.conkerorrc/gtk2rc
deleted file mode 100644
index fd511e5..0000000
--- a/.conkerorrc/gtk2rc
+++ /dev/null
@@ -1,11 +0,0 @@
-include "/home/slash/.gtkrc-2.0"
-
-style "noscrollbars" {
- GtkScrollbar::slider-width=0
- GtkScrollbar::trough-border=0
- GtkScrollbar::has-backward-stepper=0
- GtkScrollbar::has-forward-stepper=0
- GtkScrollbar::has-secondary-backward-stepper=0
- GtkScrollbar::has-secondary-forward-stepper=0
-}
-widget "MozillaGtkWidget.*" style "noscrollbars"
diff --git a/.conkerorrc/keys.js b/.conkerorrc/keys.js
deleted file mode 100644
index 5bf7fa3..0000000
--- a/.conkerorrc/keys.js
+++ /dev/null
@@ -1 +0,0 @@
-define_key(default_base_keymap, "C-x f", "follow-new-buffer");
diff --git a/.conkerorrc/modeline.js b/.conkerorrc/modeline.js
deleted file mode 100644
index 25c008e..0000000
--- a/.conkerorrc/modeline.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- eval: (git-auto-commit-mode 1) -*-
-require("favicon");
-
-add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget, true));
-add_hook("mode_line_hook", mode_line_adder(buffer_count_widget, true));
-add_hook("mode_line_hook", mode_line_adder(downloads_status_widget));
diff --git a/.conkerorrc/settings.js b/.conkerorrc/settings.js
deleted file mode 100644
index 8f59204..0000000
--- a/.conkerorrc/settings.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- eval: (git-auto-commit-mode 1) -*-
-cwd = make_file("/home/slash/downloads/");
-url_remoting_fn = load_url_in_new_buffer;
-read_buffer_show_icons = true;
-hint_digits = ";ASDFGHJKL";
-
-hints_minibuffer_annotation_mode(true);
-
-add_hook("before_quit_hook",
- function () {
- var w = get_recent_conkeror_window();
- var result = (w == null) ||
- "y" == (yield w.minibuffer.read_single_character_option(
- $prompt = "Quit Conkeror? (y/n)",
- $options = ["y", "n"]));
- yield co_return(result);
- });
-
-remove_hook("download_added_hook", open_download_buffer_automatically);
diff --git a/.conkerorrc/theme.js b/.conkerorrc/theme.js
deleted file mode 100644
index b298459..0000000
--- a/.conkerorrc/theme.js
+++ /dev/null
@@ -1,2 +0,0 @@
-theme_load_paths.push("/home/slash/.conkerorrc/themes/");
-theme_load("naquadah");
diff --git a/.conkerorrc/themes/naquadah/conkeror--scrollbars.css b/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
deleted file mode 100644
index 0f70e96..0000000
--- a/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
+++ /dev/null
@@ -1,36 +0,0 @@
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* The "background" behind the scrolling part of the scrollbar. */
-scrollbar {
- background-color: #222;
-}
-
-/* corner between horizontal and vertical scrollbars */
-scrollcorner {
- background-color: black;
-}
-
-/* The scroll up/down buttons. */
-scrollbarbutton {
- background-color: #666;
-}
-
-/* The actual scrolling part of the scrollbar. */
-thumb {
- background-color: #666;
-}
-
-thumb, scrollbarbutton {
- -moz-border-bottom-colors: #000 #333;
- -moz-border-left-colors: #aaa #888;
- -moz-border-right-colors: #000 #333;
- -moz-border-top-colors: #aaa #888;
-}
-
-scrollbarbutton:hover:active, scrollbarbutton[active="true"] {
- -moz-border-bottom-colors: #aaa #888;
- -moz-border-left-colors: #000 #333;
- -moz-border-right-colors: #aaa #888;
- -moz-border-top-colors: #000 #333;
-}
diff --git a/.conkerorrc/themes/naquadah/hints--url-panel.css b/.conkerorrc/themes/naquadah/hints--url-panel.css
deleted file mode 100644
index 143f3c1..0000000
--- a/.conkerorrc/themes/naquadah/hints--url-panel.css
+++ /dev/null
@@ -1,17 +0,0 @@
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-.panel {
- border-top: 4px double #333333;
- color: white;
- background-color: black;
-}
-
-.panel .panel-row-label {
- font-weight: bold;
-}
-
-.panel .url-panel-label {
- font-weight: bold;
-}
-
diff --git a/.conkerorrc/themes/naquadah/minibuffer.css b/.conkerorrc/themes/naquadah/minibuffer.css
deleted file mode 100644
index c882f3e..0000000
--- a/.conkerorrc/themes/naquadah/minibuffer.css
+++ /dev/null
@@ -1,52 +0,0 @@
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#minibuffer {
- background-color: #252A2E;
- border: 0px none #444;
- border-top: 0;
- color: #EEEEEC;
- font: 11px Tahoma;
-}
-
-#minibuffer-input, #minibuffer-input * {
- color: #EEEEEC;
-}
-
-#minibuffer-prompt {
- color: #EEEEEC;
-}
-
-/* Completions display */
-
-tree.completions treechildren { border: none !important; }
-
-tree.completions treecol { -moz-binding: none !important; }
-tree.completions {
- -moz-appearance: none !important;
- border: 0px none !important;
- border-top: 4px double #333333 !important;
- background-color: #252A2E !important;
- -moz-border-top-colors: -moz-initial !important;
- color: #EEEEEC !important;
-}
-
-tree.completions treechildren::-moz-tree-row {
- background-color: #252A2E !important;
- border: none;
-}
-
-tree.completions treechildren::-moz-tree-row(current) {
- background-color: #0C191C !important;
- color: #EEEEEC;
-}
-
-tree.completions treechildren::-moz-tree-cell-text(completion-description) {
- color: green !important;
- font-weight: bold !important;
-}
-
-tree.completions treechildren::-moz-tree-cell-text(current) {
- color: #EEEEEC !important;
-}
-
diff --git a/.conkerorrc/themes/naquadah/mode-line.css b/.conkerorrc/themes/naquadah/mode-line.css
deleted file mode 100644
index 7e1ed45..0000000
--- a/.conkerorrc/themes/naquadah/mode-line.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.mode-line {
- font: 11px Tahoma;
- padding: 0px;
- border: 1px solid #2E3436;
- color: #EEEEEC;
- background-color: #0C191C;
-}
-
-.mode-line label {
- color: #EEEEEC;
-}
diff --git a/.conkerorrc/themes/naquadah/new-tabs.css b/.conkerorrc/themes/naquadah/new-tabs.css
deleted file mode 100644
index f5d30c0..0000000
--- a/.conkerorrc/themes/naquadah/new-tabs.css
+++ /dev/null
@@ -1,54 +0,0 @@
-#tab2-bar {
- background: #222;
-}
-
-.tab2 {
- margin: 2px 0px 0px 2px;
- padding: 0px;
- height: 22px;
- border-width: 2px;
- border-bottom-width: 0;
- border-style: solid;
- -moz-border-radius: 3px 3px 0 0;
- -moz-border-left-colors: #888 #555;
- -moz-border-right-colors: #000 #171717;
- -moz-border-top-colors: #888 #555;
- background: #333;
- min-width: 200px;
- max-width: 200px;
- overflow: hidden; /* Chops end of label */
-}
-
-.tab2[selected=true] {
- -moz-border-left-colors: #aaa #888;
- -moz-border-right-colors: #000 #333;
- -moz-border-top-colors: #aaa #888;
- background: #666;
-}
-
-.tab2:hover {
- -moz-border-left-colors: #eee #bbb;
- -moz-border-right-colors: #333 #666;
- -moz-border-top-colors: #eee #bbb;
- background: #999;
-}
-
-.tab2-label {
- margin-left: 4px;
- padding-top: 1px;
- color: #fff;
- font: 11px Tahoma;
-}
-
-.tab2-icon {
- margin: 1px !important;
- padding: 1px;
- width: 20px;
- height: 15px;
- max-height: 15px;
- -moz-border-radius: 1px;
- background: black;
- color: white;
- font: 900 11px Tahoma;
- text-align: center;
-}
diff --git a/.conkerorrc/themes/naquadah/tab-bar.css b/.conkerorrc/themes/naquadah/tab-bar.css
deleted file mode 100644
index c451778..0000000
--- a/.conkerorrc/themes/naquadah/tab-bar.css
+++ /dev/null
@@ -1,41 +0,0 @@
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* TABS */
-#tab2-bar {
- background: #000;
-}
-
-#tab2-bar .tab2 {
- margin: 0;
- padding: 0;
- border: none;
- /*height: 19px;
- border: 1px solid #666;
- min-width: 200px;
- max-width: 200px;*/
- background: #333;
- overflow: hidden;
-}
-
-#tab2-bar .tab2-label {
- margin: 0;
- color: white;
- font: 11px Tahoma;
-}
-
-#tab2-bar .tab2-icon {
- height: 16px;
- width: 16px;
- background: #222;
- color: white;
- border: 1px solid #999;
- font: 900 11px Tahoma;
- text-align: center;
-}
-
-#tab2-bar .tab2[selected=true] {
- border: 1px solid white;
- background: #666;
- border: 1px solid #999;
-}
diff --git a/.conkerorrc/themes/naquadah/theme.json b/.conkerorrc/themes/naquadah/theme.json
deleted file mode 100644
index bb74ee1..0000000
--- a/.conkerorrc/themes/naquadah/theme.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "sheets" : [
- "conkeror--scrollbars.css",
- "new-tabs.css",
- "minibuffer.css",
- "mode-line.css",
- "hints--url-panel.css",
- "tab-bar.css"
- ]
-}
diff --git a/.conkerorrc/webjumps.js b/.conkerorrc/webjumps.js
deleted file mode 100644
index e13c281..0000000
--- a/.conkerorrc/webjumps.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- eval: (git-auto-commit-mode 1) -*-
-
-define_webjump("emacswiki",
- "http://www.google.com/cse?cx=004774160799092323420%3A6-ff2s0o6yi&q=%s",
- $alternative="http://www.emacswiki.org");
-define_webjump("php",
- "http://www.php.net/manual-lookup.php?pattern=%s&scope=quickref",
- $alternative="http://www.php.net");
-define_webjump("python",
- "http://docs.python.org/search.html?q=%s&check_keywords=yes&area=default",
- $alternative="http://www.python.org");
-define_webjump("ddg",
- "https://duckduckgo.com/?q=%s",
- $alternative="https://duckduckgo.com");
-define_webjump("metal-archives",
- "http://www.metal-archives.com/search?searchString=%s&type=band_name",
- $alternative="http://www.metal-arhives.com");
-define_webjump("djangodocs",
- "https://docs.djangoproject.com/search/?q=%s&release=5",
- $alternative="https://docs.djangoproject.com/");
-define_webjump("google",
- "https://duckduckgo.com?q=!google%%20%s");
-
-// Archlinux
-define_webjump("arch/wiki",
- "https://wiki.archlinux.org/index.php?search=%s",
- $alternative="https://wiki.archlinux.org");
-define_webjump("arch/aur",
- "https://aur.archlinux.org/packages.php?O=0&K=%s&do_Search=Go",
- $alternative="https://aur.archlinux.org");
-define_webjump("arch/packages",
- "https://www.archlinux.org/packages/?sort=&q=%s&limit=50",
- $alternative="https://packages.archlinux.org");
diff --git a/.conky_box.lua b/.conky_box.lua
deleted file mode 100644
index ef53427..0000000
--- a/.conky_box.lua
+++ /dev/null
@@ -1,311 +0,0 @@
---[[BOX WIDGET v1.1 by Wlourf 27/01/2011
-This widget can drawn some boxes, even circles in your conky window
-http://u-scripts.blogspot.com/2011/01/box-widget.html)
-
-Inspired by Background by londonali1010 (2009), thanks ;-)
-
-The parameters (all optionals) are :
-x - x coordinate of top-left corner of the box, default = 0 = (top-left corner of conky window)
-y - y coordinate of top-left corner of the box, default = 0 = (top-left corner of conky window)
-w - width of the box, default = width of the conky window
-h - height of the box, default = height of the conky window
-corners - corners is a table for the four corners in this order : top-left, top-right,bottom-right, bottom-left
- each corner is defined in a table with a shape and a radius, available shapes are : "curve","circle","line"
- example for the same shapes for all corners:
- { {"circle",10} }
- example for first corner different from the three others
- { {"circle",10}, {"circle",5} }
- example for top corners differents from bottom corners
- { {"circle",10}, {"circle",10}, {"line",0} }
- default = { {"line",0} } i.e=no corner
-operator - set the compositing operator (needs in the conkyrc : own_window_argb_visual yes)
- see http://cairographics.org/operators/
- available operators are :
- "clear","source","over","in","out","atop","dest","dest_over","dest_in","dest_out","dest_atop","xor","add","saturate"
- default = "over"
-border - if border>0, the script draws only the border, like a frame, default=0
-dash - if border>0 and dash>0, the border is draw with dashes, default=0
-skew_x - skew box around x axis, default = 0
-skew_y - skew box around y axis, default = 0
-scale_x - rescale the x axis, default=1, useful for drawing elipses ...
-scale_y - rescale the x axis, default=1
-angle - angle of rotation of the box in degrees, default = 0
- i.e. a horizontal graph
-rot_x - x point of rotation's axis, default = 0,
- relative to top-left corner of the box, (not the conky window)
-rot_y - y point of rotation's axis, default = 0
- relative to top-left corner of the box, (not the conky window)
-draw_me - if set to false, box is not drawn (default = true or 1)
- it can be used with a conky string, if the string returns 1, the box is drawn :
- example : "${if_empty ${wireless_essid wlan0}}${else}1$endif",
-
-linear_gradient - table with the coordinates of two points to define a linear gradient,
- points are relative to top-left corner of the box, (not the conky window)
- {x1,y1,x2,y2}
-radial_gradient - table with the coordinates of two circle to define a radial gradient,
- points are relative to top-left corner of the box, (not the conky window)
- {x1,y1,r1,x2,y2,r2} (r=radius)
-colour - table of colours, default = plain white {{1,0xFFFFFF,0.5}}
- this table contains one or more tables with format {P,C,A}
- P=position of gradient (0 = start of the gradient, 1= end of the gradient)
- C=hexadecimal colour
- A=alpha (opacity) of color (0=invisible,1=opacity 100%)
- Examples :
- for a plain color {{1,0x00FF00,0.5}}
- for a gradient with two colours {{0,0x00FF00,0.5},{1,0x000033,1}} {x=80,y=150,w=20,h=20,
- radial_gradient={20,20,0,20,20,20},
- colour={{0.5,0xFFFFFF,1},{1,0x000000,0}},
- or {{0.5,0x00FF00,1},{1,0x000033,1}} -with this one, gradient will start in the middle
- for a gradient with three colours {{0,0x00FF00,0.5},{0.5,0x000033,1},{1,0x440033,1}}
- and so on ...
-
-
-
-To call this script in Conky, use (assuming you have saved this script to ~/scripts/):
- lua_load ~/scripts/box.lua
- lua_draw_hook_pre main_box
-
-And leave one line blank or not after TEXT
-
-Changelog:
-+ v1.0 -- Original release (19.12.2010)
-+ v1.1 -- Adding parameters: operator, dash, angle, skew_x, skew_y, draw_me
- corners are described in a table
-
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation version 3 (GPLv3)
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
--- MA 02110-1301, USA.
-
-
-]]
-
-
-require 'cairo'
-
-function conky_main_box()
-
- if conky_window==nil then return end
-
- ---------------------- PARAMETERS BEGIN HERE
- local boxes_settings={
- {
- x = conky_window.text_start_x - 10,
- y = conky_window.text_start_y - 10,
- w = conky_window.text_width + 20,
- h = conky_window.text_height + 20,
- colour = {{1,0x000000,0.4}},
- },
- }
-
-
- ---------------------------- PARAMETERS END HERE
-
- local cs=cairo_xlib_surface_create(conky_window.display, conky_window.drawable, conky_window.visual, conky_window.width, conky_window.height)
- local cr=cairo_create(cs)
-
- if tonumber(conky_parse("$updates"))<5 then return end
- for i in pairs(boxes_settings) do
- draw_box (cr,boxes_settings[i])
- end
- cairo_destroy(cr)
- cairo_surface_destroy(cs)
-end
-
-
-function draw_box(cr,t)
-
- if t.draw_me == true then t.draw_me = nil end
- if t.draw_me ~= nil and conky_parse(tostring(t.draw_me)) ~= "1" then return end
-
- local table_corners={"circle","curve","line"}
-
- local t_operators={
- clear = CAIRO_OPERATOR_CLEAR,
- source = CAIRO_OPERATOR_SOURCE,
- over = CAIRO_OPERATOR_OVER,
- ["in"] = CAIRO_OPERATOR_IN,
- out = CAIRO_OPERATOR_OUT,
- atop = CAIRO_OPERATOR_ATOP,
- dest = CAIRO_OPERATOR_DEST,
- dest_over = CAIRO_OPERATOR_DEST_OVER,
- dest_in = CAIRO_OPERATOR_DEST_IN,
- dest_out = CAIRO_OPERATOR_DEST_OUT,
- dest_atop = CAIRO_OPERATOR_DEST_ATOP,
- xor = CAIRO_OPERATOR_XOR,
- add = CAIRO_OPERATOR_ADD,
- saturate = CAIRO_OPERATOR_SATURATE,
- }
-
- function rgba_to_r_g_b_a(tc)
- --tc={position,colour,alpha}
- local colour = tc[2]
- local alpha = tc[3]
- return ((colour / 0x10000) % 0x100) / 255., ((colour / 0x100) % 0x100) / 255., (colour % 0x100) / 255., alpha
- end
-
- function table.copy(t)
- local t2 = {}
- for k,v in pairs(t) do
- t2[k] = {v[1],v[2]}
- end
- return t2
- end
-
- function draw_corner(num,t)
- local shape=t[1]
- local radius=t[2]
- local x,y = t[3],t[4]
- if shape=="line" then
- if num == 1 then cairo_line_to(cr,radius,0)
- elseif num == 2 then cairo_line_to(cr,x,radius)
- elseif num == 3 then cairo_line_to(cr,x-radius,y)
- elseif num == 4 then cairo_line_to(cr,0,y-radius)
- end
- end
- if shape=="circle" then
- local PI = math.pi
- if num == 1 then cairo_arc(cr,radius,radius,radius,-PI,-PI/2)
- elseif num == 2 then cairo_arc(cr,x-radius,y+radius,radius,-PI/2,0)
- elseif num == 3 then cairo_arc(cr,x-radius,y-radius,radius,0,PI/2)
- elseif num == 4 then cairo_arc(cr,radius,y-radius,radius,PI/2,-PI)
- end
- end
- if shape=="curve" then
- if num == 1 then cairo_curve_to(cr,0,radius ,0,0 ,radius,0)
- elseif num == 2 then cairo_curve_to(cr,x-radius,0, x,y, x,radius)
- elseif num == 3 then cairo_curve_to(cr,x,y-radius, x,y, x-radius,y)
- elseif num == 4 then cairo_curve_to(cr,radius,y, x,y, 0,y-radius)
- end
- end
- end
-
- --check values and set default values
- if t.x == nil then t.x = 0 end
- if t.y == nil then t.y = 0 end
- if t.w == nil then t.w = conky_window.width end
- if t.h == nil then t.h = conky_window.height end
- if t.radius == nil then t.radius = 0 end
- if t.border == nil then t.border = 0 end
- if t.colour==nil then t.colour={{1,0xFFFFFF,0.5}} end
- if t.linear_gradient ~= nil then
- if #t.linear_gradient ~= 4 then
- t.linear_gradient = {t.x,t.y,t.width,t.height}
- end
- end
- if t.angle==nil then t.angle = 0 end
-
- if t.skew_x == nil then t.skew_x=0 end
- if t.skew_y == nil then t.skew_y=0 end
- if t.scale_x==nil then t.scale_x=1 end
- if t.scale_y==nil then t.scale_y=1 end
- if t.rot_x == nil then t.rot_x=0 end
- if t.rot_y == nil then t.rot_y=0 end
-
- if t.operator == nil then t.operator = "over" end
- if (t_operators[t.operator]) == nil then
- print ("wrong operator :",t.operator)
- t.operator = "over"
- end
-
- if t.radial_gradient ~= nil then
- if #t.radial_gradient ~= 6 then
- t.radial_gradient = {t.x,t.y,0, t.x,t.y, t.width}
- end
- end
-
- for i=1, #t.colour do
- if #t.colour[i]~=3 then
- print ("error in color table")
- t.colour[i]={1,0xFFFFFF,1}
- end
- end
-
- if t.corners == nil then t.corners={ {"line",0} } end
- local t_corners = {}
- local t_corners = table.copy(t.corners)
- --don't use t_corners=t.corners otherwise t.corners is altered
-
- --complete the t_corners table if needed
- for i=#t_corners+1,4 do
- t_corners[i]=t_corners[#t_corners]
- local flag=false
- for j,v in pairs(table_corners) do flag=flag or (t_corners[i][1]==v) end
- if not flag then print ("error in corners table :",t_corners[i][1]);t_corners[i][1]="curve" end
- end
-
- --this way :
- -- t_corners[1][4]=x
- -- t_corners[2][3]=y
- --doesn't work
- t_corners[1]={t_corners[1][1],t_corners[1][2],0,0}
- t_corners[2]={t_corners[2][1],t_corners[2][2],t.w,0}
- t_corners[3]={t_corners[3][1],t_corners[3][2],t.w,t.h}
- t_corners[4]={t_corners[4][1],t_corners[4][2],0,t.h}
-
- t.no_gradient = (t.linear_gradient == nil ) and (t.radial_gradient == nil )
-
- cairo_save(cr)
- cairo_translate(cr, t.x, t.y)
- if t.rot_x~=0 or t.rot_y~=0 or t.angle~=0 then
- cairo_translate(cr,t.rot_x,t.rot_y)
- cairo_rotate(cr,t.angle*math.pi/180)
- cairo_translate(cr,-t.rot_x,-t.rot_y)
- end
- if t.scale_x~=1 or t.scale_y~=1 or t.skew_x~=0 or t.skew_y~=0 then
- local matrix0 = cairo_matrix_t:create()
- tolua.takeownership(matrix0)
- cairo_matrix_init (matrix0, t.scale_x,math.pi*t.skew_y/180 , math.pi*t.skew_x/180 ,t.scale_y,0,0)
- cairo_transform(cr,matrix0)
- end
-
- local tc=t_corners
- cairo_move_to(cr,tc[1][2],0)
- cairo_line_to(cr,t.w-tc[2][2],0)
- draw_corner(2,tc[2])
- cairo_line_to(cr,t.w,t.h-tc[3][2])
- draw_corner(3,tc[3])
- cairo_line_to(cr,tc[4][2],t.h)
- draw_corner(4,tc[4])
- cairo_line_to(cr,0,tc[1][2])
- draw_corner(1,tc[1])
-
- if t.no_gradient then
- cairo_set_source_rgba(cr,rgba_to_r_g_b_a(t.colour[1]))
- else
- if t.linear_gradient ~= nil then
- pat = cairo_pattern_create_linear (t.linear_gradient[1],t.linear_gradient[2],t.linear_gradient[3],t.linear_gradient[4])
- elseif t.radial_gradient ~= nil then
- pat = cairo_pattern_create_radial (t.radial_gradient[1],t.radial_gradient[2],t.radial_gradient[3],
- t.radial_gradient[4],t.radial_gradient[5],t.radial_gradient[6])
- end
- for i=1, #t.colour do
- cairo_pattern_add_color_stop_rgba (pat, t.colour[i][1], rgba_to_r_g_b_a(t.colour[i]))
- end
- cairo_set_source (cr, pat)
- cairo_pattern_destroy(pat)
- end
-
- cairo_set_operator(cr,t_operators[t.operator])
-
- if t.border>0 then
- cairo_close_path(cr)
- if t.dash ~= nil then cairo_set_dash(cr, t.dash, 1, 0.0) end
- cairo_set_line_width(cr,t.border)
- cairo_stroke(cr)
- else
- cairo_fill(cr)
- end
-
- cairo_restore(cr)
-end
-
diff --git a/.conkyrc b/.conkyrc
deleted file mode 100644
index 297229e..0000000
--- a/.conkyrc
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- eval: (git-auto-commit-mode 1) -*-
-background yes
-use_xft yes
-xftfont tamsyn:pixelsize=14
-!xftalpha 0.1
-update_interval 2.0
-total_run_times 0
-double_buffer yes
-minimum_size 250 5
-maximum_width 400
-draw_shades no
-draw_outline no
-draw_borders no
-draw_graph_borders no
-default_color gray
-default_shade_color red
-default_outline_color green
-alignment top_right
-gap_x 10
-gap_y 42
-no_buffers yes
-uppercase no
-cpu_avg_samples 2
-net_avg_samples 1
-override_utf8_locale no
-use_spacer yes
-lua_load ~/.conkybox.lua
-lua_draw_hook_pre conky_main_box
-
-TEXT
-${font Arial:bold:size=10}${color Tan1}TODO ${color RoyalBlue}${voffset -2}${hr 2}
-$font${color SlateGray}${exec /home/slash/development/projects/ntd/src/ntd list short}
-
-$if_mpd_playing${font Arial:bold:size=10}${color Tan1}MUSIC ${color RoyalBlue}${voffset -2}${hr 2}
-$font$alignc${color SlateGray}$mpd_title
-$alignc$mpd_artist
-$alignc$mpd_album
-$mpd_bar
-
-$endif${font Arial:bold:size=10}${color Tan1}USAGE ${color RoyalBlue}${voffset -2}${hr 2}
-$font${color SlateGray}CPU1 $alignr${cpu cpu1}% ${cpubar cpu1 7,170}
-$font${color SlateGray}CPU2 $alignr${cpu cpu2}% ${cpubar cpu2 7,170}
-$font${color SlateGray}MEM $alignr${memperc}% ${membar 7,170}
-$font${color SlateGray}SWAP $alignr${swapperc}% ${swapbar 7, 170}
-
-${font Arial:bold:size=10}${color Tan1}HDD ${color RoyalBlue}${voffset -2}${hr 2}
-${font}${color SlateGray}Write: $alignr$diskio_write
-Read: $alignr$diskio_read
-
-${font Arial:bold:size=10}${color Tan1}TOP PROCESS ${color RoyalBlue}${voffset -2}${hr 2}
-${color SlateGray}${font}CPU: ${top name 1}${alignr}${top cpu 1}%
-MEM: ${top_mem name 1}${alignr}${top_mem mem 1}%
-IO: ${top_io name 1}${alignr}${top_io io_perc 1}%
diff --git a/.fonts.conf b/.fonts.conf
deleted file mode 100644
index 6204d1f..0000000
--- a/.fonts.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
- true
-
-
-
- true
-
-
-
- hintslight
-
-
-
- rgb
-
-
-
- true
-
-
-
-
-
- lcddefault
-
-
-
-
--
cgit v1.2.3-54-g00ecf
From 6fdf03dea68258371aa8a1aa711c532e279df0ee Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Mon, 23 Jul 2012 09:20:16 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index c45aba0..81bf582 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -173,4 +173,4 @@ http://rss.feedsportal.com/c/32569/f/491734/index.rss
http://feeds.feedburner.com/TheGeekStuff
http://feeds2.feedburner.com/Command-line-fu
http://feeds.feedburner.com/GoDjango
-http://identity.mozilla.com/rss
+# http://identity.mozilla.com/rss
--
cgit v1.2.3-54-g00ecf
From 0ea11ed1770c39535d4a2a3a8b216ff8265f0cb0 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Mon, 23 Jul 2012 20:25:20 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 81bf582..a25d7c9 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -5,7 +5,7 @@ http://ryuslash.ninth.su/blog/blog.xml
# http://gitorious.org/~ryuslash/watchlist.atom
#-----[ Blogs ]-------------------------------------------------------
-http://julien.danjou.info/blog/index.xml blogs
+# http://julien.danjou.info/blog/index.xml blogs
http://kakaroto.homelinux.net/feed/ blogs
http://awhan.wordpress.com/feed/ blogs
http://beej.us/blog/feed/ blogs
--
cgit v1.2.3-54-g00ecf
From 183e083ae80847b8a055a59075ddb6a5597dfc2c Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:30:21 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index a25d7c9..61e5ee6 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -6,24 +6,24 @@ http://ryuslash.ninth.su/blog/blog.xml
#-----[ Blogs ]-------------------------------------------------------
# http://julien.danjou.info/blog/index.xml blogs
-http://kakaroto.homelinux.net/feed/ blogs
-http://awhan.wordpress.com/feed/ blogs
+# http://kakaroto.homelinux.net/feed/ blogs
+# http://awhan.wordpress.com/feed/ blogs
http://beej.us/blog/feed/ blogs
-http://torvalds-family.blogspot.com/feeds/posts/default blogs
-http://emacs.wordpress.com/feed/ blogs
+# http://torvalds-family.blogspot.com/feeds/posts/default blogs
+# http://emacs.wordpress.com/feed/ blogs
http://feedproxy.google.com/SaferCode blogs
-http://blog.gitorious.org/feed/ blogs
-http://dieter.plaetinck.be/index.rss blogs
+# http://blog.gitorious.org/feed/ blogs
+# http://dieter.plaetinck.be/index.rss blogs
http://irreal.org/blog/?feed=rss2
# Reddit
-http://www.reddit.com/r/announcements/new/.rss
-http://www.reddit.com/r/archlinux/new/.rss
-http://www.reddit.com/r/blog/new/.rss
-http://www.reddit.com/r/c_language/new/.rss
-http://www.reddit.com/r/C_Programming/new/.rss
-http://www.reddit.com/r/coding/new/.rss
+# http://www.reddit.com/r/announcements/new/.rss
+# http://www.reddit.com/r/archlinux/new/.rss
+# http://www.reddit.com/r/blog/new/.rss
+# http://www.reddit.com/r/c_language/new/.rss
+# http://www.reddit.com/r/C_Programming/new/.rss
+# http://www.reddit.com/r/coding/new/.rss
http://www.reddit.com/r/commandline/new/.rss
http://www.reddit.com/r/cpp/new/.rss
http://www.reddit.com/r/csharp/new/.rss
--
cgit v1.2.3-54-g00ecf
From 8e9e7bc0a2b5757b07e43d9906dcca9ce8d2d313 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:31:31 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 61e5ee6..d2012c8 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -24,7 +24,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/c_language/new/.rss
# http://www.reddit.com/r/C_Programming/new/.rss
# http://www.reddit.com/r/coding/new/.rss
-http://www.reddit.com/r/commandline/new/.rss
+# http://www.reddit.com/r/commandline/new/.rss
http://www.reddit.com/r/cpp/new/.rss
http://www.reddit.com/r/csharp/new/.rss
http://www.reddit.com/r/django/new/.rss
--
cgit v1.2.3-54-g00ecf
From 3fe088e2bc597a03e482864904f74c83982d1d2a Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:32:17 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index d2012c8..fa85e35 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -25,7 +25,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/C_Programming/new/.rss
# http://www.reddit.com/r/coding/new/.rss
# http://www.reddit.com/r/commandline/new/.rss
-http://www.reddit.com/r/cpp/new/.rss
+# http://www.reddit.com/r/cpp/new/.rss
http://www.reddit.com/r/csharp/new/.rss
http://www.reddit.com/r/django/new/.rss
http://www.reddit.com/r/emacs/new/.rss
--
cgit v1.2.3-54-g00ecf
From 3995ff64c0f341723899cd74142ebdee4d981aeb Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:33:47 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index fa85e35..d18f156 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -26,8 +26,8 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/coding/new/.rss
# http://www.reddit.com/r/commandline/new/.rss
# http://www.reddit.com/r/cpp/new/.rss
-http://www.reddit.com/r/csharp/new/.rss
-http://www.reddit.com/r/django/new/.rss
+# http://www.reddit.com/r/csharp/new/.rss
+# http://www.reddit.com/r/django/new/.rss
http://www.reddit.com/r/emacs/new/.rss
http://www.reddit.com/r/ExpertProgramming/new/.rss
http://www.reddit.com/r/Fedora/new/.rss
--
cgit v1.2.3-54-g00ecf
From 4448bd0a1abeef36a05e3180e5bf9c60253a1e04 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:34:15 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index d18f156..bf95c91 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -28,7 +28,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/cpp/new/.rss
# http://www.reddit.com/r/csharp/new/.rss
# http://www.reddit.com/r/django/new/.rss
-http://www.reddit.com/r/emacs/new/.rss
+# http://www.reddit.com/r/emacs/new/.rss
http://www.reddit.com/r/ExpertProgramming/new/.rss
http://www.reddit.com/r/Fedora/new/.rss
http://www.reddit.com/r/git/new/.rss
--
cgit v1.2.3-54-g00ecf
From 7cace47fb52d2e582eb194ba6b52c9e202dc45e6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:35:00 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index bf95c91..b143b86 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -29,7 +29,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/csharp/new/.rss
# http://www.reddit.com/r/django/new/.rss
# http://www.reddit.com/r/emacs/new/.rss
-http://www.reddit.com/r/ExpertProgramming/new/.rss
+# http://www.reddit.com/r/ExpertProgramming/new/.rss
http://www.reddit.com/r/Fedora/new/.rss
http://www.reddit.com/r/git/new/.rss
http://www.reddit.com/r/golang/new/.rss
--
cgit v1.2.3-54-g00ecf
From 3ad42fc42bda3950bc6f9b7d188d1f3e9c4e5f40 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:35:38 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index b143b86..179ba0c 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -30,7 +30,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/django/new/.rss
# http://www.reddit.com/r/emacs/new/.rss
# http://www.reddit.com/r/ExpertProgramming/new/.rss
-http://www.reddit.com/r/Fedora/new/.rss
+# http://www.reddit.com/r/Fedora/new/.rss
http://www.reddit.com/r/git/new/.rss
http://www.reddit.com/r/golang/new/.rss
http://www.reddit.com/r/javascript/new/.rss
--
cgit v1.2.3-54-g00ecf
From c96e647c39e61f445ed55177aed4fd72b09ca32f Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:36:03 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 179ba0c..d8e7fd3 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -31,7 +31,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/emacs/new/.rss
# http://www.reddit.com/r/ExpertProgramming/new/.rss
# http://www.reddit.com/r/Fedora/new/.rss
-http://www.reddit.com/r/git/new/.rss
+# http://www.reddit.com/r/git/new/.rss
http://www.reddit.com/r/golang/new/.rss
http://www.reddit.com/r/javascript/new/.rss
http://www.reddit.com/r/linux/new/.rss
--
cgit v1.2.3-54-g00ecf
From 55cc0b10ea530e27a803433cf4554bb3096caa43 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:36:53 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index d8e7fd3..6ca348a 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -32,7 +32,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/ExpertProgramming/new/.rss
# http://www.reddit.com/r/Fedora/new/.rss
# http://www.reddit.com/r/git/new/.rss
-http://www.reddit.com/r/golang/new/.rss
+# http://www.reddit.com/r/golang/new/.rss
http://www.reddit.com/r/javascript/new/.rss
http://www.reddit.com/r/linux/new/.rss
http://www.reddit.com/r/linux_gaming/new/.rss
--
cgit v1.2.3-54-g00ecf
From 90ab689fc07c3602f01ee78f5f234f351633c0f0 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:37:05 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 6ca348a..00b71c2 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -33,7 +33,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/Fedora/new/.rss
# http://www.reddit.com/r/git/new/.rss
# http://www.reddit.com/r/golang/new/.rss
-http://www.reddit.com/r/javascript/new/.rss
+# http://www.reddit.com/r/javascript/new/.rss
http://www.reddit.com/r/linux/new/.rss
http://www.reddit.com/r/linux_gaming/new/.rss
http://www.reddit.com/r/LinuxHacking/new/.rss
--
cgit v1.2.3-54-g00ecf
From 508091f667308d4f9b4b87077617fda3ef8a2477 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:37:43 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 00b71c2..51aa6f4 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -34,7 +34,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/git/new/.rss
# http://www.reddit.com/r/golang/new/.rss
# http://www.reddit.com/r/javascript/new/.rss
-http://www.reddit.com/r/linux/new/.rss
+# http://www.reddit.com/r/linux/new/.rss
http://www.reddit.com/r/linux_gaming/new/.rss
http://www.reddit.com/r/LinuxHacking/new/.rss
http://www.reddit.com/r/maemo/new/.rss
--
cgit v1.2.3-54-g00ecf
From b429579e0a4c12198c45324f7dc674be484225fc Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:39:04 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 51aa6f4..40b0595 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -35,7 +35,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/golang/new/.rss
# http://www.reddit.com/r/javascript/new/.rss
# http://www.reddit.com/r/linux/new/.rss
-http://www.reddit.com/r/linux_gaming/new/.rss
+# http://www.reddit.com/r/linux_gaming/new/.rss
http://www.reddit.com/r/LinuxHacking/new/.rss
http://www.reddit.com/r/maemo/new/.rss
http://www.reddit.com/r/n900/new/.rss
--
cgit v1.2.3-54-g00ecf
From 5e386bbcf6bd233da4705b78581f16bc913d57f2 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:40:23 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 40b0595..5a8a9d4 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -36,7 +36,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/javascript/new/.rss
# http://www.reddit.com/r/linux/new/.rss
# http://www.reddit.com/r/linux_gaming/new/.rss
-http://www.reddit.com/r/LinuxHacking/new/.rss
+# http://www.reddit.com/r/LinuxHacking/new/.rss
http://www.reddit.com/r/maemo/new/.rss
http://www.reddit.com/r/n900/new/.rss
http://www.reddit.com/r/opensource/new/.rss
--
cgit v1.2.3-54-g00ecf
From 396d6ed1b929c85e101f172d0c012b6d3038bd62 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:41:17 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 5a8a9d4..3a9718b 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -37,7 +37,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/linux/new/.rss
# http://www.reddit.com/r/linux_gaming/new/.rss
# http://www.reddit.com/r/LinuxHacking/new/.rss
-http://www.reddit.com/r/maemo/new/.rss
+# http://www.reddit.com/r/maemo/new/.rss
http://www.reddit.com/r/n900/new/.rss
http://www.reddit.com/r/opensource/new/.rss
http://www.reddit.com/r/PHP/new/.rss
--
cgit v1.2.3-54-g00ecf
From 0813996c19708eee72ba05985dedb014a9a922a2 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:42:34 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 3a9718b..719b632 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -38,7 +38,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/linux_gaming/new/.rss
# http://www.reddit.com/r/LinuxHacking/new/.rss
# http://www.reddit.com/r/maemo/new/.rss
-http://www.reddit.com/r/n900/new/.rss
+# http://www.reddit.com/r/n900/new/.rss
http://www.reddit.com/r/opensource/new/.rss
http://www.reddit.com/r/PHP/new/.rss
http://www.reddit.com/r/programming/new/.rss
--
cgit v1.2.3-54-g00ecf
From efd733cae6b730ff39fbcc98d0847c152a92b247 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:42:41 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 719b632..febc805 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -39,7 +39,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/LinuxHacking/new/.rss
# http://www.reddit.com/r/maemo/new/.rss
# http://www.reddit.com/r/n900/new/.rss
-http://www.reddit.com/r/opensource/new/.rss
+# http://www.reddit.com/r/opensource/new/.rss
http://www.reddit.com/r/PHP/new/.rss
http://www.reddit.com/r/programming/new/.rss
http://www.reddit.com/r/Python/new/.rss
--
cgit v1.2.3-54-g00ecf
From 2328df6682e79f386c73be2ada557c0eef6c651c Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:43:18 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index febc805..0dedba0 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -40,7 +40,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/maemo/new/.rss
# http://www.reddit.com/r/n900/new/.rss
# http://www.reddit.com/r/opensource/new/.rss
-http://www.reddit.com/r/PHP/new/.rss
+# http://www.reddit.com/r/PHP/new/.rss
http://www.reddit.com/r/programming/new/.rss
http://www.reddit.com/r/Python/new/.rss
http://www.reddit.com/r/scheme/new/.rss
--
cgit v1.2.3-54-g00ecf
From dfe9553ad99f59ae5633d4f68a64bb6e16a915eb Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:45:13 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 0dedba0..870cc46 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -41,7 +41,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/n900/new/.rss
# http://www.reddit.com/r/opensource/new/.rss
# http://www.reddit.com/r/PHP/new/.rss
-http://www.reddit.com/r/programming/new/.rss
+# http://www.reddit.com/r/programming/new/.rss
http://www.reddit.com/r/Python/new/.rss
http://www.reddit.com/r/scheme/new/.rss
http://www.reddit.com/r/systems/new/.rss
--
cgit v1.2.3-54-g00ecf
From 922c8fe3c0822d6e74b2bee70f608f3003b066fb Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:45:21 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 870cc46..23c3c69 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -42,7 +42,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/opensource/new/.rss
# http://www.reddit.com/r/PHP/new/.rss
# http://www.reddit.com/r/programming/new/.rss
-http://www.reddit.com/r/Python/new/.rss
+# http://www.reddit.com/r/Python/new/.rss
http://www.reddit.com/r/scheme/new/.rss
http://www.reddit.com/r/systems/new/.rss
http://www.reddit.com/r/wayland/new/.rss
--
cgit v1.2.3-54-g00ecf
From b28e30250e65fb67b7a3b1a661a148e8111f0783 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:46:55 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 23c3c69..9606cbc 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -43,7 +43,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/PHP/new/.rss
# http://www.reddit.com/r/programming/new/.rss
# http://www.reddit.com/r/Python/new/.rss
-http://www.reddit.com/r/scheme/new/.rss
+# http://www.reddit.com/r/scheme/new/.rss
http://www.reddit.com/r/systems/new/.rss
http://www.reddit.com/r/wayland/new/.rss
--
cgit v1.2.3-54-g00ecf
From 5d9bc78174ae9f0b7d4b7cf2665db385015825f9 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:47:09 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 9606cbc..fde3f7f 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -44,7 +44,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/programming/new/.rss
# http://www.reddit.com/r/Python/new/.rss
# http://www.reddit.com/r/scheme/new/.rss
-http://www.reddit.com/r/systems/new/.rss
+# http://www.reddit.com/r/systems/new/.rss
http://www.reddit.com/r/wayland/new/.rss
#-----[ CVS Changes ]-------------------------------------------------
--
cgit v1.2.3-54-g00ecf
From 7cdbcaf300d16be1ec0f22d5265a84eb41e58f4a Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:47:48 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index fde3f7f..6c762dc 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -45,7 +45,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/Python/new/.rss
# http://www.reddit.com/r/scheme/new/.rss
# http://www.reddit.com/r/systems/new/.rss
-http://www.reddit.com/r/wayland/new/.rss
+# http://www.reddit.com/r/wayland/new/.rss
#-----[ CVS Changes ]-------------------------------------------------
http://git.naquadah.org/?p=naquadah-theme.git;a=rss cvs
--
cgit v1.2.3-54-g00ecf
From cbce0c7ef19d00a8713405e979882d98831c2397 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:48:59 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 6c762dc..06ecb12 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -48,7 +48,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/wayland/new/.rss
#-----[ CVS Changes ]-------------------------------------------------
-http://git.naquadah.org/?p=naquadah-theme.git;a=rss cvs
+# http://git.naquadah.org/?p=naquadah-theme.git;a=rss cvs
#http://git.naquadah.org/?p=rainbow.git;a=rss cvs
http://code.google.com/feeds/p/autopair/svnchanges/basic cvs
http://git.cs.fau.de/?p=re06huxa/herbstluftwm;a=atom cvs
--
cgit v1.2.3-54-g00ecf
From 9e4b418802c3ba8ac15b64e73399cb2394b1518b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:49:47 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 06ecb12..aa1dc15 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -50,7 +50,7 @@ http://irreal.org/blog/?feed=rss2
#-----[ CVS Changes ]-------------------------------------------------
# http://git.naquadah.org/?p=naquadah-theme.git;a=rss cvs
#http://git.naquadah.org/?p=rainbow.git;a=rss cvs
-http://code.google.com/feeds/p/autopair/svnchanges/basic cvs
+# http://code.google.com/feeds/p/autopair/svnchanges/basic cvs
http://git.cs.fau.de/?p=re06huxa/herbstluftwm;a=atom cvs
https://github.com/knopwob/dunst/commits/master.atom cvs
https://github.com/akrennmair/newsbeuter/commits/master.atom
--
cgit v1.2.3-54-g00ecf
From 04e0fb925f243bd080572ff53b2b5d888dbd2f9e Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:51:25 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index aa1dc15..910c8cb 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -51,7 +51,7 @@ http://irreal.org/blog/?feed=rss2
# http://git.naquadah.org/?p=naquadah-theme.git;a=rss cvs
#http://git.naquadah.org/?p=rainbow.git;a=rss cvs
# http://code.google.com/feeds/p/autopair/svnchanges/basic cvs
-http://git.cs.fau.de/?p=re06huxa/herbstluftwm;a=atom cvs
+# http://git.cs.fau.de/?p=re06huxa/herbstluftwm;a=atom cvs
https://github.com/knopwob/dunst/commits/master.atom cvs
https://github.com/akrennmair/newsbeuter/commits/master.atom
http://repo.or.cz/w/conkeror.git/atom
--
cgit v1.2.3-54-g00ecf
From fba3a1a5338097a325f49aad39aef5e141dbbc39 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:52:15 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 910c8cb..3f5b175 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -52,7 +52,7 @@ http://irreal.org/blog/?feed=rss2
#http://git.naquadah.org/?p=rainbow.git;a=rss cvs
# http://code.google.com/feeds/p/autopair/svnchanges/basic cvs
# http://git.cs.fau.de/?p=re06huxa/herbstluftwm;a=atom cvs
-https://github.com/knopwob/dunst/commits/master.atom cvs
+# https://github.com/knopwob/dunst/commits/master.atom cvs
https://github.com/akrennmair/newsbeuter/commits/master.atom
http://repo.or.cz/w/conkeror.git/atom
https://github.com/mooz/keysnail/commits/master.atom
--
cgit v1.2.3-54-g00ecf
From 163b1ea5e67e9e8a4f4cef42006b562adb67f07c Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:53:03 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 3f5b175..2a8062a 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -53,7 +53,7 @@ http://irreal.org/blog/?feed=rss2
# http://code.google.com/feeds/p/autopair/svnchanges/basic cvs
# http://git.cs.fau.de/?p=re06huxa/herbstluftwm;a=atom cvs
# https://github.com/knopwob/dunst/commits/master.atom cvs
-https://github.com/akrennmair/newsbeuter/commits/master.atom
+# https://github.com/akrennmair/newsbeuter/commits/master.atom
http://repo.or.cz/w/conkeror.git/atom
https://github.com/mooz/keysnail/commits/master.atom
--
cgit v1.2.3-54-g00ecf
From 182640c4bc4b5f00c0b783ac0588fcdf34a2396d Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:53:26 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 2a8062a..d085427 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -54,7 +54,7 @@ http://irreal.org/blog/?feed=rss2
# http://git.cs.fau.de/?p=re06huxa/herbstluftwm;a=atom cvs
# https://github.com/knopwob/dunst/commits/master.atom cvs
# https://github.com/akrennmair/newsbeuter/commits/master.atom
-http://repo.or.cz/w/conkeror.git/atom
+# http://repo.or.cz/w/conkeror.git/atom
https://github.com/mooz/keysnail/commits/master.atom
#-----[ Programming ]-------------------------------------------------
--
cgit v1.2.3-54-g00ecf
From a135cb671d16b532044ae4f6ad2d75d280a52e2b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:53:55 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index d085427..3f6abea 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -55,7 +55,7 @@ http://irreal.org/blog/?feed=rss2
# https://github.com/knopwob/dunst/commits/master.atom cvs
# https://github.com/akrennmair/newsbeuter/commits/master.atom
# http://repo.or.cz/w/conkeror.git/atom
-https://github.com/mooz/keysnail/commits/master.atom
+# https://github.com/mooz/keysnail/commits/master.atom
#-----[ Programming ]-------------------------------------------------
# http://www.reddit.com/r/cpp/.rss devel
--
cgit v1.2.3-54-g00ecf
From 7a6677717b296942f076650095c934700b8f92a1 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:56:17 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 3f6abea..bb9f1e7 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -59,7 +59,7 @@ http://irreal.org/blog/?feed=rss2
#-----[ Programming ]-------------------------------------------------
# http://www.reddit.com/r/cpp/.rss devel
-http://services.devx.com/outgoing/devxfeed.xml devel
+# http://services.devx.com/outgoing/devxfeed.xml devel
#http://www.dzone.com/feed/frontpage/rss.xml devel
# http://www.reddit.com/r/ExpertProgramming/.rss devel
# http://www.reddit.com/r/programming/.rss devel
--
cgit v1.2.3-54-g00ecf
From fc3fd552cd756d8c16e692ea49ebf9fcae302e83 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:57:09 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index bb9f1e7..5a34c4e 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -63,7 +63,7 @@ http://irreal.org/blog/?feed=rss2
#http://www.dzone.com/feed/frontpage/rss.xml devel
# http://www.reddit.com/r/ExpertProgramming/.rss devel
# http://www.reddit.com/r/programming/.rss devel
-http://steve-yegge.blogspot.com/feeds/posts/default devel
+# http://steve-yegge.blogspot.com/feeds/posts/default devel
# http://www.reddit.com/r/systems/.rss devel
# http://www.reddit.com/r/coding/.rss devel
# http://www.reddit.com/r/git/.rss devel
--
cgit v1.2.3-54-g00ecf
From 0fdd50e94207fff92a31df43e59dcedf3dacd45d Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:57:40 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 5a34c4e..4819239 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -68,7 +68,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/coding/.rss devel
# http://www.reddit.com/r/git/.rss devel
# http://www.reddit.com/r/C_Programming/.rss devel
-http://feeds.feedburner.com/FalloutTutorials devel
+# http://feeds.feedburner.com/FalloutTutorials devel
http://www.devarticles.com/rss.xml devel
http://www.script-tutorials.com/feed/rss/
http://news.ycombinator.com/rss
--
cgit v1.2.3-54-g00ecf
From 1592794fd75ceb2909c1c4b1bd94a3481d747df6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 00:59:30 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 4819239..ffeab4d 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -69,7 +69,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/git/.rss devel
# http://www.reddit.com/r/C_Programming/.rss devel
# http://feeds.feedburner.com/FalloutTutorials devel
-http://www.devarticles.com/rss.xml devel
+# http://www.devarticles.com/rss.xml devel
http://www.script-tutorials.com/feed/rss/
http://news.ycombinator.com/rss
https://www.djangoproject.com/rss/community/q-and-a/
--
cgit v1.2.3-54-g00ecf
From 950fc207bd3abe04faf42603f51ba5f47accfd2d Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:05:08 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index ffeab4d..c5142da 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -70,7 +70,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/C_Programming/.rss devel
# http://feeds.feedburner.com/FalloutTutorials devel
# http://www.devarticles.com/rss.xml devel
-http://www.script-tutorials.com/feed/rss/
+# http://www.script-tutorials.com/feed/rss/
http://news.ycombinator.com/rss
https://www.djangoproject.com/rss/community/q-and-a/
--
cgit v1.2.3-54-g00ecf
From 9f3b7f9eb94c396dff7c2b698ee93388e62650e8 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:05:54 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index c5142da..799ab7a 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -71,7 +71,7 @@ http://irreal.org/blog/?feed=rss2
# http://feeds.feedburner.com/FalloutTutorials devel
# http://www.devarticles.com/rss.xml devel
# http://www.script-tutorials.com/feed/rss/
-http://news.ycombinator.com/rss
+# http://news.ycombinator.com/rss
https://www.djangoproject.com/rss/community/q-and-a/
#-----[ Linux and FLOSS ]---------------------------------------------
--
cgit v1.2.3-54-g00ecf
From ec790512bd669fdaa5f30ee4929375ded7dd3fd1 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:09:05 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 799ab7a..71d465b 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -72,7 +72,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.devarticles.com/rss.xml devel
# http://www.script-tutorials.com/feed/rss/
# http://news.ycombinator.com/rss
-https://www.djangoproject.com/rss/community/q-and-a/
+# https://www.djangoproject.com/rss/community/q-and-a/
#-----[ Linux and FLOSS ]---------------------------------------------
# http://www.reddit.com/r/commandline/.rss linux
--
cgit v1.2.3-54-g00ecf
From b749a14b6173100e98d75d1305e163bbc372bf76 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:11:11 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 71d465b..86707b5 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -76,7 +76,7 @@ http://irreal.org/blog/?feed=rss2
#-----[ Linux and FLOSS ]---------------------------------------------
# http://www.reddit.com/r/commandline/.rss linux
-http://www.desktoplinux.com/backend/headlines.rss linux
+# http://www.desktoplinux.com/backend/headlines.rss linux
http://distrowatch.com/news/dw.xml linux
http://www.howtoforge.com/node/feed linux
http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Articles linux
--
cgit v1.2.3-54-g00ecf
From 998462ef135f50e5cb152ef46804c3c0a4b1e90e Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:11:59 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 86707b5..ed46cec 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -77,7 +77,7 @@ http://irreal.org/blog/?feed=rss2
#-----[ Linux and FLOSS ]---------------------------------------------
# http://www.reddit.com/r/commandline/.rss linux
# http://www.desktoplinux.com/backend/headlines.rss linux
-http://distrowatch.com/news/dw.xml linux
+# http://distrowatch.com/news/dw.xml linux
http://www.howtoforge.com/node/feed linux
http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Articles linux
http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Tutorials linux
--
cgit v1.2.3-54-g00ecf
From 56aec039e50ab89b98cc8fe68f668d390abb8f71 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:12:50 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index ed46cec..f90d4b9 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -78,7 +78,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/commandline/.rss linux
# http://www.desktoplinux.com/backend/headlines.rss linux
# http://distrowatch.com/news/dw.xml linux
-http://www.howtoforge.com/node/feed linux
+# http://www.howtoforge.com/node/feed linux
http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Articles linux
http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Tutorials linux
http://feeds.feedburner.com/LinuxMagazine linux
--
cgit v1.2.3-54-g00ecf
From d3f020ccb3da323e2b37c1daa00bf726e36ee63d Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:15:19 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index f90d4b9..4cf6bdb 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -79,7 +79,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.desktoplinux.com/backend/headlines.rss linux
# http://distrowatch.com/news/dw.xml linux
# http://www.howtoforge.com/node/feed linux
-http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Articles linux
+# http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Articles linux
http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Tutorials linux
http://feeds.feedburner.com/LinuxMagazine linux
http://www.linuxprogrammingblog.com/rss.xml linux
--
cgit v1.2.3-54-g00ecf
From 890178d6f5a3405e6086047e405ee6a21bcfdac7 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:16:08 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 4cf6bdb..db4514a 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -80,7 +80,7 @@ http://irreal.org/blog/?feed=rss2
# http://distrowatch.com/news/dw.xml linux
# http://www.howtoforge.com/node/feed linux
# http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Articles linux
-http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Tutorials linux
+# http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Tutorials linux
http://feeds.feedburner.com/LinuxMagazine linux
http://www.linuxprogrammingblog.com/rss.xml linux
http://linuxtoday.com/backend/biglt.rss linux
--
cgit v1.2.3-54-g00ecf
From 870ec613c63abf4940950152c5d4a3d877fd6b5b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:17:08 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index db4514a..bf805d2 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -81,7 +81,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.howtoforge.com/node/feed linux
# http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Articles linux
# http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Tutorials linux
-http://feeds.feedburner.com/LinuxMagazine linux
+# http://feeds.feedburner.com/LinuxMagazine linux
http://www.linuxprogrammingblog.com/rss.xml linux
http://linuxtoday.com/backend/biglt.rss linux
http://www.linux.com/rss/feeds.php linux
--
cgit v1.2.3-54-g00ecf
From 5e73f3f53cc123f0828cf9f2a41a6eab78f4c907 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:17:57 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index bf805d2..065f514 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -82,7 +82,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Articles linux
# http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Tutorials linux
# http://feeds.feedburner.com/LinuxMagazine linux
-http://www.linuxprogrammingblog.com/rss.xml linux
+# http://www.linuxprogrammingblog.com/rss.xml linux
http://linuxtoday.com/backend/biglt.rss linux
http://www.linux.com/rss/feeds.php linux
http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
--
cgit v1.2.3-54-g00ecf
From 6fae8167bc248f8874299d849574cb5b55c51ecf Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:19:13 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 065f514..7219aa3 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -83,7 +83,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp?type_by=Tutorials linux
# http://feeds.feedburner.com/LinuxMagazine linux
# http://www.linuxprogrammingblog.com/rss.xml linux
-http://linuxtoday.com/backend/biglt.rss linux
+# http://linuxtoday.com/backend/biglt.rss linux
http://www.linux.com/rss/feeds.php linux
http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
http://lwn.net/headlines/newrss linux
--
cgit v1.2.3-54-g00ecf
From 7a9026e8ec5b8bc47fb6f279dc5c15f85cd78060 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:20:58 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 7219aa3..9ba8b3e 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -84,7 +84,7 @@ http://irreal.org/blog/?feed=rss2
# http://feeds.feedburner.com/LinuxMagazine linux
# http://www.linuxprogrammingblog.com/rss.xml linux
# http://linuxtoday.com/backend/biglt.rss linux
-http://www.linux.com/rss/feeds.php linux
+# http://www.linux.com/rss/feeds.php linux
http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
http://lwn.net/headlines/newrss linux
http://blogs.zdnet.com/open-source/wp-rss2.php linux
--
cgit v1.2.3-54-g00ecf
From e9d17a164e9963662309b7e9186a76506c74919b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:21:40 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 9ba8b3e..58fa60a 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -85,7 +85,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.linuxprogrammingblog.com/rss.xml linux
# http://linuxtoday.com/backend/biglt.rss linux
# http://www.linux.com/rss/feeds.php linux
-http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
+# http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
http://lwn.net/headlines/newrss linux
http://blogs.zdnet.com/open-source/wp-rss2.php linux
http://ostatic.com/blog/feed linux
--
cgit v1.2.3-54-g00ecf
From 23d34f01c7adbcfba3f98557d758522a9a358ba7 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:22:45 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 58fa60a..eb8bbe1 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -86,7 +86,7 @@ http://irreal.org/blog/?feed=rss2
# http://linuxtoday.com/backend/biglt.rss linux
# http://www.linux.com/rss/feeds.php linux
# http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
-http://lwn.net/headlines/newrss linux
+# http://lwn.net/headlines/newrss linux
http://blogs.zdnet.com/open-source/wp-rss2.php linux
http://ostatic.com/blog/feed linux
# http://www.reddit.com/r/linux/.rss linux
--
cgit v1.2.3-54-g00ecf
From 20c27a4f581aaee038bf883a19cc14bf8e1d3d11 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:23:48 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index eb8bbe1..3cfb73d 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -87,7 +87,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.linux.com/rss/feeds.php linux
# http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
# http://lwn.net/headlines/newrss linux
-http://blogs.zdnet.com/open-source/wp-rss2.php linux
+# http://blogs.zdnet.com/open-source/wp-rss2.php linux
http://ostatic.com/blog/feed linux
# http://www.reddit.com/r/linux/.rss linux
http://www.theopenforce.com/atom.xml linux
--
cgit v1.2.3-54-g00ecf
From 5f8d94d679c1c6a806201302540e3767fc0350a3 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:25:13 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 3cfb73d..1097b93 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -88,7 +88,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
# http://lwn.net/headlines/newrss linux
# http://blogs.zdnet.com/open-source/wp-rss2.php linux
-http://ostatic.com/blog/feed linux
+# http://ostatic.com/blog/feed linux
# http://www.reddit.com/r/linux/.rss linux
http://www.theopenforce.com/atom.xml linux
http://www.ubuntugeek.com/feed/ linux
--
cgit v1.2.3-54-g00ecf
From b3575435a1ac157c854a61c14ee1bfa72e5cdbb6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:25:50 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 1097b93..49ab8c0 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -90,7 +90,7 @@ http://irreal.org/blog/?feed=rss2
# http://blogs.zdnet.com/open-source/wp-rss2.php linux
# http://ostatic.com/blog/feed linux
# http://www.reddit.com/r/linux/.rss linux
-http://www.theopenforce.com/atom.xml linux
+# http://www.theopenforce.com/atom.xml linux
http://www.ubuntugeek.com/feed/ linux
http://www.warpedsystems.sk.ca/backend/index.xml linux
# http://www.reddit.com/r/archlinux/.rss linux
--
cgit v1.2.3-54-g00ecf
From 80059c9b8bd893df8d0c7d4d3aa9f26250e3807c Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:26:38 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 49ab8c0..0a41350 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -91,7 +91,7 @@ http://irreal.org/blog/?feed=rss2
# http://ostatic.com/blog/feed linux
# http://www.reddit.com/r/linux/.rss linux
# http://www.theopenforce.com/atom.xml linux
-http://www.ubuntugeek.com/feed/ linux
+# http://www.ubuntugeek.com/feed/ linux
http://www.warpedsystems.sk.ca/backend/index.xml linux
# http://www.reddit.com/r/archlinux/.rss linux
# http://www.reddit.com/r/linuxquestions/.rss linux
--
cgit v1.2.3-54-g00ecf
From fd1cce4b4a1dbc08d9edf2a7bab196cdcf196af5 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:28:03 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 0a41350..d82cc05 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -92,7 +92,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/linux/.rss linux
# http://www.theopenforce.com/atom.xml linux
# http://www.ubuntugeek.com/feed/ linux
-http://www.warpedsystems.sk.ca/backend/index.xml linux
+# http://www.warpedsystems.sk.ca/backend/index.xml linux
# http://www.reddit.com/r/archlinux/.rss linux
# http://www.reddit.com/r/linuxquestions/.rss linux
http://www.echolinux.com/rss
--
cgit v1.2.3-54-g00ecf
From 6fb6d941af6f34c70980fb69cadfd0cd780ceef2 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:29:04 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index d82cc05..08ab818 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -96,7 +96,7 @@ http://irreal.org/blog/?feed=rss2
# http://www.reddit.com/r/archlinux/.rss linux
# http://www.reddit.com/r/linuxquestions/.rss linux
http://www.echolinux.com/rss
-http://www.tuxradar.com/rss
+# http://www.tuxradar.com/rss
#-----[ Emacs ]-------------------------------------------------------
http://wordpress.com/tag/emacs/feed/ emacs
--
cgit v1.2.3-54-g00ecf
From 45ea7257ec2895822819312d3edd82ec2677ceba Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:30:37 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 08ab818..8f9c255 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -99,7 +99,7 @@ http://www.echolinux.com/rss
# http://www.tuxradar.com/rss
#-----[ Emacs ]-------------------------------------------------------
-http://wordpress.com/tag/emacs/feed/ emacs
+# http://wordpress.com/tag/emacs/feed/ emacs
# http://www.reddit.com/r/emacs/.rss emacs
http://planet.emacsen.org/atom.xml emacs
http://emacsblog.org/feed/ emacs
--
cgit v1.2.3-54-g00ecf
From ba16a0a5f4042d1622a2e3bed976a82ce011ad67 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:32:06 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 8f9c255..8ec5f38 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -101,7 +101,7 @@ http://www.echolinux.com/rss
#-----[ Emacs ]-------------------------------------------------------
# http://wordpress.com/tag/emacs/feed/ emacs
# http://www.reddit.com/r/emacs/.rss emacs
-http://planet.emacsen.org/atom.xml emacs
+# http://planet.emacsen.org/atom.xml emacs
http://emacsblog.org/feed/ emacs
http://www.emacswiki.org/emacs?action=rss emacs
http://feeds.feedburner.com/XahsEmacsBlog
--
cgit v1.2.3-54-g00ecf
From b0f84f52d3066862be47ac7d4fb88c4ef4d1a929 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:32:54 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 8ec5f38..0d7e9bb 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -102,7 +102,7 @@ http://www.echolinux.com/rss
# http://wordpress.com/tag/emacs/feed/ emacs
# http://www.reddit.com/r/emacs/.rss emacs
# http://planet.emacsen.org/atom.xml emacs
-http://emacsblog.org/feed/ emacs
+# http://emacsblog.org/feed/ emacs
http://www.emacswiki.org/emacs?action=rss emacs
http://feeds.feedburner.com/XahsEmacsBlog
http://www.masteringemacs.org/feed/
--
cgit v1.2.3-54-g00ecf
From 2c900a263a684ecc588fc528968740feb466467f Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:33:28 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 0d7e9bb..788e681 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -103,7 +103,7 @@ http://www.echolinux.com/rss
# http://www.reddit.com/r/emacs/.rss emacs
# http://planet.emacsen.org/atom.xml emacs
# http://emacsblog.org/feed/ emacs
-http://www.emacswiki.org/emacs?action=rss emacs
+# http://www.emacswiki.org/emacs?action=rss emacs
http://feeds.feedburner.com/XahsEmacsBlog
http://www.masteringemacs.org/feed/
http://wikemacs.org/wiki/index.php?title=Special:RecentChanges&feed=atom
--
cgit v1.2.3-54-g00ecf
From 809a670d8950479352cd913dfaf8ffd928d64141 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:35:10 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 788e681..6ccdeb3 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -104,7 +104,7 @@ http://www.echolinux.com/rss
# http://planet.emacsen.org/atom.xml emacs
# http://emacsblog.org/feed/ emacs
# http://www.emacswiki.org/emacs?action=rss emacs
-http://feeds.feedburner.com/XahsEmacsBlog
+# http://feeds.feedburner.com/XahsEmacsBlog
http://www.masteringemacs.org/feed/
http://wikemacs.org/wiki/index.php?title=Special:RecentChanges&feed=atom
http://stackoverflow.com/feeds/tag?tagnames=emacs&sort=newest
--
cgit v1.2.3-54-g00ecf
From 31e850e067cbd8fcc2d2e14c848f5499b8e467d9 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:36:49 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 6ccdeb3..ce77be1 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -105,7 +105,7 @@ http://www.echolinux.com/rss
# http://emacsblog.org/feed/ emacs
# http://www.emacswiki.org/emacs?action=rss emacs
# http://feeds.feedburner.com/XahsEmacsBlog
-http://www.masteringemacs.org/feed/
+# http://www.masteringemacs.org/feed/
http://wikemacs.org/wiki/index.php?title=Special:RecentChanges&feed=atom
http://stackoverflow.com/feeds/tag?tagnames=emacs&sort=newest
http://stackoverflow.com/feeds/tag?tagnames=elisp&sort=newest
--
cgit v1.2.3-54-g00ecf
From 9977ef760a619e32047009445df5dc59ab4834bd Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:38:29 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index ce77be1..c051282 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -106,7 +106,7 @@ http://www.echolinux.com/rss
# http://www.emacswiki.org/emacs?action=rss emacs
# http://feeds.feedburner.com/XahsEmacsBlog
# http://www.masteringemacs.org/feed/
-http://wikemacs.org/wiki/index.php?title=Special:RecentChanges&feed=atom
+# http://wikemacs.org/wiki/index.php?title=Special:RecentChanges&feed=atom
http://stackoverflow.com/feeds/tag?tagnames=emacs&sort=newest
http://stackoverflow.com/feeds/tag?tagnames=elisp&sort=newest
--
cgit v1.2.3-54-g00ecf
From ee81cf95316a339dc92a316c2beffe4d8deba664 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:39:13 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index c051282..d91a4e1 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -107,7 +107,7 @@ http://www.echolinux.com/rss
# http://feeds.feedburner.com/XahsEmacsBlog
# http://www.masteringemacs.org/feed/
# http://wikemacs.org/wiki/index.php?title=Special:RecentChanges&feed=atom
-http://stackoverflow.com/feeds/tag?tagnames=emacs&sort=newest
+# http://stackoverflow.com/feeds/tag?tagnames=emacs&sort=newest
http://stackoverflow.com/feeds/tag?tagnames=elisp&sort=newest
#-----[ N900 ]--------------------------------------------------------
--
cgit v1.2.3-54-g00ecf
From f869f87cb831d6ece1743244116c3f807e1e5834 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:40:03 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index d91a4e1..ef887d2 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -108,7 +108,7 @@ http://www.echolinux.com/rss
# http://www.masteringemacs.org/feed/
# http://wikemacs.org/wiki/index.php?title=Special:RecentChanges&feed=atom
# http://stackoverflow.com/feeds/tag?tagnames=emacs&sort=newest
-http://stackoverflow.com/feeds/tag?tagnames=elisp&sort=newest
+# http://stackoverflow.com/feeds/tag?tagnames=elisp&sort=newest
#-----[ N900 ]--------------------------------------------------------
# http://www.reddit.com/r/n900/.rss n900
--
cgit v1.2.3-54-g00ecf
From 9bbd37b1791e1522764648d30ceb69bb42c785aa Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:41:31 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index ef887d2..5adf845 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -112,7 +112,7 @@ http://www.echolinux.com/rss
#-----[ N900 ]--------------------------------------------------------
# http://www.reddit.com/r/n900/.rss n900
-http://maemo.org/news/planet-maemo/rss.xml n900
+# http://maemo.org/news/planet-maemo/rss.xml n900
# http://www.reddit.com/r/maemo/.rss n900
#-----[ iPhone ]------------------------------------------------------
--
cgit v1.2.3-54-g00ecf
From f9bc25763b1bc7b0df349578c16b44949b05c8ac Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:42:49 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 5adf845..c1f79c1 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -121,8 +121,8 @@ http://iphonesdkdev.blogspot.com/feeds/posts/default iphone
http://iphonedevelopertips.com/feed iphone
#-----[ Other Software ]----------------------------------------------
-http://www.archlinux.org/feeds/news/ software
-http://gitlog.wordpress.com/feed/ software
+# http://www.archlinux.org/feeds/news/ software
+# http://gitlog.wordpress.com/feed/ software
http://rollingrelease.com/?feed=rss software
http://sourceforge.net/export/rss2_keepsake.php?group_id=134378 software
http://valajournal.blogspot.com/feeds/posts/default software
--
cgit v1.2.3-54-g00ecf
From 751584bce6bbec6500700b99079fe17b24b41cab Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:43:52 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index c1f79c1..0b9742b 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -123,7 +123,7 @@ http://iphonedevelopertips.com/feed iphone
#-----[ Other Software ]----------------------------------------------
# http://www.archlinux.org/feeds/news/ software
# http://gitlog.wordpress.com/feed/ software
-http://rollingrelease.com/?feed=rss software
+# http://rollingrelease.com/?feed=rss software
http://sourceforge.net/export/rss2_keepsake.php?group_id=134378 software
http://valajournal.blogspot.com/feeds/posts/default software
http://www.gimp.org/news.rdf
--
cgit v1.2.3-54-g00ecf
From f0808af09fcdc5b1604e5d582eb42e5a29ddfc30 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:44:43 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 0b9742b..f8f89fe 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -124,7 +124,7 @@ http://iphonedevelopertips.com/feed iphone
# http://www.archlinux.org/feeds/news/ software
# http://gitlog.wordpress.com/feed/ software
# http://rollingrelease.com/?feed=rss software
-http://sourceforge.net/export/rss2_keepsake.php?group_id=134378 software
+# http://sourceforge.net/export/rss2_keepsake.php?group_id=134378 software
http://valajournal.blogspot.com/feeds/posts/default software
http://www.gimp.org/news.rdf
http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
--
cgit v1.2.3-54-g00ecf
From 675347d8aea9ce337182f1e5ff4e4122de6b7e06 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:45:22 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index f8f89fe..3db1f9c 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -125,7 +125,7 @@ http://iphonedevelopertips.com/feed iphone
# http://gitlog.wordpress.com/feed/ software
# http://rollingrelease.com/?feed=rss software
# http://sourceforge.net/export/rss2_keepsake.php?group_id=134378 software
-http://valajournal.blogspot.com/feeds/posts/default software
+# http://valajournal.blogspot.com/feeds/posts/default software
http://www.gimp.org/news.rdf
http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
http://git.savannah.gnu.org/cgit/identica-mode.git/atom/?h=master
--
cgit v1.2.3-54-g00ecf
From 024eac7de016c37f040925b34c3dcf966b0ae7f9 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:46:14 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 3db1f9c..28eebd0 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -126,7 +126,7 @@ http://iphonedevelopertips.com/feed iphone
# http://rollingrelease.com/?feed=rss software
# http://sourceforge.net/export/rss2_keepsake.php?group_id=134378 software
# http://valajournal.blogspot.com/feeds/posts/default software
-http://www.gimp.org/news.rdf
+# http://www.gimp.org/news.rdf
http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
http://git.savannah.gnu.org/cgit/identica-mode.git/atom/?h=master
--
cgit v1.2.3-54-g00ecf
From 8276fe0f597ec8232cbf10a812e934c034d9ca0a Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:46:51 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 28eebd0..e10d12e 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -128,7 +128,7 @@ http://iphonedevelopertips.com/feed iphone
# http://valajournal.blogspot.com/feeds/posts/default software
# http://www.gimp.org/news.rdf
http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
-http://git.savannah.gnu.org/cgit/identica-mode.git/atom/?h=master
+# http://git.savannah.gnu.org/cgit/identica-mode.git/atom/?h=master
#-----[ Games ]-------------------------------------------------------
http://feeds.feedburner.com/qj/qjnet game
--
cgit v1.2.3-54-g00ecf
From 792448862091564835c6a630fecacab1dde95fd0 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:49:52 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index e10d12e..7a2dab6 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -131,7 +131,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://git.savannah.gnu.org/cgit/identica-mode.git/atom/?h=master
#-----[ Games ]-------------------------------------------------------
-http://feeds.feedburner.com/qj/qjnet game
+# http://feeds.feedburner.com/qj/qjnet game
http://www.swtor.com/feed/news/all
#-----[ Funny ]-------------------------------------------------------
--
cgit v1.2.3-54-g00ecf
From eaedc21c74903af5025ee0ddd8ca51b3ea4a4a6d Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:49:57 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 7a2dab6..acb249e 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -132,7 +132,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
#-----[ Games ]-------------------------------------------------------
# http://feeds.feedburner.com/qj/qjnet game
-http://www.swtor.com/feed/news/all
+# http://www.swtor.com/feed/news/all
#-----[ Funny ]-------------------------------------------------------
http://feeds.feedburner.com/ClientsFromHell funny
--
cgit v1.2.3-54-g00ecf
From 88bfe4c3b2b99c1371e13918e0aa1844c756f82f Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:51:46 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index acb249e..33a4367 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -135,7 +135,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://www.swtor.com/feed/news/all
#-----[ Funny ]-------------------------------------------------------
-http://feeds.feedburner.com/ClientsFromHell funny
+# http://feeds.feedburner.com/ClientsFromHell funny
#http://feeds.feedburner.com/VeryDemotivational funny
#-----[ Comics ]------------------------------------------------------
--
cgit v1.2.3-54-g00ecf
From b1281a6f1a4cfd9055b42e4555b82180dbbc06c6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 01:58:49 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 33a4367..771ed77 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -139,7 +139,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
#http://feeds.feedburner.com/VeryDemotivational funny
#-----[ Comics ]------------------------------------------------------
-http://feeds.feedburner.com/AbstruseGoose comics
+# http://feeds.feedburner.com/AbstruseGoose comics
http://www.cad-comic.com/rss/rss.xml comics
http://feeds.dilbert.com/DilbertDailyStrip comics
http://feedproxy.google.com/uclick/garfield comics
--
cgit v1.2.3-54-g00ecf
From 3447d033eff565be9530070012f769a8e1b250f1 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:00:11 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 771ed77..d6c2029 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -140,7 +140,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
#-----[ Comics ]------------------------------------------------------
# http://feeds.feedburner.com/AbstruseGoose comics
-http://www.cad-comic.com/rss/rss.xml comics
+# http://www.cad-comic.com/rss/rss.xml comics
http://feeds.dilbert.com/DilbertDailyStrip comics
http://feedproxy.google.com/uclick/garfield comics
http://feeds.feedburner.com/GeekAndPoke comics
--
cgit v1.2.3-54-g00ecf
From 5c2449b3e3ce07ef9c84fefb18ef840c0b298323 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:00:28 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index d6c2029..88ca2fa 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -141,7 +141,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
#-----[ Comics ]------------------------------------------------------
# http://feeds.feedburner.com/AbstruseGoose comics
# http://www.cad-comic.com/rss/rss.xml comics
-http://feeds.dilbert.com/DilbertDailyStrip comics
+# http://feeds.dilbert.com/DilbertDailyStrip comics
http://feedproxy.google.com/uclick/garfield comics
http://feeds.feedburner.com/GeekAndPoke comics
http://feeds.feedburner.com/NotInventedHere comics
--
cgit v1.2.3-54-g00ecf
From 77a3463c8da1c690444fecbe5faa6b0e61969c3a Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:01:16 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 88ca2fa..c8fcb24 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -142,7 +142,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://feeds.feedburner.com/AbstruseGoose comics
# http://www.cad-comic.com/rss/rss.xml comics
# http://feeds.dilbert.com/DilbertDailyStrip comics
-http://feedproxy.google.com/uclick/garfield comics
+# http://feedproxy.google.com/uclick/garfield comics
http://feeds.feedburner.com/GeekAndPoke comics
http://feeds.feedburner.com/NotInventedHere comics
http://syndicated.livejournal.com/oglaf/data/rss comics
--
cgit v1.2.3-54-g00ecf
From 39a8afd2869ccbb02be40fe2fe761979dd2843d3 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:02:42 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index c8fcb24..055d58f 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -143,7 +143,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://www.cad-comic.com/rss/rss.xml comics
# http://feeds.dilbert.com/DilbertDailyStrip comics
# http://feedproxy.google.com/uclick/garfield comics
-http://feeds.feedburner.com/GeekAndPoke comics
+# http://feeds.feedburner.com/GeekAndPoke comics
http://feeds.feedburner.com/NotInventedHere comics
http://syndicated.livejournal.com/oglaf/data/rss comics
http://feeds.feedburner.com/omaketheater comics
--
cgit v1.2.3-54-g00ecf
From ff8b304f32cf058d4a0feedbc312beddc035bdf6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:03:19 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 055d58f..25c1bed 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -144,7 +144,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://feeds.dilbert.com/DilbertDailyStrip comics
# http://feedproxy.google.com/uclick/garfield comics
# http://feeds.feedburner.com/GeekAndPoke comics
-http://feeds.feedburner.com/NotInventedHere comics
+# http://feeds.feedburner.com/NotInventedHere comics
http://syndicated.livejournal.com/oglaf/data/rss comics
http://feeds.feedburner.com/omaketheater comics
http://www.penny-arcade.com/rss.xml comics
--
cgit v1.2.3-54-g00ecf
From b611c39cfc53be7526387a55b0ec95f25b957f18 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:03:35 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 25c1bed..60a817c 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -145,7 +145,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://feedproxy.google.com/uclick/garfield comics
# http://feeds.feedburner.com/GeekAndPoke comics
# http://feeds.feedburner.com/NotInventedHere comics
-http://syndicated.livejournal.com/oglaf/data/rss comics
+# http://syndicated.livejournal.com/oglaf/data/rss comics
http://feeds.feedburner.com/omaketheater comics
http://www.penny-arcade.com/rss.xml comics
http://www.pvponline.com/rss/?section=article comics
--
cgit v1.2.3-54-g00ecf
From 93ee880c8f56c9fd4ccf2185b8b723f1c6bc392d Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:05:02 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 60a817c..91578b8 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -146,7 +146,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://feeds.feedburner.com/GeekAndPoke comics
# http://feeds.feedburner.com/NotInventedHere comics
# http://syndicated.livejournal.com/oglaf/data/rss comics
-http://feeds.feedburner.com/omaketheater comics
+# http://feeds.feedburner.com/omaketheater comics
http://www.penny-arcade.com/rss.xml comics
http://www.pvponline.com/rss/?section=article comics
http://www.questionablecontent.net/QCRSS.xml comics
--
cgit v1.2.3-54-g00ecf
From eb49d67452851913576d95286da39f83d2f4ee99 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:05:18 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 91578b8..774c8a4 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -147,7 +147,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://feeds.feedburner.com/NotInventedHere comics
# http://syndicated.livejournal.com/oglaf/data/rss comics
# http://feeds.feedburner.com/omaketheater comics
-http://www.penny-arcade.com/rss.xml comics
+# http://www.penny-arcade.com/rss.xml comics
http://www.pvponline.com/rss/?section=article comics
http://www.questionablecontent.net/QCRSS.xml comics
http://feeds.feedburner.com/ScenesFromAMultiverse comics
--
cgit v1.2.3-54-g00ecf
From e0da2c9a5309044f5e8d638d90ccc37ed4934b49 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:10:28 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 774c8a4..fce807f 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -148,7 +148,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://syndicated.livejournal.com/oglaf/data/rss comics
# http://feeds.feedburner.com/omaketheater comics
# http://www.penny-arcade.com/rss.xml comics
-http://www.pvponline.com/rss/?section=article comics
+# http://www.pvponline.com/rss/?section=article comics
http://www.questionablecontent.net/QCRSS.xml comics
http://feeds.feedburner.com/ScenesFromAMultiverse comics
http://www.vgcats.com/vgcats.rdf.xml comics
--
cgit v1.2.3-54-g00ecf
From 7c13a42bb12091469c32b2d15e2ccfcaa558eb81 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:11:50 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index fce807f..90560b3 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -149,7 +149,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://feeds.feedburner.com/omaketheater comics
# http://www.penny-arcade.com/rss.xml comics
# http://www.pvponline.com/rss/?section=article comics
-http://www.questionablecontent.net/QCRSS.xml comics
+# http://www.questionablecontent.net/QCRSS.xml comics
http://feeds.feedburner.com/ScenesFromAMultiverse comics
http://www.vgcats.com/vgcats.rdf.xml comics
http://feeds2.feedburner.com/virtualshackles comics
--
cgit v1.2.3-54-g00ecf
From c8d72534a575684e54dae13f8cf4d8ffb0e7d15f Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:12:06 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 90560b3..681c4df 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -150,7 +150,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://www.penny-arcade.com/rss.xml comics
# http://www.pvponline.com/rss/?section=article comics
# http://www.questionablecontent.net/QCRSS.xml comics
-http://feeds.feedburner.com/ScenesFromAMultiverse comics
+# http://feeds.feedburner.com/ScenesFromAMultiverse comics
http://www.vgcats.com/vgcats.rdf.xml comics
http://feeds2.feedburner.com/virtualshackles comics
http://xkcd.com/rss.xml comics
--
cgit v1.2.3-54-g00ecf
From 0d7e6af608a3dfe83566f7733dd75d88c6002018 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:12:57 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 681c4df..86ee58c 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -151,7 +151,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://www.pvponline.com/rss/?section=article comics
# http://www.questionablecontent.net/QCRSS.xml comics
# http://feeds.feedburner.com/ScenesFromAMultiverse comics
-http://www.vgcats.com/vgcats.rdf.xml comics
+# http://www.vgcats.com/vgcats.rdf.xml comics
http://feeds2.feedburner.com/virtualshackles comics
http://xkcd.com/rss.xml comics
http://feeds.feedburner.com/maximumble?format=xml comics
--
cgit v1.2.3-54-g00ecf
From 3e763a7c5eb962cf8ba3febf18ea03333f11b3c2 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:13:28 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 86ee58c..44db5fd 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -152,7 +152,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://www.questionablecontent.net/QCRSS.xml comics
# http://feeds.feedburner.com/ScenesFromAMultiverse comics
# http://www.vgcats.com/vgcats.rdf.xml comics
-http://feeds2.feedburner.com/virtualshackles comics
+# http://feeds2.feedburner.com/virtualshackles comics
http://xkcd.com/rss.xml comics
http://feeds.feedburner.com/maximumble?format=xml comics
http://feeds.feedburner.com/ProgsLife comics
--
cgit v1.2.3-54-g00ecf
From 717c8895f767bbea59b588573a7f6add3e85813e Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:14:05 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 44db5fd..d5d42fd 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -153,7 +153,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://feeds.feedburner.com/ScenesFromAMultiverse comics
# http://www.vgcats.com/vgcats.rdf.xml comics
# http://feeds2.feedburner.com/virtualshackles comics
-http://xkcd.com/rss.xml comics
+# http://xkcd.com/rss.xml comics
http://feeds.feedburner.com/maximumble?format=xml comics
http://feeds.feedburner.com/ProgsLife comics
http://www.rsspect.com/rss/asw.xml
--
cgit v1.2.3-54-g00ecf
From 79b7274379aec336b006f93188c717fd9a222c6e Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:15:00 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index d5d42fd..e066d6e 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -154,7 +154,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://www.vgcats.com/vgcats.rdf.xml comics
# http://feeds2.feedburner.com/virtualshackles comics
# http://xkcd.com/rss.xml comics
-http://feeds.feedburner.com/maximumble?format=xml comics
+# http://feeds.feedburner.com/maximumble?format=xml comics
http://feeds.feedburner.com/ProgsLife comics
http://www.rsspect.com/rss/asw.xml
http://pbfcomics.com/feed/feed.xml
--
cgit v1.2.3-54-g00ecf
From dc42b3f48bd3683677123232980374a4062a1578 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:15:48 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index e066d6e..fc59fde 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -156,7 +156,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://xkcd.com/rss.xml comics
# http://feeds.feedburner.com/maximumble?format=xml comics
http://feeds.feedburner.com/ProgsLife comics
-http://www.rsspect.com/rss/asw.xml
+# http://www.rsspect.com/rss/asw.xml
http://pbfcomics.com/feed/feed.xml
http://feeds.feedburner.com/MinionComics
http://www.savagechickens.com/feed
--
cgit v1.2.3-54-g00ecf
From 184f3f5f16a3aa23740ebc4a5b3e853226c29663 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:16:07 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index fc59fde..c078bd3 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -157,7 +157,7 @@ http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
# http://feeds.feedburner.com/maximumble?format=xml comics
http://feeds.feedburner.com/ProgsLife comics
# http://www.rsspect.com/rss/asw.xml
-http://pbfcomics.com/feed/feed.xml
+# http://pbfcomics.com/feed/feed.xml
http://feeds.feedburner.com/MinionComics
http://www.savagechickens.com/feed
http://feeds.feedburner.com/basiccomic
--
cgit v1.2.3-54-g00ecf
From c0a4fd13c936b5e50519917e80b494437b55240e Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:16:58 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index c078bd3..1e47e09 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -159,7 +159,7 @@ http://feeds.feedburner.com/ProgsLife comics
# http://www.rsspect.com/rss/asw.xml
# http://pbfcomics.com/feed/feed.xml
http://feeds.feedburner.com/MinionComics
-http://www.savagechickens.com/feed
+# http://www.savagechickens.com/feed
http://feeds.feedburner.com/basiccomic
#-----[ Misc ]--------------------------------------------------------
--
cgit v1.2.3-54-g00ecf
From bbdb6b28e53d57a5985e08e8f187fef970327291 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:17:56 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 1e47e09..a847469 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -160,7 +160,7 @@ http://feeds.feedburner.com/ProgsLife comics
# http://pbfcomics.com/feed/feed.xml
http://feeds.feedburner.com/MinionComics
# http://www.savagechickens.com/feed
-http://feeds.feedburner.com/basiccomic
+# http://feeds.feedburner.com/basiccomic
#-----[ Misc ]--------------------------------------------------------
http://wallbase.cc/rss misc
--
cgit v1.2.3-54-g00ecf
From b4c1a5e47fe571e19d373730b3a9198c68cc082b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:18:47 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index a847469..820e6dc 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -169,7 +169,7 @@ http://www.mailinator.com/rss.jsp?email=ryuslash misc
#-----[ New ]----------------------------------------------------------
-http://rss.feedsportal.com/c/32569/f/491734/index.rss
+# http://rss.feedsportal.com/c/32569/f/491734/index.rss
http://feeds.feedburner.com/TheGeekStuff
http://feeds2.feedburner.com/Command-line-fu
http://feeds.feedburner.com/GoDjango
--
cgit v1.2.3-54-g00ecf
From 8d3506b220acddaaf74673b043b6362a9783c010 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:19:26 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 820e6dc..e986ae3 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -170,7 +170,7 @@ http://www.mailinator.com/rss.jsp?email=ryuslash misc
#-----[ New ]----------------------------------------------------------
# http://rss.feedsportal.com/c/32569/f/491734/index.rss
-http://feeds.feedburner.com/TheGeekStuff
+# http://feeds.feedburner.com/TheGeekStuff
http://feeds2.feedburner.com/Command-line-fu
http://feeds.feedburner.com/GoDjango
# http://identity.mozilla.com/rss
--
cgit v1.2.3-54-g00ecf
From d858fdd81c705e29a7d83b6ae6ffb17988aa5281 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:20:14 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index e986ae3..671942f 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -171,6 +171,6 @@ http://www.mailinator.com/rss.jsp?email=ryuslash misc
#-----[ New ]----------------------------------------------------------
# http://rss.feedsportal.com/c/32569/f/491734/index.rss
# http://feeds.feedburner.com/TheGeekStuff
-http://feeds2.feedburner.com/Command-line-fu
+# http://feeds2.feedburner.com/Command-line-fu
http://feeds.feedburner.com/GoDjango
# http://identity.mozilla.com/rss
--
cgit v1.2.3-54-g00ecf
From ce0f9c931f82912477fe9ebf84d9af5b3debc30a Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:20:40 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 671942f..54d8494 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -172,5 +172,5 @@ http://www.mailinator.com/rss.jsp?email=ryuslash misc
# http://rss.feedsportal.com/c/32569/f/491734/index.rss
# http://feeds.feedburner.com/TheGeekStuff
# http://feeds2.feedburner.com/Command-line-fu
-http://feeds.feedburner.com/GoDjango
+$ http://feeds.feedburner.com/GoDjango
# http://identity.mozilla.com/rss
--
cgit v1.2.3-54-g00ecf
From 8007a5b297fef9e7653f7e174803e485a66f6d10 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 24 Jul 2012 02:20:44 +0200
Subject: .config/newsbeuter/urls
---
.config/newsbeuter/urls | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 54d8494..911e000 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -172,5 +172,5 @@ http://www.mailinator.com/rss.jsp?email=ryuslash misc
# http://rss.feedsportal.com/c/32569/f/491734/index.rss
# http://feeds.feedburner.com/TheGeekStuff
# http://feeds2.feedburner.com/Command-line-fu
-$ http://feeds.feedburner.com/GoDjango
+# http://feeds.feedburner.com/GoDjango
# http://identity.mozilla.com/rss
--
cgit v1.2.3-54-g00ecf
From 45d6c3a990be59852840de898143c28214c534d4 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 25 Jul 2012 16:09:09 +0200
Subject: .zshrc
---
.zshrc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.zshrc b/.zshrc
index 38c4fd7..54e61f4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -14,6 +14,13 @@ zstyle :compinstall filename '/home/slash/.zshrc'
autoload -Uz compinit
compinit
+autoload -U predict-on
+zle -N predict-on
+zle -N predict-off
+bindkey '^X^Z' predict-on
+bindkey '^Z' predict-off
+predict-on
+
function shutdown()
{
dbus-send --system --print-reply \
--
cgit v1.2.3-54-g00ecf
From 34bf1efffdab45f838467638512dfd33ccbaf99a Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 25 Jul 2012 22:37:47 +0200
Subject: .zshrc
---
.zshrc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.zshrc b/.zshrc
index 54e61f4..7d0a4d5 100644
--- a/.zshrc
+++ b/.zshrc
@@ -94,9 +94,9 @@ bindkey "\e[F" end-of-line
bindkey "^W" backward-delete-char
# Show syntax highlighting when we're not running in emacs
-if [ -z $EMACS ]; then
- source ~/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh
+# if [ -z $EMACS ]; then
+# source ~/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh
- ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue'
- ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue'
-fi
+# ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue'
+# ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue'
+# fi
--
cgit v1.2.3-54-g00ecf
From ec8f151855adfc2e3a052958d5ebf26a287acd37 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 25 Jul 2012 22:40:50 +0200
Subject: .zshrc
---
.zshrc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.zshrc b/.zshrc
index 7d0a4d5..54e61f4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -94,9 +94,9 @@ bindkey "\e[F" end-of-line
bindkey "^W" backward-delete-char
# Show syntax highlighting when we're not running in emacs
-# if [ -z $EMACS ]; then
-# source ~/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh
+if [ -z $EMACS ]; then
+ source ~/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh
-# ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue'
-# ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue'
-# fi
+ ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue'
+ ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue'
+fi
--
cgit v1.2.3-54-g00ecf
From 2171af2036d9d7e1a08a4319e8966d5df905142d Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 31 Jul 2012 16:10:55 +0200
Subject: .zprofile
---
.zprofile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.zprofile b/.zprofile
index 0fc5ba9..f7f027a 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,7 +1,7 @@
# -*- eval: (git-auto-commit-mode 1) -*-
export BROWSER=firefox
export EDITOR="emacsclient -c -a emacs"
-export INFOPATH="${HOME}/documents/info:${INFOPATH}:/usr/local/stumpwm/share/info"
+export INFOPATH="${HOME}/documents/info:/usr/share/info:/usr/local/stumpwm/share/info"
PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
PATH="$HOME/code/ext/emacs/trunk/lib-src:$PATH"
--
cgit v1.2.3-54-g00ecf
From 9583a411ad87fd807f4934e9b94af40b5563ee19 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 1 Aug 2012 01:52:58 +0200
Subject: .zprofile
---
.zprofile | 1 +
1 file changed, 1 insertion(+)
diff --git a/.zprofile b/.zprofile
index f7f027a..7836842 100644
--- a/.zprofile
+++ b/.zprofile
@@ -5,4 +5,5 @@ export INFOPATH="${HOME}/documents/info:/usr/share/info:/usr/local/stumpwm/share
PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
PATH="$HOME/code/ext/emacs/trunk/lib-src:$PATH"
+PATH="/usr/local/scwm/bin:$PATH"
export PATH="$HOME/code/ext/emacs/trunk/src:$PATH"
--
cgit v1.2.3-54-g00ecf
From 46f4a8312f4e1ec0fba25f2773ef258158d77e42 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 1 Aug 2012 09:29:30 +0200
Subject: .zprofile
---
.zprofile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.zprofile b/.zprofile
index 7836842..bf6f1f8 100644
--- a/.zprofile
+++ b/.zprofile
@@ -6,4 +6,4 @@ export INFOPATH="${HOME}/documents/info:/usr/share/info:/usr/local/stumpwm/share
PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
PATH="$HOME/code/ext/emacs/trunk/lib-src:$PATH"
PATH="/usr/local/scwm/bin:$PATH"
-export PATH="$HOME/code/ext/emacs/trunk/src:$PATH"
+export PATH="/usr/local/emacs/bin:$PATH"
--
cgit v1.2.3-54-g00ecf
From e99cc6b1b705a0f1893c672636ce38b2e56515f7 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 1 Aug 2012 09:29:42 +0200
Subject: .zprofile
---
.zprofile | 1 -
1 file changed, 1 deletion(-)
diff --git a/.zprofile b/.zprofile
index bf6f1f8..b6fd4a1 100644
--- a/.zprofile
+++ b/.zprofile
@@ -4,6 +4,5 @@ export EDITOR="emacsclient -c -a emacs"
export INFOPATH="${HOME}/documents/info:/usr/share/info:/usr/local/stumpwm/share/info"
PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
-PATH="$HOME/code/ext/emacs/trunk/lib-src:$PATH"
PATH="/usr/local/scwm/bin:$PATH"
export PATH="/usr/local/emacs/bin:$PATH"
--
cgit v1.2.3-54-g00ecf
From 27f690c39ef076bdd392a29f10d7a049c8af6ecf Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 1 Aug 2012 23:49:47 +0200
Subject: .zprofile
---
.zprofile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.zprofile b/.zprofile
index b6fd4a1..acb0d01 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,7 +1,7 @@
# -*- eval: (git-auto-commit-mode 1) -*-
export BROWSER=firefox
export EDITOR="emacsclient -c -a emacs"
-export INFOPATH="${HOME}/documents/info:/usr/share/info:/usr/local/stumpwm/share/info"
+export INFOPATH="${HOME}/documents/info:/usr/local/emacs/share/info:/usr/share/info:/usr/local/stumpwm/share/info"
PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
PATH="/usr/local/scwm/bin:$PATH"
--
cgit v1.2.3-54-g00ecf
From 267a283586be51246a851907c3a6986aaa280c16 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 8 Aug 2012 10:34:04 +0200
Subject: .zshrc
---
.zshrc | 7 -------
1 file changed, 7 deletions(-)
diff --git a/.zshrc b/.zshrc
index 54e61f4..38c4fd7 100644
--- a/.zshrc
+++ b/.zshrc
@@ -14,13 +14,6 @@ zstyle :compinstall filename '/home/slash/.zshrc'
autoload -Uz compinit
compinit
-autoload -U predict-on
-zle -N predict-on
-zle -N predict-off
-bindkey '^X^Z' predict-on
-bindkey '^Z' predict-off
-predict-on
-
function shutdown()
{
dbus-send --system --print-reply \
--
cgit v1.2.3-54-g00ecf
From f12ecd0ba99f0b286fa1b8803c185771b50e2716 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Mon, 13 Aug 2012 23:14:04 +0200
Subject: .zprofile
---
.zprofile | 1 +
1 file changed, 1 insertion(+)
diff --git a/.zprofile b/.zprofile
index acb0d01..60c7292 100644
--- a/.zprofile
+++ b/.zprofile
@@ -5,4 +5,5 @@ export INFOPATH="${HOME}/documents/info:/usr/local/emacs/share/info:/usr/share/i
PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
PATH="/usr/local/scwm/bin:$PATH"
+PATH="/usr/local/clfswm/bin:$PATH"
export PATH="/usr/local/emacs/bin:$PATH"
--
cgit v1.2.3-54-g00ecf
From 0b0f0fa73cfe9df2fc167bcba291b257e0b4b1fb Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 18 Aug 2012 13:19:27 +0200
Subject: Merge .emacs.d
---
.emacs.d/.gitignore | 16 +
.emacs.d/.gitmodules | 9 +
.emacs.d/eshell/.gitignore | 4 +
.emacs.d/eshell/alias | 8 +
.emacs.d/eshell/login | 2 +
.emacs.d/gnus.el | 70 +++++
.emacs.d/init3.el | 13 +
.emacs.d/site-lisp/.gitignore | 1 +
.emacs.d/site-lisp/autosmiley.el | 95 ++++++
.emacs.d/site-lisp/org-contacts.el | 620 +++++++++++++++++++++++++++++++++++++
.emacs.d/site-lisp/shift-indent.el | 33 ++
.emacs.d/site-lisp/xmodmap-mode.el | 9 +
.emacs.d/startup/.dir-locals.el | 1 +
13 files changed, 881 insertions(+)
create mode 100644 .emacs.d/.gitignore
create mode 100644 .emacs.d/.gitmodules
create mode 100644 .emacs.d/eshell/.gitignore
create mode 100644 .emacs.d/eshell/alias
create mode 100644 .emacs.d/eshell/login
create mode 100644 .emacs.d/gnus.el
create mode 100644 .emacs.d/init3.el
create mode 100644 .emacs.d/site-lisp/.gitignore
create mode 100644 .emacs.d/site-lisp/autosmiley.el
create mode 100644 .emacs.d/site-lisp/org-contacts.el
create mode 100644 .emacs.d/site-lisp/shift-indent.el
create mode 100644 .emacs.d/site-lisp/xmodmap-mode.el
create mode 100644 .emacs.d/startup/.dir-locals.el
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
new file mode 100644
index 0000000..326a586
--- /dev/null
+++ b/.emacs.d/.gitignore
@@ -0,0 +1,16 @@
+tramp
+elpa
+bookmarks
+abbrev_defs
+custom.el
+*.elc
+ac-comphist.dat
+auto-save-list/
+url/
+packages/
+newsticker/
+templates/
+themes/
+rinit.*
+!rinit.org
+history
diff --git a/.emacs.d/.gitmodules b/.emacs.d/.gitmodules
new file mode 100644
index 0000000..2559e06
--- /dev/null
+++ b/.emacs.d/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "site-lisp/identica-mode"]
+ path = site-lisp/identica-mode
+ url = git://git.sv.gnu.org/identica-mode.git
+[submodule "site-lisp/tron-theme"]
+ path = site-lisp/tron-theme
+ url = git://gitorious.org/ryuslash/tron-theme.git
+[submodule "site-lisp/git-auto-commit-mode"]
+ path = site-lisp/git-auto-commit-mode
+ url = git://gitorious.org/git-auto-commit-mode/git-auto-commit-mode.git
diff --git a/.emacs.d/eshell/.gitignore b/.emacs.d/eshell/.gitignore
new file mode 100644
index 0000000..7a28188
--- /dev/null
+++ b/.emacs.d/eshell/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!login
+!alias
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias
new file mode 100644
index 0000000..940108a
--- /dev/null
+++ b/.emacs.d/eshell/alias
@@ -0,0 +1,8 @@
+alias git git --no-pager $*
+alias rm rm -v $*
+alias sudo *sudo $*
+alias ncmpcpp ansi-term ncmpcpp ncmpcpp
+alias listen eshell-exec-visual mplayer http://usa7-vn.mixstream.net/listen/8248.pls
+alias o find-file $1
+alias d dired $1
+alias newsbeuter ansi-term newsbeuter newsbeuter
diff --git a/.emacs.d/eshell/login b/.emacs.d/eshell/login
new file mode 100644
index 0000000..f898d68
--- /dev/null
+++ b/.emacs.d/eshell/login
@@ -0,0 +1,2 @@
+(defun inspect (var)
+ (symbol-value (intern var)))
diff --git a/.emacs.d/gnus.el b/.emacs.d/gnus.el
new file mode 100644
index 0000000..1bf988a
--- /dev/null
+++ b/.emacs.d/gnus.el
@@ -0,0 +1,70 @@
+;; -*- eval: (git-auto-commit-mode 1) -*-
+(setq gnus-select-method '(nntp "news.eternal-september.org"))
+(setq gnus-secondary-select-methods
+ '((nnmaildir "gmail"
+ (directory "~/documents/mail/gmail/"))
+ (nnmaildir "ninthfloor"
+ (directory "~/documents/mail/ninthfloor/"))
+ (nnmaildir "arch"
+ (directory "~/documents/mail/arch/"))
+ (nnmaildir "aethon"
+ (directory "~/documents/mail/aethon/"))
+ (nnmaildir "ryuslash"
+ (directory "~/documents/mail/ryuslash.org/"))
+ (nntp "news.gmane.org")))
+
+(setq gnus-auto-subscribed-groups nil)
+(setq gnus-save-newsrc-file nil)
+(setq gnus-read-newsrc-file nil)
+(setq gnus-novice-user t)
+(setq gnus-article-truncate-lines nil)
+
+(setq message-send-mail-function 'message-send-mail-with-sendmail)
+(setq sendmail-program "/usr/bin/msmtp")
+(setq message-sendmail-extra-arguments '("-a" "gmail"))
+
+;; (setq gnus-parameters
+;; '(("gmail"
+;; (display . all))
+;; ("aethon"
+;; (display . all)
+;; ("arch"
+;; (display . all)))))
+
+(setq gnus-permanently-visible-groups
+ "\\(gmail\\|aethon\\|arch\\|ninthfloor\\|ryuslash\\):INBOX")
+
+(setq nntp-marks-is-evil t)
+
+(setq gnus-check-new-newsgroups nil)
+
+(setq gnus-posting-styles
+ '((".*"
+ (address "ryuslash@gmail.com")
+ (eval (setq message-sendmail-extra-arguments '("-a" "gmail"))))
+ ("ninthfloor:"
+ (address "ryuslash@ninthfloor.org")
+ (eval (setq message-sendmail-extra-arguments '("-a" "ninthfloor"))))
+ ("arch:"
+ (address "tom.willemsen@archlinux.us")
+ (eval (setq message-sendmail-extra-arguments '("-a" "arch"))))
+ ("aethon:"
+ (address "thomas@aethon.nl")
+ (signature-file "~/documents/work/aethon/signature.txt")
+ (eval (setq message-sendmail-extra-arguments '("-a" "aethon"))))
+ ("ryuslash:"
+ (address "tom@ryuslash.org")
+ (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash"))))))
+
+(setq user-mail-address "ryuslash@gmail.com")
+(setq user-full-name "Tom Willemsen")
+
+(add-hook 'gnus-summary-mode-hook '(lambda () (linum-mode -1)))
+(add-hook 'gnus-article-mode-hook '(lambda () (linum-mode -1)))
+(add-hook 'gnus-group-mode-hook '(lambda () (linum-mode -1)))
+
+;-----[ BBDB ]--------------------------------------------------------
+(require 'bbdb)
+(bbdb-initialize 'gnus 'message)
+(bbdb-insinuate-gnus)
+(setq bbdb-north-american-phone-numbers-p nil)
diff --git a/.emacs.d/init3.el b/.emacs.d/init3.el
new file mode 100644
index 0000000..1b5abdf
--- /dev/null
+++ b/.emacs.d/init3.el
@@ -0,0 +1,13 @@
+;; -*- mode: Emacs-Lisp; eval: (git-auto-commit-mode 1) -*-
+(require 'bytecomp)
+
+(defvar startup-files
+ (directory-files "~/.emacs.d/startup/" t "^[^.].*\\.el$")
+ "A list of the files that should be loaded during startup.")
+
+(while startup-files
+ (let ((filename (car startup-files))
+ (byte-compile-warnings nil))
+ (if (not (eq (byte-recompile-file filename nil 0) nil))
+ (load (substring filename 0 -3))))
+ (setq startup-files (cdr startup-files)))
diff --git a/.emacs.d/site-lisp/.gitignore b/.emacs.d/site-lisp/.gitignore
new file mode 100644
index 0000000..813048b
--- /dev/null
+++ b/.emacs.d/site-lisp/.gitignore
@@ -0,0 +1 @@
+rudel/
diff --git a/.emacs.d/site-lisp/autosmiley.el b/.emacs.d/site-lisp/autosmiley.el
new file mode 100644
index 0000000..1037e43
--- /dev/null
+++ b/.emacs.d/site-lisp/autosmiley.el
@@ -0,0 +1,95 @@
+;;; autosmiley.el --- Convert smileys into their graphical representation
+
+;; Author: Damyan Pepper (gmail account, username damyanp)
+;; Created: 20060315
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, you can either send email to this
+;; program's maintainer or write to: The Free Software Foundation,
+;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Defines the minor mode autosmiley-mode that converts smileys like
+;; :-) into their graphical representations on the fly.
+
+;; Tested on:
+;;
+;; GNU Emacs 22.0.50.1 (i386-mingw-nt5.1.2600) of 2006-03-14 on W2ONE
+;;
+;; History:
+;;
+;; 20060315 - First Release
+
+
+
+(require 'smiley)
+
+(defun autosmiley-overlay-p (overlay)
+ "Return whether OVERLAY is an overlay of autosmiley mode."
+ (memq (overlay-get overlay 'category)
+ '(autosmiley)))
+
+(defun autosmiley-remove-smileys (beg end)
+ (dolist (o (overlays-in beg end))
+ (when (autosmiley-overlay-p o)
+ (delete-overlay o))))
+
+(defvar *autosmiley-counter* 0
+ "Each smiley needs to have a unique display string otherwise
+ adjacent smileys will be merged into a single image. So we put
+ a counter on each one to make them unique")
+
+(defun autosmiley-add-smiley (beg end image)
+ (let ((overlay (make-overlay beg end)))
+ (overlay-put overlay 'category 'autosmiley)
+ (overlay-put overlay 'display (append image (list :counter (incf *autosmiley-counter*))))))
+
+
+(defun autosmiley-add-smileys (beg end)
+ (save-excursion
+ (dolist (entry smiley-cached-regexp-alist)
+ (let ((regexp (car entry))
+ (group (nth 1 entry))
+ (image (nth 2 entry)))
+ (when image
+ (goto-char beg)
+ (while (re-search-forward regexp end t)
+ (autosmiley-add-smiley (match-beginning group) (match-end group) image)))))))
+
+
+(defun autosmiley-change (beg end &optional old-len)
+ (let ((beg-line (save-excursion (goto-char beg) (line-beginning-position)))
+ (end-line (save-excursion (goto-char end) (line-end-position))))
+ (autosmiley-remove-smileys beg-line end-line)
+ (autosmiley-add-smileys beg-line end-line)))
+
+
+;;;###autoload
+(define-minor-mode autosmiley-mode
+ "Minor mode for automatically replacing smileys in text with
+cute little graphical smileys."
+ :group 'autosmiley :lighter " :)"
+ (save-excursion
+ (save-restriction
+ (widen)
+ (autosmiley-remove-smileys (point-min) (point-max))
+ (if autosmiley-mode
+ (progn
+ (unless smiley-cached-regexp-alist
+ (smiley-update-cache))
+ (jit-lock-register 'autosmiley-change))
+ (jit-lock-unregister 'autosmiley-change)))))
+
+
+(provide 'autosmiley)
diff --git a/.emacs.d/site-lisp/org-contacts.el b/.emacs.d/site-lisp/org-contacts.el
new file mode 100644
index 0000000..b6d9e50
--- /dev/null
+++ b/.emacs.d/site-lisp/org-contacts.el
@@ -0,0 +1,620 @@
+;;; org-contacts.el --- Contacts management
+
+;; Copyright (C) 2010-2012 Julien Danjou
+
+;; Author: Julien Danjou
+;; Keywords: outlines, hypermedia, calendar
+;;
+;; This file is NOT part of GNU Emacs.
+;;
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see .
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+
+;; This file contains the code for managing your contacts into Org-mode.
+
+;; To enter new contacts, you can use `org-capture' and a template just like
+;; this:
+
+;; ("c" "Contacts" entry (file "~/Org/contacts.org")
+;; "* %(org-contacts-template-name)
+;; :PROPERTIES:
+;; :EMAIL: %(org-contacts-template-email)
+;; :END:")))
+;;
+;;; Code:
+
+(eval-when-compile
+ (require 'cl))
+
+(eval-and-compile
+ (require 'org))
+
+(defgroup org-contacts nil
+ "Options concerning contacts management."
+ :group 'org)
+
+(defcustom org-contacts-files nil
+ "List of Org files to use as contacts source.
+If set to nil, all your Org files will be used."
+ :type '(repeat file)
+ :group 'org-contacts)
+
+(defcustom org-contacts-email-property "EMAIL"
+ "Name of the property for contact email address."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-address-property "ADDRESS"
+ "Name of the property for contact address."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-birthday-property "BIRTHDAY"
+ "Name of the property for contact birthday date."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-birthday-format "Birthday: %l (%Y)"
+ "Format of the anniversary agenda entry. The following replacements are available:
+
+ %h - Heading name
+ %l - Link to the heading
+ %y - Number of year
+ %Y - Number of year (ordinal)"
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-last-read-mail-property "LAST_READ_MAIL"
+ "Name of the property for contact last read email link storage."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-icon-property "ICON"
+ "Name of the property for contact icon."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-nickname-property "NICKNAME"
+ "Name of the property for IRC nickname match."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-icon-size 32
+ "Size of the contacts icons."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-icon-use-gravatar (fboundp 'gravatar-retrieve)
+ "Whether use Gravatar to fetch contact icons."
+ :type 'boolean
+ :group 'org-contacts)
+
+(defcustom org-contacts-completion-ignore-case t
+ "Ignore case when completing contacts."
+ :type 'boolean
+ :group 'org-contacts)
+
+(defcustom org-contacts-group-prefix "+"
+ "Group prefix."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-matcher (concat org-contacts-email-property "<>\"\"")
+ "Matching rule for finding heading that are contacts.
+This can be a tag name, or a property check."
+ :type 'string
+ :group 'org-contacts)
+
+(defcustom org-contacts-email-link-description-format "%s (%d)"
+ "Format used to store links to email.
+This overrides `org-email-link-description-format' if set."
+ :group 'org-contacts
+ :type 'string)
+
+(defcustom org-contacts-vcard-file "contacts.vcf"
+ "Default file for vcard export."
+ :group 'org-contacts
+ :type 'file)
+
+(defvar org-contacts-keymap
+ (let ((map (make-sparse-keymap)))
+ (define-key map "M" 'org-contacts-view-send-email)
+ (define-key map "i" 'org-contacts-view-switch-to-irc-buffer)
+ map)
+ "The keymap used in `org-contacts' result list.")
+
+(defun org-contacts-files ()
+ "Return list of Org files to use for contact management."
+ (or org-contacts-files (org-agenda-files t 'ifmode)))
+
+(defun org-contacts-filter (&optional name-match tags-match)
+ "Search for a contact maching NAME-MATCH and TAGS-MATCH.
+If both match values are nil, return all contacts."
+ (let* (todo-only
+ (tags-matcher
+ (if tags-match
+ (cdr (org-make-tags-matcher tags-match))
+ t))
+ (name-matcher
+ (if name-match
+ '(org-string-match-p name-match (org-get-heading t))
+ t))
+ (contacts-matcher
+ (cdr (org-make-tags-matcher org-contacts-matcher)))
+ markers result)
+ (dolist (file (org-contacts-files))
+ (org-check-agenda-file file)
+ (with-current-buffer (org-get-agenda-file-buffer file)
+ (unless (eq major-mode 'org-mode)
+ (error "File %s is no in `org-mode'" file))
+ (org-scan-tags
+ '(add-to-list 'markers (set-marker (make-marker) (point)))
+ `(and ,contacts-matcher ,tags-matcher ,name-matcher)
+ todo-only)))
+ (dolist (marker markers result)
+ (org-with-point-at marker
+ (add-to-list 'result
+ (list (org-get-heading t) marker (org-entry-properties marker 'all)))))))
+
+(when (not (fboundp 'completion-table-case-fold))
+ ;; That function is new in Emacs 24...
+ (defun completion-table-case-fold (table &optional dont-fold)
+ (lambda (string pred action)
+ (let ((completion-ignore-case (not dont-fold)))
+ (complete-with-action action table string pred)))))
+
+(defun org-contacts-complete-name (&optional start)
+ "Complete text at START with a user name and email."
+ (let* ((end (point))
+ (start (or start
+ (save-excursion
+ (re-search-backward "\\(\\`\\|[\n:,]\\)[ \t]*")
+ (goto-char (match-end 0))
+ (point))))
+ (orig (buffer-substring start end))
+ (completion-ignore-case org-contacts-completion-ignore-case)
+ (group-completion-p (org-string-match-p (concat "^" org-contacts-group-prefix) orig))
+ (completion-list
+ (if group-completion-p
+ (mapcar (lambda (group) (propertize (concat org-contacts-group-prefix group) 'org-contacts-group group))
+ (org-uniquify
+ (loop for contact in (org-contacts-filter)
+ with group-list
+ nconc (org-split-string
+ (or (cdr (assoc-string "ALLTAGS" (caddr contact))) "") ":"))))
+ (loop for contact in (org-contacts-filter)
+ ;; The contact name is always the car of the assoc-list
+ ;; returned by `org-contacts-filter'.
+ for contact-name = (car contact)
+ ;; Build the list of the user email addresses.
+ for email-list = (split-string (or
+ (cdr (assoc-string org-contacts-email-property (caddr contact)))
+ ""))
+ ;; If the user has email addresses…
+ if email-list
+ ;; … append a list of USER .
+ nconc (loop for email in email-list
+ collect (org-contacts-format-email contact-name email)))))
+ (completion-list (all-completions orig completion-list)))
+ ;; If we are completing a group, and that's the only group, just return
+ ;; the real result.
+ (when (and group-completion-p
+ (= (length completion-list) 1))
+ (setq completion-list
+ (list (concat (car completion-list) ";: "
+ (mapconcat 'identity
+ (loop for contact in (org-contacts-filter
+ nil
+ (get-text-property 0 'org-contacts-group (car completion-list)))
+ ;; The contact name is always the car of the assoc-list
+ ;; returned by `org-contacts-filter'.
+ for contact-name = (car contact)
+ ;; Grab the first email of the contact
+ for email = (car (split-string (or
+ (cdr (assoc-string org-contacts-email-property (caddr contact)))
+ "")))
+ ;; If the user has an email address, append USER .
+ if email collect (org-contacts-format-email contact-name email))
+ ", ")))))
+ (list start end (completion-table-case-fold completion-list (not org-contacts-completion-ignore-case)))))
+
+(defun org-contacts-message-complete-function ()
+ "Function used in `completion-at-point-functions' in `message-mode'."
+ (let ((mail-abbrev-mode-regexp
+ "^\\(Resent-To\\|To\\|B?Cc\\|Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\|Disposition-Notification-To\\|Return-Receipt-To\\):"))
+ (when (mail-abbrev-in-expansion-header-p)
+ (org-contacts-complete-name))))
+
+(defun org-contacts-gnus-get-name-email ()
+ "Get name and email address from Gnus message."
+ (if (gnus-alive-p)
+ (gnus-with-article-headers
+ (mail-extract-address-components
+ (or (mail-fetch-field "From") "")))))
+
+(defun org-contacts-gnus-article-from-get-marker ()
+ "Return a marker for a contact based on From."
+ (let* ((address (org-contacts-gnus-get-name-email))
+ (name (car address))
+ (email (cadr address)))
+ (cadar (or (org-contacts-filter
+ nil
+ (concat org-contacts-email-property "={\\b" (regexp-quote email) "\\b}"))
+ (when name
+ (org-contacts-filter
+ (concat "^" name "$")))))))
+
+(defun org-contacts-gnus-article-from-goto ()
+ "Go to contact in the From address of current Gnus message."
+ (interactive)
+ (let ((marker (org-contacts-gnus-article-from-get-marker)))
+ (when marker
+ (switch-to-buffer-other-window (marker-buffer marker))
+ (goto-char marker)
+ (when (eq major-mode 'org-mode)
+ (org-show-context 'agenda)
+ (save-excursion
+ (and (outline-next-heading)
+ ;; show the next heading
+ (org-flag-heading nil)))))))
+
+(defun org-contacts-anniversaries (&optional field format)
+ "Compute FIELD anniversary for each contact, returning FORMAT.
+Default FIELD value is \"BIRTHDAY\".
+
+Format is a string matching the following format specification:
+
+ %h - Heading name
+ %l - Link to the heading
+ %y - Number of year
+ %Y - Number of year (ordinal)"
+ (let ((calendar-date-style 'american)
+ (entry ""))
+ (unless format (setq format org-contacts-birthday-format))
+ (loop for contact in (org-contacts-filter)
+ for anniv = (let ((anniv (cdr (assoc-string
+ (or field org-contacts-birthday-property)
+ (caddr contact)))))
+ (when anniv
+ (calendar-gregorian-from-absolute
+ (org-time-string-to-absolute anniv))))
+ ;; Use `diary-anniversary' to compute anniversary.
+ if (and anniv (apply 'diary-anniversary anniv))
+ collect (format-spec format
+ `((?l . ,(org-with-point-at (cadr contact) (org-store-link nil)))
+ (?h . ,(car contact))
+ (?y . ,(- (calendar-extract-year date)
+ (calendar-extract-year anniv)))
+ (?Y . ,(let ((years (- (calendar-extract-year date)
+ (calendar-extract-year anniv))))
+ (format "%d%s" years (diary-ordinal-suffix years)))))))))
+
+(defun org-completing-read-date (prompt collection
+ &optional predicate require-match initial-input
+ hist def inherit-input-method)
+ "Like `completing-read' but reads a date.
+Only PROMPT and DEF are really used."
+ (org-read-date nil nil nil prompt nil def))
+
+(add-to-list 'org-property-set-functions-alist
+ `(,org-contacts-birthday-property . org-completing-read-date))
+
+(defun org-contacts-template-name (&optional return-value)
+ "Try to return the contact name for a template.
+If not found return RETURN-VALUE or something that would ask the user."
+ (or (car (org-contacts-gnus-get-name-email))
+ return-value
+ "%^{Name}"))
+
+(defun org-contacts-template-email (&optional return-value)
+ "Try to return the contact email for a template.
+If not found return RETURN-VALUE or something that would ask the user."
+ (or (cadr (org-contacts-gnus-get-name-email))
+ return-value
+ (concat "%^{" org-contacts-email-property "}p")))
+
+(defun org-contacts-gnus-store-last-mail ()
+ "Store a link between mails and contacts.
+
+This function should be called from `gnus-article-prepare-hook'."
+ (let ((marker (org-contacts-gnus-article-from-get-marker)))
+ (when marker
+ (with-current-buffer (marker-buffer marker)
+ (save-excursion
+ (goto-char marker)
+ (let* ((org-email-link-description-format (or org-contacts-email-link-description-format
+ org-email-link-description-format))
+ (link (gnus-with-article-buffer (org-store-link nil))))
+ (org-set-property org-contacts-last-read-mail-property link)))))))
+
+(defun org-contacts-icon-as-string ()
+ (let ((image (org-contacts-get-icon)))
+ (concat
+ (propertize "-" 'display
+ (append
+ (if image
+ image
+ `'(space :width (,org-contacts-icon-size)))
+ '(:ascent center)))
+ " ")))
+
+;;;###autoload
+(defun org-contacts (name)
+ "Create agenda view for contacts matching NAME."
+ (interactive (list (read-string "Name: ")))
+ (let ((org-agenda-files (org-contacts-files))
+ (org-agenda-skip-function
+ (lambda () (org-agenda-skip-if nil `(notregexp ,name))))
+ (org-agenda-format (propertize
+ "%(org-contacts-icon-as-string)% p% s%(org-contacts-irc-number-of-unread-messages)%+T"
+ 'keymap org-contacts-keymap))
+ (org-agenda-overriding-header
+ (or org-agenda-overriding-header
+ (concat "List of contacts matching `" name "':"))))
+ (setq org-agenda-skip-regexp name)
+ (org-tags-view nil org-contacts-matcher)
+ (with-current-buffer org-agenda-buffer-name
+ (setq org-agenda-redo-command
+ (list 'org-contacts name)))))
+
+(defun org-contacts-completing-read (prompt
+ &optional predicate
+ initial-input hist def inherit-input-method)
+ "Call `completing-read' with contacts name as collection."
+ (org-completing-read
+ prompt (org-contacts-filter) predicate t initial-input hist def inherit-input-method))
+
+(defun org-contacts-format-email (name email)
+ "Format a mail address."
+ (unless email
+ (error "`email' cannot be nul"))
+ (if name
+ (concat name " <" email ">")
+ email))
+
+(defun org-contacts-check-mail-address (mail)
+ "Add MAIL address to contact at point if it does not have it."
+ (let ((mails (org-entry-get (point) org-contacts-email-property)))
+ (unless (member mail (split-string mails))
+ (when (yes-or-no-p
+ (format "Do you want to add this address to %s?" (org-get-heading t)))
+ (org-set-property org-contacts-email-property (concat mails " " mail))))))
+
+(defun org-contacts-gnus-check-mail-address ()
+ "Check that contact has the current address recorded.
+This function should be called from `gnus-article-prepare-hook'."
+ (let ((marker (org-contacts-gnus-article-from-get-marker)))
+ (when marker
+ (org-with-point-at marker
+ (org-contacts-check-mail-address (cadr (org-contacts-gnus-get-name-email)))))))
+
+(defun org-contacts-gnus-insinuate ()
+ "Add some hooks for Gnus user.
+This adds `org-contacts-gnus-check-mail-address' and
+`org-contacts-gnus-store-last-mail' to
+`gnus-article-prepare-hook'. It also adds a binding on `;' in
+`gnus-summary-mode-map' to `org-contacts-gnus-article-from-goto'"
+ (require 'gnus)
+ (require 'gnus-art)
+ (define-key gnus-summary-mode-map ";" 'org-contacts-gnus-article-from-goto)
+ (add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-check-mail-address)
+ (add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-store-last-mail))
+
+(when (boundp 'completion-at-point-functions)
+ (add-hook 'message-mode-hook
+ (lambda ()
+ (add-to-list 'completion-at-point-functions
+ 'org-contacts-message-complete-function))))
+
+(defun org-contacts-wl-get-from-header-content ()
+ "Retrieve the content of the `From' header of an email.
+Works from wl-summary-mode and mime-view-mode - that is while viewing email.
+Depends on Wanderlust been loaded."
+ (with-current-buffer (org-capture-get :original-buffer)
+ (cond
+ ((eq major-mode 'wl-summary-mode) (when wl-summary-buffer-elmo-folder
+ (elmo-message-field
+ wl-summary-buffer-elmo-folder
+ (wl-summary-message-number)
+ 'from)))
+ ((eq major-mode 'mime-view-mode) (std11-narrow-to-header)
+ (prog1
+ (std11-fetch-field "From")
+ (widen))))))
+
+(defun org-contacts-wl-get-name-email ()
+ "Get name and email address from wanderlust email.
+See `org-contacts-wl-get-from-header-content' for limitations."
+ (let ((from (org-contacts-wl-get-from-header-content)))
+ (when from
+ (list (wl-address-header-extract-realname from)
+ (wl-address-header-extract-address from)))))
+
+(defun org-contacts-template-wl-name (&optional return-value)
+ "Try to return the contact name for a template from wl.
+If not found return RETURN-VALUE or something that would ask the user."
+ (or (car (org-contacts-wl-get-name-email))
+ return-value
+ "%^{Name}"))
+
+(defun org-contacts-template-wl-email (&optional return-value)
+ "Try to return the contact email for a template from wl.
+If not found return RETURN-VALUE or something that would ask the user."
+ (or (cadr (org-contacts-wl-get-name-email))
+ return-value
+ (concat "%^{" org-contacts-email-property "}p")))
+
+(defun org-contacts-view-send-email (&optional ask)
+ "Send email to the contact at point.
+If ASK is set, ask for the email address even if there's only one address."
+ (interactive "P")
+ (let ((marker (org-get-at-bol 'org-hd-marker)))
+ (org-with-point-at marker
+ (let ((emails (org-entry-get (point) org-contacts-email-property)))
+ (if emails
+ (let ((email-list (split-string emails)))
+ (if (and (= (length email-list) 1) (not ask))
+ (compose-mail (org-contacts-format-email
+ (org-get-heading t) emails))
+ (let ((email (completing-read "Send mail to which address: " email-list)))
+ (org-contacts-check-mail-address email)
+ (compose-mail (org-contacts-format-email (org-get-heading t) email)))))
+ (error (format "This contact has no mail address set (no %s property)."
+ org-contacts-email-property)))))))
+
+(defun org-contacts-get-icon (&optional pom)
+ "Get icon for contact at POM."
+ (setq pom (or pom (point)))
+ (catch 'icon
+ ;; Use `org-contacts-icon-property'
+ (let ((image-data (org-entry-get pom org-contacts-icon-property)))
+ (when image-data
+ (throw 'icon
+ (if (fboundp 'gnus-rescale-image)
+ (gnus-rescale-image (create-image image-data)
+ (cons org-contacts-icon-size org-contacts-icon-size))
+ (create-image image-data)))))
+ ;; Next, try Gravatar
+ (when org-contacts-icon-use-gravatar
+ (let* ((gravatar-size org-contacts-icon-size)
+ (email-list (org-entry-get pom org-contacts-email-property))
+ (gravatar
+ (when email-list
+ (loop for email in (split-string email-list)
+ for gravatar = (gravatar-retrieve-synchronously email)
+ if (and gravatar
+ (not (eq gravatar 'error)))
+ return gravatar))))
+ (when gravatar (throw 'icon gravatar))))))
+
+(defun org-contacts-irc-buffer (&optional pom)
+ "Get the IRC buffer associated with the entry at POM."
+ (setq pom (or pom (point)))
+ (let ((nick (org-entry-get pom org-contacts-nickname-property)))
+ (when nick
+ (let ((buffer (get-buffer nick)))
+ (when buffer
+ (with-current-buffer buffer
+ (when (eq major-mode 'erc-mode)
+ buffer)))))))
+
+(defun org-contacts-irc-number-of-unread-messages (&optional pom)
+ "Return the number of unread messages for contact at POM."
+ (when (boundp 'erc-modified-channels-alist)
+ (let ((number (cadr (assoc (org-contacts-irc-buffer pom) erc-modified-channels-alist))))
+ (if number
+ (format (concat "%3d unread message" (if (> number 1) "s" " ") " ") number)
+ (make-string 21 ? )))))
+
+(defun org-contacts-view-switch-to-irc-buffer ()
+ "Switch to the IRC buffer of the current contact if it has one."
+ (interactive)
+ (let ((marker (org-get-at-bol 'org-hd-marker)))
+ (org-with-point-at marker
+ (switch-to-buffer-other-window (org-contacts-irc-buffer)))))
+
+(defun org-contacts-completing-read-nickname (prompt collection
+ &optional predicate require-match initial-input
+ hist def inherit-input-method)
+ "Like `completing-read' but reads a nickname."
+ (org-completing-read prompt (append collection (erc-nicknames-list)) predicate require-match
+ initial-input hist def inherit-input-method))
+
+(defun erc-nicknames-list ()
+ "Return all nicknames of all ERC buffers."
+ (if (fboundp 'erc-buffer-list)
+ (loop for buffer in (erc-buffer-list)
+ nconc (with-current-buffer buffer
+ (loop for user-entry in (mapcar 'car (erc-get-channel-user-list))
+ collect (elt user-entry 1))))))
+
+(add-to-list 'org-property-set-functions-alist
+ `(,org-contacts-nickname-property . org-contacts-completing-read-nickname))
+
+(defun org-contacts-vcard-escape (str)
+ "Escape ; , and \n in STR for use in the VCard format.
+Thanks to http://www.emacswiki.org/cgi-bin/wiki/bbdb-vcard-export.el for the regexp."
+ (when str
+ (replace-regexp-in-string "\n" "\\\\n" (replace-regexp-in-string "\\(;\\|,\\|\\\\\\)" "\\\\\\1" str))))
+
+(defun org-contacts-vcard-encode-name (name)
+ "Try to encode NAME as VCard's N property. The N property expects FamilyName;GivenName;AdditionalNames;Prefix;Postfix.
+Org-contacts does not specify how to encode the name. So we try to do our best."
+ (concat (replace-regexp-in-string "\\(\\w+\\) \\(.*\\)" "\\2;\\1" name) ";;;"))
+
+(defun org-contacts-vcard-format (contact)
+ "Formats CONTACT in VCard 3.0 format."
+ (let* ((properties (caddr contact))
+ (name (org-contacts-vcard-escape (car contact)))
+ (n (org-contacts-vcard-encode-name name))
+ (email (org-contacts-vcard-escape (cdr (assoc-string org-contacts-email-property properties))))
+ (bday (org-contacts-vcard-escape (cdr (assoc-string org-contacts-birthday-property properties))))
+ (addr (cdr (assoc-string org-contacts-address-property properties)))
+ (nick (org-contacts-vcard-escape (cdr (assoc-string org-contacts-nickname-property properties))))
+
+ (head (format "BEGIN:VCARD\nVERSION:3.0\nN:%s\nFN:%s\n" n name)))
+ (concat head
+ (when email (format "EMAIL:%s\n" email))
+ (when addr
+ (format "ADR:;;%s\n" (replace-regexp-in-string "\\, ?" ";" addr)))
+ (when bday
+ (let ((cal-bday (calendar-gregorian-from-absolute (org-time-string-to-absolute bday))))
+ (format "BDAY:%04d-%02d-%02d\n"
+ (calendar-extract-year cal-bday)
+ (calendar-extract-month cal-bday)
+ (calendar-extract-day cal-bday))))
+ (when nick (format "NICKNAME:%s\n" nick))
+ "END:VCARD\n\n")))
+
+(defun org-contacts-export-as-vcard (&optional name file to-buffer)
+ "Export all contacts matching NAME as VCard 3.0. It TO-BUFFER is nil, the content is written to FILE or `org-contacts-vcard-file'. If TO-BUFFER is non-nil, the buffer is created and the VCard is written into that buffer."
+ (interactive) ; TODO ask for name?
+ (let* ((filename (or file org-contacts-vcard-file))
+ (buffer (if to-buffer
+ (get-buffer-create to-buffer)
+ (find-file-noselect filename))))
+
+ (message "Exporting...")
+
+ (set-buffer buffer)
+ (let ((inhibit-read-only t)) (erase-buffer))
+ (fundamental-mode)
+ (org-install-letbind)
+
+ (when (fboundp 'set-buffer-file-coding-system)
+ (set-buffer-file-coding-system coding-system-for-write))
+
+ (loop for contact in (org-contacts-filter name)
+ do (insert (org-contacts-vcard-format contact)))
+
+ (if to-buffer
+ (current-buffer)
+ (progn (save-buffer) (kill-buffer)))))
+
+(defun org-contacts-show-map (&optional name)
+ "Show contacts on a map. Requires google-maps-el."
+ (interactive)
+ (unless (fboundp 'google-maps-static-show)
+ (error "org-contacts-show-map requires google-maps-el."))
+ (google-maps-static-show
+ :markers
+ (loop
+ for contact in (org-contacts-filter name)
+ for addr = (cdr (assoc-string org-contacts-address-property (caddr contact)))
+ if addr
+ collect (cons (list addr) (list :label (string-to-char (car contact)))))))
+
+(provide 'org-contacts)
diff --git a/.emacs.d/site-lisp/shift-indent.el b/.emacs.d/site-lisp/shift-indent.el
new file mode 100644
index 0000000..d6d6e76
--- /dev/null
+++ b/.emacs.d/site-lisp/shift-indent.el
@@ -0,0 +1,33 @@
+(require 'simple)
+
+(defun indent-shift-left (start end &optional count)
+ (interactive
+ (if mark-active
+ (list (region-beginning) (region-end) current-prefix-arg)
+ (list (line-beginning-position) (line-end-position) current-prefix-arg)))
+ (if count
+ (setq count (prefix-numeric-value count))
+ (setq count tab-width))
+ (when (> count 0)
+ (let ((deactivate-mark nil))
+ (save-excursion
+ (goto-char start)
+ (while (< (point) end)
+ (if (and (< (current-indentation) count)
+ (not (looking-at "[ \t]*$")))
+ (error "Can't shift all lines enough"))
+ (forward-line))
+ (indent-rigidly start end (- count))))))
+
+(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
+
+(defun indent-shift-right (start end &optional count)
+ (interactive
+ (if mark-active
+ (list (region-beginning) (region-end) current-prefix-arg)
+ (list (line-beginning-position) (line-end-position) current-prefix-arg)))
+ (let ((deactivate-mark nil))
+ (if count
+ (setq count (prefix-numeric-value count))
+ (setq count tab-width))
+ (indent-rigidly start end count)))
diff --git a/.emacs.d/site-lisp/xmodmap-mode.el b/.emacs.d/site-lisp/xmodmap-mode.el
new file mode 100644
index 0000000..3002a49
--- /dev/null
+++ b/.emacs.d/site-lisp/xmodmap-mode.el
@@ -0,0 +1,9 @@
+(define-generic-mode 'xmodmap-mode
+ '(?!)
+ '("add" "clear" "keycode" "keysym" "pointer" "remove")
+ nil
+ '("[xX]modmap\\(rc\\)?\\'")
+ nil
+ "Simple mode for xmodmap files.")
+
+(provide 'xmodmap-mode)
diff --git a/.emacs.d/startup/.dir-locals.el b/.emacs.d/startup/.dir-locals.el
new file mode 100644
index 0000000..eecb8a9
--- /dev/null
+++ b/.emacs.d/startup/.dir-locals.el
@@ -0,0 +1 @@
+((nil . ((eval . (git-auto-commit-mode)))))
--
cgit v1.2.3-54-g00ecf
From 9a500861070e1ce374064d14ee2372e12c22a06f Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 18 Aug 2012 13:57:56 +0200
Subject: Restructure emacs configuration
---
.emacs.d/.gitignore | 16 -
.emacs.d/.gitmodules | 9 -
.emacs.d/eshell/.gitignore | 4 -
.emacs.d/eshell/alias | 8 -
.emacs.d/eshell/login | 2 -
.emacs.d/gnus.el | 70 ---
.emacs.d/init3.el | 13 -
.emacs.d/site-lisp/.gitignore | 1 -
.emacs.d/site-lisp/autosmiley.el | 95 ---
.emacs.d/site-lisp/org-contacts.el | 620 --------------------
.emacs.d/site-lisp/shift-indent.el | 33 --
.emacs.d/site-lisp/xmodmap-mode.el | 9 -
.emacs.d/startup/.dir-locals.el | 1 -
Makefile | 13 +
emacs/Makefile | 24 +
emacs/eshell/Makefile | 6 +
emacs/eshell/alias | 8 +
emacs/gnus.el | 70 +++
emacs/init.el | 1124 ++++++++++++++++++++++++++++++++++++
19 files changed, 1245 insertions(+), 881 deletions(-)
delete mode 100644 .emacs.d/.gitignore
delete mode 100644 .emacs.d/.gitmodules
delete mode 100644 .emacs.d/eshell/.gitignore
delete mode 100644 .emacs.d/eshell/alias
delete mode 100644 .emacs.d/eshell/login
delete mode 100644 .emacs.d/gnus.el
delete mode 100644 .emacs.d/init3.el
delete mode 100644 .emacs.d/site-lisp/.gitignore
delete mode 100644 .emacs.d/site-lisp/autosmiley.el
delete mode 100644 .emacs.d/site-lisp/org-contacts.el
delete mode 100644 .emacs.d/site-lisp/shift-indent.el
delete mode 100644 .emacs.d/site-lisp/xmodmap-mode.el
delete mode 100644 .emacs.d/startup/.dir-locals.el
create mode 100644 Makefile
create mode 100644 emacs/Makefile
create mode 100644 emacs/eshell/Makefile
create mode 100644 emacs/eshell/alias
create mode 100644 emacs/gnus.el
create mode 100644 emacs/init.el
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
deleted file mode 100644
index 326a586..0000000
--- a/.emacs.d/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-tramp
-elpa
-bookmarks
-abbrev_defs
-custom.el
-*.elc
-ac-comphist.dat
-auto-save-list/
-url/
-packages/
-newsticker/
-templates/
-themes/
-rinit.*
-!rinit.org
-history
diff --git a/.emacs.d/.gitmodules b/.emacs.d/.gitmodules
deleted file mode 100644
index 2559e06..0000000
--- a/.emacs.d/.gitmodules
+++ /dev/null
@@ -1,9 +0,0 @@
-[submodule "site-lisp/identica-mode"]
- path = site-lisp/identica-mode
- url = git://git.sv.gnu.org/identica-mode.git
-[submodule "site-lisp/tron-theme"]
- path = site-lisp/tron-theme
- url = git://gitorious.org/ryuslash/tron-theme.git
-[submodule "site-lisp/git-auto-commit-mode"]
- path = site-lisp/git-auto-commit-mode
- url = git://gitorious.org/git-auto-commit-mode/git-auto-commit-mode.git
diff --git a/.emacs.d/eshell/.gitignore b/.emacs.d/eshell/.gitignore
deleted file mode 100644
index 7a28188..0000000
--- a/.emacs.d/eshell/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*
-!.gitignore
-!login
-!alias
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias
deleted file mode 100644
index 940108a..0000000
--- a/.emacs.d/eshell/alias
+++ /dev/null
@@ -1,8 +0,0 @@
-alias git git --no-pager $*
-alias rm rm -v $*
-alias sudo *sudo $*
-alias ncmpcpp ansi-term ncmpcpp ncmpcpp
-alias listen eshell-exec-visual mplayer http://usa7-vn.mixstream.net/listen/8248.pls
-alias o find-file $1
-alias d dired $1
-alias newsbeuter ansi-term newsbeuter newsbeuter
diff --git a/.emacs.d/eshell/login b/.emacs.d/eshell/login
deleted file mode 100644
index f898d68..0000000
--- a/.emacs.d/eshell/login
+++ /dev/null
@@ -1,2 +0,0 @@
-(defun inspect (var)
- (symbol-value (intern var)))
diff --git a/.emacs.d/gnus.el b/.emacs.d/gnus.el
deleted file mode 100644
index 1bf988a..0000000
--- a/.emacs.d/gnus.el
+++ /dev/null
@@ -1,70 +0,0 @@
-;; -*- eval: (git-auto-commit-mode 1) -*-
-(setq gnus-select-method '(nntp "news.eternal-september.org"))
-(setq gnus-secondary-select-methods
- '((nnmaildir "gmail"
- (directory "~/documents/mail/gmail/"))
- (nnmaildir "ninthfloor"
- (directory "~/documents/mail/ninthfloor/"))
- (nnmaildir "arch"
- (directory "~/documents/mail/arch/"))
- (nnmaildir "aethon"
- (directory "~/documents/mail/aethon/"))
- (nnmaildir "ryuslash"
- (directory "~/documents/mail/ryuslash.org/"))
- (nntp "news.gmane.org")))
-
-(setq gnus-auto-subscribed-groups nil)
-(setq gnus-save-newsrc-file nil)
-(setq gnus-read-newsrc-file nil)
-(setq gnus-novice-user t)
-(setq gnus-article-truncate-lines nil)
-
-(setq message-send-mail-function 'message-send-mail-with-sendmail)
-(setq sendmail-program "/usr/bin/msmtp")
-(setq message-sendmail-extra-arguments '("-a" "gmail"))
-
-;; (setq gnus-parameters
-;; '(("gmail"
-;; (display . all))
-;; ("aethon"
-;; (display . all)
-;; ("arch"
-;; (display . all)))))
-
-(setq gnus-permanently-visible-groups
- "\\(gmail\\|aethon\\|arch\\|ninthfloor\\|ryuslash\\):INBOX")
-
-(setq nntp-marks-is-evil t)
-
-(setq gnus-check-new-newsgroups nil)
-
-(setq gnus-posting-styles
- '((".*"
- (address "ryuslash@gmail.com")
- (eval (setq message-sendmail-extra-arguments '("-a" "gmail"))))
- ("ninthfloor:"
- (address "ryuslash@ninthfloor.org")
- (eval (setq message-sendmail-extra-arguments '("-a" "ninthfloor"))))
- ("arch:"
- (address "tom.willemsen@archlinux.us")
- (eval (setq message-sendmail-extra-arguments '("-a" "arch"))))
- ("aethon:"
- (address "thomas@aethon.nl")
- (signature-file "~/documents/work/aethon/signature.txt")
- (eval (setq message-sendmail-extra-arguments '("-a" "aethon"))))
- ("ryuslash:"
- (address "tom@ryuslash.org")
- (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash"))))))
-
-(setq user-mail-address "ryuslash@gmail.com")
-(setq user-full-name "Tom Willemsen")
-
-(add-hook 'gnus-summary-mode-hook '(lambda () (linum-mode -1)))
-(add-hook 'gnus-article-mode-hook '(lambda () (linum-mode -1)))
-(add-hook 'gnus-group-mode-hook '(lambda () (linum-mode -1)))
-
-;-----[ BBDB ]--------------------------------------------------------
-(require 'bbdb)
-(bbdb-initialize 'gnus 'message)
-(bbdb-insinuate-gnus)
-(setq bbdb-north-american-phone-numbers-p nil)
diff --git a/.emacs.d/init3.el b/.emacs.d/init3.el
deleted file mode 100644
index 1b5abdf..0000000
--- a/.emacs.d/init3.el
+++ /dev/null
@@ -1,13 +0,0 @@
-;; -*- mode: Emacs-Lisp; eval: (git-auto-commit-mode 1) -*-
-(require 'bytecomp)
-
-(defvar startup-files
- (directory-files "~/.emacs.d/startup/" t "^[^.].*\\.el$")
- "A list of the files that should be loaded during startup.")
-
-(while startup-files
- (let ((filename (car startup-files))
- (byte-compile-warnings nil))
- (if (not (eq (byte-recompile-file filename nil 0) nil))
- (load (substring filename 0 -3))))
- (setq startup-files (cdr startup-files)))
diff --git a/.emacs.d/site-lisp/.gitignore b/.emacs.d/site-lisp/.gitignore
deleted file mode 100644
index 813048b..0000000
--- a/.emacs.d/site-lisp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rudel/
diff --git a/.emacs.d/site-lisp/autosmiley.el b/.emacs.d/site-lisp/autosmiley.el
deleted file mode 100644
index 1037e43..0000000
--- a/.emacs.d/site-lisp/autosmiley.el
+++ /dev/null
@@ -1,95 +0,0 @@
-;;; autosmiley.el --- Convert smileys into their graphical representation
-
-;; Author: Damyan Pepper (gmail account, username damyanp)
-;; Created: 20060315
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; Defines the minor mode autosmiley-mode that converts smileys like
-;; :-) into their graphical representations on the fly.
-
-;; Tested on:
-;;
-;; GNU Emacs 22.0.50.1 (i386-mingw-nt5.1.2600) of 2006-03-14 on W2ONE
-;;
-;; History:
-;;
-;; 20060315 - First Release
-
-
-
-(require 'smiley)
-
-(defun autosmiley-overlay-p (overlay)
- "Return whether OVERLAY is an overlay of autosmiley mode."
- (memq (overlay-get overlay 'category)
- '(autosmiley)))
-
-(defun autosmiley-remove-smileys (beg end)
- (dolist (o (overlays-in beg end))
- (when (autosmiley-overlay-p o)
- (delete-overlay o))))
-
-(defvar *autosmiley-counter* 0
- "Each smiley needs to have a unique display string otherwise
- adjacent smileys will be merged into a single image. So we put
- a counter on each one to make them unique")
-
-(defun autosmiley-add-smiley (beg end image)
- (let ((overlay (make-overlay beg end)))
- (overlay-put overlay 'category 'autosmiley)
- (overlay-put overlay 'display (append image (list :counter (incf *autosmiley-counter*))))))
-
-
-(defun autosmiley-add-smileys (beg end)
- (save-excursion
- (dolist (entry smiley-cached-regexp-alist)
- (let ((regexp (car entry))
- (group (nth 1 entry))
- (image (nth 2 entry)))
- (when image
- (goto-char beg)
- (while (re-search-forward regexp end t)
- (autosmiley-add-smiley (match-beginning group) (match-end group) image)))))))
-
-
-(defun autosmiley-change (beg end &optional old-len)
- (let ((beg-line (save-excursion (goto-char beg) (line-beginning-position)))
- (end-line (save-excursion (goto-char end) (line-end-position))))
- (autosmiley-remove-smileys beg-line end-line)
- (autosmiley-add-smileys beg-line end-line)))
-
-
-;;;###autoload
-(define-minor-mode autosmiley-mode
- "Minor mode for automatically replacing smileys in text with
-cute little graphical smileys."
- :group 'autosmiley :lighter " :)"
- (save-excursion
- (save-restriction
- (widen)
- (autosmiley-remove-smileys (point-min) (point-max))
- (if autosmiley-mode
- (progn
- (unless smiley-cached-regexp-alist
- (smiley-update-cache))
- (jit-lock-register 'autosmiley-change))
- (jit-lock-unregister 'autosmiley-change)))))
-
-
-(provide 'autosmiley)
diff --git a/.emacs.d/site-lisp/org-contacts.el b/.emacs.d/site-lisp/org-contacts.el
deleted file mode 100644
index b6d9e50..0000000
--- a/.emacs.d/site-lisp/org-contacts.el
+++ /dev/null
@@ -1,620 +0,0 @@
-;;; org-contacts.el --- Contacts management
-
-;; Copyright (C) 2010-2012 Julien Danjou
-
-;; Author: Julien Danjou
-;; Keywords: outlines, hypermedia, calendar
-;;
-;; This file is NOT part of GNU Emacs.
-;;
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see .
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-
-;; This file contains the code for managing your contacts into Org-mode.
-
-;; To enter new contacts, you can use `org-capture' and a template just like
-;; this:
-
-;; ("c" "Contacts" entry (file "~/Org/contacts.org")
-;; "* %(org-contacts-template-name)
-;; :PROPERTIES:
-;; :EMAIL: %(org-contacts-template-email)
-;; :END:")))
-;;
-;;; Code:
-
-(eval-when-compile
- (require 'cl))
-
-(eval-and-compile
- (require 'org))
-
-(defgroup org-contacts nil
- "Options concerning contacts management."
- :group 'org)
-
-(defcustom org-contacts-files nil
- "List of Org files to use as contacts source.
-If set to nil, all your Org files will be used."
- :type '(repeat file)
- :group 'org-contacts)
-
-(defcustom org-contacts-email-property "EMAIL"
- "Name of the property for contact email address."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-address-property "ADDRESS"
- "Name of the property for contact address."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-birthday-property "BIRTHDAY"
- "Name of the property for contact birthday date."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-birthday-format "Birthday: %l (%Y)"
- "Format of the anniversary agenda entry. The following replacements are available:
-
- %h - Heading name
- %l - Link to the heading
- %y - Number of year
- %Y - Number of year (ordinal)"
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-last-read-mail-property "LAST_READ_MAIL"
- "Name of the property for contact last read email link storage."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-icon-property "ICON"
- "Name of the property for contact icon."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-nickname-property "NICKNAME"
- "Name of the property for IRC nickname match."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-icon-size 32
- "Size of the contacts icons."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-icon-use-gravatar (fboundp 'gravatar-retrieve)
- "Whether use Gravatar to fetch contact icons."
- :type 'boolean
- :group 'org-contacts)
-
-(defcustom org-contacts-completion-ignore-case t
- "Ignore case when completing contacts."
- :type 'boolean
- :group 'org-contacts)
-
-(defcustom org-contacts-group-prefix "+"
- "Group prefix."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-matcher (concat org-contacts-email-property "<>\"\"")
- "Matching rule for finding heading that are contacts.
-This can be a tag name, or a property check."
- :type 'string
- :group 'org-contacts)
-
-(defcustom org-contacts-email-link-description-format "%s (%d)"
- "Format used to store links to email.
-This overrides `org-email-link-description-format' if set."
- :group 'org-contacts
- :type 'string)
-
-(defcustom org-contacts-vcard-file "contacts.vcf"
- "Default file for vcard export."
- :group 'org-contacts
- :type 'file)
-
-(defvar org-contacts-keymap
- (let ((map (make-sparse-keymap)))
- (define-key map "M" 'org-contacts-view-send-email)
- (define-key map "i" 'org-contacts-view-switch-to-irc-buffer)
- map)
- "The keymap used in `org-contacts' result list.")
-
-(defun org-contacts-files ()
- "Return list of Org files to use for contact management."
- (or org-contacts-files (org-agenda-files t 'ifmode)))
-
-(defun org-contacts-filter (&optional name-match tags-match)
- "Search for a contact maching NAME-MATCH and TAGS-MATCH.
-If both match values are nil, return all contacts."
- (let* (todo-only
- (tags-matcher
- (if tags-match
- (cdr (org-make-tags-matcher tags-match))
- t))
- (name-matcher
- (if name-match
- '(org-string-match-p name-match (org-get-heading t))
- t))
- (contacts-matcher
- (cdr (org-make-tags-matcher org-contacts-matcher)))
- markers result)
- (dolist (file (org-contacts-files))
- (org-check-agenda-file file)
- (with-current-buffer (org-get-agenda-file-buffer file)
- (unless (eq major-mode 'org-mode)
- (error "File %s is no in `org-mode'" file))
- (org-scan-tags
- '(add-to-list 'markers (set-marker (make-marker) (point)))
- `(and ,contacts-matcher ,tags-matcher ,name-matcher)
- todo-only)))
- (dolist (marker markers result)
- (org-with-point-at marker
- (add-to-list 'result
- (list (org-get-heading t) marker (org-entry-properties marker 'all)))))))
-
-(when (not (fboundp 'completion-table-case-fold))
- ;; That function is new in Emacs 24...
- (defun completion-table-case-fold (table &optional dont-fold)
- (lambda (string pred action)
- (let ((completion-ignore-case (not dont-fold)))
- (complete-with-action action table string pred)))))
-
-(defun org-contacts-complete-name (&optional start)
- "Complete text at START with a user name and email."
- (let* ((end (point))
- (start (or start
- (save-excursion
- (re-search-backward "\\(\\`\\|[\n:,]\\)[ \t]*")
- (goto-char (match-end 0))
- (point))))
- (orig (buffer-substring start end))
- (completion-ignore-case org-contacts-completion-ignore-case)
- (group-completion-p (org-string-match-p (concat "^" org-contacts-group-prefix) orig))
- (completion-list
- (if group-completion-p
- (mapcar (lambda (group) (propertize (concat org-contacts-group-prefix group) 'org-contacts-group group))
- (org-uniquify
- (loop for contact in (org-contacts-filter)
- with group-list
- nconc (org-split-string
- (or (cdr (assoc-string "ALLTAGS" (caddr contact))) "") ":"))))
- (loop for contact in (org-contacts-filter)
- ;; The contact name is always the car of the assoc-list
- ;; returned by `org-contacts-filter'.
- for contact-name = (car contact)
- ;; Build the list of the user email addresses.
- for email-list = (split-string (or
- (cdr (assoc-string org-contacts-email-property (caddr contact)))
- ""))
- ;; If the user has email addresses…
- if email-list
- ;; … append a list of USER .
- nconc (loop for email in email-list
- collect (org-contacts-format-email contact-name email)))))
- (completion-list (all-completions orig completion-list)))
- ;; If we are completing a group, and that's the only group, just return
- ;; the real result.
- (when (and group-completion-p
- (= (length completion-list) 1))
- (setq completion-list
- (list (concat (car completion-list) ";: "
- (mapconcat 'identity
- (loop for contact in (org-contacts-filter
- nil
- (get-text-property 0 'org-contacts-group (car completion-list)))
- ;; The contact name is always the car of the assoc-list
- ;; returned by `org-contacts-filter'.
- for contact-name = (car contact)
- ;; Grab the first email of the contact
- for email = (car (split-string (or
- (cdr (assoc-string org-contacts-email-property (caddr contact)))
- "")))
- ;; If the user has an email address, append USER .
- if email collect (org-contacts-format-email contact-name email))
- ", ")))))
- (list start end (completion-table-case-fold completion-list (not org-contacts-completion-ignore-case)))))
-
-(defun org-contacts-message-complete-function ()
- "Function used in `completion-at-point-functions' in `message-mode'."
- (let ((mail-abbrev-mode-regexp
- "^\\(Resent-To\\|To\\|B?Cc\\|Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\|Disposition-Notification-To\\|Return-Receipt-To\\):"))
- (when (mail-abbrev-in-expansion-header-p)
- (org-contacts-complete-name))))
-
-(defun org-contacts-gnus-get-name-email ()
- "Get name and email address from Gnus message."
- (if (gnus-alive-p)
- (gnus-with-article-headers
- (mail-extract-address-components
- (or (mail-fetch-field "From") "")))))
-
-(defun org-contacts-gnus-article-from-get-marker ()
- "Return a marker for a contact based on From."
- (let* ((address (org-contacts-gnus-get-name-email))
- (name (car address))
- (email (cadr address)))
- (cadar (or (org-contacts-filter
- nil
- (concat org-contacts-email-property "={\\b" (regexp-quote email) "\\b}"))
- (when name
- (org-contacts-filter
- (concat "^" name "$")))))))
-
-(defun org-contacts-gnus-article-from-goto ()
- "Go to contact in the From address of current Gnus message."
- (interactive)
- (let ((marker (org-contacts-gnus-article-from-get-marker)))
- (when marker
- (switch-to-buffer-other-window (marker-buffer marker))
- (goto-char marker)
- (when (eq major-mode 'org-mode)
- (org-show-context 'agenda)
- (save-excursion
- (and (outline-next-heading)
- ;; show the next heading
- (org-flag-heading nil)))))))
-
-(defun org-contacts-anniversaries (&optional field format)
- "Compute FIELD anniversary for each contact, returning FORMAT.
-Default FIELD value is \"BIRTHDAY\".
-
-Format is a string matching the following format specification:
-
- %h - Heading name
- %l - Link to the heading
- %y - Number of year
- %Y - Number of year (ordinal)"
- (let ((calendar-date-style 'american)
- (entry ""))
- (unless format (setq format org-contacts-birthday-format))
- (loop for contact in (org-contacts-filter)
- for anniv = (let ((anniv (cdr (assoc-string
- (or field org-contacts-birthday-property)
- (caddr contact)))))
- (when anniv
- (calendar-gregorian-from-absolute
- (org-time-string-to-absolute anniv))))
- ;; Use `diary-anniversary' to compute anniversary.
- if (and anniv (apply 'diary-anniversary anniv))
- collect (format-spec format
- `((?l . ,(org-with-point-at (cadr contact) (org-store-link nil)))
- (?h . ,(car contact))
- (?y . ,(- (calendar-extract-year date)
- (calendar-extract-year anniv)))
- (?Y . ,(let ((years (- (calendar-extract-year date)
- (calendar-extract-year anniv))))
- (format "%d%s" years (diary-ordinal-suffix years)))))))))
-
-(defun org-completing-read-date (prompt collection
- &optional predicate require-match initial-input
- hist def inherit-input-method)
- "Like `completing-read' but reads a date.
-Only PROMPT and DEF are really used."
- (org-read-date nil nil nil prompt nil def))
-
-(add-to-list 'org-property-set-functions-alist
- `(,org-contacts-birthday-property . org-completing-read-date))
-
-(defun org-contacts-template-name (&optional return-value)
- "Try to return the contact name for a template.
-If not found return RETURN-VALUE or something that would ask the user."
- (or (car (org-contacts-gnus-get-name-email))
- return-value
- "%^{Name}"))
-
-(defun org-contacts-template-email (&optional return-value)
- "Try to return the contact email for a template.
-If not found return RETURN-VALUE or something that would ask the user."
- (or (cadr (org-contacts-gnus-get-name-email))
- return-value
- (concat "%^{" org-contacts-email-property "}p")))
-
-(defun org-contacts-gnus-store-last-mail ()
- "Store a link between mails and contacts.
-
-This function should be called from `gnus-article-prepare-hook'."
- (let ((marker (org-contacts-gnus-article-from-get-marker)))
- (when marker
- (with-current-buffer (marker-buffer marker)
- (save-excursion
- (goto-char marker)
- (let* ((org-email-link-description-format (or org-contacts-email-link-description-format
- org-email-link-description-format))
- (link (gnus-with-article-buffer (org-store-link nil))))
- (org-set-property org-contacts-last-read-mail-property link)))))))
-
-(defun org-contacts-icon-as-string ()
- (let ((image (org-contacts-get-icon)))
- (concat
- (propertize "-" 'display
- (append
- (if image
- image
- `'(space :width (,org-contacts-icon-size)))
- '(:ascent center)))
- " ")))
-
-;;;###autoload
-(defun org-contacts (name)
- "Create agenda view for contacts matching NAME."
- (interactive (list (read-string "Name: ")))
- (let ((org-agenda-files (org-contacts-files))
- (org-agenda-skip-function
- (lambda () (org-agenda-skip-if nil `(notregexp ,name))))
- (org-agenda-format (propertize
- "%(org-contacts-icon-as-string)% p% s%(org-contacts-irc-number-of-unread-messages)%+T"
- 'keymap org-contacts-keymap))
- (org-agenda-overriding-header
- (or org-agenda-overriding-header
- (concat "List of contacts matching `" name "':"))))
- (setq org-agenda-skip-regexp name)
- (org-tags-view nil org-contacts-matcher)
- (with-current-buffer org-agenda-buffer-name
- (setq org-agenda-redo-command
- (list 'org-contacts name)))))
-
-(defun org-contacts-completing-read (prompt
- &optional predicate
- initial-input hist def inherit-input-method)
- "Call `completing-read' with contacts name as collection."
- (org-completing-read
- prompt (org-contacts-filter) predicate t initial-input hist def inherit-input-method))
-
-(defun org-contacts-format-email (name email)
- "Format a mail address."
- (unless email
- (error "`email' cannot be nul"))
- (if name
- (concat name " <" email ">")
- email))
-
-(defun org-contacts-check-mail-address (mail)
- "Add MAIL address to contact at point if it does not have it."
- (let ((mails (org-entry-get (point) org-contacts-email-property)))
- (unless (member mail (split-string mails))
- (when (yes-or-no-p
- (format "Do you want to add this address to %s?" (org-get-heading t)))
- (org-set-property org-contacts-email-property (concat mails " " mail))))))
-
-(defun org-contacts-gnus-check-mail-address ()
- "Check that contact has the current address recorded.
-This function should be called from `gnus-article-prepare-hook'."
- (let ((marker (org-contacts-gnus-article-from-get-marker)))
- (when marker
- (org-with-point-at marker
- (org-contacts-check-mail-address (cadr (org-contacts-gnus-get-name-email)))))))
-
-(defun org-contacts-gnus-insinuate ()
- "Add some hooks for Gnus user.
-This adds `org-contacts-gnus-check-mail-address' and
-`org-contacts-gnus-store-last-mail' to
-`gnus-article-prepare-hook'. It also adds a binding on `;' in
-`gnus-summary-mode-map' to `org-contacts-gnus-article-from-goto'"
- (require 'gnus)
- (require 'gnus-art)
- (define-key gnus-summary-mode-map ";" 'org-contacts-gnus-article-from-goto)
- (add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-check-mail-address)
- (add-hook 'gnus-article-prepare-hook 'org-contacts-gnus-store-last-mail))
-
-(when (boundp 'completion-at-point-functions)
- (add-hook 'message-mode-hook
- (lambda ()
- (add-to-list 'completion-at-point-functions
- 'org-contacts-message-complete-function))))
-
-(defun org-contacts-wl-get-from-header-content ()
- "Retrieve the content of the `From' header of an email.
-Works from wl-summary-mode and mime-view-mode - that is while viewing email.
-Depends on Wanderlust been loaded."
- (with-current-buffer (org-capture-get :original-buffer)
- (cond
- ((eq major-mode 'wl-summary-mode) (when wl-summary-buffer-elmo-folder
- (elmo-message-field
- wl-summary-buffer-elmo-folder
- (wl-summary-message-number)
- 'from)))
- ((eq major-mode 'mime-view-mode) (std11-narrow-to-header)
- (prog1
- (std11-fetch-field "From")
- (widen))))))
-
-(defun org-contacts-wl-get-name-email ()
- "Get name and email address from wanderlust email.
-See `org-contacts-wl-get-from-header-content' for limitations."
- (let ((from (org-contacts-wl-get-from-header-content)))
- (when from
- (list (wl-address-header-extract-realname from)
- (wl-address-header-extract-address from)))))
-
-(defun org-contacts-template-wl-name (&optional return-value)
- "Try to return the contact name for a template from wl.
-If not found return RETURN-VALUE or something that would ask the user."
- (or (car (org-contacts-wl-get-name-email))
- return-value
- "%^{Name}"))
-
-(defun org-contacts-template-wl-email (&optional return-value)
- "Try to return the contact email for a template from wl.
-If not found return RETURN-VALUE or something that would ask the user."
- (or (cadr (org-contacts-wl-get-name-email))
- return-value
- (concat "%^{" org-contacts-email-property "}p")))
-
-(defun org-contacts-view-send-email (&optional ask)
- "Send email to the contact at point.
-If ASK is set, ask for the email address even if there's only one address."
- (interactive "P")
- (let ((marker (org-get-at-bol 'org-hd-marker)))
- (org-with-point-at marker
- (let ((emails (org-entry-get (point) org-contacts-email-property)))
- (if emails
- (let ((email-list (split-string emails)))
- (if (and (= (length email-list) 1) (not ask))
- (compose-mail (org-contacts-format-email
- (org-get-heading t) emails))
- (let ((email (completing-read "Send mail to which address: " email-list)))
- (org-contacts-check-mail-address email)
- (compose-mail (org-contacts-format-email (org-get-heading t) email)))))
- (error (format "This contact has no mail address set (no %s property)."
- org-contacts-email-property)))))))
-
-(defun org-contacts-get-icon (&optional pom)
- "Get icon for contact at POM."
- (setq pom (or pom (point)))
- (catch 'icon
- ;; Use `org-contacts-icon-property'
- (let ((image-data (org-entry-get pom org-contacts-icon-property)))
- (when image-data
- (throw 'icon
- (if (fboundp 'gnus-rescale-image)
- (gnus-rescale-image (create-image image-data)
- (cons org-contacts-icon-size org-contacts-icon-size))
- (create-image image-data)))))
- ;; Next, try Gravatar
- (when org-contacts-icon-use-gravatar
- (let* ((gravatar-size org-contacts-icon-size)
- (email-list (org-entry-get pom org-contacts-email-property))
- (gravatar
- (when email-list
- (loop for email in (split-string email-list)
- for gravatar = (gravatar-retrieve-synchronously email)
- if (and gravatar
- (not (eq gravatar 'error)))
- return gravatar))))
- (when gravatar (throw 'icon gravatar))))))
-
-(defun org-contacts-irc-buffer (&optional pom)
- "Get the IRC buffer associated with the entry at POM."
- (setq pom (or pom (point)))
- (let ((nick (org-entry-get pom org-contacts-nickname-property)))
- (when nick
- (let ((buffer (get-buffer nick)))
- (when buffer
- (with-current-buffer buffer
- (when (eq major-mode 'erc-mode)
- buffer)))))))
-
-(defun org-contacts-irc-number-of-unread-messages (&optional pom)
- "Return the number of unread messages for contact at POM."
- (when (boundp 'erc-modified-channels-alist)
- (let ((number (cadr (assoc (org-contacts-irc-buffer pom) erc-modified-channels-alist))))
- (if number
- (format (concat "%3d unread message" (if (> number 1) "s" " ") " ") number)
- (make-string 21 ? )))))
-
-(defun org-contacts-view-switch-to-irc-buffer ()
- "Switch to the IRC buffer of the current contact if it has one."
- (interactive)
- (let ((marker (org-get-at-bol 'org-hd-marker)))
- (org-with-point-at marker
- (switch-to-buffer-other-window (org-contacts-irc-buffer)))))
-
-(defun org-contacts-completing-read-nickname (prompt collection
- &optional predicate require-match initial-input
- hist def inherit-input-method)
- "Like `completing-read' but reads a nickname."
- (org-completing-read prompt (append collection (erc-nicknames-list)) predicate require-match
- initial-input hist def inherit-input-method))
-
-(defun erc-nicknames-list ()
- "Return all nicknames of all ERC buffers."
- (if (fboundp 'erc-buffer-list)
- (loop for buffer in (erc-buffer-list)
- nconc (with-current-buffer buffer
- (loop for user-entry in (mapcar 'car (erc-get-channel-user-list))
- collect (elt user-entry 1))))))
-
-(add-to-list 'org-property-set-functions-alist
- `(,org-contacts-nickname-property . org-contacts-completing-read-nickname))
-
-(defun org-contacts-vcard-escape (str)
- "Escape ; , and \n in STR for use in the VCard format.
-Thanks to http://www.emacswiki.org/cgi-bin/wiki/bbdb-vcard-export.el for the regexp."
- (when str
- (replace-regexp-in-string "\n" "\\\\n" (replace-regexp-in-string "\\(;\\|,\\|\\\\\\)" "\\\\\\1" str))))
-
-(defun org-contacts-vcard-encode-name (name)
- "Try to encode NAME as VCard's N property. The N property expects FamilyName;GivenName;AdditionalNames;Prefix;Postfix.
-Org-contacts does not specify how to encode the name. So we try to do our best."
- (concat (replace-regexp-in-string "\\(\\w+\\) \\(.*\\)" "\\2;\\1" name) ";;;"))
-
-(defun org-contacts-vcard-format (contact)
- "Formats CONTACT in VCard 3.0 format."
- (let* ((properties (caddr contact))
- (name (org-contacts-vcard-escape (car contact)))
- (n (org-contacts-vcard-encode-name name))
- (email (org-contacts-vcard-escape (cdr (assoc-string org-contacts-email-property properties))))
- (bday (org-contacts-vcard-escape (cdr (assoc-string org-contacts-birthday-property properties))))
- (addr (cdr (assoc-string org-contacts-address-property properties)))
- (nick (org-contacts-vcard-escape (cdr (assoc-string org-contacts-nickname-property properties))))
-
- (head (format "BEGIN:VCARD\nVERSION:3.0\nN:%s\nFN:%s\n" n name)))
- (concat head
- (when email (format "EMAIL:%s\n" email))
- (when addr
- (format "ADR:;;%s\n" (replace-regexp-in-string "\\, ?" ";" addr)))
- (when bday
- (let ((cal-bday (calendar-gregorian-from-absolute (org-time-string-to-absolute bday))))
- (format "BDAY:%04d-%02d-%02d\n"
- (calendar-extract-year cal-bday)
- (calendar-extract-month cal-bday)
- (calendar-extract-day cal-bday))))
- (when nick (format "NICKNAME:%s\n" nick))
- "END:VCARD\n\n")))
-
-(defun org-contacts-export-as-vcard (&optional name file to-buffer)
- "Export all contacts matching NAME as VCard 3.0. It TO-BUFFER is nil, the content is written to FILE or `org-contacts-vcard-file'. If TO-BUFFER is non-nil, the buffer is created and the VCard is written into that buffer."
- (interactive) ; TODO ask for name?
- (let* ((filename (or file org-contacts-vcard-file))
- (buffer (if to-buffer
- (get-buffer-create to-buffer)
- (find-file-noselect filename))))
-
- (message "Exporting...")
-
- (set-buffer buffer)
- (let ((inhibit-read-only t)) (erase-buffer))
- (fundamental-mode)
- (org-install-letbind)
-
- (when (fboundp 'set-buffer-file-coding-system)
- (set-buffer-file-coding-system coding-system-for-write))
-
- (loop for contact in (org-contacts-filter name)
- do (insert (org-contacts-vcard-format contact)))
-
- (if to-buffer
- (current-buffer)
- (progn (save-buffer) (kill-buffer)))))
-
-(defun org-contacts-show-map (&optional name)
- "Show contacts on a map. Requires google-maps-el."
- (interactive)
- (unless (fboundp 'google-maps-static-show)
- (error "org-contacts-show-map requires google-maps-el."))
- (google-maps-static-show
- :markers
- (loop
- for contact in (org-contacts-filter name)
- for addr = (cdr (assoc-string org-contacts-address-property (caddr contact)))
- if addr
- collect (cons (list addr) (list :label (string-to-char (car contact)))))))
-
-(provide 'org-contacts)
diff --git a/.emacs.d/site-lisp/shift-indent.el b/.emacs.d/site-lisp/shift-indent.el
deleted file mode 100644
index d6d6e76..0000000
--- a/.emacs.d/site-lisp/shift-indent.el
+++ /dev/null
@@ -1,33 +0,0 @@
-(require 'simple)
-
-(defun indent-shift-left (start end &optional count)
- (interactive
- (if mark-active
- (list (region-beginning) (region-end) current-prefix-arg)
- (list (line-beginning-position) (line-end-position) current-prefix-arg)))
- (if count
- (setq count (prefix-numeric-value count))
- (setq count tab-width))
- (when (> count 0)
- (let ((deactivate-mark nil))
- (save-excursion
- (goto-char start)
- (while (< (point) end)
- (if (and (< (current-indentation) count)
- (not (looking-at "[ \t]*$")))
- (error "Can't shift all lines enough"))
- (forward-line))
- (indent-rigidly start end (- count))))))
-
-(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
-
-(defun indent-shift-right (start end &optional count)
- (interactive
- (if mark-active
- (list (region-beginning) (region-end) current-prefix-arg)
- (list (line-beginning-position) (line-end-position) current-prefix-arg)))
- (let ((deactivate-mark nil))
- (if count
- (setq count (prefix-numeric-value count))
- (setq count tab-width))
- (indent-rigidly start end count)))
diff --git a/.emacs.d/site-lisp/xmodmap-mode.el b/.emacs.d/site-lisp/xmodmap-mode.el
deleted file mode 100644
index 3002a49..0000000
--- a/.emacs.d/site-lisp/xmodmap-mode.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(define-generic-mode 'xmodmap-mode
- '(?!)
- '("add" "clear" "keycode" "keysym" "pointer" "remove")
- nil
- '("[xX]modmap\\(rc\\)?\\'")
- nil
- "Simple mode for xmodmap files.")
-
-(provide 'xmodmap-mode)
diff --git a/.emacs.d/startup/.dir-locals.el b/.emacs.d/startup/.dir-locals.el
deleted file mode 100644
index eecb8a9..0000000
--- a/.emacs.d/startup/.dir-locals.el
+++ /dev/null
@@ -1 +0,0 @@
-((nil . ((eval . (git-auto-commit-mode)))))
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a58a911
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,13 @@
+modules = emacs
+install-modules = $(addprefix install-,$(modules))
+
+.PHONY: all install $(modules) $(install-modules)
+
+all: $(modules)
+install: $(install-modules)
+
+$(modules):
+ $(MAKE) -C $@/
+
+$(install-modules): install-%:
+ $(MAKE) -C $*/ install
diff --git a/emacs/Makefile b/emacs/Makefile
new file mode 100644
index 0000000..45151ef
--- /dev/null
+++ b/emacs/Makefile
@@ -0,0 +1,24 @@
+EMACS = emacs
+
+files = init.el init.elc
+install-files = $(addprefix install-,$(files))
+submodules = eshell
+install-submodules = $(addprefix install-,$(submodules))
+
+.PHONY: all $(submodules) install $(install-submodules) $(install-files)
+
+all: $(files) $(submodules)
+
+$(submodules):
+ $(MAKE) -C $@/
+
+$(filter %.elc,$(files)): %.elc: %.el
+ $(EMACS) -batch -eval "(byte-compile-file \"$^\")"
+
+install: $(install-files) $(install-submodules)
+
+$(install-files): install-%:
+ install -Dm 444 $* ${HOME}/.emacs.d/$*
+
+$(install-submodules): install-%:
+ $(MAKE) -C $*/ install
diff --git a/emacs/eshell/Makefile b/emacs/eshell/Makefile
new file mode 100644
index 0000000..a28a794
--- /dev/null
+++ b/emacs/eshell/Makefile
@@ -0,0 +1,6 @@
+.PHONY: all install
+
+all:
+
+install:
+ install -Dm 444 alias ${HOME}/.emacs.d/eshell/alias
diff --git a/emacs/eshell/alias b/emacs/eshell/alias
new file mode 100644
index 0000000..940108a
--- /dev/null
+++ b/emacs/eshell/alias
@@ -0,0 +1,8 @@
+alias git git --no-pager $*
+alias rm rm -v $*
+alias sudo *sudo $*
+alias ncmpcpp ansi-term ncmpcpp ncmpcpp
+alias listen eshell-exec-visual mplayer http://usa7-vn.mixstream.net/listen/8248.pls
+alias o find-file $1
+alias d dired $1
+alias newsbeuter ansi-term newsbeuter newsbeuter
diff --git a/emacs/gnus.el b/emacs/gnus.el
new file mode 100644
index 0000000..1bf988a
--- /dev/null
+++ b/emacs/gnus.el
@@ -0,0 +1,70 @@
+;; -*- eval: (git-auto-commit-mode 1) -*-
+(setq gnus-select-method '(nntp "news.eternal-september.org"))
+(setq gnus-secondary-select-methods
+ '((nnmaildir "gmail"
+ (directory "~/documents/mail/gmail/"))
+ (nnmaildir "ninthfloor"
+ (directory "~/documents/mail/ninthfloor/"))
+ (nnmaildir "arch"
+ (directory "~/documents/mail/arch/"))
+ (nnmaildir "aethon"
+ (directory "~/documents/mail/aethon/"))
+ (nnmaildir "ryuslash"
+ (directory "~/documents/mail/ryuslash.org/"))
+ (nntp "news.gmane.org")))
+
+(setq gnus-auto-subscribed-groups nil)
+(setq gnus-save-newsrc-file nil)
+(setq gnus-read-newsrc-file nil)
+(setq gnus-novice-user t)
+(setq gnus-article-truncate-lines nil)
+
+(setq message-send-mail-function 'message-send-mail-with-sendmail)
+(setq sendmail-program "/usr/bin/msmtp")
+(setq message-sendmail-extra-arguments '("-a" "gmail"))
+
+;; (setq gnus-parameters
+;; '(("gmail"
+;; (display . all))
+;; ("aethon"
+;; (display . all)
+;; ("arch"
+;; (display . all)))))
+
+(setq gnus-permanently-visible-groups
+ "\\(gmail\\|aethon\\|arch\\|ninthfloor\\|ryuslash\\):INBOX")
+
+(setq nntp-marks-is-evil t)
+
+(setq gnus-check-new-newsgroups nil)
+
+(setq gnus-posting-styles
+ '((".*"
+ (address "ryuslash@gmail.com")
+ (eval (setq message-sendmail-extra-arguments '("-a" "gmail"))))
+ ("ninthfloor:"
+ (address "ryuslash@ninthfloor.org")
+ (eval (setq message-sendmail-extra-arguments '("-a" "ninthfloor"))))
+ ("arch:"
+ (address "tom.willemsen@archlinux.us")
+ (eval (setq message-sendmail-extra-arguments '("-a" "arch"))))
+ ("aethon:"
+ (address "thomas@aethon.nl")
+ (signature-file "~/documents/work/aethon/signature.txt")
+ (eval (setq message-sendmail-extra-arguments '("-a" "aethon"))))
+ ("ryuslash:"
+ (address "tom@ryuslash.org")
+ (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash"))))))
+
+(setq user-mail-address "ryuslash@gmail.com")
+(setq user-full-name "Tom Willemsen")
+
+(add-hook 'gnus-summary-mode-hook '(lambda () (linum-mode -1)))
+(add-hook 'gnus-article-mode-hook '(lambda () (linum-mode -1)))
+(add-hook 'gnus-group-mode-hook '(lambda () (linum-mode -1)))
+
+;-----[ BBDB ]--------------------------------------------------------
+(require 'bbdb)
+(bbdb-initialize 'gnus 'message)
+(bbdb-insinuate-gnus)
+(setq bbdb-north-american-phone-numbers-p nil)
diff --git a/emacs/init.el b/emacs/init.el
new file mode 100644
index 0000000..9dadf1c
--- /dev/null
+++ b/emacs/init.el
@@ -0,0 +1,1124 @@
+(eval-and-compile
+ (package-initialize)
+
+ (mapc #'(lambda (directory)
+ (add-to-list 'load-path directory)
+ (let ((default-directory directory))
+ (normal-top-level-add-subdirs-to-load-path)))
+ '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")))
+
+(eval-when-compile
+ (require 'org-contacts)
+ (require 'sauron))
+
+(autoload 'identica-mode "identica-mode" nil t)
+(autoload 'mu4e "mu4e" nil t)
+
+(defalias 'yes-or-no-p 'y-or-n-p)
+
+(defmacro oni:define-mailbox (name email &optional signature longname)
+ "Define a mailbox function."
+ `(defun ,(make-symbol (concat "oni:" name "-mailbox")) ()
+ ,(concat "Settings for " name " mailbox")
+ (setq mu4e-mu-home ,(expand-file-name (concat "~/.mu/" name))
+ mu4e-maildir ,(expand-file-name (concat "~/documents/mail/"
+ (or longname name)))
+ mu4e-get-mail-command ,(concat "offlineimap -oa " (or longname
+ name))
+ mu4e~main-buffer-name ,(concat "*mu4e-" name "*")
+ user-mail-address ,email
+ message-sendmail-extra-arguments '("-a" ,name)
+ message-signature-file ,signature)))
+
+(defmacro oni:generic-outline (regex)
+ "Prepare for enabling `outline-minor-mode'."
+ `(progn
+ (outline-minor-mode)
+ (set (make-local-variable 'outline-regexp) ,regex)
+ (hide-body)
+ (local-set-key [C-tab] 'outline-toggle-children)))
+
+(defun oni:after-save-func ()
+ "Function for `after-save-hook'."
+ (oni:compile-el)
+ (executable-make-buffer-file-executable-if-script-p))
+
+(defun oni:before-save-func ()
+ "Function for `before-save-hook'."
+ (if (eq major-mode 'html-mode)
+ (oni:replace-html-special-chars))
+ (if (not (eq major-mode 'markdown-mode))
+ (delete-trailing-whitespace)))
+
+(defun oni:c-mode-common-func ()
+ "Function for `c-mode-common-hook'."
+ (setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
+ (hs-minor-mode))
+
+(defun oni:compile-el ()
+ "Compile the current buffer file if it is an .el file."
+ (let* ((full-file-name (buffer-file-name))
+ (file-name (file-name-nondirectory full-file-name))
+ (suffix (file-name-extension file-name)))
+ (if (and (not (string-equal file-name ".dir-locals.el"))
+ (string-equal suffix "el"))
+ (byte-compile-file full-file-name))))
+
+(defun oni:hs-minor-mode-func ()
+ "Function for `hs-minor-mode-hook'."
+ (local-set-key [C-tab] 'hs-toggle-hiding)
+ (hs-hide-all))
+
+(defun oni:jabber-chat-mode-func ()
+ "Function for `jabber-chat-mode-hook'."
+ (visual-line-mode))
+
+(defun oni:mini-fix-timestamp-string (date-string)
+ "A minimal version of Xah Lee's `fix-timestamp-string'
+ function, found at http://xahlee.org/emacs/elisp_parse_time.html"
+ (setq date-string (replace-regexp-in-string "Jan" "01" date-string)
+ date-string (replace-regexp-in-string "Feb" "02" date-string)
+ date-string (replace-regexp-in-string "Mar" "03" date-string)
+ date-string (replace-regexp-in-string "Apr" "04" date-string)
+ date-string (replace-regexp-in-string "May" "05" date-string)
+ date-string (replace-regexp-in-string "Jun" "06" date-string)
+ date-string (replace-regexp-in-string "Jul" "07" date-string)
+ date-string (replace-regexp-in-string "Aug" "08" date-string)
+ date-string (replace-regexp-in-string "Sep" "09" date-string)
+ date-string (replace-regexp-in-string "Oct" "10" date-string)
+ date-string (replace-regexp-in-string "Nov" "11" date-string)
+ date-string (replace-regexp-in-string "Dec" "12" date-string))
+ (string-match
+ "^\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{4\\}\\)$"
+ date-string)
+ (format "%s-%s-%s"
+ (match-string 3 date-string)
+ (match-string 2 date-string)
+ (match-string 1 date-string)))
+
+(defun oni:myepisodes-formatter (plist)
+ "Format RSS items from MyEpisodes as org tasks."
+ (let ((str (plist-get plist :title)))
+ (string-match
+ "^\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]$"
+ str)
+ (let* ((title (match-string 1 str))
+ (episode (match-string 2 str))
+ (name (match-string 3 str))
+ (date (oni:mini-fix-timestamp-string (match-string 4 str))))
+ (format "* ACQUIRE %s %s - %s <%s>" title episode name date))))
+
+(defun oni:prog-mode-func ()
+ "Function for `prog-mode-hook'."
+ (rainbow-delimiters-mode)
+ (fci-mode)
+ (pretty-symbols-mode))
+
+(defun oni:replace-html-special-chars ()
+ (oni:replace-occurrences "é" "é"))
+
+(defun oni:replace-occurrences (from to)
+ "Replace all occurrences of FROM with TO in the current buffer."
+ (save-excursion
+ (goto-char (point-min))
+ (while (search-forward from nil t)
+ (replace-match to))))
+
+(defun oni:required-packages-installed-p ()
+ "Check if all the packages I need are installed."
+ (let ((tmp-packages oni:required-packages)
+ (result t))
+ (while (and tmp-packages result)
+ (if (not (package-installed-p (car tmp-packages)))
+ (setq result nil))
+ (setq tmp-packages (cdr tmp-packages)))
+ result))
+
+(defun oni:view-mail ()
+ "Show a menu with all mailbox options from `oni:mailbox-map'
+for easy selection."
+ (interactive)
+ (require 'tmm)
+ (let* ((tmm-completion-prompt "Choose a mailbox\n")
+ (inbox (tmm-prompt oni:mailbox-map)))
+ (if inbox
+ (progn
+ (require 'mu4e)
+ (funcall (intern (concat "oni:" inbox "-mailbox")))
+ (mu4e)))))
+
+(defvar oni:mailbox-map
+ '("top" ("menu"
+ ("ryulash.org" . "ryuslash")
+ ("ninthfloor" . "ninthfloor")
+ ("gmail" . "gmail")
+ ("aethon" . "aethon")))
+ "A mailbox map for use with `tmm-prompt'.")
+
+(defvar oni:required-packages
+ '(graphviz-dot-mode htmlize magit rainbow-delimiters
+ rainbow-mode yasnippet markdown-mode flymake
+ flymake-cursor pony-mode sauron dispass
+ expand-region fill-column-indicator
+ git-auto-commit-mode idomenu magit smex)
+ "List of all the packages I have (want) installed")
+
+(eval-after-load "mu4e"
+ '(add-to-list
+ 'org-capture-templates
+ '("c" "Contact" entry (file "~/documents/org/misc/contacts.org")
+ (concat "* %(mu4e-view-snarf-from 'name)\n"
+ " :PROPERTIES:\n"
+ " :EMAIL: %(mu4e-view-snarf-from 'email)\n"
+ " :END:"))))
+
+(oni:define-mailbox
+ "aethon" "thomas@aethon.nl"
+ (expand-file-name "~/documents/work/aethon/signature.txt"))
+(oni:define-mailbox "gmail" "ryuslash@gmail.com")
+(oni:define-mailbox "ninthfloor" "ryuslash@ninthfloor.org")
+(oni:define-mailbox "ryuslash" "tom@ryuslash.org" nil "ryuslash.org")
+
+(setq-default c-basic-offset 4)
+(setq-default fci-rule-column 73)
+
+(setq fci-rule-color "darkred")
+(setq inferior-lisp-program "sbcl")
+(setq jabber-account-list '(("ryuslash@jabber.org")))
+(setq jabber-chat-buffer-format "*jabber:%n*")
+(setq jabber-chat-buffer-show-avatar nil)
+(setq jabber-chat-fill-long-lines nil)
+(setq jabber-chat-foreign-prompt-format "[%t] < ")
+(setq jabber-chat-local-prompt-format "[%t] > ")
+(setq jabber-chatstates-confirm nil)
+(setq jabber-history-dir "~/.emacs.d/jabber")
+(setq jabber-roster-show-bindings nil)
+(setq jabber-roster-show-offline-contacts nil)
+(setq mail-header-separator "")
+(setq mu4e-headers-date-format "%d-%m %H:%M")
+(setq mu4e-headers-fields '((:date . 11)
+ (:flags . 6)
+ (:to . 22)
+ (:from . 22)
+ (:subject)))
+(setq mu4e-headers-show-threads nil)
+(setq mu4e-headers-sort-revert nil)
+(setq package-archives
+ '(("melpa" . "http://melpa.milkbox.net/packages/")
+ ("ELPA" . "http://tromey.com/elpa/")
+ ("gnu" . "http://elpa.gnu.org/packages/")
+ ("marmalade" . "http://marmalade-repo.org/packages/")))
+(setq package-load-list '((htmlize "1.39")
+ all))
+(setq org-feed-alist
+ '(("MyEpisodes"
+ "http://www.myepisodes.com/rss.php?feed=mylist&uid=Slash&pwdmd5=04028968e1f0b7ee678b748a4320ac17"
+ "~/documents/org/org" "MyEpisodes"
+ :formatter oni:myepisodes-formatter)))
+(setq send-mail-function 'smtpmail-send-it)
+(setq sendmail-program "/usr/bin/msmtp")
+(setq yas-prompt-functions '(yas-ido-prompt))
+
+(add-hook 'after-save-hook 'oni:after-save-func)
+(add-hook 'before-save-hook 'oni:before-save-func)
+(add-hook 'c-mode-common-hook 'oni:c-mode-common-func)
+(add-hook 'hs-minor-mode-hook 'oni:hs-minor-mode-func)
+(add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
+(add-hook 'prog-mode-hook 'oni:prog-mode-func)
+
+(global-set-key (kbd "") 'jabber-switch-to-roster-buffer)
+(global-set-key (kbd "M-n") 'idomenu)
+
+(unless (oni:required-packages-installed-p)
+ (message "%s" "Refreshing package database...")
+ (package-refresh-contents)
+ (message "%s" " done.")
+ (mapc #'(lambda (package)
+ (when (not (package-installed-p package))
+ (package-install package)))
+ oni:required-packages))
+
+(defconst oni:c-outline-regex
+ (eval-when-compile
+ (concat
+ "\\(?:static\\s +\\)?\\(?:\\sw+\\(?: \\|\t\\|\n\\)*?\\*?\\)"
+ "\\(?:\\s \\|\t\\|\n\\)\\(?:\\sw\\|_\\)+([^)]*)[^;\n]*$"))
+ "Regex for `outline-minor-mode' for `c-mode'.")
+
+(defun oni:c-mode-func ()
+ "Function for `c-mode-hook'."
+ (local-set-key [f9] 'compile)
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(add-hook 'c-mode-hook 'oni:c-mode-func)
+
+(defun oni:css-mode-func ()
+ "Function for `css-mode-hook'."
+ (setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
+ (hs-minor-mode)
+ (local-set-key "\C-j" 'oni:newline-and-indent)
+ (rainbow-mode))
+
+(add-hook 'css-mode-hook 'oni:css-mode-func)
+
+(defun oni:emacs-lisp-mode-func ()
+ "Function for `emacs-lisp-mode-hook'."
+ (eldoc-mode)
+ (when (buffer-file-name)
+ (hs-minor-mode)))
+
+(add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func)
+
+(defun oni:go-mode-func ()
+ "Function for `go-mode-hook'."
+ (setq indent-tabs-mode nil)
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(add-hook 'go-mode-hook 'oni:go-mode-func)
+
+(defun oni:html-mode-func ()
+ "Function for `html-mode-hook'."
+ (fci-mode))
+
+(add-hook 'html-mode-hook 'oni:html-mode-func)
+
+(defconst oni:javascript-outline-regex "function \\(\\w\\|_\\)+("
+ "Regex for `outline-minor-mode' for `js-mode'.")
+
+(defun oni:js-mode-func ()
+ "Function for `js-mode-hook'."
+ (oni:generic-outline oni:javascript-outline-regex)
+ (rainbow-delimiters-mode)
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(add-hook 'js-mode-hook 'oni:js-mode-func)
+
+(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js-mode))
+
+(defun oni:lisp-mode-func ()
+ "Function for `lisp-mode-hook'."
+ (hs-minor-mode))
+
+(add-hook 'lisp-mode-hook 'oni:lisp-mode-func)
+
+(defconst oni:python-outline-regex
+ (eval-when-compile
+ (concat "^[ \t]*\\(?:@[a-zA-Z0-9_]+\\(?:([a-zA-Z0-9_=, ]*)\\)?"
+ "\n\\)*[ \t]*\\(?:\\(class\\|def\\)[ \t]+\\(\\sw\\|\\s_\\)+"
+ "\\(([^)]*):\\)?\\|\\#[ a-zA-Z0-9]*\\#\\)"))
+ "Regex for `outline-minor-mode' for `python-mode'.")
+
+(defun oni:python-mode-func ()
+ "Function for `python-mode-hook'."
+ (flymake-mode)
+ (local-set-key (kbd "C->") 'python-indent-shift-right)
+ (local-set-key (kbd "C-<") 'python-indent-shift-left)
+ (local-set-key [C-tab] 'outline-toggle-children)
+ (oni:generic-outline oni:python-outline-regex)
+ (set (make-local-variable 'electric-indent-chars) nil)
+ (rainbow-delimiters-mode)
+ (fci-mode))
+
+(add-hook 'python-mode-hook 'oni:python-mode-func)
+
+(autoload 'pony-mode "pony-mode" nil t)
+
+(defconst oni:php-outline-regex
+ (eval-when-compile
+ (concat
+ "^ *\\(\\(?:namespace\\|interface\\) [a-zA-Z0-9_]\\|\\(\\(abstract"
+ "\\|final\\) \\)?class [a-zA-Z0-9_]+\\( extends [\\a-zA-Z0-9_]+\\)?"
+ "\\|\\(abstract \\)?\\(public\\|private\\|protected\\)?"
+ "\\( static\\)? function [a-zA-Z0-9_]+(\\|/\\*\\*\\)"))
+ "Regex for `outline-minor-mode' for `php-mode'.")
+
+(defun oni:php-mode-func ()
+ "Function for `php-mode-hook'."
+ (flymake-mode)
+ ;; (oni:gtags-for-php)
+ (local-set-key "\C-j" 'oni:newline-and-indent)
+ (c-set-offset 'arglist-intro '+)
+ (c-set-offset 'arglist-close '0)
+ (rainbow-delimiters-mode)
+ (setq fci-rule-column 81))
+
+(autoload 'php-mode "php-mode" nil t)
+
+(setq-default php-mode-warn-if-mumamo-off nil)
+
+(setq php-function-call-face 'font-lock-function-name-face
+ php-mode-force-pear t)
+
+(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
+
+(add-hook 'php-mode-hook 'oni:php-mode-func)
+
+(add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode))
+
+(defun oni:scheme-mode-func ()
+ "Function for `scheme-mode-hook'."
+ (hs-minor-mode))
+
+(add-hook 'scheme-mode-hook 'oni:scheme-mode-func)
+
+(require 'geiser-install)
+
+(setq geiser-active-implementations '(guile)
+ geiser-repl-history-filename "~/.emacs.d/geiser-history")
+
+(defun oni:java-mode-func ()
+ "Function for `java-mode-hook'."
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(add-hook 'java-mode-hook 'oni:java-mode-func)
+
+(defun oni:close-client-window ()
+ "Close a client's frames."
+ (interactive)
+ (server-save-buffers-kill-terminal nil))
+
+(when (daemonp)
+ (global-set-key "\C-x\C-c" 'oni:close-client-window))
+
+(defun oni:org-mode-func ()
+ "Function for `org-mode-hook'."
+ (flyspell-mode)
+ (auto-fill-mode))
+
+(add-hook 'org-mode-hook 'oni:org-mode-func)
+
+(global-set-key "\C-ca" 'org-agenda)
+(global-set-key "\C-cc" 'org-capture)
+
+(eval-after-load "org"
+ '(progn
+ (require 'appt)
+ (require 'org-protocol)
+ (require 'org-habit)
+ (require 'org-contacts)
+
+ (add-to-list 'org-modules 'habit)
+
+ (org-indent-mode t)
+
+ (org-agenda-to-appt)
+ (ad-activate 'org-agenda-redo)))
+
+(eval-after-load "org-crypt"
+ '(org-crypt-use-before-save-magic))
+
+(setq org-hide-emphasis-markers t)
+
+(setq org-refile-allow-creating-parent-nodes t
+ org-refile-targets '((nil . (:maxlevel . 6)))
+ org-refile-use-outline-path 'file)
+
+(defadvice org-agenda-redo (after org-agenda-redo-add-appts)
+ "Pressing `r' on the agenda will also add appointments."
+ (progn
+ (setq appt-time-msg-list nil)
+ (org-agenda-to-appt)))
+
+(setq org-agenda-custom-commands
+ '(("b" "Bookmarks to look at."
+ todo "LOOKAT")
+ ("w" "Work todo."
+ tags-todo "CATEGORY=\"Work\"")))
+
+(setq org-directory (expand-file-name "~/documents/org"))
+
+(setq org-default-notes-file (concat org-directory "/org"))
+
+(setq org-agenda-files
+ `(,(concat org-directory "/org")
+ ,(concat org-directory "/misc/contacts.org")
+ ,(concat org-directory "/misc/bookmarks.org")))
+
+(setq org-agenda-sorting-strategy ; How to sort my agenda.
+ '((agenda habit-down time-up priority-down category-keep)
+ (todo priority-down category-up)
+ (tags priority-down category-keep)
+ (search category-keep)))
+
+(setq org-capture-templates ; What to capture when.
+ '(("t" "Task" entry (file+headline "" "tasks")
+ "* TODO %^{Description}\n %u\n\n %?")
+ ("T" "Task with link" entry (file+headline "" "tasks")
+ "* TODO %^{Description}\n %u\n\n %a\n %?")
+ ("h" "Habit" entry (file+headline "" "tasks")
+ (concat "* TODO %^{Description}\n"
+ " SCHEDULED: %^T\n"
+ " :PROPERTIES:\n"
+ " :STYLE: habit\n"
+ " :END:")
+ :immediate-finish t)
+ ("l" "Log" entry (file+headline "" "notes")
+ (concat "* %n %<%d-%m-%Y %H:%M:%S>\n"
+ " %a\n\n"
+ " %?")
+ :prepend t :empty-lines 1)
+ ("a" "Appointment" entry (file+headline "" "appointments")
+ "* %^{Description} %^T" :immediate-finish t)
+ ("b" "Bookmark" entry (file "~/documents/org/misc/bookmarks.org")
+ "* %c\n\n %:initial")))
+
+(setq org-export-htmlize-output-type 'css
+ org-outline-path-complete-in-steps t
+ org-return-follows-link t
+ org-src-fontify-natively t
+ org-tags-exclude-from-inheritance '("crypt")
+ org-use-fast-todo-selection t)
+
+(setq org-todo-keyword-faces
+ '(("TODO" :foreground "red")
+ ("IN PROGRESS" :foreground "yellow")
+ ("DONE" :foreground "forest green")
+ ("SUCCEEDED" :foreground "forest green")
+ ("WAITING" :foreground "orange")
+ ("CANCELLED" :foreground "orangered")
+ ("FAILED" :foreground "orangered")))
+
+(setq org-todo-keywords
+ '((sequence "TODO(t)" "IN PROGRESS" "WAITING(@/!)" "|"
+ "DONE(!/!)" "CANCELLED(@/!)")))
+
+(defun oni:diary-display-func ()
+ "Function for `diary-display-hook'."
+ (diary-fancy-display))
+
+(add-hook 'diary-display-hook 'oni:diary-display-func)
+
+(setq appt-display-diary nil)
+
+(defun oni:newline-and-indent ()
+ (interactive)
+ (if (and (not (or (= (point) (point-max))
+ (= (point) (point-min))))
+ (or (and (char-equal (char-before) ?{)
+ (char-equal (char-after) ?}))
+ (and (char-equal (char-before) ?\()
+ (char-equal (char-after) ?\)))))
+ (save-excursion (newline-and-indent)))
+ (newline-and-indent))
+
+(defun oni:emms-toggle-playing ()
+ "Toggle between playing/paused states."
+ (interactive)
+ (if (eq emms-player-playing-p nil)
+ (emms-start)
+ (emms-pause)))
+
+(eval-after-load "emms-source-file"
+ '(progn
+ (require 'emms-setup)
+
+ (emms-standard)
+ (require 'emms-player-mpd)
+
+ (setq emms-player-mpd-server-name "localhost")
+ (setq emms-player-mpd-server-port "6600")
+
+ (add-to-list 'emms-info-functions 'emms-info-mpd)
+ (add-to-list 'emms-player-list 'emms-player-mpd)
+ (setq emms-player-mpd-music-directory "/mnt/music/mp3")))
+
+(setq emms-source-file-default-directory "/mnt/music/")
+
+(global-set-key [XF86AudioNext] 'emms-next)
+(global-set-key [XF86AudioPlay] 'oni:emms-toggle-playing)
+(global-set-key [XF86AudioPrev] 'emms-previous)
+(global-set-key [XF86AudioStop] 'emms-stop)
+(global-set-key [XF86Tools] 'emms)
+
+(defun oni:erc-mode-func ()
+ "Function for `erc-mode-hook'."
+ (erc-fill-mode -1)
+ (visual-line-mode)
+ (setq truncate-lines nil))
+
+(setq erc-autojoin-channels-alist
+ '(("freenode.net" "#herbstluftwm" "#ninthfloor" "#emacs"
+ "#dispass")))
+
+(setq erc-nick "ryuslash")
+
+(add-hook 'erc-mode-hook 'oni:erc-mode-func)
+
+(setq erc-insert-timestamp-function 'erc-insert-timestamp-left
+ erc-timestamp-format "[%H:%M] "
+ erc-timestamp-only-if-changed-flag nil)
+
+(setq erc-hide-list '("JOIN" "PART" "QUIT"))
+
+(defun oni:eshell-mode-func ()
+ "Function for `eshell-mode-hook'."
+ (setq truncate-lines nil))
+
+(add-hook 'eshell-mode-hook 'oni:eshell-mode-func)
+
+(require 'cl)
+(defun oni:shorten-dir (dir)
+ "Shorten a directory, (almost) like fish does it."
+ (let ((scount (1- (count ?/ dir))))
+ (dotimes (i scount)
+ (string-match "\\(/\\.?.\\)[^/]+" dir)
+ (setq dir (replace-match "\\1" nil nil dir))))
+ dir)
+
+(defun oni:eshell-prompt-function ()
+ (let ((status (if (zerop eshell-last-command-status) ?+ ?-))
+ (hostname (shell-command-to-string "hostname"))
+ (dir (abbreviate-file-name (eshell/pwd)))
+ (branch
+ (shell-command-to-string
+ "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'"))
+ (userstatus (if (zerop (user-uid)) ?# ?$)))
+ (format "%c%s:%s@%s %c "
+ status
+ (substring hostname 0 -1)
+ (oni:shorten-dir dir)
+ (when (not (string= branch ""))
+ (substring branch 2 -1))
+ userstatus)))
+
+(setq eshell-prompt-function 'oni:eshell-prompt-function)
+
+(defun oni:raise-eshell ()
+ "Start or switch back to `eshell'. Also change directories to
+ current working directory."
+ (interactive)
+ (let ((dir (file-name-directory
+ (or (buffer-file-name) "~/")))
+ (hasfile (not (eq (buffer-file-name) nil))))
+ (eshell)
+ (if (and hasfile (eq eshell-process-list nil))
+ (progn
+ (eshell/cd dir)
+ (eshell-reset)))))
+
+(global-set-key [f8] 'oni:raise-eshell)
+
+(eval-after-load "em-term"
+ '(add-to-list 'eshell-visual-commands
+ "unison"))
+
+(defun oni:flymake-mode-func ()
+ "Function for `flymake-mode-hook'."
+ (local-set-key [M-P] 'flymake-goto-prev-error)
+ (local-set-key [M-N] 'flymake-goto-next-error))
+
+(add-hook 'flymake-mode-hook 'oni:flymake-mode-func)
+
+(defun oni:flymake-pyflakes-init ()
+ "Initialize function for flymake with pyflakes."
+ (let* ((temp-file (flymake-init-create-temp-buffer-copy
+ 'flymake-create-temp-inplace))
+ (local-file (file-relative-name temp-file (file-name-directory
+ buffer-file-name))))
+ (list "pyflakes" (list local-file))))
+
+(eval-after-load "flymake"
+ '(progn
+ (require 'flymake-cursor)
+
+ (add-to-list ; Make sure pyflakes is loaded
+ 'flymake-allowed-file-name-masks ; for python files.
+ '("\\.py\\'" oni:flymake-pyflakes-init))
+
+ (add-to-list ; Error line repexp for go
+ 'flymake-err-line-patterns ; compilation.
+ '("^\\([a-zA-Z0-9_]+\\.go\\):\\([0-9]+\\):\\(.*\\)$"
+ 1 2 nil 3))
+
+ (add-to-list ; Go uses makefiles, makes
+ 'flymake-allowed-file-name-masks ; flymaking 'easy'.
+ '("\\.go$" flymake-simple-make-init))))
+
+(setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log")
+ flymake-log-level 0
+ flymake-gui-warnings-enabled nil)
+
+(autoload 'gtags-mode "gtags" nil t)
+
+(defun oni:gtags-create-or-update ()
+ "Create or update the GNU Global tag file"
+ (interactive)
+ (if (not (= 0 (call-process "global" nil nil nil " -p")))
+ (let ((olddir default-directory)
+ (topdir (read-directory-name
+ "gtags: top of source tree:" default-directory)))
+ (cd topdir)
+ (shell-command "~/bin/create_gtags")
+ (cd olddir))
+ ;; Tagfile already exists; update it
+ (shell-command "~/bin/update_gtags")))
+
+(defun oni:gtags-for-php ()
+ "Setup gtags for `php-mode'."
+ (let* ((file-name (buffer-file-name))
+ (fext (if (not (eq nil file-name))
+ (file-name-extension (buffer-file-name))
+ nil)))
+ (if (equal fext "php")
+ (progn
+ (gtags-mode)
+ (oni:gtags-create-or-update)))))
+
+(defun oni:gtags-mode-func ()
+ "Function for `gtags-mode-hook'."
+ (local-set-key "\M-," 'gtags-find-tag)
+ (local-set-key "\M-." 'gtags-find-rtag))
+
+(add-hook 'gtags-mode-hook 'oni:gtags-mode-func)
+
+(setq gtags-auto-update t)
+
+(require 'newcomment)
+
+(defun oni:kill-region-or-backward-char ()
+ "Kill either the active region, or delete the character left of
+ the cursor"
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (backward-delete-char-untabify 1)))
+
+(global-set-key "\C-w" 'oni:kill-region-or-backward-char)
+
+(defun oni:kill-region-or-forward-char ()
+ "Kill either the active region, or delete the character right
+ of the cursor"
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (delete-forward-char 1)))
+
+(global-set-key "\C-d" 'oni:kill-region-or-forward-char)
+
+(defun oni:kill-region-or-line ()
+ "Kill either the active region, or the rest of the line,
+ depending on whether or not `region-active-p' is t"
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (kill-line)))
+
+(global-set-key "\C-k" 'oni:kill-region-or-line)
+
+(defun oni:move-beginning-of-dwim ()
+ "Move to the beginning of line, either after the indentatoin of
+ before."
+ (interactive)
+ (let ((start (point)))
+ (back-to-indentation)
+ (if (= start (point))
+ (beginning-of-line))))
+
+(global-set-key "\C-a" 'oni:move-beginning-of-dwim)
+
+(defun oni:move-end-of-dwim ()
+ "Move to the end of line, either before any comments or after
+ them."
+ (interactive)
+ (let ((start (point))
+ (eolpos (line-end-position)))
+ (beginning-of-line)
+ (if (and comment-start
+ (comment-search-forward eolpos t))
+ (progn
+ (search-backward-regexp (concat "[^ \t" comment-start "]"))
+ (forward-char)
+
+ (when (or (bolp)
+ (= start (point)))
+ (end-of-line)))
+ (end-of-line))))
+
+(global-set-key "\C-e" 'oni:move-end-of-dwim)
+
+(defun oni:self-insert-dwim ()
+ "Execute self insert, but when the region is active call self
+ insert at the end of the region and at the beginning."
+ (interactive)
+ (if (region-active-p)
+ (let ((electric-pair-mode nil)
+ (beginning (region-beginning))
+ (end (region-end)))
+ (goto-char end)
+ (self-insert-command 1)
+ (save-excursion
+ (goto-char beginning)
+ (self-insert-command 1)))
+ (self-insert-command 1)))
+
+(global-set-key "'" 'oni:self-insert-dwim)
+(global-set-key "\"" 'oni:self-insert-dwim)
+
+(global-set-key [f7] 'magit-status)
+
+(defun oni:magit-log-edit-mode-func ()
+ "Function for `magit-log-edit-mode-hook'."
+ (auto-fill-mode)
+ (font-lock-add-keywords
+ nil
+ '(("\\`\\(.\\{,50\\}\\)\\(.*\\)\n?\\(.*\\)$"
+ (1 'git-commit-summary-face)
+ (2 'git-commit-overlong-summary-face)
+ (3 'git-commit-nonempty-second-line-face))
+ ("`\\([^']+\\)'" 1 font-lock-constant-face))
+ t))
+
+(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
+
+(defun oni:markdown-mode-func ()
+ "Function for `markdown-mode-hook'."
+ (auto-fill-mode)
+ (whitespace-mode))
+
+(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
+
+(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?do?wn$" . markdown-mode))
+
+(setq whitespace-style '(face trailing))
+
+(defun oni:message-mode-func ()
+ "Function for `message-mode-hook'."
+ (auto-fill-mode)
+ (flyspell-mode)
+ (ispell-change-dictionary (read-string "New dictionary: ")))
+
+(setq message-send-mail-function 'message-send-mail-with-sendmail)
+
+(add-hook 'message-mode-hook 'oni:message-mode-func)
+
+(require 'w3m-load)
+
+(require 'uniquify)
+
+(setq uniquify-buffer-name-style 'post-forward)
+
+(defun oni:raise-scratch (&optional mode)
+ "Show the *scratch* buffer. If called with a universal
+argument, ask the user which mode to use. If MODE is not nil,
+open a new buffer with the name *MODE-scratch* and load MODE as
+its major mode."
+ (interactive (list (if current-prefix-arg
+ (read-string "Mode: ")
+ nil)))
+ (let* ((bname (if mode
+ (concat "*" mode "-scratch*")
+ "*scratch*"))
+ (buffer (get-buffer bname))
+ (mode-sym (intern (concat mode "-mode"))))
+
+ (unless buffer
+ (setq buffer (generate-new-buffer bname))
+ (with-current-buffer buffer
+ (when (fboundp mode-sym)
+ (funcall mode-sym))))
+
+ (switch-to-buffer buffer)))
+
+(setq initial-major-mode 'emacs-lisp-mode
+ initial-scratch-message nil)
+
+(global-set-key [XF86HomePage] 'oni:raise-scratch)
+
+(defun oni:reload-buffer ()
+ "Reload current buffer."
+ (interactive)
+ (revert-buffer nil t nil))
+
+(global-set-key [f5] 'oni:reload-buffer)
+
+(defun oni:term-mode-func ()
+ "Function for `term-mode-hook'."
+ (setq truncate-lines nil))
+
+(add-hook 'term-mode-hook 'oni:term-mode-func)
+
+(defun oni:texinfo-mode-func ()
+ "Function for `texinfo-mode-hook'."
+ (auto-fill-mode))
+
+(add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func)
+
+(autoload 'xmodmap-mode "xmodmap-mode" nil t)
+(add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode))
+
+(defun oni:indent-shift-left (start end &optional count)
+ (interactive
+ (if mark-active
+ (list (region-beginning) (region-end) current-prefix-arg)
+ (list (line-beginning-position)
+ (line-end-position)
+ current-prefix-arg)))
+ (if count
+ (setq count (prefix-numeric-value count))
+ (setq count tab-width))
+ (when (> count 0)
+ (let ((deactivate-mark nil))
+ (save-excursion
+ (goto-char start)
+ (while (< (point) end)
+ (if (and (< (current-indentation) count)
+ (not (looking-at "[ \t]*$")))
+ (error "Can't shift all lines enough"))
+ (forward-line))
+ (indent-rigidly start end (- count))))))
+
+(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
+
+(defun oni:indent-shift-right (start end &optional count)
+ (interactive
+ (if mark-active
+ (list (region-beginning) (region-end) current-prefix-arg)
+ (list (line-beginning-position)
+ (line-end-position)
+ current-prefix-arg)))
+ (let ((deactivate-mark nil))
+ (if count
+ (setq count (prefix-numeric-value count))
+ (setq count tab-width))
+ (indent-rigidly start end count)))
+
+(global-set-key (kbd "C-<") 'indent-shift-left)
+(global-set-key (kbd "C->") 'indent-shift-right)
+
+(autoload 'po-mode "po-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
+
+(autoload 'sawfish-mode "sawfish" nil t)
+
+(add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode))
+
+(electric-indent-mode)
+(electric-pair-mode)
+(show-paren-mode)
+(savehist-mode)
+
+(blink-cursor-mode -1)
+(menu-bar-mode -1)
+(scroll-bar-mode -1)
+(tool-bar-mode -1)
+(tooltip-mode -1)
+
+(defun oni:write-file-func ()
+ "Function for `write-file-hooks'."
+ (time-stamp))
+
+(add-hook 'write-file-hooks 'oni:write-file-func)
+
+(setq time-stamp-active t)
+(setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)")
+
+(ido-mode)
+
+(setq ido-auto-merge-delay-time 1000000)
+
+(setq ido-save-directory-list-file nil)
+
+(eval-after-load "ido"
+ '(setq ido-ignore-buffers `(,@ido-ignore-buffers
+ "^\\*.*\\*$" "^irc\\." "^\\#")))
+
+(setq smex-save-file "~/.emacs.d/smex-items")
+
+(smex-initialize)
+
+(eval-after-load "smex"
+ '(progn
+ (global-set-key (kbd "M-x") 'smex)
+ (global-set-key (kbd "C-M-x") 'smex-major-mode-commands)))
+
+(require 'iso-transl)
+
+(setq-default bidi-paragraph-direction 'left-to-right)
+
+(setq-default gac-automatically-push-p t)
+
+(setq-default indent-tabs-mode nil
+ tab-width 4)
+
+(setq-default require-final-newline t)
+
+(setq-default truncate-lines t)
+
+(add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode))
+
+(setq auto-mode-case-fold nil)
+
+(setq auto-save-file-name-transforms
+ `((".*" ,temporary-file-directory t))
+
+ backup-directory-alist
+ `((".*" . ,temporary-file-directory)))
+
+(setq browse-url-browser-function 'browse-url-generic
+ browse-url-generic-program (getenv "BROWSER"))
+
+(setq custom-file "~/.emacs.d/custom.el")
+
+(setq custom-theme-directory "~/.emacs.d/themes")
+(add-to-list 'custom-theme-load-path
+ (concat custom-theme-directory "/naquadah-theme"))
+(load-theme 'naquadah t)
+
+(setq
+ default-frame-alist
+ `((border-width . 0)
+ (internal-border-width . 0)
+ (vertical-scroll-bars . nil)
+ (menu-bar-lines . nil)
+ (tool-bar-lines . nil)
+ (font . "DejaVu Sans Mono:pixelsize=18")
+ (left-fringe . 0)))
+
+(setq frame-title-format '(:eval (concat "emacs: " (buffer-name))))
+
+(setq help-at-pt-display-when-idle t)
+(help-at-pt-set-timer)
+
+(setq sauron-max-line-length 189)
+
+(eval-after-load "sauron"
+ '(setq sauron-modules (append '(sauron-identica sauron-jabber)
+ sauron-modules)))
+
+ (setq sauron-column-alist ; I don't need as much
+ '((timestamp . 6) ; information as the default.
+ (message)))
+
+(setq sauron-hide-mode-line t)
+(setq sauron-timestamp-format "%H:%M")
+(setq sauron-watch-nicks '("ryuslash"))
+(setq sauron-watch-patterns '("ryuslash"))
+(setq special-display-buffer-names '("*Sauron*"))
+(setq special-display-frame-alist
+ '((minibuffer . nil)
+ (right-fringe . 0)))
+
+(setq inhibit-default-init t)
+
+(setq inhibit-local-menu-bar-menus t)
+
+(setq inhibit-startup-message t)
+
+(setq jit-lock-defer-time 0.2)
+
+(setq message-log-max 1000)
+
+(setq org-blog-directory "~/code/projects/orgweb/blog"
+ org-blog-unfinished-directory "~/documents/blog/drafts")
+
+(setq org-contacts-files '("~/documents/org/misc/contacts.org"))
+
+(setq rainbow-delimiters-max-face-count 12)
+
+(setq redisplay-dont-pause t)
+
+(put 'upcase-region 'disabled nil)
+(put 'downcase-region 'disabled nil)
+(put 'narrow-to-region 'disabled nil)
+
+(global-set-key (kbd "C-@") 'er/expand-region)
+
+(defface oni:mode-line-modified
+ '((t (:inherit font-lock-warning-face)))
+ "Face for the modified state in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-mode
+ '((t (:inherit font-lock-string-face)))
+ "Face for the major mode in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-position
+ '((t (:inherit font-lock-constant-face)))
+ "Face for the buffer position in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-line
+ '((t (:inherit font-lock-type-face)))
+ "Face for the line number in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-column
+ '((t (:inherit font-lock-type-face)))
+ "Face for the column number in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-state
+ '((t (:inherit font-lock-preprocessor-face)))
+ "Face for the state of the buffer in the mode-line"
+ :group 'local)
+
+(setq-default
+ mode-line-format
+ (list
+ '(:eval (if (and (buffer-modified-p) (buffer-file-name))
+ (propertize "!"
+ 'face 'oni:mode-line-modified
+ 'help-echo "Buffer has been modified")
+ " "))
+
+ '(:eval (propertize "%m"
+ 'face 'oni:mode-line-mode
+ 'help-echo buffer-file-coding-system))
+
+ ": "
+
+ '(:eval (propertize "%b "
+ 'face 'mode-line-buffer-id
+ 'help-echo (buffer-file-name)))
+
+ "("
+ (propertize "%p" 'face 'oni:mode-line-buffer-position) ":"
+ (propertize "%04l" 'face 'oni:mode-line-buffer-line) ","
+ (propertize "%02c" 'face 'oni:mode-line-buffer-column)
+ ") "
+
+ "["
+ '(:eval (propertize
+ (if buffer-read-only
+ "R"
+ (if overwrite-mode "O" "I"))
+ 'face 'oni:mode-line-buffer-state
+ 'help-echo (concat "Buffer is "
+ (if buffer-read-only
+ "read-only"
+ (if overwrite-mode
+ "in overwrite mode"
+ "in insert mode")))))
+
+ "] "
+
+ '(:eval (propertize (format-time-string "%H:%M")
+ 'help-echo
+ (concat (format-time-string "%c; ")
+ (emacs-uptime "Uptime: %hh"))))
+ " --"
+ '(:eval global-mode-string)))
+
+(setq scroll-conservatively 101)
+
+(setq use-dialog-box nil)
+
+(setq user-full-name "Tom Willemsen")
+
+(define-key key-translation-map (kbd "C-j") (kbd "C-l"))
+(define-key key-translation-map (kbd "C-l") (kbd "C-j"))
+
+(global-set-key "\C-x\C-b" 'electric-buffer-list)
+(global-set-key "\C-\M-d" 'kill-word)
+(global-set-key "\C-\M-w" 'backward-kill-word)
+(global-set-key (kbd "C-S-k") 'kill-whole-line)
+(global-set-key [XF86Mail] 'oni:view-mail)
+(global-set-key "\C-cip" 'identica-update-status-interactive)
+
+(when (or window-system (daemonp))
+ (global-unset-key "\C-z"))
+
+(load custom-file)
+(load "rudel-loaddefs.el")
+(load (expand-file-name "~/quicklisp/slime-helper.el"))
--
cgit v1.2.3-54-g00ecf
From c93b49d16784cafad5d6144bd2b150a19eb17bef Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 19 Aug 2012 00:19:15 +0200
Subject: emacs/gnus.el
---
emacs/gnus.el | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/emacs/gnus.el b/emacs/gnus.el
index 1bf988a..1f629b5 100644
--- a/emacs/gnus.el
+++ b/emacs/gnus.el
@@ -68,3 +68,7 @@
(bbdb-initialize 'gnus 'message)
(bbdb-insinuate-gnus)
(setq bbdb-north-american-phone-numbers-p nil)
+
+;; Local Variables:
+;; no-update-autoloads: t
+;; End:
--
cgit v1.2.3-54-g00ecf
From c2efea9e6bb44dde3d4dd559568b48a22407f14f Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 19 Aug 2012 00:26:15 +0200
Subject: emacs/Makefile, emacs/eshell-init.el, emacs/init.el
---
emacs/Makefile | 12 +++--
emacs/eshell-init.el | 63 ++++++++++++++++++++++
emacs/init.el | 149 +++++++++++++++++++++++----------------------------
3 files changed, 137 insertions(+), 87 deletions(-)
create mode 100644 emacs/eshell-init.el
diff --git a/emacs/Makefile b/emacs/Makefile
index 45151ef..6d986ef 100644
--- a/emacs/Makefile
+++ b/emacs/Makefile
@@ -1,13 +1,13 @@
EMACS = emacs
-files = init.el init.elc
-install-files = $(addprefix install-,$(files))
+files = init.el init.elc eshell-init.el eshell-init.elc
+install-files = $(addprefix install-,$(files)) install-loaddefs.el
submodules = eshell
install-submodules = $(addprefix install-,$(submodules))
.PHONY: all $(submodules) install $(install-submodules) $(install-files)
-all: $(files) $(submodules)
+all: loaddefs.el $(files) $(submodules)
$(submodules):
$(MAKE) -C $@/
@@ -15,9 +15,13 @@ $(submodules):
$(filter %.elc,$(files)): %.elc: %.el
$(EMACS) -batch -eval "(byte-compile-file \"$^\")"
+loaddefs.el: $(files)
+ $(EMACS) -batch -eval "(let ((generated-autoload-file \"${CURDIR}/loaddefs.el\")) \
+ (update-directory-autoloads \"${CURDIR}\"))"
+
install: $(install-files) $(install-submodules)
-$(install-files): install-%:
+$(install-files): install-%: $*
install -Dm 444 $* ${HOME}/.emacs.d/$*
$(install-submodules): install-%:
diff --git a/emacs/eshell-init.el b/emacs/eshell-init.el
new file mode 100644
index 0000000..1dd8773
--- /dev/null
+++ b/emacs/eshell-init.el
@@ -0,0 +1,63 @@
+;; Eshell settings
+(eval-when-compile
+ '(load "init.el"))
+
+(eval-after-load "em-term"
+ '(add-to-list 'eshell-visual-commands
+ "unison"))
+
+(defun oni:eshell-mode-func ()
+ "Function for `eshell-mode-hook'."
+ (setq truncate-lines nil))
+
+(defun oni:eshell-prompt-function ()
+ (let ((status (if (zerop eshell-last-command-status) ?+ ?-))
+ (hostname (shell-command-to-string "hostname"))
+ (dir (abbreviate-file-name (eshell/pwd)))
+ (branch
+ (shell-command-to-string
+ "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'"))
+ (userstatus (if (zerop (user-uid)) ?# ?$)))
+ (concat
+ (propertize (char-to-string status)
+ 'face `(:foreground ,(if (= status ?+)
+ (oni:color chameleon-1)
+ (oni:color scarlet-red-2))))
+ " "
+ (propertize (substring hostname 0 -1) 'face 'mode-line-buffer-id)
+ " "
+ (propertize (oni:shorten-dir dir) 'face 'font-lock-string-face)
+ " "
+ (propertize (when (not (string= branch ""))
+ ;; Cut off "* " and "\n"
+ (substring branch 2 -1))
+ 'face 'font-lock-function-name-face)
+ " \n"
+ (propertize (char-to-string userstatus)
+ 'face `(:foreground ,(oni:color sky-blue-1)))
+ "> ")))
+
+;;;###autoload
+(defun oni:raise-eshell ()
+ "Start or switch back to `eshell'. Also change directories to
+ current working directory."
+ (interactive)
+ (let ((dir (file-name-directory
+ (or (buffer-file-name) "~/")))
+ (hasfile (not (eq (buffer-file-name) nil))))
+ (eshell)
+ (if (and hasfile (eq eshell-process-list nil))
+ (progn
+ (eshell/cd dir)
+ (eshell-reset)))))
+
+(defun oni:shorten-dir (dir)
+ "Shorten a directory, (almost) like fish does it."
+ (while (string-match "\\(/\\.?.\\)[^/]+/" dir)
+ (setq dir (replace-match "\\1/" nil nil dir)))
+ dir)
+
+(setq eshell-prompt-regexp "^[#$]> ")
+(setq eshell-highlight-prompt nil)
+(setq eshell-prompt-function 'oni:eshell-prompt-function)
+(add-hook 'eshell-mode-hook 'oni:eshell-mode-func)
diff --git a/emacs/init.el b/emacs/init.el
index 9dadf1c..3887354 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -2,20 +2,55 @@
(package-initialize)
(mapc #'(lambda (directory)
- (add-to-list 'load-path directory)
- (let ((default-directory directory))
- (normal-top-level-add-subdirs-to-load-path)))
- '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")))
+ (add-to-list 'load-path directory)
+ (let ((default-directory directory))
+ (normal-top-level-add-subdirs-to-load-path)))
+ '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
+ (add-to-list 'load-path "~/.emacs.d/"))
(eval-when-compile
+ (require 'appt)
+ (require 'browse-url)
+ (require 'em-dirs)
+ (require 'em-prompt)
+ (require 'emms-source-file)
+ (require 'erc-join)
+ (require 'erc-stamp)
+ (require 'fill-column-indicator)
+ (require 'geiser-repl)
+ (require 'gtags)
+ (require 'hideshow)
+ (require 'jabber)
+ (require 'message)
+ (require 'mu4e)
+ (require 'org-capture)
(require 'org-contacts)
- (require 'sauron))
+ (require 'org-feed)
+ (require 'org-html)
+ (require 'php-mode)
+ (require 'rainbow-delimiters)
+ (require 'sauron)
+ (require 'sendmail)
+ (require 'smex)
+ (require 'time-stamp)
+ (require 'whitespace)
+ (require 'yasnippet))
(autoload 'identica-mode "identica-mode" nil t)
(autoload 'mu4e "mu4e" nil t)
+(autoload 'naquadah-get-colors "naquadah-theme")
+(load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
+(load (expand-file-name "~/.emacs.d/loaddefs.el"))
(defalias 'yes-or-no-p 'y-or-n-p)
+(defconst oni:c-outline-regex
+ (eval-when-compile
+ (concat
+ "\\(?:static\\s +\\)?\\(?:\\sw+\\(?: \\|\t\\|\n\\)*?\\*?\\)"
+ "\\(?:\\s \\|\t\\|\n\\)\\(?:\\sw\\|_\\)+([^)]*)[^;\n]*$"))
+ "Regex for `outline-minor-mode' for `c-mode'.")
+
(defmacro oni:define-mailbox (name email &optional signature longname)
"Define a mailbox function."
`(defun ,(make-symbol (concat "oni:" name "-mailbox")) ()
@@ -38,6 +73,25 @@
(hide-body)
(local-set-key [C-tab] 'outline-toggle-children)))
+(defmacro oni:color (name)
+ `(naquadah-get-colors (quote ,name)))
+
+(defvar oni:mailbox-map
+ '("top" ("menu"
+ ("ryulash.org" . "ryuslash")
+ ("ninthfloor" . "ninthfloor")
+ ("gmail" . "gmail")
+ ("aethon" . "aethon")))
+ "A mailbox map for use with `tmm-prompt'.")
+
+(defvar oni:required-packages
+ '(graphviz-dot-mode htmlize magit rainbow-delimiters
+ rainbow-mode yasnippet markdown-mode flymake
+ flymake-cursor pony-mode sauron dispass
+ expand-region fill-column-indicator
+ git-auto-commit-mode idomenu magit smex)
+ "List of all the packages I have (want) installed")
+
(defun oni:after-save-func ()
"Function for `after-save-hook'."
(oni:compile-el)
@@ -147,21 +201,8 @@ for easy selection."
(funcall (intern (concat "oni:" inbox "-mailbox")))
(mu4e)))))
-(defvar oni:mailbox-map
- '("top" ("menu"
- ("ryulash.org" . "ryuslash")
- ("ninthfloor" . "ninthfloor")
- ("gmail" . "gmail")
- ("aethon" . "aethon")))
- "A mailbox map for use with `tmm-prompt'.")
-
-(defvar oni:required-packages
- '(graphviz-dot-mode htmlize magit rainbow-delimiters
- rainbow-mode yasnippet markdown-mode flymake
- flymake-cursor pony-mode sauron dispass
- expand-region fill-column-indicator
- git-auto-commit-mode idomenu magit smex)
- "List of all the packages I have (want) installed")
+(eval-after-load "info"
+ '(require 'info+))
(eval-after-load "mu4e"
'(add-to-list
@@ -193,7 +234,6 @@ for easy selection."
(setq jabber-chatstates-confirm nil)
(setq jabber-history-dir "~/.emacs.d/jabber")
(setq jabber-roster-show-bindings nil)
-(setq jabber-roster-show-offline-contacts nil)
(setq mail-header-separator "")
(setq mu4e-headers-date-format "%d-%m %H:%M")
(setq mu4e-headers-fields '((:date . 11)
@@ -227,6 +267,7 @@ for easy selection."
(add-hook 'prog-mode-hook 'oni:prog-mode-func)
(global-set-key (kbd "") 'jabber-switch-to-roster-buffer)
+(global-set-key (kbd "") 'oni:raise-eshell)
(global-set-key (kbd "M-n") 'idomenu)
(unless (oni:required-packages-installed-p)
@@ -238,13 +279,6 @@ for easy selection."
(package-install package)))
oni:required-packages))
-(defconst oni:c-outline-regex
- (eval-when-compile
- (concat
- "\\(?:static\\s +\\)?\\(?:\\sw+\\(?: \\|\t\\|\n\\)*?\\*?\\)"
- "\\(?:\\s \\|\t\\|\n\\)\\(?:\\sw\\|_\\)+([^)]*)[^;\n]*$"))
- "Regex for `outline-minor-mode' for `c-mode'.")
-
(defun oni:c-mode-func ()
"Function for `c-mode-hook'."
(local-set-key [f9] 'compile)
@@ -550,58 +584,6 @@ for easy selection."
(setq erc-hide-list '("JOIN" "PART" "QUIT"))
-(defun oni:eshell-mode-func ()
- "Function for `eshell-mode-hook'."
- (setq truncate-lines nil))
-
-(add-hook 'eshell-mode-hook 'oni:eshell-mode-func)
-
-(require 'cl)
-(defun oni:shorten-dir (dir)
- "Shorten a directory, (almost) like fish does it."
- (let ((scount (1- (count ?/ dir))))
- (dotimes (i scount)
- (string-match "\\(/\\.?.\\)[^/]+" dir)
- (setq dir (replace-match "\\1" nil nil dir))))
- dir)
-
-(defun oni:eshell-prompt-function ()
- (let ((status (if (zerop eshell-last-command-status) ?+ ?-))
- (hostname (shell-command-to-string "hostname"))
- (dir (abbreviate-file-name (eshell/pwd)))
- (branch
- (shell-command-to-string
- "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'"))
- (userstatus (if (zerop (user-uid)) ?# ?$)))
- (format "%c%s:%s@%s %c "
- status
- (substring hostname 0 -1)
- (oni:shorten-dir dir)
- (when (not (string= branch ""))
- (substring branch 2 -1))
- userstatus)))
-
-(setq eshell-prompt-function 'oni:eshell-prompt-function)
-
-(defun oni:raise-eshell ()
- "Start or switch back to `eshell'. Also change directories to
- current working directory."
- (interactive)
- (let ((dir (file-name-directory
- (or (buffer-file-name) "~/")))
- (hasfile (not (eq (buffer-file-name) nil))))
- (eshell)
- (if (and hasfile (eq eshell-process-list nil))
- (progn
- (eshell/cd dir)
- (eshell-reset)))))
-
-(global-set-key [f8] 'oni:raise-eshell)
-
-(eval-after-load "em-term"
- '(add-to-list 'eshell-visual-commands
- "unison"))
-
(defun oni:flymake-mode-func ()
"Function for `flymake-mode-hook'."
(local-set-key [M-P] 'flymake-goto-prev-error)
@@ -1008,9 +990,6 @@ its major mode."
(setq message-log-max 1000)
-(setq org-blog-directory "~/code/projects/orgweb/blog"
- org-blog-unfinished-directory "~/documents/blog/drafts")
-
(setq org-contacts-files '("~/documents/org/misc/contacts.org"))
(setq rainbow-delimiters-max-face-count 12)
@@ -1122,3 +1101,7 @@ its major mode."
(load custom-file)
(load "rudel-loaddefs.el")
(load (expand-file-name "~/quicklisp/slime-helper.el"))
+
+;; Local Variables:
+;; no-update-autoloads: t
+;; End:
--
cgit v1.2.3-54-g00ecf
From f6b0811650b444da31920d675697569e6b36f218 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 19 Aug 2012 00:31:18 +0200
Subject: emacs/eshell-init.el
---
emacs/eshell-init.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/emacs/eshell-init.el b/emacs/eshell-init.el
index 1dd8773..16f221d 100644
--- a/emacs/eshell-init.el
+++ b/emacs/eshell-init.el
@@ -28,10 +28,11 @@
" "
(propertize (oni:shorten-dir dir) 'face 'font-lock-string-face)
" "
- (propertize (when (not (string= branch ""))
- ;; Cut off "* " and "\n"
- (substring branch 2 -1))
- 'face 'font-lock-function-name-face)
+ (when (not (string= branch ""))
+ (propertize
+ ;; Cut off "* " and "\n"
+ (substring branch 2 -1)
+ 'face 'font-lock-function-name-face))
" \n"
(propertize (char-to-string userstatus)
'face `(:foreground ,(oni:color sky-blue-1)))
--
cgit v1.2.3-54-g00ecf
From 19a13b82ff13848a3d014eea1a39dfe337bfa1ba Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 19 Aug 2012 12:13:23 +0200
Subject: emacs: Improve path segment regex
---
emacs/eshell-init.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emacs/eshell-init.el b/emacs/eshell-init.el
index 16f221d..9309b3f 100644
--- a/emacs/eshell-init.el
+++ b/emacs/eshell-init.el
@@ -54,7 +54,7 @@
(defun oni:shorten-dir (dir)
"Shorten a directory, (almost) like fish does it."
- (while (string-match "\\(/\\.?.\\)[^/]+/" dir)
+ (while (string-match "\\(/\\.?[^./]\\)[^/]+/" dir)
(setq dir (replace-match "\\1/" nil nil dir)))
dir)
--
cgit v1.2.3-54-g00ecf
From 887438d81bed7e151e04df156fe938447a002f20 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 24 Aug 2012 10:51:47 +0200
Subject: emacs/init: Obfuscate emails a little
---
emacs/init.el | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
index 3887354..ca48f47 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -65,6 +65,11 @@
message-sendmail-extra-arguments '("-a" ,name)
message-signature-file ,signature)))
+(defmacro oni:email (user at host dot com)
+ "Turn arguments into an email address."
+ (concat (symbol-name user) "@" (symbol-name host) "."
+ (symbol-name com)))
+
(defmacro oni:generic-outline (regex)
"Prepare for enabling `outline-minor-mode'."
`(progn
@@ -213,16 +218,19 @@ for easy selection."
" :EMAIL: %(mu4e-view-snarf-from 'email)\n"
" :END:"))))
-(oni:define-mailbox
- "aethon" "thomas@aethon.nl"
+(oni:define-mailbox "aethon"
+ (oni:email thomas at aethon dot nl)
(expand-file-name "~/documents/work/aethon/signature.txt"))
-(oni:define-mailbox "gmail" "ryuslash@gmail.com")
-(oni:define-mailbox "ninthfloor" "ryuslash@ninthfloor.org")
-(oni:define-mailbox "ryuslash" "tom@ryuslash.org" nil "ryuslash.org")
+(oni:define-mailbox "gmail" (oni:email ryuslash at gmail dot com))
+(oni:define-mailbox "ninthfloor"
+ (oni:email ryuslash at ninthfloor dot org))
+(oni:define-mailbox "ryuslash" (oni:email tom at ryuslash dot org)
+ nil "ryuslash.org")
(setq-default c-basic-offset 4)
(setq-default fci-rule-column 73)
+(setq avandu-article-render-function #'avandu-view-w3m)
(setq fci-rule-color "darkred")
(setq inferior-lisp-program "sbcl")
(setq jabber-account-list '(("ryuslash@jabber.org")))
@@ -243,6 +251,11 @@ for easy selection."
(:subject)))
(setq mu4e-headers-show-threads nil)
(setq mu4e-headers-sort-revert nil)
+(setq mu4e-my-email-addresses (list
+ (oni:email tom at ryuslash dot org)
+ (oni:email ryuslash at gmail dot com)
+ (oni:email ryuslash at ninthfloor dot org)
+ (oni:email thomas at aethon dot nl)))
(setq package-archives
'(("melpa" . "http://melpa.milkbox.net/packages/")
("ELPA" . "http://tromey.com/elpa/")
--
cgit v1.2.3-54-g00ecf
From 54bf4091fde9efc3b816440f3d586a5ba72b6add Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 24 Aug 2012 10:53:16 +0200
Subject: emacs/init: Fix indentation
---
emacs/init.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
index ca48f47..2b9594b 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -980,9 +980,9 @@ its major mode."
'(setq sauron-modules (append '(sauron-identica sauron-jabber)
sauron-modules)))
- (setq sauron-column-alist ; I don't need as much
- '((timestamp . 6) ; information as the default.
- (message)))
+(setq sauron-column-alist ; I don't need as much
+ '((timestamp . 6) ; information as the default.
+ (message)))
(setq sauron-hide-mode-line t)
(setq sauron-timestamp-format "%H:%M")
--
cgit v1.2.3-54-g00ecf
From 8cf4fc59e7e25ca00b9691267e05b63997eaabee Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 26 Aug 2012 21:50:26 +0200
Subject: emacs
---
emacs/Makefile | 10 +-
emacs/eshell-init.el | 64 ---
emacs/init.el | 1565 ++++++++++++++++++++++++--------------------------
3 files changed, 757 insertions(+), 882 deletions(-)
delete mode 100644 emacs/eshell-init.el
diff --git a/emacs/Makefile b/emacs/Makefile
index 6d986ef..51a55a4 100644
--- a/emacs/Makefile
+++ b/emacs/Makefile
@@ -1,13 +1,13 @@
EMACS = emacs
-files = init.el init.elc eshell-init.el eshell-init.elc
-install-files = $(addprefix install-,$(files)) install-loaddefs.el
+files = init.el init.elc
+install-files = $(addprefix install-,$(files))
submodules = eshell
install-submodules = $(addprefix install-,$(submodules))
.PHONY: all $(submodules) install $(install-submodules) $(install-files)
-all: loaddefs.el $(files) $(submodules)
+all: $(files) $(submodules)
$(submodules):
$(MAKE) -C $@/
@@ -15,10 +15,6 @@ $(submodules):
$(filter %.elc,$(files)): %.elc: %.el
$(EMACS) -batch -eval "(byte-compile-file \"$^\")"
-loaddefs.el: $(files)
- $(EMACS) -batch -eval "(let ((generated-autoload-file \"${CURDIR}/loaddefs.el\")) \
- (update-directory-autoloads \"${CURDIR}\"))"
-
install: $(install-files) $(install-submodules)
$(install-files): install-%: $*
diff --git a/emacs/eshell-init.el b/emacs/eshell-init.el
deleted file mode 100644
index 9309b3f..0000000
--- a/emacs/eshell-init.el
+++ /dev/null
@@ -1,64 +0,0 @@
-;; Eshell settings
-(eval-when-compile
- '(load "init.el"))
-
-(eval-after-load "em-term"
- '(add-to-list 'eshell-visual-commands
- "unison"))
-
-(defun oni:eshell-mode-func ()
- "Function for `eshell-mode-hook'."
- (setq truncate-lines nil))
-
-(defun oni:eshell-prompt-function ()
- (let ((status (if (zerop eshell-last-command-status) ?+ ?-))
- (hostname (shell-command-to-string "hostname"))
- (dir (abbreviate-file-name (eshell/pwd)))
- (branch
- (shell-command-to-string
- "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'"))
- (userstatus (if (zerop (user-uid)) ?# ?$)))
- (concat
- (propertize (char-to-string status)
- 'face `(:foreground ,(if (= status ?+)
- (oni:color chameleon-1)
- (oni:color scarlet-red-2))))
- " "
- (propertize (substring hostname 0 -1) 'face 'mode-line-buffer-id)
- " "
- (propertize (oni:shorten-dir dir) 'face 'font-lock-string-face)
- " "
- (when (not (string= branch ""))
- (propertize
- ;; Cut off "* " and "\n"
- (substring branch 2 -1)
- 'face 'font-lock-function-name-face))
- " \n"
- (propertize (char-to-string userstatus)
- 'face `(:foreground ,(oni:color sky-blue-1)))
- "> ")))
-
-;;;###autoload
-(defun oni:raise-eshell ()
- "Start or switch back to `eshell'. Also change directories to
- current working directory."
- (interactive)
- (let ((dir (file-name-directory
- (or (buffer-file-name) "~/")))
- (hasfile (not (eq (buffer-file-name) nil))))
- (eshell)
- (if (and hasfile (eq eshell-process-list nil))
- (progn
- (eshell/cd dir)
- (eshell-reset)))))
-
-(defun oni:shorten-dir (dir)
- "Shorten a directory, (almost) like fish does it."
- (while (string-match "\\(/\\.?[^./]\\)[^/]+/" dir)
- (setq dir (replace-match "\\1/" nil nil dir)))
- dir)
-
-(setq eshell-prompt-regexp "^[#$]> ")
-(setq eshell-highlight-prompt nil)
-(setq eshell-prompt-function 'oni:eshell-prompt-function)
-(add-hook 'eshell-mode-hook 'oni:eshell-mode-func)
diff --git a/emacs/init.el b/emacs/init.el
index 2b9594b..fb33134 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1,3 +1,9 @@
+(require 'geiser-install)
+(require 'iso-transl)
+(require 'newcomment)
+(require 'uniquify)
+(require 'w3m-load)
+
(eval-and-compile
(package-initialize)
@@ -36,11 +42,26 @@
(require 'whitespace)
(require 'yasnippet))
+(autoload 'gtags-mode "gtags" nil t)
(autoload 'identica-mode "identica-mode" nil t)
(autoload 'mu4e "mu4e" nil t)
(autoload 'naquadah-get-colors "naquadah-theme")
+(autoload 'php-mode "php-mode" nil t)
+(autoload 'po-mode "po-mode" nil t)
+(autoload 'pony-mode "pony-mode" nil t)
+(autoload 'sawfish-mode "sawfish" nil t)
+(autoload 'xmodmap-mode "xmodmap-mode" nil t)
+
(load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
-(load (expand-file-name "~/.emacs.d/loaddefs.el"))
+
+(define-key key-translation-map (kbd "C-j") (kbd "C-l"))
+(define-key key-translation-map (kbd "C-l") (kbd "C-j"))
+
+(defadvice org-agenda-redo (after org-agenda-redo-add-appts)
+ "Pressing `r' on the agenda will also add appointments."
+ (progn
+ (setq appt-time-msg-list nil)
+ (org-agenda-to-appt)))
(defalias 'yes-or-no-p 'y-or-n-p)
@@ -51,6 +72,55 @@
"\\(?:\\s \\|\t\\|\n\\)\\(?:\\sw\\|_\\)+([^)]*)[^;\n]*$"))
"Regex for `outline-minor-mode' for `c-mode'.")
+(defconst oni:javascript-outline-regex "function \\(\\w\\|_\\)+("
+ "Regex for `outline-minor-mode' for `js-mode'.")
+
+(defconst oni:php-outline-regex
+ (eval-when-compile
+ (concat
+ "^ *\\(\\(?:namespace\\|interface\\) [a-zA-Z0-9_]\\|\\(\\(abstract"
+ "\\|final\\) \\)?class [a-zA-Z0-9_]+\\( extends [\\a-zA-Z0-9_]+\\)?"
+ "\\|\\(abstract \\)?\\(public\\|private\\|protected\\)?"
+ "\\( static\\)? function [a-zA-Z0-9_]+(\\|/\\*\\*\\)"))
+ "Regex for `outline-minor-mode' for `php-mode'.")
+
+(defconst oni:python-outline-regex
+ (eval-when-compile
+ (concat "^[ \t]*\\(?:@[a-zA-Z0-9_]+\\(?:([a-zA-Z0-9_=, ]*)\\)?"
+ "\n\\)*[ \t]*\\(?:\\(class\\|def\\)[ \t]+\\(\\sw\\|\\s_\\)+"
+ "\\(([^)]*):\\)?\\|\\#[ a-zA-Z0-9]*\\#\\)"))
+ "Regex for `outline-minor-mode' for `python-mode'.")
+
+(defface oni:mode-line-buffer-column
+ '((t (:inherit font-lock-type-face)))
+ "Face for the column number in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-line
+ '((t (:inherit font-lock-type-face)))
+ "Face for the line number in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-position
+ '((t (:inherit font-lock-constant-face)))
+ "Face for the buffer position in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-state
+ '((t (:inherit font-lock-preprocessor-face)))
+ "Face for the state of the buffer in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-mode
+ '((t (:inherit font-lock-string-face)))
+ "Face for the major mode in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-modified
+ '((t (:inherit font-lock-warning-face)))
+ "Face for the modified state in the mode-line"
+ :group 'local)
+
(defmacro oni:define-mailbox (name email &optional signature longname)
"Define a mailbox function."
`(defun ,(make-symbol (concat "oni:" name "-mailbox")) ()
@@ -114,6 +184,16 @@
(setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
(hs-minor-mode))
+(defun oni:c-mode-func ()
+ "Function for `c-mode-hook'."
+ (local-set-key [f9] 'compile)
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(defun oni:close-client-window ()
+ "Close a client's frames."
+ (interactive)
+ (server-save-buffers-kill-terminal nil))
+
(defun oni:compile-el ()
"Compile the current buffer file if it is an .el file."
(let* ((full-file-name (buffer-file-name))
@@ -123,15 +203,199 @@
(string-equal suffix "el"))
(byte-compile-file full-file-name))))
+(defun oni:css-mode-func ()
+ "Function for `css-mode-hook'."
+ (setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
+ (hs-minor-mode)
+ (local-set-key "\C-j" 'oni:newline-and-indent)
+ (rainbow-mode))
+
+(defun oni:diary-display-func ()
+ "Function for `diary-display-hook'."
+ (diary-fancy-display))
+
+(defun oni:emacs-lisp-mode-func ()
+ "Function for `emacs-lisp-mode-hook'."
+ (eldoc-mode)
+ (when (buffer-file-name)
+ (hs-minor-mode)))
+
+(defun oni:emms-toggle-playing ()
+ "Toggle between playing/paused states."
+ (interactive)
+ (if (eq emms-player-playing-p nil)
+ (emms-start)
+ (emms-pause)))
+
+(defun oni:erc-mode-func ()
+ "Function for `erc-mode-hook'."
+ (erc-fill-mode -1)
+ (visual-line-mode)
+ (setq truncate-lines nil))
+
+(defun oni:eshell-mode-func ()
+ "Function for `eshell-mode-hook'."
+ (setq truncate-lines nil))
+
+(defun oni:eshell-prompt-function ()
+ (let ((status (if (zerop eshell-last-command-status) ?+ ?-))
+ (hostname (shell-command-to-string "hostname"))
+ (dir (abbreviate-file-name (eshell/pwd)))
+ (branch
+ (shell-command-to-string
+ "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'"))
+ (userstatus (if (zerop (user-uid)) ?# ?$)))
+ (concat
+ (propertize (char-to-string status)
+ 'face `(:foreground ,(if (= status ?+)
+ (oni:color chameleon-1)
+ (oni:color scarlet-red-2))))
+ " "
+ (propertize (substring hostname 0 -1) 'face 'mode-line-buffer-id)
+ " "
+ (propertize (oni:shorten-dir dir) 'face 'font-lock-string-face)
+ " "
+ (when (not (string= branch ""))
+ (propertize
+ ;; Cut off "* " and "\n"
+ (substring branch 2 -1)
+ 'face 'font-lock-function-name-face))
+ " \n"
+ (propertize (char-to-string userstatus)
+ 'face `(:foreground ,(oni:color sky-blue-1)))
+ "> ")))
+
+(defun oni:flymake-mode-func ()
+ "Function for `flymake-mode-hook'."
+ (local-set-key [M-P] 'flymake-goto-prev-error)
+ (local-set-key [M-N] 'flymake-goto-next-error))
+
+(defun oni:flymake-pyflakes-init ()
+ "Initialize function for flymake with pyflakes."
+ (let* ((temp-file (flymake-init-create-temp-buffer-copy
+ 'flymake-create-temp-inplace))
+ (local-file (file-relative-name temp-file (file-name-directory
+ buffer-file-name))))
+ (list "pyflakes" (list local-file))))
+
+(defun oni:go-mode-func ()
+ "Function for `go-mode-hook'."
+ (setq indent-tabs-mode nil)
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(defun oni:gtags-mode-func ()
+ "Function for `gtags-mode-hook'."
+ (local-set-key "\M-," 'gtags-find-tag)
+ (local-set-key "\M-." 'gtags-find-rtag))
+
(defun oni:hs-minor-mode-func ()
"Function for `hs-minor-mode-hook'."
(local-set-key [C-tab] 'hs-toggle-hiding)
(hs-hide-all))
+(defun oni:html-mode-func ()
+ "Function for `html-mode-hook'."
+ (fci-mode))
+
+(defun oni:indent-shift-left (start end &optional count)
+ (interactive
+ (if mark-active
+ (list (region-beginning) (region-end) current-prefix-arg)
+ (list (line-beginning-position)
+ (line-end-position)
+ current-prefix-arg)))
+ (if count
+ (setq count (prefix-numeric-value count))
+ (setq count tab-width))
+ (when (> count 0)
+ (let ((deactivate-mark nil))
+ (save-excursion
+ (goto-char start)
+ (while (< (point) end)
+ (if (and (< (current-indentation) count)
+ (not (looking-at "[ \t]*$")))
+ (error "Can't shift all lines enough"))
+ (forward-line))
+ (indent-rigidly start end (- count))))))
+
+(defun oni:indent-shift-right (start end &optional count)
+ (interactive
+ (if mark-active
+ (list (region-beginning) (region-end) current-prefix-arg)
+ (list (line-beginning-position)
+ (line-end-position)
+ current-prefix-arg)))
+ (let ((deactivate-mark nil))
+ (if count
+ (setq count (prefix-numeric-value count))
+ (setq count tab-width))
+ (indent-rigidly start end count)))
+
(defun oni:jabber-chat-mode-func ()
"Function for `jabber-chat-mode-hook'."
(visual-line-mode))
+(defun oni:java-mode-func ()
+ "Function for `java-mode-hook'."
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(defun oni:js-mode-func ()
+ "Function for `js-mode-hook'."
+ (oni:generic-outline oni:javascript-outline-regex)
+ (rainbow-delimiters-mode)
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(defun oni:kill-region-or-backward-char ()
+ "Kill either the active region, or delete the character left of
+ the cursor"
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (backward-delete-char-untabify 1)))
+
+(defun oni:kill-region-or-forward-char ()
+ "Kill either the active region, or delete the character right
+ of the cursor"
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (delete-forward-char 1)))
+
+(defun oni:kill-region-or-line ()
+ "Kill either the active region, or the rest of the line,
+ depending on whether or not `region-active-p' is t"
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (kill-line)))
+
+(defun oni:lisp-mode-func ()
+ "Function for `lisp-mode-hook'."
+ (hs-minor-mode))
+
+(defun oni:magit-log-edit-mode-func ()
+ "Function for `magit-log-edit-mode-hook'."
+ (auto-fill-mode)
+ (font-lock-add-keywords
+ nil
+ '(("\\`\\(.\\{,50\\}\\)\\(.*\\)\n?\\(.*\\)$"
+ (1 'git-commit-summary-face)
+ (2 'git-commit-overlong-summary-face)
+ (3 'git-commit-nonempty-second-line-face))
+ ("`\\([^']+\\)'" 1 font-lock-constant-face))
+ t))
+
+(defun oni:markdown-mode-func ()
+ "Function for `markdown-mode-hook'."
+ (auto-fill-mode)
+ (whitespace-mode))
+
+(defun oni:message-mode-func ()
+ "Function for `message-mode-hook'."
+ (auto-fill-mode)
+ (flyspell-mode)
+ (ispell-change-dictionary (read-string "New dictionary: ")))
+
(defun oni:mini-fix-timestamp-string (date-string)
"A minimal version of Xah Lee's `fix-timestamp-string'
function, found at http://xahlee.org/emacs/elisp_parse_time.html"
@@ -155,17 +419,82 @@
(match-string 2 date-string)
(match-string 1 date-string)))
-(defun oni:myepisodes-formatter (plist)
- "Format RSS items from MyEpisodes as org tasks."
- (let ((str (plist-get plist :title)))
- (string-match
- "^\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]$"
- str)
- (let* ((title (match-string 1 str))
- (episode (match-string 2 str))
- (name (match-string 3 str))
- (date (oni:mini-fix-timestamp-string (match-string 4 str))))
- (format "* ACQUIRE %s %s - %s <%s>" title episode name date))))
+(defun oni:move-beginning-of-dwim ()
+ "Move to the beginning of line, either after the indentatoin of
+ before."
+ (interactive)
+ (let ((start (point)))
+ (back-to-indentation)
+ (if (= start (point))
+ (beginning-of-line))))
+
+(defun oni:move-end-of-dwim ()
+ "Move to the end of line, either before any comments or after
+ them."
+ (interactive)
+ (let ((start (point))
+ (eolpos (line-end-position)))
+ (beginning-of-line)
+ (if (and comment-start
+ (comment-search-forward eolpos t))
+ (progn
+ (search-backward-regexp (concat "[^ \t" comment-start "]"))
+ (forward-char)
+
+ (when (or (bolp)
+ (= start (point)))
+ (end-of-line)))
+ (end-of-line))))
+
+(defun oni:myepisodes-formatter (plist)
+ "Format RSS items from MyEpisodes as org tasks."
+ (let ((str (plist-get plist :title)))
+ (string-match
+ "^\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]$"
+ str)
+ (let* ((title (match-string 1 str))
+ (episode (match-string 2 str))
+ (name (match-string 3 str))
+ (date (oni:mini-fix-timestamp-string (match-string 4 str))))
+ (format "* ACQUIRE %s %s - %s <%s>" title episode name date))))
+
+(defun oni:newline-and-indent ()
+ (interactive)
+ (if (and (not (or (= (point) (point-max))
+ (= (point) (point-min))))
+ (or (and (char-equal (char-before) ?{)
+ (char-equal (char-after) ?}))
+ (and (char-equal (char-before) ?\()
+ (char-equal (char-after) ?\)))))
+ (save-excursion (newline-and-indent)))
+ (newline-and-indent))
+
+(defun oni:org-capture-before-finalize-func ()
+ (save-excursion
+ (goto-char (point-min))
+ (while (re-search-forward "<>" nil t)
+ (let (beg end)
+ (save-match-data
+ (search-forward "\n\n")
+ (skip-syntax-forward " ")
+ (setq beg (point))
+ (search-forward "\n")
+ (setq end (1- (point))))
+ (replace-match (buffer-substring beg end) t t)))))
+
+(defun oni:org-mode-func ()
+ "Function for `org-mode-hook'."
+ (flyspell-mode)
+ (auto-fill-mode))
+
+(defun oni:php-mode-func ()
+ "Function for `php-mode-hook'."
+ (flymake-mode)
+ (local-set-key "\C-j" 'oni:newline-and-indent)
+ (c-set-offset 'arglist-intro '+)
+ (c-set-offset 'arglist-close '0)
+ (rainbow-delimiters-mode)
+ (setq fci-rule-column 81))
(defun oni:prog-mode-func ()
"Function for `prog-mode-hook'."
@@ -173,6 +502,57 @@
(fci-mode)
(pretty-symbols-mode))
+(defun oni:python-mode-func ()
+ "Function for `python-mode-hook'."
+ (flymake-mode)
+ (local-set-key (kbd "C->") 'python-indent-shift-right)
+ (local-set-key (kbd "C-<") 'python-indent-shift-left)
+ (local-set-key [C-tab] 'outline-toggle-children)
+ (oni:generic-outline oni:python-outline-regex)
+ (set (make-local-variable 'electric-indent-chars) nil)
+ (rainbow-delimiters-mode)
+ (fci-mode))
+
+(defun oni:raise-eshell ()
+ "Start or switch back to `eshell'. Also change directories to
+ current working directory."
+ (interactive)
+ (let ((dir (file-name-directory
+ (or (buffer-file-name) "~/")))
+ (hasfile (not (eq (buffer-file-name) nil))))
+ (eshell)
+ (if (and hasfile (eq eshell-process-list nil))
+ (progn
+ (eshell/cd dir)
+ (eshell-reset)))))
+
+(defun oni:raise-scratch (&optional mode)
+ "Show the *scratch* buffer. If called with a universal
+argument, ask the user which mode to use. If MODE is not nil,
+open a new buffer with the name *MODE-scratch* and load MODE as
+its major mode."
+ (interactive (list (if current-prefix-arg
+ (read-string "Mode: ")
+ nil)))
+ (let* ((bname (if mode
+ (concat "*" mode "-scratch*")
+ "*scratch*"))
+ (buffer (get-buffer bname))
+ (mode-sym (intern (concat mode "-mode"))))
+
+ (unless buffer
+ (setq buffer (generate-new-buffer bname))
+ (with-current-buffer buffer
+ (when (fboundp mode-sym)
+ (funcall mode-sym))))
+
+ (switch-to-buffer buffer)))
+
+(defun oni:reload-buffer ()
+ "Reload current buffer."
+ (interactive)
+ (revert-buffer nil t nil))
+
(defun oni:replace-html-special-chars ()
(oni:replace-occurrences "é" "é"))
@@ -193,6 +573,39 @@
(setq tmp-packages (cdr tmp-packages)))
result))
+(defun oni:scheme-mode-func ()
+ "Function for `scheme-mode-hook'."
+ (hs-minor-mode))
+
+(defun oni:self-insert-dwim ()
+ "Execute self insert, but when the region is active call self
+ insert at the end of the region and at the beginning."
+ (interactive)
+ (if (region-active-p)
+ (let ((electric-pair-mode nil)
+ (beginning (region-beginning))
+ (end (region-end)))
+ (goto-char end)
+ (self-insert-command 1)
+ (save-excursion
+ (goto-char beginning)
+ (self-insert-command 1)))
+ (self-insert-command 1)))
+
+(defun oni:shorten-dir (dir)
+ "Shorten a directory, (almost) like fish does it."
+ (while (string-match "\\(/\\.?[^./]\\)[^/]+/" dir)
+ (setq dir (replace-match "\\1/" nil nil dir)))
+ dir)
+
+(defun oni:term-mode-func ()
+ "Function for `term-mode-hook'."
+ (setq truncate-lines nil))
+
+(defun oni:texinfo-mode-func ()
+ "Function for `texinfo-mode-hook'."
+ (auto-fill-mode))
+
(defun oni:view-mail ()
"Show a menu with all mailbox options from `oni:mailbox-map'
for easy selection."
@@ -206,6 +619,53 @@ for easy selection."
(funcall (intern (concat "oni:" inbox "-mailbox")))
(mu4e)))))
+(defun oni:write-file-func ()
+ "Function for `write-file-hooks'."
+ (time-stamp))
+
+(eval-after-load "ebuff-menu"
+ '(define-key electric-buffer-menu-mode-map
+ (kbd "C-s") 'isearch-forward))
+
+(eval-after-load "em-term"
+ '(add-to-list 'eshell-visual-commands
+ "unison"))
+
+(eval-after-load "emms-source-file"
+ '(progn
+ (require 'emms-setup)
+
+ (emms-standard)
+ (require 'emms-player-mpd)
+
+ (setq emms-player-mpd-server-name "localhost")
+ (setq emms-player-mpd-server-port "6600")
+
+ (add-to-list 'emms-info-functions 'emms-info-mpd)
+ (add-to-list 'emms-player-list 'emms-player-mpd)
+ (setq emms-player-mpd-music-directory "/mnt/music/mp3")))
+
+(eval-after-load "flymake"
+ '(progn
+ (require 'flymake-cursor)
+
+ (add-to-list ; Make sure pyflakes is loaded
+ 'flymake-allowed-file-name-masks ; for python files.
+ '("\\.py\\'" oni:flymake-pyflakes-init))
+
+ (add-to-list ; Error line repexp for go
+ 'flymake-err-line-patterns ; compilation.
+ '("^\\([a-zA-Z0-9_]+\\.go\\):\\([0-9]+\\):\\(.*\\)$"
+ 1 2 nil 3))
+
+ (add-to-list ; Go uses makefiles, makes
+ 'flymake-allowed-file-name-masks ; flymaking 'easy'.
+ '("\\.go$" flymake-simple-make-init))))
+
+(eval-after-load "ido"
+ '(setq ido-ignore-buffers `(,@ido-ignore-buffers
+ "^\\*.*\\*$" "^irc\\." "^\\#")))
+
(eval-after-load "info"
'(require 'info+))
@@ -218,6 +678,32 @@ for easy selection."
" :EMAIL: %(mu4e-view-snarf-from 'email)\n"
" :END:"))))
+(eval-after-load "org"
+ '(progn
+ (require 'appt)
+ (require 'org-protocol)
+ (require 'org-habit)
+ (require 'org-contacts)
+
+ (add-to-list 'org-modules 'habit)
+
+ (org-indent-mode t)
+
+ (org-agenda-to-appt)
+ (ad-activate 'org-agenda-redo)))
+
+(eval-after-load "org-crypt"
+ '(org-crypt-use-before-save-magic))
+
+(eval-after-load "sauron"
+ '(setq sauron-modules (append '(sauron-identica sauron-jabber)
+ sauron-modules)))
+
+(eval-after-load "smex"
+ '(progn
+ (global-set-key (kbd "M-x") 'smex)
+ (global-set-key (kbd "C-M-x") 'smex-major-mode-commands)))
+
(oni:define-mailbox "aethon"
(oni:email thomas at aethon dot nl)
(expand-file-name "~/documents/work/aethon/signature.txt"))
@@ -227,12 +713,115 @@ for easy selection."
(oni:define-mailbox "ryuslash" (oni:email tom at ryuslash dot org)
nil "ryuslash.org")
+(put 'upcase-region 'disabled nil)
+(put 'downcase-region 'disabled nil)
+(put 'narrow-to-region 'disabled nil)
+
+(setq-default bidi-paragraph-direction 'left-to-right)
(setq-default c-basic-offset 4)
(setq-default fci-rule-column 73)
+(setq-default gac-automatically-push-p t)
+(setq-default indent-tabs-mode nil)
+(setq-default mode-line-format
+ (list
+ '(:eval
+ (if (and (buffer-modified-p) (buffer-file-name))
+ (propertize "!"
+ 'face 'oni:mode-line-modified
+ 'help-echo "Buffer has been modified")
+ " "))
+
+ '(:eval (propertize "%m"
+ 'face 'oni:mode-line-mode
+ 'help-echo buffer-file-coding-system))
+
+ ": "
+
+ '(:eval (propertize "%b "
+ 'face 'mode-line-buffer-id
+ 'help-echo (buffer-file-name)))
+
+ "("
+ (propertize "%p" 'face 'oni:mode-line-buffer-position) ":"
+ (propertize "%04l" 'face 'oni:mode-line-buffer-line) ","
+ (propertize "%02c" 'face 'oni:mode-line-buffer-column)
+ ") "
+
+ "["
+ '(:eval (propertize
+ (if buffer-read-only
+ "R"
+ (if overwrite-mode "O" "I"))
+ 'face 'oni:mode-line-buffer-state
+ 'help-echo (concat "Buffer is "
+ (if buffer-read-only
+ "read-only"
+ (if overwrite-mode
+ "in overwrite mode"
+ "in insert mode")))))
+
+ "] "
+
+ '(:eval
+ (propertize (format-time-string "%H:%M")
+ 'help-echo
+ (concat (format-time-string "%c; ")
+ (emacs-uptime "Uptime: %hh"))))
+ " --"
+ '(:eval global-mode-string)))
+(setq-default php-mode-warn-if-mumamo-off nil)
+(setq-default require-final-newline t)
+(setq-default tab-width 4)
+(setq-default truncate-lines t)
+(setq appt-display-diary nil)
+(setq auto-mode-case-fold nil)
+(setq auto-save-file-name-transforms
+ `((".*" ,temporary-file-directory t)))
(setq avandu-article-render-function #'avandu-view-w3m)
+(setq backup-directory-alist
+ `((".*" . ,temporary-file-directory)))
+(setq browse-url-browser-function 'browse-url-generic)
+(setq browse-url-generic-program (getenv "BROWSER"))
+(setq custom-file "~/.emacs.d/custom.el")
+(setq custom-theme-directory "~/.emacs.d/themes")
+(setq default-frame-alist
+ `((border-width . 0)
+ (internal-border-width . 0)
+ (vertical-scroll-bars . nil)
+ (menu-bar-lines . nil)
+ (tool-bar-lines . nil)
+ (font . "DejaVu Sans Mono:pixelsize=18")
+ (left-fringe . 0)))
+(setq emms-source-file-default-directory "/mnt/music/")
+(setq erc-autojoin-channels-alist
+ '(("freenode.net" "#herbstluftwm" "#ninthfloor" "#emacs"
+ "#dispass")))
+(setq erc-hide-list '("JOIN" "PART" "QUIT"))
+(setq erc-insert-timestamp-function 'erc-insert-timestamp-left)
+(setq erc-nick "ryuslash")
+(setq erc-timestamp-format "[%H:%M] ")
+(setq erc-timestamp-only-if-changed-flag nil)
+(setq eshell-highlight-prompt nil)
+(setq eshell-prompt-function 'oni:eshell-prompt-function)
+(setq eshell-prompt-regexp "^[#$]> ")
(setq fci-rule-color "darkred")
+(setq flymake-gui-warnings-enabled nil)
+(setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
+(setq flymake-log-level 0)
+(setq frame-title-format '(:eval (concat "emacs: " (buffer-name))))
+(setq geiser-active-implementations '(guile))
+(setq geiser-repl-history-filename "~/.emacs.d/geiser-history")
+(setq gtags-auto-update t)
+(setq help-at-pt-display-when-idle t)
+(setq ido-auto-merge-delay-time 1000000)
+(setq ido-save-directory-list-file nil)
(setq inferior-lisp-program "sbcl")
+(setq inhibit-default-init t)
+(setq inhibit-local-menu-bar-menus t)
+(setq inhibit-startup-message t)
+(setq initial-major-mode 'emacs-lisp-mode)
+(setq initial-scratch-message nil)
(setq jabber-account-list '(("ryuslash@jabber.org")))
(setq jabber-chat-buffer-format "*jabber:%n*")
(setq jabber-chat-buffer-show-avatar nil)
@@ -242,7 +831,10 @@ for easy selection."
(setq jabber-chatstates-confirm nil)
(setq jabber-history-dir "~/.emacs.d/jabber")
(setq jabber-roster-show-bindings nil)
+(setq jit-lock-defer-time 0.2)
(setq mail-header-separator "")
+(setq message-log-max 1000)
+(setq message-send-mail-function 'message-send-mail-with-sendmail)
(setq mu4e-headers-date-format "%d-%m %H:%M")
(setq mu4e-headers-fields '((:date . 11)
(:flags . 6)
@@ -256,243 +848,27 @@ for easy selection."
(oni:email ryuslash at gmail dot com)
(oni:email ryuslash at ninthfloor dot org)
(oni:email thomas at aethon dot nl)))
-(setq package-archives
- '(("melpa" . "http://melpa.milkbox.net/packages/")
- ("ELPA" . "http://tromey.com/elpa/")
- ("gnu" . "http://elpa.gnu.org/packages/")
- ("marmalade" . "http://marmalade-repo.org/packages/")))
-(setq package-load-list '((htmlize "1.39")
- all))
-(setq org-feed-alist
- '(("MyEpisodes"
- "http://www.myepisodes.com/rss.php?feed=mylist&uid=Slash&pwdmd5=04028968e1f0b7ee678b748a4320ac17"
- "~/documents/org/org" "MyEpisodes"
- :formatter oni:myepisodes-formatter)))
-(setq send-mail-function 'smtpmail-send-it)
-(setq sendmail-program "/usr/bin/msmtp")
-(setq yas-prompt-functions '(yas-ido-prompt))
-
-(add-hook 'after-save-hook 'oni:after-save-func)
-(add-hook 'before-save-hook 'oni:before-save-func)
-(add-hook 'c-mode-common-hook 'oni:c-mode-common-func)
-(add-hook 'hs-minor-mode-hook 'oni:hs-minor-mode-func)
-(add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
-(add-hook 'prog-mode-hook 'oni:prog-mode-func)
-
-(global-set-key (kbd "") 'jabber-switch-to-roster-buffer)
-(global-set-key (kbd "") 'oni:raise-eshell)
-(global-set-key (kbd "M-n") 'idomenu)
-
-(unless (oni:required-packages-installed-p)
- (message "%s" "Refreshing package database...")
- (package-refresh-contents)
- (message "%s" " done.")
- (mapc #'(lambda (package)
- (when (not (package-installed-p package))
- (package-install package)))
- oni:required-packages))
-
-(defun oni:c-mode-func ()
- "Function for `c-mode-hook'."
- (local-set-key [f9] 'compile)
- (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(add-hook 'c-mode-hook 'oni:c-mode-func)
-
-(defun oni:css-mode-func ()
- "Function for `css-mode-hook'."
- (setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
- (hs-minor-mode)
- (local-set-key "\C-j" 'oni:newline-and-indent)
- (rainbow-mode))
-
-(add-hook 'css-mode-hook 'oni:css-mode-func)
-
-(defun oni:emacs-lisp-mode-func ()
- "Function for `emacs-lisp-mode-hook'."
- (eldoc-mode)
- (when (buffer-file-name)
- (hs-minor-mode)))
-
-(add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func)
-
-(defun oni:go-mode-func ()
- "Function for `go-mode-hook'."
- (setq indent-tabs-mode nil)
- (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(add-hook 'go-mode-hook 'oni:go-mode-func)
-
-(defun oni:html-mode-func ()
- "Function for `html-mode-hook'."
- (fci-mode))
-
-(add-hook 'html-mode-hook 'oni:html-mode-func)
-
-(defconst oni:javascript-outline-regex "function \\(\\w\\|_\\)+("
- "Regex for `outline-minor-mode' for `js-mode'.")
-
-(defun oni:js-mode-func ()
- "Function for `js-mode-hook'."
- (oni:generic-outline oni:javascript-outline-regex)
- (rainbow-delimiters-mode)
- (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(add-hook 'js-mode-hook 'oni:js-mode-func)
-
-(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js-mode))
-
-(defun oni:lisp-mode-func ()
- "Function for `lisp-mode-hook'."
- (hs-minor-mode))
-
-(add-hook 'lisp-mode-hook 'oni:lisp-mode-func)
-
-(defconst oni:python-outline-regex
- (eval-when-compile
- (concat "^[ \t]*\\(?:@[a-zA-Z0-9_]+\\(?:([a-zA-Z0-9_=, ]*)\\)?"
- "\n\\)*[ \t]*\\(?:\\(class\\|def\\)[ \t]+\\(\\sw\\|\\s_\\)+"
- "\\(([^)]*):\\)?\\|\\#[ a-zA-Z0-9]*\\#\\)"))
- "Regex for `outline-minor-mode' for `python-mode'.")
-
-(defun oni:python-mode-func ()
- "Function for `python-mode-hook'."
- (flymake-mode)
- (local-set-key (kbd "C->") 'python-indent-shift-right)
- (local-set-key (kbd "C-<") 'python-indent-shift-left)
- (local-set-key [C-tab] 'outline-toggle-children)
- (oni:generic-outline oni:python-outline-regex)
- (set (make-local-variable 'electric-indent-chars) nil)
- (rainbow-delimiters-mode)
- (fci-mode))
-
-(add-hook 'python-mode-hook 'oni:python-mode-func)
-
-(autoload 'pony-mode "pony-mode" nil t)
-
-(defconst oni:php-outline-regex
- (eval-when-compile
- (concat
- "^ *\\(\\(?:namespace\\|interface\\) [a-zA-Z0-9_]\\|\\(\\(abstract"
- "\\|final\\) \\)?class [a-zA-Z0-9_]+\\( extends [\\a-zA-Z0-9_]+\\)?"
- "\\|\\(abstract \\)?\\(public\\|private\\|protected\\)?"
- "\\( static\\)? function [a-zA-Z0-9_]+(\\|/\\*\\*\\)"))
- "Regex for `outline-minor-mode' for `php-mode'.")
-
-(defun oni:php-mode-func ()
- "Function for `php-mode-hook'."
- (flymake-mode)
- ;; (oni:gtags-for-php)
- (local-set-key "\C-j" 'oni:newline-and-indent)
- (c-set-offset 'arglist-intro '+)
- (c-set-offset 'arglist-close '0)
- (rainbow-delimiters-mode)
- (setq fci-rule-column 81))
-
-(autoload 'php-mode "php-mode" nil t)
-
-(setq-default php-mode-warn-if-mumamo-off nil)
-
-(setq php-function-call-face 'font-lock-function-name-face
- php-mode-force-pear t)
-
-(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
-
-(add-hook 'php-mode-hook 'oni:php-mode-func)
-
-(add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode))
-
-(defun oni:scheme-mode-func ()
- "Function for `scheme-mode-hook'."
- (hs-minor-mode))
-
-(add-hook 'scheme-mode-hook 'oni:scheme-mode-func)
-
-(require 'geiser-install)
-
-(setq geiser-active-implementations '(guile)
- geiser-repl-history-filename "~/.emacs.d/geiser-history")
-
-(defun oni:java-mode-func ()
- "Function for `java-mode-hook'."
- (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(add-hook 'java-mode-hook 'oni:java-mode-func)
-
-(defun oni:close-client-window ()
- "Close a client's frames."
- (interactive)
- (server-save-buffers-kill-terminal nil))
-
-(when (daemonp)
- (global-set-key "\C-x\C-c" 'oni:close-client-window))
-
-(defun oni:org-mode-func ()
- "Function for `org-mode-hook'."
- (flyspell-mode)
- (auto-fill-mode))
-
-(add-hook 'org-mode-hook 'oni:org-mode-func)
-
-(global-set-key "\C-ca" 'org-agenda)
-(global-set-key "\C-cc" 'org-capture)
-
-(eval-after-load "org"
- '(progn
- (require 'appt)
- (require 'org-protocol)
- (require 'org-habit)
- (require 'org-contacts)
-
- (add-to-list 'org-modules 'habit)
-
- (org-indent-mode t)
-
- (org-agenda-to-appt)
- (ad-activate 'org-agenda-redo)))
-
-(eval-after-load "org-crypt"
- '(org-crypt-use-before-save-magic))
-
-(setq org-hide-emphasis-markers t)
-
-(setq org-refile-allow-creating-parent-nodes t
- org-refile-targets '((nil . (:maxlevel . 6)))
- org-refile-use-outline-path 'file)
-
-(defadvice org-agenda-redo (after org-agenda-redo-add-appts)
- "Pressing `r' on the agenda will also add appointments."
- (progn
- (setq appt-time-msg-list nil)
- (org-agenda-to-appt)))
-
(setq org-agenda-custom-commands
'(("b" "Bookmarks to look at."
todo "LOOKAT")
("w" "Work todo."
tags-todo "CATEGORY=\"Work\"")))
-
-(setq org-directory (expand-file-name "~/documents/org"))
-
-(setq org-default-notes-file (concat org-directory "/org"))
-
-(setq org-agenda-files
- `(,(concat org-directory "/org")
- ,(concat org-directory "/misc/contacts.org")
- ,(concat org-directory "/misc/bookmarks.org")))
-
-(setq org-agenda-sorting-strategy ; How to sort my agenda.
+(setq org-agenda-sorting-strategy
'((agenda habit-down time-up priority-down category-keep)
(todo priority-down category-up)
(tags priority-down category-keep)
(search category-keep)))
-
-(setq org-capture-templates ; What to capture when.
- '(("t" "Task" entry (file+headline "" "tasks")
- "* TODO %^{Description}\n %u\n\n %?")
- ("T" "Task with link" entry (file+headline "" "tasks")
- "* TODO %^{Description}\n %u\n\n %a\n %?")
- ("h" "Habit" entry (file+headline "" "tasks")
+(setq org-capture-templates
+ '(("t" "Task" entry (file "")
+ "* TODO <>
+ :PROPERTIES:
+ :DIRECTORY: %(directory-file-name (or (org-capture-get :original-file) org-default-notes-file))
+ :FILE: %f
+ :END:
+ %u
+
+ %?%a")
+ ("h" "Habit" entry (file "")
(concat "* TODO %^{Description}\n"
" SCHEDULED: %^T\n"
" :PROPERTIES:\n"
@@ -508,14 +884,27 @@ for easy selection."
"* %^{Description} %^T" :immediate-finish t)
("b" "Bookmark" entry (file "~/documents/org/misc/bookmarks.org")
"* %c\n\n %:initial")))
-
-(setq org-export-htmlize-output-type 'css
- org-outline-path-complete-in-steps t
- org-return-follows-link t
- org-src-fontify-natively t
- org-tags-exclude-from-inheritance '("crypt")
- org-use-fast-todo-selection t)
-
+(setq org-contacts-files '("~/documents/org/misc/contacts.org"))
+(setq org-directory (expand-file-name "~/documents/org"))
+(setq org-agenda-files
+ `(,(concat org-directory "/org")
+ ,(concat org-directory "/misc/contacts.org")
+ ,(concat org-directory "/misc/bookmarks.org")))
+(setq org-default-notes-file (concat org-directory "/org"))
+(setq org-export-htmlize-output-type 'css)
+(setq org-feed-alist
+ '(("MyEpisodes"
+ "http://www.myepisodes.com/rss.php?feed=mylist&uid=Slash&pwdmd5=04028968e1f0b7ee678b748a4320ac17"
+ "~/documents/org/org" "MyEpisodes"
+ :formatter oni:myepisodes-formatter)))
+(setq org-hide-emphasis-markers t)
+(setq org-outline-path-complete-in-steps t)
+(setq org-refile-allow-creating-parent-nodes t)
+(setq org-refile-targets '((nil . (:maxlevel . 6))))
+(setq org-refile-use-outline-path 'file)
+(setq org-return-follows-link t)
+(setq org-src-fontify-natively t)
+(setq org-tags-exclude-from-inheritance '("crypt"))
(setq org-todo-keyword-faces
'(("TODO" :foreground "red")
("IN PROGRESS" :foreground "yellow")
@@ -524,373 +913,133 @@ for easy selection."
("WAITING" :foreground "orange")
("CANCELLED" :foreground "orangered")
("FAILED" :foreground "orangered")))
-
(setq org-todo-keywords
'((sequence "TODO(t)" "IN PROGRESS" "WAITING(@/!)" "|"
"DONE(!/!)" "CANCELLED(@/!)")))
+(setq org-use-fast-todo-selection t)
+(setq package-archives
+ '(("melpa" . "http://melpa.milkbox.net/packages/")
+ ("ELPA" . "http://tromey.com/elpa/")
+ ("gnu" . "http://elpa.gnu.org/packages/")
+ ("marmalade" . "http://marmalade-repo.org/packages/")))
+(setq package-load-list '((htmlize "1.39")
+ all))
+(setq php-function-call-face 'font-lock-function-name-face)
+(setq php-mode-force-pear t)
+(setq rainbow-delimiters-max-face-count 12)
+(setq redisplay-dont-pause t)
+(setq sauron-column-alist '((timestamp . 6)
+ (message)))
+(setq sauron-hide-mode-line t)
+(setq sauron-max-line-length 189)
+(setq sauron-timestamp-format "%H:%M")
+(setq sauron-watch-nicks '("ryuslash"))
+(setq sauron-watch-patterns '("ryuslash"))
+(setq scroll-conservatively 101)
+(setq send-mail-function 'smtpmail-send-it)
+(setq sendmail-program "/usr/bin/msmtp")
+(setq smex-save-file "~/.emacs.d/smex-items")
+(setq special-display-buffer-names '("*Sauron*"))
+(setq special-display-frame-alist '((minibuffer . nil)
+ (right-fringe . 0)))
+(setq time-stamp-active t)
+(setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)")
+(setq uniquify-buffer-name-style 'post-forward)
+(setq use-dialog-box nil)
+(setq user-full-name "Tom Willemsen")
+(setq whitespace-style '(face trailing))
+(setq yas-prompt-functions '(yas-ido-prompt))
-(defun oni:diary-display-func ()
- "Function for `diary-display-hook'."
- (diary-fancy-display))
-
+(add-hook 'after-save-hook 'oni:after-save-func)
+(add-hook 'before-save-hook 'oni:before-save-func)
+(add-hook 'c-mode-common-hook 'oni:c-mode-common-func)
+(add-hook 'c-mode-hook 'oni:c-mode-func)
+(add-hook 'css-mode-hook 'oni:css-mode-func)
(add-hook 'diary-display-hook 'oni:diary-display-func)
+(add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func)
+(add-hook 'erc-mode-hook 'oni:erc-mode-func)
+(add-hook 'eshell-mode-hook 'oni:eshell-mode-func)
+(add-hook 'flymake-mode-hook 'oni:flymake-mode-func)
+(add-hook 'go-mode-hook 'oni:go-mode-func)
+(add-hook 'gtags-mode-hook 'oni:gtags-mode-func)
+(add-hook 'hs-minor-mode-hook 'oni:hs-minor-mode-func)
+(add-hook 'html-mode-hook 'oni:html-mode-func)
+(add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
+(add-hook 'java-mode-hook 'oni:java-mode-func)
+(add-hook 'js-mode-hook 'oni:js-mode-func)
+(add-hook 'lisp-mode-hook 'oni:lisp-mode-func)
+(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
+(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
+(add-hook 'message-mode-hook 'oni:message-mode-func)
+(add-hook 'org-capture-before-finalize-hook
+ 'oni:org-capture-before-finalize-func)
+(add-hook 'org-mode-hook 'oni:org-mode-func)
+(add-hook 'php-mode-hook 'oni:php-mode-func)
+(add-hook 'prog-mode-hook 'oni:prog-mode-func)
+(add-hook 'python-mode-hook 'oni:python-mode-func)
+(add-hook 'scheme-mode-hook 'oni:scheme-mode-func)
+(add-hook 'term-mode-hook 'oni:term-mode-func)
+(add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func)
+(add-hook 'write-file-hooks 'oni:write-file-func)
-(setq appt-display-diary nil)
-
-(defun oni:newline-and-indent ()
- (interactive)
- (if (and (not (or (= (point) (point-max))
- (= (point) (point-min))))
- (or (and (char-equal (char-before) ?{)
- (char-equal (char-after) ?}))
- (and (char-equal (char-before) ?\()
- (char-equal (char-after) ?\)))))
- (save-excursion (newline-and-indent)))
- (newline-and-indent))
-
-(defun oni:emms-toggle-playing ()
- "Toggle between playing/paused states."
- (interactive)
- (if (eq emms-player-playing-p nil)
- (emms-start)
- (emms-pause)))
-
-(eval-after-load "emms-source-file"
- '(progn
- (require 'emms-setup)
-
- (emms-standard)
- (require 'emms-player-mpd)
-
- (setq emms-player-mpd-server-name "localhost")
- (setq emms-player-mpd-server-port "6600")
-
- (add-to-list 'emms-info-functions 'emms-info-mpd)
- (add-to-list 'emms-player-list 'emms-player-mpd)
- (setq emms-player-mpd-music-directory "/mnt/music/mp3")))
-
-(setq emms-source-file-default-directory "/mnt/music/")
-
-(global-set-key [XF86AudioNext] 'emms-next)
-(global-set-key [XF86AudioPlay] 'oni:emms-toggle-playing)
-(global-set-key [XF86AudioPrev] 'emms-previous)
-(global-set-key [XF86AudioStop] 'emms-stop)
-(global-set-key [XF86Tools] 'emms)
-
-(defun oni:erc-mode-func ()
- "Function for `erc-mode-hook'."
- (erc-fill-mode -1)
- (visual-line-mode)
- (setq truncate-lines nil))
-
-(setq erc-autojoin-channels-alist
- '(("freenode.net" "#herbstluftwm" "#ninthfloor" "#emacs"
- "#dispass")))
-
-(setq erc-nick "ryuslash")
-
-(add-hook 'erc-mode-hook 'oni:erc-mode-func)
-
-(setq erc-insert-timestamp-function 'erc-insert-timestamp-left
- erc-timestamp-format "[%H:%M] "
- erc-timestamp-only-if-changed-flag nil)
-
-(setq erc-hide-list '("JOIN" "PART" "QUIT"))
-
-(defun oni:flymake-mode-func ()
- "Function for `flymake-mode-hook'."
- (local-set-key [M-P] 'flymake-goto-prev-error)
- (local-set-key [M-N] 'flymake-goto-next-error))
-
-(add-hook 'flymake-mode-hook 'oni:flymake-mode-func)
-
-(defun oni:flymake-pyflakes-init ()
- "Initialize function for flymake with pyflakes."
- (let* ((temp-file (flymake-init-create-temp-buffer-copy
- 'flymake-create-temp-inplace))
- (local-file (file-relative-name temp-file (file-name-directory
- buffer-file-name))))
- (list "pyflakes" (list local-file))))
-
-(eval-after-load "flymake"
- '(progn
- (require 'flymake-cursor)
-
- (add-to-list ; Make sure pyflakes is loaded
- 'flymake-allowed-file-name-masks ; for python files.
- '("\\.py\\'" oni:flymake-pyflakes-init))
-
- (add-to-list ; Error line repexp for go
- 'flymake-err-line-patterns ; compilation.
- '("^\\([a-zA-Z0-9_]+\\.go\\):\\([0-9]+\\):\\(.*\\)$"
- 1 2 nil 3))
-
- (add-to-list ; Go uses makefiles, makes
- 'flymake-allowed-file-name-masks ; flymaking 'easy'.
- '("\\.go$" flymake-simple-make-init))))
-
-(setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log")
- flymake-log-level 0
- flymake-gui-warnings-enabled nil)
-
-(autoload 'gtags-mode "gtags" nil t)
-
-(defun oni:gtags-create-or-update ()
- "Create or update the GNU Global tag file"
- (interactive)
- (if (not (= 0 (call-process "global" nil nil nil " -p")))
- (let ((olddir default-directory)
- (topdir (read-directory-name
- "gtags: top of source tree:" default-directory)))
- (cd topdir)
- (shell-command "~/bin/create_gtags")
- (cd olddir))
- ;; Tagfile already exists; update it
- (shell-command "~/bin/update_gtags")))
-
-(defun oni:gtags-for-php ()
- "Setup gtags for `php-mode'."
- (let* ((file-name (buffer-file-name))
- (fext (if (not (eq nil file-name))
- (file-name-extension (buffer-file-name))
- nil)))
- (if (equal fext "php")
- (progn
- (gtags-mode)
- (oni:gtags-create-or-update)))))
-
-(defun oni:gtags-mode-func ()
- "Function for `gtags-mode-hook'."
- (local-set-key "\M-," 'gtags-find-tag)
- (local-set-key "\M-." 'gtags-find-rtag))
-
-(add-hook 'gtags-mode-hook 'oni:gtags-mode-func)
-
-(setq gtags-auto-update t)
-
-(require 'newcomment)
-
-(defun oni:kill-region-or-backward-char ()
- "Kill either the active region, or delete the character left of
- the cursor"
- (interactive)
- (if (region-active-p)
- (kill-region (region-beginning) (region-end))
- (backward-delete-char-untabify 1)))
-
-(global-set-key "\C-w" 'oni:kill-region-or-backward-char)
-
-(defun oni:kill-region-or-forward-char ()
- "Kill either the active region, or delete the character right
- of the cursor"
- (interactive)
- (if (region-active-p)
- (kill-region (region-beginning) (region-end))
- (delete-forward-char 1)))
-
-(global-set-key "\C-d" 'oni:kill-region-or-forward-char)
-
-(defun oni:kill-region-or-line ()
- "Kill either the active region, or the rest of the line,
- depending on whether or not `region-active-p' is t"
- (interactive)
- (if (region-active-p)
- (kill-region (region-beginning) (region-end))
- (kill-line)))
-
-(global-set-key "\C-k" 'oni:kill-region-or-line)
-
-(defun oni:move-beginning-of-dwim ()
- "Move to the beginning of line, either after the indentatoin of
- before."
- (interactive)
- (let ((start (point)))
- (back-to-indentation)
- (if (= start (point))
- (beginning-of-line))))
-
-(global-set-key "\C-a" 'oni:move-beginning-of-dwim)
-
-(defun oni:move-end-of-dwim ()
- "Move to the end of line, either before any comments or after
- them."
- (interactive)
- (let ((start (point))
- (eolpos (line-end-position)))
- (beginning-of-line)
- (if (and comment-start
- (comment-search-forward eolpos t))
- (progn
- (search-backward-regexp (concat "[^ \t" comment-start "]"))
- (forward-char)
-
- (when (or (bolp)
- (= start (point)))
- (end-of-line)))
- (end-of-line))))
-
-(global-set-key "\C-e" 'oni:move-end-of-dwim)
-
-(defun oni:self-insert-dwim ()
- "Execute self insert, but when the region is active call self
- insert at the end of the region and at the beginning."
- (interactive)
- (if (region-active-p)
- (let ((electric-pair-mode nil)
- (beginning (region-beginning))
- (end (region-end)))
- (goto-char end)
- (self-insert-command 1)
- (save-excursion
- (goto-char beginning)
- (self-insert-command 1)))
- (self-insert-command 1)))
-
-(global-set-key "'" 'oni:self-insert-dwim)
-(global-set-key "\"" 'oni:self-insert-dwim)
-
-(global-set-key [f7] 'magit-status)
-
-(defun oni:magit-log-edit-mode-func ()
- "Function for `magit-log-edit-mode-hook'."
- (auto-fill-mode)
- (font-lock-add-keywords
- nil
- '(("\\`\\(.\\{,50\\}\\)\\(.*\\)\n?\\(.*\\)$"
- (1 'git-commit-summary-face)
- (2 'git-commit-overlong-summary-face)
- (3 'git-commit-nonempty-second-line-face))
- ("`\\([^']+\\)'" 1 font-lock-constant-face))
- t))
-
-(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
+(global-set-key (kbd "'") 'oni:self-insert-dwim)
+(global-set-key (kbd "") 'emms-next)
+(global-set-key (kbd "") 'oni:emms-toggle-playing)
+(global-set-key (kbd "") 'emms-previous)
+(global-set-key (kbd "") 'emms-stop)
+(global-set-key (kbd "") 'oni:raise-scratch)
+(global-set-key (kbd "") 'oni:view-mail)
+(global-set-key (kbd "") 'emms)
+(global-set-key (kbd "") 'oni:reload-buffer)
+(global-set-key (kbd "") 'jabber-switch-to-roster-buffer)
+(global-set-key (kbd "") 'magit-status)
+(global-set-key (kbd "") 'oni:raise-eshell)
+(global-set-key (kbd "C-<") 'indent-shift-left)
+(global-set-key (kbd "C->") 'indent-shift-right)
+(global-set-key (kbd "C-@") 'er/expand-region)
+(global-set-key (kbd "C-M-d") 'kill-word)
+(global-set-key (kbd "C-M-w") 'backward-kill-word)
+(global-set-key (kbd "C-S-k") 'kill-whole-line)
+(global-set-key (kbd "C-a") 'oni:move-beginning-of-dwim)
+(global-set-key (kbd "C-c a") 'org-agenda)
+(global-set-key (kbd "C-c c") 'org-capture)
+(global-set-key (kbd "C-c i p") 'identica-update-status-interactive)
+(global-set-key (kbd "C-d") 'oni:kill-region-or-forward-char)
+(global-set-key (kbd "C-e") 'oni:move-end-of-dwim)
+(global-set-key (kbd "C-k") 'oni:kill-region-or-line)
+(global-set-key (kbd "C-w") 'oni:kill-region-or-backward-char)
+(global-set-key (kbd "C-x C-b") 'electric-buffer-list)
+(global-set-key (kbd "M-n") 'idomenu)
+(global-set-key (kbd "\"") 'oni:self-insert-dwim)
-(defun oni:markdown-mode-func ()
- "Function for `markdown-mode-hook'."
- (auto-fill-mode)
- (whitespace-mode))
+(when (daemonp)
+ (global-set-key "\C-x\C-c" 'oni:close-client-window))
-(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
+(when (or window-system (daemonp))
+ (global-unset-key "\C-z"))
+(add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js-mode))
(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?do?wn$" . markdown-mode))
-
-(setq whitespace-style '(face trailing))
-
-(defun oni:message-mode-func ()
- "Function for `message-mode-hook'."
- (auto-fill-mode)
- (flyspell-mode)
- (ispell-change-dictionary (read-string "New dictionary: ")))
-
-(setq message-send-mail-function 'message-send-mail-with-sendmail)
-
-(add-hook 'message-mode-hook 'oni:message-mode-func)
-
-(require 'w3m-load)
-
-(require 'uniquify)
-
-(setq uniquify-buffer-name-style 'post-forward)
-
-(defun oni:raise-scratch (&optional mode)
- "Show the *scratch* buffer. If called with a universal
-argument, ask the user which mode to use. If MODE is not nil,
-open a new buffer with the name *MODE-scratch* and load MODE as
-its major mode."
- (interactive (list (if current-prefix-arg
- (read-string "Mode: ")
- nil)))
- (let* ((bname (if mode
- (concat "*" mode "-scratch*")
- "*scratch*"))
- (buffer (get-buffer bname))
- (mode-sym (intern (concat mode "-mode"))))
-
- (unless buffer
- (setq buffer (generate-new-buffer bname))
- (with-current-buffer buffer
- (when (fboundp mode-sym)
- (funcall mode-sym))))
-
- (switch-to-buffer buffer)))
-
-(setq initial-major-mode 'emacs-lisp-mode
- initial-scratch-message nil)
-
-(global-set-key [XF86HomePage] 'oni:raise-scratch)
-
-(defun oni:reload-buffer ()
- "Reload current buffer."
- (interactive)
- (revert-buffer nil t nil))
-
-(global-set-key [f5] 'oni:reload-buffer)
-
-(defun oni:term-mode-func ()
- "Function for `term-mode-hook'."
- (setq truncate-lines nil))
-
-(add-hook 'term-mode-hook 'oni:term-mode-func)
-
-(defun oni:texinfo-mode-func ()
- "Function for `texinfo-mode-hook'."
- (auto-fill-mode))
-
-(add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func)
-
-(autoload 'xmodmap-mode "xmodmap-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
+(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
+(add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode))
+(add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode))
(add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode))
-(defun oni:indent-shift-left (start end &optional count)
- (interactive
- (if mark-active
- (list (region-beginning) (region-end) current-prefix-arg)
- (list (line-beginning-position)
- (line-end-position)
- current-prefix-arg)))
- (if count
- (setq count (prefix-numeric-value count))
- (setq count tab-width))
- (when (> count 0)
- (let ((deactivate-mark nil))
- (save-excursion
- (goto-char start)
- (while (< (point) end)
- (if (and (< (current-indentation) count)
- (not (looking-at "[ \t]*$")))
- (error "Can't shift all lines enough"))
- (forward-line))
- (indent-rigidly start end (- count))))))
+(add-to-list 'custom-theme-load-path
+ (concat custom-theme-directory "/naquadah-theme"))
(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
-(defun oni:indent-shift-right (start end &optional count)
- (interactive
- (if mark-active
- (list (region-beginning) (region-end) current-prefix-arg)
- (list (line-beginning-position)
- (line-end-position)
- current-prefix-arg)))
- (let ((deactivate-mark nil))
- (if count
- (setq count (prefix-numeric-value count))
- (setq count tab-width))
- (indent-rigidly start end count)))
-
-(global-set-key (kbd "C-<") 'indent-shift-left)
-(global-set-key (kbd "C->") 'indent-shift-right)
-
-(autoload 'po-mode "po-mode" nil t)
-(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
-
-(autoload 'sawfish-mode "sawfish" nil t)
-
-(add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode))
-
-(electric-indent-mode)
-(electric-pair-mode)
-(show-paren-mode)
-(savehist-mode)
+(unless (oni:required-packages-installed-p)
+ (message "%s" "Refreshing package database...")
+ (package-refresh-contents)
+ (message "%s" " done.")
+ (mapc #'(lambda (package)
+ (when (not (package-installed-p package))
+ (package-install package)))
+ oni:required-packages))
(blink-cursor-mode -1)
(menu-bar-mode -1)
@@ -898,223 +1047,17 @@ its major mode."
(tool-bar-mode -1)
(tooltip-mode -1)
-(defun oni:write-file-func ()
- "Function for `write-file-hooks'."
- (time-stamp))
-
-(add-hook 'write-file-hooks 'oni:write-file-func)
-
-(setq time-stamp-active t)
-(setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)")
-
+(electric-indent-mode)
+(electric-pair-mode)
(ido-mode)
-
-(setq ido-auto-merge-delay-time 1000000)
-
-(setq ido-save-directory-list-file nil)
-
-(eval-after-load "ido"
- '(setq ido-ignore-buffers `(,@ido-ignore-buffers
- "^\\*.*\\*$" "^irc\\." "^\\#")))
-
-(setq smex-save-file "~/.emacs.d/smex-items")
+(savehist-mode)
+(show-paren-mode)
(smex-initialize)
-
-(eval-after-load "smex"
- '(progn
- (global-set-key (kbd "M-x") 'smex)
- (global-set-key (kbd "C-M-x") 'smex-major-mode-commands)))
-
-(require 'iso-transl)
-
-(setq-default bidi-paragraph-direction 'left-to-right)
-
-(setq-default gac-automatically-push-p t)
-
-(setq-default indent-tabs-mode nil
- tab-width 4)
-
-(setq-default require-final-newline t)
-
-(setq-default truncate-lines t)
-
-(add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode))
-
-(setq auto-mode-case-fold nil)
-
-(setq auto-save-file-name-transforms
- `((".*" ,temporary-file-directory t))
-
- backup-directory-alist
- `((".*" . ,temporary-file-directory)))
-
-(setq browse-url-browser-function 'browse-url-generic
- browse-url-generic-program (getenv "BROWSER"))
-
-(setq custom-file "~/.emacs.d/custom.el")
-
-(setq custom-theme-directory "~/.emacs.d/themes")
-(add-to-list 'custom-theme-load-path
- (concat custom-theme-directory "/naquadah-theme"))
-(load-theme 'naquadah t)
-
-(setq
- default-frame-alist
- `((border-width . 0)
- (internal-border-width . 0)
- (vertical-scroll-bars . nil)
- (menu-bar-lines . nil)
- (tool-bar-lines . nil)
- (font . "DejaVu Sans Mono:pixelsize=18")
- (left-fringe . 0)))
-
-(setq frame-title-format '(:eval (concat "emacs: " (buffer-name))))
-
-(setq help-at-pt-display-when-idle t)
(help-at-pt-set-timer)
-(setq sauron-max-line-length 189)
-
-(eval-after-load "sauron"
- '(setq sauron-modules (append '(sauron-identica sauron-jabber)
- sauron-modules)))
-
-(setq sauron-column-alist ; I don't need as much
- '((timestamp . 6) ; information as the default.
- (message)))
-
-(setq sauron-hide-mode-line t)
-(setq sauron-timestamp-format "%H:%M")
-(setq sauron-watch-nicks '("ryuslash"))
-(setq sauron-watch-patterns '("ryuslash"))
-(setq special-display-buffer-names '("*Sauron*"))
-(setq special-display-frame-alist
- '((minibuffer . nil)
- (right-fringe . 0)))
-
-(setq inhibit-default-init t)
-
-(setq inhibit-local-menu-bar-menus t)
-
-(setq inhibit-startup-message t)
-
-(setq jit-lock-defer-time 0.2)
-
-(setq message-log-max 1000)
-
-(setq org-contacts-files '("~/documents/org/misc/contacts.org"))
-
-(setq rainbow-delimiters-max-face-count 12)
-
-(setq redisplay-dont-pause t)
-
-(put 'upcase-region 'disabled nil)
-(put 'downcase-region 'disabled nil)
-(put 'narrow-to-region 'disabled nil)
-
-(global-set-key (kbd "C-@") 'er/expand-region)
-
-(defface oni:mode-line-modified
- '((t (:inherit font-lock-warning-face)))
- "Face for the modified state in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-mode
- '((t (:inherit font-lock-string-face)))
- "Face for the major mode in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-buffer-position
- '((t (:inherit font-lock-constant-face)))
- "Face for the buffer position in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-buffer-line
- '((t (:inherit font-lock-type-face)))
- "Face for the line number in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-buffer-column
- '((t (:inherit font-lock-type-face)))
- "Face for the column number in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-buffer-state
- '((t (:inherit font-lock-preprocessor-face)))
- "Face for the state of the buffer in the mode-line"
- :group 'local)
-
-(setq-default
- mode-line-format
- (list
- '(:eval (if (and (buffer-modified-p) (buffer-file-name))
- (propertize "!"
- 'face 'oni:mode-line-modified
- 'help-echo "Buffer has been modified")
- " "))
-
- '(:eval (propertize "%m"
- 'face 'oni:mode-line-mode
- 'help-echo buffer-file-coding-system))
-
- ": "
-
- '(:eval (propertize "%b "
- 'face 'mode-line-buffer-id
- 'help-echo (buffer-file-name)))
-
- "("
- (propertize "%p" 'face 'oni:mode-line-buffer-position) ":"
- (propertize "%04l" 'face 'oni:mode-line-buffer-line) ","
- (propertize "%02c" 'face 'oni:mode-line-buffer-column)
- ") "
-
- "["
- '(:eval (propertize
- (if buffer-read-only
- "R"
- (if overwrite-mode "O" "I"))
- 'face 'oni:mode-line-buffer-state
- 'help-echo (concat "Buffer is "
- (if buffer-read-only
- "read-only"
- (if overwrite-mode
- "in overwrite mode"
- "in insert mode")))))
-
- "] "
-
- '(:eval (propertize (format-time-string "%H:%M")
- 'help-echo
- (concat (format-time-string "%c; ")
- (emacs-uptime "Uptime: %hh"))))
- " --"
- '(:eval global-mode-string)))
-
-(setq scroll-conservatively 101)
-
-(setq use-dialog-box nil)
-
-(setq user-full-name "Tom Willemsen")
-
-(define-key key-translation-map (kbd "C-j") (kbd "C-l"))
-(define-key key-translation-map (kbd "C-l") (kbd "C-j"))
-
-(global-set-key "\C-x\C-b" 'electric-buffer-list)
-(global-set-key "\C-\M-d" 'kill-word)
-(global-set-key "\C-\M-w" 'backward-kill-word)
-(global-set-key (kbd "C-S-k") 'kill-whole-line)
-(global-set-key [XF86Mail] 'oni:view-mail)
-(global-set-key "\C-cip" 'identica-update-status-interactive)
-
-(when (or window-system (daemonp))
- (global-unset-key "\C-z"))
+(load-theme 'naquadah t)
(load custom-file)
(load "rudel-loaddefs.el")
(load (expand-file-name "~/quicklisp/slime-helper.el"))
-
-;; Local Variables:
-;; no-update-autoloads: t
-;; End:
--
cgit v1.2.3-54-g00ecf
From 999f51952e31e1101b54873b5550e6116f13dfaa Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 26 Aug 2012 21:58:53 +0200
Subject: Add stumpwm
---
Makefile | 2 +-
stumpwm/Makefile | 4 ++
stumpwm/stumpwmrc | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 158 insertions(+), 1 deletion(-)
create mode 100644 stumpwm/Makefile
create mode 100644 stumpwm/stumpwmrc
diff --git a/Makefile b/Makefile
index a58a911..8df6334 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-modules = emacs
+modules = emacs stumpwm
install-modules = $(addprefix install-,$(modules))
.PHONY: all install $(modules) $(install-modules)
diff --git a/stumpwm/Makefile b/stumpwm/Makefile
new file mode 100644
index 0000000..98362a6
--- /dev/null
+++ b/stumpwm/Makefile
@@ -0,0 +1,4 @@
+.PHONY: all install
+all:
+install: stumpwmrc
+ install -Dm 444 $^ ${HOME}/.$^
diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc
new file mode 100644
index 0000000..1bed825
--- /dev/null
+++ b/stumpwm/stumpwmrc
@@ -0,0 +1,153 @@
+;; -*- mode: lisp; -*-
+(require 'swank)
+
+(in-package :stumpwm)
+
+;; Naquadah
+(defun colour (key)
+ (let ((colours (list :aluminium-1 #xeeeeec
+ :aluminium-2 #xd3d7cf
+ :aluminium-3 #xbabdb6
+ :aluminium-4 #x888a85
+ :aluminium-5 #x555753
+ :aluminium-6 #x2e3436
+ :butter-1 #xfce94f
+ :butter-2 #xedd400
+ :butter-3 #xc4a000
+ :orange-1 #xfcaf3e
+ :orange-2 #xf57900
+ :orange-3 #xce5c00
+ :chocolate-1 #xe9b96e
+ :chocolate-2 #xc17d11
+ :chocolate-3 #x9f5902
+ :chameleon-1 #x8ae234
+ :chameleon-2 #x73d216
+ :chameleon-3 #x4e9a06
+ :sky-blue-1 #x729fcf
+ :sky-blue-2 #x3465a4
+ :sky-blue-3 #x204a87
+ :plum-1 #xad7fa8
+ :plum-2 #x75507b
+ :plum-3 #x5c3566
+ :scarlet-red-1 #xef2929
+ :scarlet-red-2 #xcc0000
+ :scarlet-red-3 #xa40000
+ :background #x252a2b
+ :black #x0c191c
+ :cyan "cyan3")))
+ (getf colours key)))
+
+(defvar *emacs-program* "emacsclient -c -a emacs"
+ "The executable to run to start Emacs.")
+(defvar *firefox-program* "firefox"
+ "The executable to run to start Firefox.")
+(defvar *urxvt-program* "urxvt"
+ "The executable to run to start URxvt.")
+(defvar *i3lock-program* "i3lock -c 000000"
+ "The executable to run to start i3lock.")
+
+(defun get-mail-count (mailbox &optional (inbox "inbox"))
+ "Check how many new messages there are in MAILBOX."
+ (length
+ (directory
+ (format nil "/home/slash/documents/mail/~A/~A/new/*.*"
+ mailbox inbox))))
+
+(defcommand run-emacs () ()
+ "Open Emacs"
+ (run-shell-command *emacs-program*))
+
+(defcommand raise-emacs () ()
+ "Open or show Emacs"
+ (run-or-raise *emacs-program* '(:class "Emacs")))
+
+(defcommand run-firefox () ()
+ "Open Firefox"
+ (run-shell-command *firefox-program*))
+
+(defcommand raise-firefox () ()
+ "Open or show Firefox"
+ (run-or-raise *firefox-program* '(:class "Firefox")))
+
+(defcommand run-urxvt () ()
+ "Open URxvt"
+ (run-shell-command *urxvt-program*))
+
+(defcommand raise-urxvt () ()
+ "Open URxvt"
+ (run-or-raise *urxvt-program* '(:class "URxvt")))
+
+(defcommand run-i3lock () ()
+ "Lock screen"
+ (run-shell-command *i3lock-program*))
+
+(set-bg-color (colour :background))
+(set-border-color (colour :aluminium-6))
+(set-fg-color (colour :aluminium-1))
+(set-float-focus-color (colour :black))
+(set-float-unfocus-color (colour :aluminium-6))
+(set-focus-color (colour :black))
+(set-font "-*-dejavu sans mono-medium-r-*-*-15-*-*-*-*-*-iso10646-*")
+(set-unfocus-color (colour :aluminium-6))
+(set-win-bg-color (colour :background))
+
+(setf *colors* (mapcar #'colour '(:black :scarlet-red-1 :chameleon-1
+ :butter-1 :sky-blue-1 :plum-1 :cyan
+ :aluminium-1)))
+(setf *input-window-gravity* :bottom-left)
+(setf *maxsize-border-width* 1)
+(setf *message-window-gravity* :top-right)
+(setf *mode-line-background-color* (colour :background))
+(setf *mode-line-border-color* (colour :aluminium-6))
+(setf *mode-line-foreground-color* (colour :aluminium-1))
+(setf *normal-border-width* 1)
+(setf *shell-program* (getenv "SHELL"))
+(setf *transient-border-width* 1)
+(setf *window-border-style* :tight)
+(setf *window-format* "%m%50t")
+(setf *screen-mode-line-format*
+ (list "[%n]"
+ '(:eval
+ (format nil " | ryu: ~D | gmail: ~D | aethon: ~D | "
+ (get-mail-count "ryuslash.org")
+ (get-mail-count "gmail")
+ (get-mail-count "aethon")))
+ '(:eval
+ (format-expand *window-formatters* *window-format*
+ (current-window)))))
+
+(set-prefix-key (kbd "C-z"))
+
+(define-key *top-map* (kbd "C-M-l") "run-i3lock")
+
+(define-key *root-map* (kbd "c") "raise-urxvt")
+(define-key *root-map* (kbd "C") "run-urxvt")
+(define-key *root-map* (kbd "e") "raise-emacs")
+(define-key *root-map* (kbd "E") "run-emacs")
+(define-key *root-map* (kbd "w") "raise-firefox")
+(define-key *root-map* (kbd "W") "run-firefox")
+
+(define-key *root-map* (kbd "C-b") "windowlist")
+(define-key *root-map* (kbd "M-b") "move-window left")
+(define-key *root-map* (kbd "M-f") "move-window right")
+(define-key *root-map* (kbd "M-n") "move-window down")
+(define-key *root-map* (kbd "M-p") "move-window up")
+(define-key *root-map* (kbd "b") "move-focus left")
+(define-key *root-map* (kbd "f") "move-focus right")
+(define-key *root-map* (kbd "n") "move-focus down")
+(define-key *root-map* (kbd "p") "move-focus up")
+
+(undefine-key *root-map* (kbd "C-a"))
+(undefine-key *root-map* (kbd "C-c"))
+(undefine-key *root-map* (kbd "C-e"))
+(undefine-key *root-map* (kbd "C-m"))
+
+(define-frame-preference "Default"
+ (0 t nil :class "Emacs")
+ (1 t nil :class "Firefox")
+ (1 t nil :class "URxvt"))
+
+(if (not (head-mode-line (current-head)))
+ (toggle-mode-line (current-screen) (current-head)))
+
+(swank:create-server)
--
cgit v1.2.3-54-g00ecf
From a81a4ec40737452979fbf378c79a99a31662e857 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 26 Aug 2012 22:19:45 +0200
Subject: stumpwm: Use .lisp extension
---
stumpwm/Makefile | 11 +++-
stumpwm/stumpwmrc | 153 -------------------------------------------------
stumpwm/stumpwmrc.lisp | 153 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 161 insertions(+), 156 deletions(-)
delete mode 100644 stumpwm/stumpwmrc
create mode 100644 stumpwm/stumpwmrc.lisp
diff --git a/stumpwm/Makefile b/stumpwm/Makefile
index 98362a6..06c6d85 100644
--- a/stumpwm/Makefile
+++ b/stumpwm/Makefile
@@ -1,4 +1,9 @@
-.PHONY: all install
+files = stumpwmrc.lisp
+install-files = $(addprefix install-,$(files))
+
+.PHONY: all install $(install-files)
all:
-install: stumpwmrc
- install -Dm 444 $^ ${HOME}/.$^
+install: $(install-files)
+
+$(install-files): install-%.lisp:
+ install -Dm 444 $*.lisp ${HOME}/.$*
diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc
deleted file mode 100644
index 1bed825..0000000
--- a/stumpwm/stumpwmrc
+++ /dev/null
@@ -1,153 +0,0 @@
-;; -*- mode: lisp; -*-
-(require 'swank)
-
-(in-package :stumpwm)
-
-;; Naquadah
-(defun colour (key)
- (let ((colours (list :aluminium-1 #xeeeeec
- :aluminium-2 #xd3d7cf
- :aluminium-3 #xbabdb6
- :aluminium-4 #x888a85
- :aluminium-5 #x555753
- :aluminium-6 #x2e3436
- :butter-1 #xfce94f
- :butter-2 #xedd400
- :butter-3 #xc4a000
- :orange-1 #xfcaf3e
- :orange-2 #xf57900
- :orange-3 #xce5c00
- :chocolate-1 #xe9b96e
- :chocolate-2 #xc17d11
- :chocolate-3 #x9f5902
- :chameleon-1 #x8ae234
- :chameleon-2 #x73d216
- :chameleon-3 #x4e9a06
- :sky-blue-1 #x729fcf
- :sky-blue-2 #x3465a4
- :sky-blue-3 #x204a87
- :plum-1 #xad7fa8
- :plum-2 #x75507b
- :plum-3 #x5c3566
- :scarlet-red-1 #xef2929
- :scarlet-red-2 #xcc0000
- :scarlet-red-3 #xa40000
- :background #x252a2b
- :black #x0c191c
- :cyan "cyan3")))
- (getf colours key)))
-
-(defvar *emacs-program* "emacsclient -c -a emacs"
- "The executable to run to start Emacs.")
-(defvar *firefox-program* "firefox"
- "The executable to run to start Firefox.")
-(defvar *urxvt-program* "urxvt"
- "The executable to run to start URxvt.")
-(defvar *i3lock-program* "i3lock -c 000000"
- "The executable to run to start i3lock.")
-
-(defun get-mail-count (mailbox &optional (inbox "inbox"))
- "Check how many new messages there are in MAILBOX."
- (length
- (directory
- (format nil "/home/slash/documents/mail/~A/~A/new/*.*"
- mailbox inbox))))
-
-(defcommand run-emacs () ()
- "Open Emacs"
- (run-shell-command *emacs-program*))
-
-(defcommand raise-emacs () ()
- "Open or show Emacs"
- (run-or-raise *emacs-program* '(:class "Emacs")))
-
-(defcommand run-firefox () ()
- "Open Firefox"
- (run-shell-command *firefox-program*))
-
-(defcommand raise-firefox () ()
- "Open or show Firefox"
- (run-or-raise *firefox-program* '(:class "Firefox")))
-
-(defcommand run-urxvt () ()
- "Open URxvt"
- (run-shell-command *urxvt-program*))
-
-(defcommand raise-urxvt () ()
- "Open URxvt"
- (run-or-raise *urxvt-program* '(:class "URxvt")))
-
-(defcommand run-i3lock () ()
- "Lock screen"
- (run-shell-command *i3lock-program*))
-
-(set-bg-color (colour :background))
-(set-border-color (colour :aluminium-6))
-(set-fg-color (colour :aluminium-1))
-(set-float-focus-color (colour :black))
-(set-float-unfocus-color (colour :aluminium-6))
-(set-focus-color (colour :black))
-(set-font "-*-dejavu sans mono-medium-r-*-*-15-*-*-*-*-*-iso10646-*")
-(set-unfocus-color (colour :aluminium-6))
-(set-win-bg-color (colour :background))
-
-(setf *colors* (mapcar #'colour '(:black :scarlet-red-1 :chameleon-1
- :butter-1 :sky-blue-1 :plum-1 :cyan
- :aluminium-1)))
-(setf *input-window-gravity* :bottom-left)
-(setf *maxsize-border-width* 1)
-(setf *message-window-gravity* :top-right)
-(setf *mode-line-background-color* (colour :background))
-(setf *mode-line-border-color* (colour :aluminium-6))
-(setf *mode-line-foreground-color* (colour :aluminium-1))
-(setf *normal-border-width* 1)
-(setf *shell-program* (getenv "SHELL"))
-(setf *transient-border-width* 1)
-(setf *window-border-style* :tight)
-(setf *window-format* "%m%50t")
-(setf *screen-mode-line-format*
- (list "[%n]"
- '(:eval
- (format nil " | ryu: ~D | gmail: ~D | aethon: ~D | "
- (get-mail-count "ryuslash.org")
- (get-mail-count "gmail")
- (get-mail-count "aethon")))
- '(:eval
- (format-expand *window-formatters* *window-format*
- (current-window)))))
-
-(set-prefix-key (kbd "C-z"))
-
-(define-key *top-map* (kbd "C-M-l") "run-i3lock")
-
-(define-key *root-map* (kbd "c") "raise-urxvt")
-(define-key *root-map* (kbd "C") "run-urxvt")
-(define-key *root-map* (kbd "e") "raise-emacs")
-(define-key *root-map* (kbd "E") "run-emacs")
-(define-key *root-map* (kbd "w") "raise-firefox")
-(define-key *root-map* (kbd "W") "run-firefox")
-
-(define-key *root-map* (kbd "C-b") "windowlist")
-(define-key *root-map* (kbd "M-b") "move-window left")
-(define-key *root-map* (kbd "M-f") "move-window right")
-(define-key *root-map* (kbd "M-n") "move-window down")
-(define-key *root-map* (kbd "M-p") "move-window up")
-(define-key *root-map* (kbd "b") "move-focus left")
-(define-key *root-map* (kbd "f") "move-focus right")
-(define-key *root-map* (kbd "n") "move-focus down")
-(define-key *root-map* (kbd "p") "move-focus up")
-
-(undefine-key *root-map* (kbd "C-a"))
-(undefine-key *root-map* (kbd "C-c"))
-(undefine-key *root-map* (kbd "C-e"))
-(undefine-key *root-map* (kbd "C-m"))
-
-(define-frame-preference "Default"
- (0 t nil :class "Emacs")
- (1 t nil :class "Firefox")
- (1 t nil :class "URxvt"))
-
-(if (not (head-mode-line (current-head)))
- (toggle-mode-line (current-screen) (current-head)))
-
-(swank:create-server)
diff --git a/stumpwm/stumpwmrc.lisp b/stumpwm/stumpwmrc.lisp
new file mode 100644
index 0000000..1bed825
--- /dev/null
+++ b/stumpwm/stumpwmrc.lisp
@@ -0,0 +1,153 @@
+;; -*- mode: lisp; -*-
+(require 'swank)
+
+(in-package :stumpwm)
+
+;; Naquadah
+(defun colour (key)
+ (let ((colours (list :aluminium-1 #xeeeeec
+ :aluminium-2 #xd3d7cf
+ :aluminium-3 #xbabdb6
+ :aluminium-4 #x888a85
+ :aluminium-5 #x555753
+ :aluminium-6 #x2e3436
+ :butter-1 #xfce94f
+ :butter-2 #xedd400
+ :butter-3 #xc4a000
+ :orange-1 #xfcaf3e
+ :orange-2 #xf57900
+ :orange-3 #xce5c00
+ :chocolate-1 #xe9b96e
+ :chocolate-2 #xc17d11
+ :chocolate-3 #x9f5902
+ :chameleon-1 #x8ae234
+ :chameleon-2 #x73d216
+ :chameleon-3 #x4e9a06
+ :sky-blue-1 #x729fcf
+ :sky-blue-2 #x3465a4
+ :sky-blue-3 #x204a87
+ :plum-1 #xad7fa8
+ :plum-2 #x75507b
+ :plum-3 #x5c3566
+ :scarlet-red-1 #xef2929
+ :scarlet-red-2 #xcc0000
+ :scarlet-red-3 #xa40000
+ :background #x252a2b
+ :black #x0c191c
+ :cyan "cyan3")))
+ (getf colours key)))
+
+(defvar *emacs-program* "emacsclient -c -a emacs"
+ "The executable to run to start Emacs.")
+(defvar *firefox-program* "firefox"
+ "The executable to run to start Firefox.")
+(defvar *urxvt-program* "urxvt"
+ "The executable to run to start URxvt.")
+(defvar *i3lock-program* "i3lock -c 000000"
+ "The executable to run to start i3lock.")
+
+(defun get-mail-count (mailbox &optional (inbox "inbox"))
+ "Check how many new messages there are in MAILBOX."
+ (length
+ (directory
+ (format nil "/home/slash/documents/mail/~A/~A/new/*.*"
+ mailbox inbox))))
+
+(defcommand run-emacs () ()
+ "Open Emacs"
+ (run-shell-command *emacs-program*))
+
+(defcommand raise-emacs () ()
+ "Open or show Emacs"
+ (run-or-raise *emacs-program* '(:class "Emacs")))
+
+(defcommand run-firefox () ()
+ "Open Firefox"
+ (run-shell-command *firefox-program*))
+
+(defcommand raise-firefox () ()
+ "Open or show Firefox"
+ (run-or-raise *firefox-program* '(:class "Firefox")))
+
+(defcommand run-urxvt () ()
+ "Open URxvt"
+ (run-shell-command *urxvt-program*))
+
+(defcommand raise-urxvt () ()
+ "Open URxvt"
+ (run-or-raise *urxvt-program* '(:class "URxvt")))
+
+(defcommand run-i3lock () ()
+ "Lock screen"
+ (run-shell-command *i3lock-program*))
+
+(set-bg-color (colour :background))
+(set-border-color (colour :aluminium-6))
+(set-fg-color (colour :aluminium-1))
+(set-float-focus-color (colour :black))
+(set-float-unfocus-color (colour :aluminium-6))
+(set-focus-color (colour :black))
+(set-font "-*-dejavu sans mono-medium-r-*-*-15-*-*-*-*-*-iso10646-*")
+(set-unfocus-color (colour :aluminium-6))
+(set-win-bg-color (colour :background))
+
+(setf *colors* (mapcar #'colour '(:black :scarlet-red-1 :chameleon-1
+ :butter-1 :sky-blue-1 :plum-1 :cyan
+ :aluminium-1)))
+(setf *input-window-gravity* :bottom-left)
+(setf *maxsize-border-width* 1)
+(setf *message-window-gravity* :top-right)
+(setf *mode-line-background-color* (colour :background))
+(setf *mode-line-border-color* (colour :aluminium-6))
+(setf *mode-line-foreground-color* (colour :aluminium-1))
+(setf *normal-border-width* 1)
+(setf *shell-program* (getenv "SHELL"))
+(setf *transient-border-width* 1)
+(setf *window-border-style* :tight)
+(setf *window-format* "%m%50t")
+(setf *screen-mode-line-format*
+ (list "[%n]"
+ '(:eval
+ (format nil " | ryu: ~D | gmail: ~D | aethon: ~D | "
+ (get-mail-count "ryuslash.org")
+ (get-mail-count "gmail")
+ (get-mail-count "aethon")))
+ '(:eval
+ (format-expand *window-formatters* *window-format*
+ (current-window)))))
+
+(set-prefix-key (kbd "C-z"))
+
+(define-key *top-map* (kbd "C-M-l") "run-i3lock")
+
+(define-key *root-map* (kbd "c") "raise-urxvt")
+(define-key *root-map* (kbd "C") "run-urxvt")
+(define-key *root-map* (kbd "e") "raise-emacs")
+(define-key *root-map* (kbd "E") "run-emacs")
+(define-key *root-map* (kbd "w") "raise-firefox")
+(define-key *root-map* (kbd "W") "run-firefox")
+
+(define-key *root-map* (kbd "C-b") "windowlist")
+(define-key *root-map* (kbd "M-b") "move-window left")
+(define-key *root-map* (kbd "M-f") "move-window right")
+(define-key *root-map* (kbd "M-n") "move-window down")
+(define-key *root-map* (kbd "M-p") "move-window up")
+(define-key *root-map* (kbd "b") "move-focus left")
+(define-key *root-map* (kbd "f") "move-focus right")
+(define-key *root-map* (kbd "n") "move-focus down")
+(define-key *root-map* (kbd "p") "move-focus up")
+
+(undefine-key *root-map* (kbd "C-a"))
+(undefine-key *root-map* (kbd "C-c"))
+(undefine-key *root-map* (kbd "C-e"))
+(undefine-key *root-map* (kbd "C-m"))
+
+(define-frame-preference "Default"
+ (0 t nil :class "Emacs")
+ (1 t nil :class "Firefox")
+ (1 t nil :class "URxvt"))
+
+(if (not (head-mode-line (current-head)))
+ (toggle-mode-line (current-screen) (current-head)))
+
+(swank:create-server)
--
cgit v1.2.3-54-g00ecf
From 74c49fab14e13f10acc613d66b1c550ff8cb7cb5 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 31 Aug 2012 09:52:16 +0200
Subject: emacs/init.el
---
emacs/init.el | 35 +++++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
index fb33134..e915b4d 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -143,10 +143,11 @@
(defmacro oni:generic-outline (regex)
"Prepare for enabling `outline-minor-mode'."
`(progn
- (outline-minor-mode)
- (set (make-local-variable 'outline-regexp) ,regex)
- (hide-body)
- (local-set-key [C-tab] 'outline-toggle-children)))
+ (when (buffer-file-name)
+ (outline-minor-mode)
+ (set (make-local-variable 'outline-regexp) ,regex)
+ (hide-body)
+ (local-set-key [C-tab] 'outline-toggle-children))))
(defmacro oni:color (name)
`(naquadah-get-colors (quote ,name)))
@@ -170,7 +171,10 @@
(defun oni:after-save-func ()
"Function for `after-save-hook'."
(oni:compile-el)
- (executable-make-buffer-file-executable-if-script-p))
+ (executable-make-buffer-file-executable-if-script-p)
+ (let ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile")))
+ (when dom-dir
+ (shell-command (concat "make -C " dom-dir " TAGS")))))
(defun oni:before-save-func ()
"Function for `before-save-hook'."
@@ -182,7 +186,8 @@
(defun oni:c-mode-common-func ()
"Function for `c-mode-common-hook'."
(setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
- (hs-minor-mode))
+ (when (buffer-file-name)
+ (hs-minor-mode)))
(defun oni:c-mode-func ()
"Function for `c-mode-hook'."
@@ -206,7 +211,8 @@
(defun oni:css-mode-func ()
"Function for `css-mode-hook'."
(setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
- (hs-minor-mode)
+ (when (buffer-file-name)
+ (hs-minor-mode))
(local-set-key "\C-j" 'oni:newline-and-indent)
(rainbow-mode))
@@ -371,7 +377,8 @@
(defun oni:lisp-mode-func ()
"Function for `lisp-mode-hook'."
- (hs-minor-mode))
+ (when (buffer-file-name)
+ (hs-minor-mode)))
(defun oni:magit-log-edit-mode-func ()
"Function for `magit-log-edit-mode-hook'."
@@ -500,7 +507,8 @@
"Function for `prog-mode-hook'."
(rainbow-delimiters-mode)
(fci-mode)
- (pretty-symbols-mode))
+ (pretty-symbols-mode)
+ (yas-minor-mode))
(defun oni:python-mode-func ()
"Function for `python-mode-hook'."
@@ -575,7 +583,8 @@ its major mode."
(defun oni:scheme-mode-func ()
"Function for `scheme-mode-hook'."
- (hs-minor-mode))
+ (when (buffer-file-name)
+ (hs-minor-mode)))
(defun oni:self-insert-dwim ()
"Execute self insert, but when the region is active call self
@@ -623,6 +632,10 @@ for easy selection."
"Function for `write-file-hooks'."
(time-stamp))
+(defun oni:yas-minor-mode-func ()
+ "Function for `yas-minor-mode-hook'."
+ (yas-load-directory (car yas-snippet-dirs)))
+
(eval-after-load "ebuff-menu"
'(define-key electric-buffer-menu-mode-map
(kbd "C-s") 'isearch-forward))
@@ -843,6 +856,7 @@ for easy selection."
(:subject)))
(setq mu4e-headers-show-threads nil)
(setq mu4e-headers-sort-revert nil)
+(setq mu4e-html2text-command "w3m -dump -T text/HTML -cols 72")
(setq mu4e-my-email-addresses (list
(oni:email tom at ryuslash dot org)
(oni:email ryuslash at gmail dot com)
@@ -981,6 +995,7 @@ for easy selection."
(add-hook 'term-mode-hook 'oni:term-mode-func)
(add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func)
(add-hook 'write-file-hooks 'oni:write-file-func)
+(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func)
(global-set-key (kbd "'") 'oni:self-insert-dwim)
(global-set-key (kbd "") 'emms-next)
--
cgit v1.2.3-54-g00ecf
From e65583e420e55058895e7e8cff7aa214d8bb4318 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 31 Aug 2012 09:52:35 +0200
Subject: stumpwm/stumpwmrc.lisp
---
stumpwm/stumpwmrc.lisp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/stumpwm/stumpwmrc.lisp b/stumpwm/stumpwmrc.lisp
index 1bed825..4a08388 100644
--- a/stumpwm/stumpwmrc.lisp
+++ b/stumpwm/stumpwmrc.lisp
@@ -108,10 +108,11 @@
(setf *screen-mode-line-format*
(list "[%n]"
'(:eval
- (format nil " | ryu: ~D | gmail: ~D | aethon: ~D | "
+ (format nil " | ryu: ~D | gmail: ~D | aethon: ~D | 9f: ~D | "
(get-mail-count "ryuslash.org")
(get-mail-count "gmail")
- (get-mail-count "aethon")))
+ (get-mail-count "aethon")
+ (get-mail-count "ninthfloor")))
'(:eval
(format-expand *window-formatters* *window-format*
(current-window)))))
@@ -145,7 +146,8 @@
(define-frame-preference "Default"
(0 t nil :class "Emacs")
(1 t nil :class "Firefox")
- (1 t nil :class "URxvt"))
+ (1 t nil :class "URxvt")
+ (1 t nil :class "Conkeror"))
(if (not (head-mode-line (current-head)))
(toggle-mode-line (current-screen) (current-head)))
--
cgit v1.2.3-54-g00ecf
From 7e1a581540c41e75c351c4ce12a510cc9c5c44e8 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 1 Sep 2012 11:45:00 +0200
Subject: emacs/init.el
---
emacs/init.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/emacs/init.el b/emacs/init.el
index e915b4d..f03c074 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -51,6 +51,7 @@
(autoload 'pony-mode "pony-mode" nil t)
(autoload 'sawfish-mode "sawfish" nil t)
(autoload 'xmodmap-mode "xmodmap-mode" nil t)
+(autoload 'jabber-connect "jabber" nil t)
(load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
--
cgit v1.2.3-54-g00ecf
From a9a0ef409f57e6447661e1d27806776da1773311 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 2 Sep 2012 11:28:47 +0200
Subject: Add cower config
---
Makefile | 2 +-
cower/Makefile | 9 +++++++++
cower/config | 3 +++
3 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 cower/Makefile
create mode 100644 cower/config
diff --git a/Makefile b/Makefile
index 8df6334..f0b7b81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-modules = emacs stumpwm
+modules = emacs stumpwm cower
install-modules = $(addprefix install-,$(modules))
.PHONY: all install $(modules) $(install-modules)
diff --git a/cower/Makefile b/cower/Makefile
new file mode 100644
index 0000000..251c672
--- /dev/null
+++ b/cower/Makefile
@@ -0,0 +1,9 @@
+files = config
+install-files = $(addprefix install-,$(files))
+
+.PHONY: all install $(install-files)
+all:
+install: $(install-files)
+
+$(install-files): install-%:
+ install -Dm 444 $* ${XDG_CONFIG_HOME}/cower/$*
diff --git a/cower/config b/cower/config
new file mode 100644
index 0000000..6c24291
--- /dev/null
+++ b/cower/config
@@ -0,0 +1,3 @@
+Color = always
+TargetDir = /home/slash/var/aur/
+IgnoreRepo = pegas
--
cgit v1.2.3-54-g00ecf
From b54569974f5a0d32bb76676bc5e328b37afb5df1 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 2 Sep 2012 11:29:02 +0200
Subject: emacs/init.el
---
emacs/init.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
index f03c074..2b65f9a 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -175,7 +175,7 @@
(executable-make-buffer-file-executable-if-script-p)
(let ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile")))
(when dom-dir
- (shell-command (concat "make -C " dom-dir " TAGS")))))
+ (shell-command (concat "make -C " dom-dir " TAGS 2>&1 >/dev/null")))))
(defun oni:before-save-func ()
"Function for `before-save-hook'."
@@ -965,7 +965,7 @@ for easy selection."
(setq whitespace-style '(face trailing))
(setq yas-prompt-functions '(yas-ido-prompt))
-(add-hook 'after-save-hook 'oni:after-save-func)
+(add-hook 'after-save-hook 'oni:after-save-func t)
(add-hook 'before-save-hook 'oni:before-save-func)
(add-hook 'c-mode-common-hook 'oni:c-mode-common-func)
(add-hook 'c-mode-hook 'oni:c-mode-func)
--
cgit v1.2.3-54-g00ecf
From e81cc4865d499b622d27ba19938bf1340051559f Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sun, 2 Sep 2012 11:34:56 +0200
Subject: emacs/init.el
---
emacs/init.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/emacs/init.el b/emacs/init.el
index 2b65f9a..add92ae 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -730,6 +730,7 @@ for easy selection."
(put 'upcase-region 'disabled nil)
(put 'downcase-region 'disabled nil)
(put 'narrow-to-region 'disabled nil)
+(put 'scroll-left 'disabled nil)
(setq-default bidi-paragraph-direction 'left-to-right)
(setq-default c-basic-offset 4)
--
cgit v1.2.3-54-g00ecf
From 6bc9482e0beffe9d93e39eac93e33f4111c71b28 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 7 Sep 2012 15:21:59 +0200
Subject: emacs/init.el
---
emacs/init.el | 150 ++++++++++++++++++++++++++--------------------------------
1 file changed, 66 insertions(+), 84 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
index add92ae..41765af 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1,9 +1,16 @@
+;;; init.el --- ryuslash's emacs init
+
+;;; Commentary:
+;; Does so much and changes so often
+
(require 'geiser-install)
(require 'iso-transl)
(require 'newcomment)
(require 'uniquify)
(require 'w3m-load)
+;;; Code:
+
(eval-and-compile
(package-initialize)
@@ -14,34 +21,6 @@
'("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
(add-to-list 'load-path "~/.emacs.d/"))
-(eval-when-compile
- (require 'appt)
- (require 'browse-url)
- (require 'em-dirs)
- (require 'em-prompt)
- (require 'emms-source-file)
- (require 'erc-join)
- (require 'erc-stamp)
- (require 'fill-column-indicator)
- (require 'geiser-repl)
- (require 'gtags)
- (require 'hideshow)
- (require 'jabber)
- (require 'message)
- (require 'mu4e)
- (require 'org-capture)
- (require 'org-contacts)
- (require 'org-feed)
- (require 'org-html)
- (require 'php-mode)
- (require 'rainbow-delimiters)
- (require 'sauron)
- (require 'sendmail)
- (require 'smex)
- (require 'time-stamp)
- (require 'whitespace)
- (require 'yasnippet))
-
(autoload 'gtags-mode "gtags" nil t)
(autoload 'identica-mode "identica-mode" nil t)
(autoload 'mu4e "mu4e" nil t)
@@ -71,10 +50,10 @@
(concat
"\\(?:static\\s +\\)?\\(?:\\sw+\\(?: \\|\t\\|\n\\)*?\\*?\\)"
"\\(?:\\s \\|\t\\|\n\\)\\(?:\\sw\\|_\\)+([^)]*)[^;\n]*$"))
- "Regex for `outline-minor-mode' for `c-mode'.")
+ "Regex for command `outline-minor-mode' for `c-mode'.")
(defconst oni:javascript-outline-regex "function \\(\\w\\|_\\)+("
- "Regex for `outline-minor-mode' for `js-mode'.")
+ "Regex for command `outline-minor-mode' for `js-mode'.")
(defconst oni:php-outline-regex
(eval-when-compile
@@ -83,14 +62,14 @@
"\\|final\\) \\)?class [a-zA-Z0-9_]+\\( extends [\\a-zA-Z0-9_]+\\)?"
"\\|\\(abstract \\)?\\(public\\|private\\|protected\\)?"
"\\( static\\)? function [a-zA-Z0-9_]+(\\|/\\*\\*\\)"))
- "Regex for `outline-minor-mode' for `php-mode'.")
+ "Regex for command `outline-minor-mode' for `php-mode'.")
(defconst oni:python-outline-regex
(eval-when-compile
(concat "^[ \t]*\\(?:@[a-zA-Z0-9_]+\\(?:([a-zA-Z0-9_=, ]*)\\)?"
"\n\\)*[ \t]*\\(?:\\(class\\|def\\)[ \t]+\\(\\sw\\|\\s_\\)+"
"\\(([^)]*):\\)?\\|\\#[ a-zA-Z0-9]*\\#\\)"))
- "Regex for `outline-minor-mode' for `python-mode'.")
+ "Regex for command `outline-minor-mode' for `python-mode'.")
(defface oni:mode-line-buffer-column
'((t (:inherit font-lock-type-face)))
@@ -123,7 +102,9 @@
:group 'local)
(defmacro oni:define-mailbox (name email &optional signature longname)
- "Define a mailbox function."
+ "Define a mailbox function for mailbox NAME with address EMAIL.
+Optionally set signature to SIGNATURE and use LONGNAME as the
+actual account name."
`(defun ,(make-symbol (concat "oni:" name "-mailbox")) ()
,(concat "Settings for " name " mailbox")
(setq mu4e-mu-home ,(expand-file-name (concat "~/.mu/" name))
@@ -137,12 +118,15 @@
message-signature-file ,signature)))
(defmacro oni:email (user at host dot com)
- "Turn arguments into an email address."
+ "Turn arguments into an email address.
+The resulting email address will look like: USER@HOST.COM, AT and DOT are
+intentionally being skipped."
(concat (symbol-name user) "@" (symbol-name host) "."
(symbol-name com)))
(defmacro oni:generic-outline (regex)
- "Prepare for enabling `outline-minor-mode'."
+ "Prepare for enabling command `outline-minor-mode'.
+Argument REGEX will be used to set `outline-regexp' for this buffer."
`(progn
(when (buffer-file-name)
(outline-minor-mode)
@@ -151,6 +135,7 @@
(local-set-key [C-tab] 'outline-toggle-children))))
(defmacro oni:color (name)
+ "Fetch color NAME from the naquadah color theme."
`(naquadah-get-colors (quote ,name)))
(defvar oni:mailbox-map
@@ -167,7 +152,7 @@
flymake-cursor pony-mode sauron dispass
expand-region fill-column-indicator
git-auto-commit-mode idomenu magit smex)
- "List of all the packages I have (want) installed")
+ "List of all the packages I have (want) installed.")
(defun oni:after-save-func ()
"Function for `after-save-hook'."
@@ -175,7 +160,7 @@
(executable-make-buffer-file-executable-if-script-p)
(let ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile")))
(when dom-dir
- (shell-command (concat "make -C " dom-dir " TAGS 2>&1 >/dev/null")))))
+ (shell-command (concat "make -C " dom-dir " TAGS >/dev/null 2>&1")))))
(defun oni:before-save-func ()
"Function for `before-save-hook'."
@@ -245,6 +230,7 @@
(setq truncate-lines nil))
(defun oni:eshell-prompt-function ()
+ "Show a pretty shell prompt."
(let ((status (if (zerop eshell-last-command-status) ?+ ?-))
(hostname (shell-command-to-string "hostname"))
(dir (abbreviate-file-name (eshell/pwd)))
@@ -305,6 +291,10 @@
(fci-mode))
(defun oni:indent-shift-left (start end &optional count)
+ "Rigidly indent region.
+Region is from START to END. Move
+COUNT number of spaces if it is non-nil otherwise use
+`tab-width'."
(interactive
(if mark-active
(list (region-beginning) (region-end) current-prefix-arg)
@@ -326,6 +316,9 @@
(indent-rigidly start end (- count))))))
(defun oni:indent-shift-right (start end &optional count)
+ "Indent region between START and END rigidly to the right.
+If COUNT has been specified indent by that much, otherwise look at
+`tab-width'."
(interactive
(if mark-active
(list (region-beginning) (region-end) current-prefix-arg)
@@ -350,27 +343,25 @@
"Function for `js-mode-hook'."
(oni:generic-outline oni:javascript-outline-regex)
(rainbow-delimiters-mode)
- (local-set-key "\C-j" 'oni:newline-and-indent))
+ (local-set-key "\C-j" 'oni:newline-and-indent)
+ (pretty-symbols-mode -1))
(defun oni:kill-region-or-backward-char ()
- "Kill either the active region, or delete the character left of
- the cursor"
+ "Either `kill-region' or `backward-delete-char-untabify'."
(interactive)
(if (region-active-p)
(kill-region (region-beginning) (region-end))
(backward-delete-char-untabify 1)))
(defun oni:kill-region-or-forward-char ()
- "Kill either the active region, or delete the character right
- of the cursor"
+ "Either `kill-region' or `delete-forward-char'."
(interactive)
(if (region-active-p)
(kill-region (region-beginning) (region-end))
(delete-forward-char 1)))
(defun oni:kill-region-or-line ()
- "Kill either the active region, or the rest of the line,
- depending on whether or not `region-active-p' is t"
+ "Either `kill-region' or `kill-line'."
(interactive)
(if (region-active-p)
(kill-region (region-beginning) (region-end))
@@ -405,8 +396,9 @@
(ispell-change-dictionary (read-string "New dictionary: ")))
(defun oni:mini-fix-timestamp-string (date-string)
- "A minimal version of Xah Lee's `fix-timestamp-string'
- function, found at http://xahlee.org/emacs/elisp_parse_time.html"
+ "A minimal version of Xah Lee's `fix-timestamp-string'.
+Turn DATE-STRING into something else that can be worked with in
+code. Found at http://xahlee.org/emacs/elisp_parse_time.html"
(setq date-string (replace-regexp-in-string "Jan" "01" date-string)
date-string (replace-regexp-in-string "Feb" "02" date-string)
date-string (replace-regexp-in-string "Mar" "03" date-string)
@@ -428,8 +420,7 @@
(match-string 1 date-string)))
(defun oni:move-beginning-of-dwim ()
- "Move to the beginning of line, either after the indentatoin of
- before."
+ "Move to beginning of line either after indentation or before."
(interactive)
(let ((start (point)))
(back-to-indentation)
@@ -437,8 +428,7 @@
(beginning-of-line))))
(defun oni:move-end-of-dwim ()
- "Move to the end of line, either before any comments or after
- them."
+ "Move to end of line, either before any comments or after."
(interactive)
(let ((start (point))
(eolpos (line-end-position)))
@@ -455,7 +445,8 @@
(end-of-line))))
(defun oni:myepisodes-formatter (plist)
- "Format RSS items from MyEpisodes as org tasks."
+ "Format RSS items from MyEpisodes as org tasks.
+PLIST contains all the pertinent information."
(let ((str (plist-get plist :title)))
(string-match
"^\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]$"
@@ -467,6 +458,8 @@
(format "* ACQUIRE %s %s - %s <%s>" title episode name date))))
(defun oni:newline-and-indent ()
+ "`newline-and-indent', but with a twist.
+When dealing with braces, add another line and indent that too."
(interactive)
(if (and (not (or (= (point) (point-max))
(= (point) (point-min))))
@@ -477,19 +470,6 @@
(save-excursion (newline-and-indent)))
(newline-and-indent))
-(defun oni:org-capture-before-finalize-func ()
- (save-excursion
- (goto-char (point-min))
- (while (re-search-forward "<>" nil t)
- (let (beg end)
- (save-match-data
- (search-forward "\n\n")
- (skip-syntax-forward " ")
- (setq beg (point))
- (search-forward "\n")
- (setq end (1- (point))))
- (replace-match (buffer-substring beg end) t t)))))
-
(defun oni:org-mode-func ()
"Function for `org-mode-hook'."
(flyspell-mode)
@@ -520,11 +500,13 @@
(oni:generic-outline oni:python-outline-regex)
(set (make-local-variable 'electric-indent-chars) nil)
(rainbow-delimiters-mode)
+ (setq fci-rule-column 80
+ fill-column 72)
(fci-mode))
(defun oni:raise-eshell ()
- "Start or switch back to `eshell'. Also change directories to
- current working directory."
+ "Start or switch back to `eshell'.
+Also change directories to current working directory."
(interactive)
(let ((dir (file-name-directory
(or (buffer-file-name) "~/")))
@@ -536,10 +518,10 @@
(eshell-reset)))))
(defun oni:raise-scratch (&optional mode)
- "Show the *scratch* buffer. If called with a universal
-argument, ask the user which mode to use. If MODE is not nil,
-open a new buffer with the name *MODE-scratch* and load MODE as
-its major mode."
+ "Show the *scratch* buffer.
+If called with a universal argument, ask the user which mode to
+use. If MODE is not nil, open a new buffer with the name
+*MODE-scratch* and load MODE as its major mode."
(interactive (list (if current-prefix-arg
(read-string "Mode: ")
nil)))
@@ -563,6 +545,7 @@ its major mode."
(revert-buffer nil t nil))
(defun oni:replace-html-special-chars ()
+ "Replace special characters with HTML escaped entities."
(oni:replace-occurrences "é" "é"))
(defun oni:replace-occurrences (from to)
@@ -589,7 +572,7 @@ its major mode."
(defun oni:self-insert-dwim ()
"Execute self insert, but when the region is active call self
- insert at the end of the region and at the beginning."
+insert at the end of the region and at the beginning."
(interactive)
(if (region-active-p)
(let ((electric-pair-mode nil)
@@ -806,7 +789,7 @@ for easy selection."
(vertical-scroll-bars . nil)
(menu-bar-lines . nil)
(tool-bar-lines . nil)
- (font . "DejaVu Sans Mono:pixelsize=18")
+ (font . "LiberationMono:pixelsize=16")
(left-fringe . 0)))
(setq emms-source-file-default-directory "/mnt/music/")
(setq erc-autojoin-channels-alist
@@ -825,12 +808,13 @@ for easy selection."
(setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
(setq flymake-log-level 0)
(setq frame-title-format '(:eval (concat "emacs: " (buffer-name))))
-(setq geiser-active-implementations '(guile))
(setq geiser-repl-history-filename "~/.emacs.d/geiser-history")
(setq gtags-auto-update t)
(setq help-at-pt-display-when-idle t)
(setq ido-auto-merge-delay-time 1000000)
+(setq ido-max-window-height 1)
(setq ido-save-directory-list-file nil)
+(setq ido-ubiquitous-exceptions '(tmm-prompt))
(setq inferior-lisp-program "sbcl")
(setq inhibit-default-init t)
(setq inhibit-local-menu-bar-menus t)
@@ -875,15 +859,8 @@ for easy selection."
(tags priority-down category-keep)
(search category-keep)))
(setq org-capture-templates
- '(("t" "Task" entry (file "")
- "* TODO <>
- :PROPERTIES:
- :DIRECTORY: %(directory-file-name (or (org-capture-get :original-file) org-default-notes-file))
- :FILE: %f
- :END:
- %u
-
- %?%a")
+ '(("t" "Task" entry (file "~/documents/org/tasks")
+ "* TODO %?")
("h" "Habit" entry (file "")
(concat "* TODO %^{Description}\n"
" SCHEDULED: %^T\n"
@@ -958,12 +935,14 @@ for easy selection."
(setq special-display-buffer-names '("*Sauron*"))
(setq special-display-frame-alist '((minibuffer . nil)
(right-fringe . 0)))
+(setq split-height-threshold 40)
(setq time-stamp-active t)
(setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)")
(setq uniquify-buffer-name-style 'post-forward)
(setq use-dialog-box nil)
(setq user-full-name "Tom Willemsen")
(setq whitespace-style '(face trailing))
+(setq window-combination-resize t)
(setq yas-prompt-functions '(yas-ido-prompt))
(add-hook 'after-save-hook 'oni:after-save-func t)
@@ -987,8 +966,6 @@ for easy selection."
(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
(add-hook 'message-mode-hook 'oni:message-mode-func)
-(add-hook 'org-capture-before-finalize-hook
- 'oni:org-capture-before-finalize-func)
(add-hook 'org-mode-hook 'oni:org-mode-func)
(add-hook 'php-mode-hook 'oni:php-mode-func)
(add-hook 'prog-mode-hook 'oni:prog-mode-func)
@@ -1069,6 +1046,7 @@ for easy selection."
(ido-mode)
(savehist-mode)
(show-paren-mode)
+(auto-insert-mode)
(smex-initialize)
(help-at-pt-set-timer)
@@ -1078,3 +1056,7 @@ for easy selection."
(load custom-file)
(load "rudel-loaddefs.el")
(load (expand-file-name "~/quicklisp/slime-helper.el"))
+
+(provide 'init)
+
+;;; init.el ends here
--
cgit v1.2.3-54-g00ecf
From e4348644d01df12cf9417332441ab2f81996a9dd Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 11 Sep 2012 10:26:37 +0200
Subject: .zprofile
---
.zprofile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.zprofile b/.zprofile
index 60c7292..4e25863 100644
--- a/.zprofile
+++ b/.zprofile
@@ -3,7 +3,7 @@ export BROWSER=firefox
export EDITOR="emacsclient -c -a emacs"
export INFOPATH="${HOME}/documents/info:/usr/local/emacs/share/info:/usr/share/info:/usr/local/stumpwm/share/info"
-PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
+PATH="${HOME}/usr/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
PATH="/usr/local/scwm/bin:$PATH"
PATH="/usr/local/clfswm/bin:$PATH"
export PATH="/usr/local/emacs/bin:$PATH"
--
cgit v1.2.3-54-g00ecf
From 71b21beaa692ad601ed59e756c87d9a083e05172 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 11 Sep 2012 10:32:30 +0200
Subject: Move Emacs config
---
.emacs.d/eshell/alias | 8 +
.emacs.d/gnus.el | 70 ++++
.emacs.d/init.el | 1064 +++++++++++++++++++++++++++++++++++++++++++++++++
.gitignore | 2 -
emacs/Makefile | 24 --
emacs/eshell/Makefile | 6 -
emacs/eshell/alias | 8 -
emacs/gnus.el | 74 ----
emacs/init.el | 1062 ------------------------------------------------
9 files changed, 1142 insertions(+), 1176 deletions(-)
create mode 100644 .emacs.d/eshell/alias
create mode 100644 .emacs.d/gnus.el
create mode 100644 .emacs.d/init.el
delete mode 100644 emacs/Makefile
delete mode 100644 emacs/eshell/Makefile
delete mode 100644 emacs/eshell/alias
delete mode 100644 emacs/gnus.el
delete mode 100644 emacs/init.el
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias
new file mode 100644
index 0000000..940108a
--- /dev/null
+++ b/.emacs.d/eshell/alias
@@ -0,0 +1,8 @@
+alias git git --no-pager $*
+alias rm rm -v $*
+alias sudo *sudo $*
+alias ncmpcpp ansi-term ncmpcpp ncmpcpp
+alias listen eshell-exec-visual mplayer http://usa7-vn.mixstream.net/listen/8248.pls
+alias o find-file $1
+alias d dired $1
+alias newsbeuter ansi-term newsbeuter newsbeuter
diff --git a/.emacs.d/gnus.el b/.emacs.d/gnus.el
new file mode 100644
index 0000000..1bf988a
--- /dev/null
+++ b/.emacs.d/gnus.el
@@ -0,0 +1,70 @@
+;; -*- eval: (git-auto-commit-mode 1) -*-
+(setq gnus-select-method '(nntp "news.eternal-september.org"))
+(setq gnus-secondary-select-methods
+ '((nnmaildir "gmail"
+ (directory "~/documents/mail/gmail/"))
+ (nnmaildir "ninthfloor"
+ (directory "~/documents/mail/ninthfloor/"))
+ (nnmaildir "arch"
+ (directory "~/documents/mail/arch/"))
+ (nnmaildir "aethon"
+ (directory "~/documents/mail/aethon/"))
+ (nnmaildir "ryuslash"
+ (directory "~/documents/mail/ryuslash.org/"))
+ (nntp "news.gmane.org")))
+
+(setq gnus-auto-subscribed-groups nil)
+(setq gnus-save-newsrc-file nil)
+(setq gnus-read-newsrc-file nil)
+(setq gnus-novice-user t)
+(setq gnus-article-truncate-lines nil)
+
+(setq message-send-mail-function 'message-send-mail-with-sendmail)
+(setq sendmail-program "/usr/bin/msmtp")
+(setq message-sendmail-extra-arguments '("-a" "gmail"))
+
+;; (setq gnus-parameters
+;; '(("gmail"
+;; (display . all))
+;; ("aethon"
+;; (display . all)
+;; ("arch"
+;; (display . all)))))
+
+(setq gnus-permanently-visible-groups
+ "\\(gmail\\|aethon\\|arch\\|ninthfloor\\|ryuslash\\):INBOX")
+
+(setq nntp-marks-is-evil t)
+
+(setq gnus-check-new-newsgroups nil)
+
+(setq gnus-posting-styles
+ '((".*"
+ (address "ryuslash@gmail.com")
+ (eval (setq message-sendmail-extra-arguments '("-a" "gmail"))))
+ ("ninthfloor:"
+ (address "ryuslash@ninthfloor.org")
+ (eval (setq message-sendmail-extra-arguments '("-a" "ninthfloor"))))
+ ("arch:"
+ (address "tom.willemsen@archlinux.us")
+ (eval (setq message-sendmail-extra-arguments '("-a" "arch"))))
+ ("aethon:"
+ (address "thomas@aethon.nl")
+ (signature-file "~/documents/work/aethon/signature.txt")
+ (eval (setq message-sendmail-extra-arguments '("-a" "aethon"))))
+ ("ryuslash:"
+ (address "tom@ryuslash.org")
+ (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash"))))))
+
+(setq user-mail-address "ryuslash@gmail.com")
+(setq user-full-name "Tom Willemsen")
+
+(add-hook 'gnus-summary-mode-hook '(lambda () (linum-mode -1)))
+(add-hook 'gnus-article-mode-hook '(lambda () (linum-mode -1)))
+(add-hook 'gnus-group-mode-hook '(lambda () (linum-mode -1)))
+
+;-----[ BBDB ]--------------------------------------------------------
+(require 'bbdb)
+(bbdb-initialize 'gnus 'message)
+(bbdb-insinuate-gnus)
+(setq bbdb-north-american-phone-numbers-p nil)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
new file mode 100644
index 0000000..6957cd5
--- /dev/null
+++ b/.emacs.d/init.el
@@ -0,0 +1,1064 @@
+;;; init.el --- ryuslash's emacs init
+
+;;; Commentary:
+;; Does so much and changes so often
+
+(require 'geiser-install)
+(require 'iso-transl)
+(require 'newcomment)
+(require 'uniquify)
+(require 'w3m-load)
+
+;;; Code:
+
+(eval-and-compile
+ (package-initialize)
+
+ (mapc #'(lambda (directory)
+ (add-to-list 'load-path directory)
+ (let ((default-directory directory))
+ (normal-top-level-add-subdirs-to-load-path)))
+ '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
+ (add-to-list 'load-path "~/.emacs.d/"))
+
+(autoload 'gtags-mode "gtags" nil t)
+(autoload 'identica-mode "identica-mode" nil t)
+(autoload 'mu4e "mu4e" nil t)
+(autoload 'naquadah-get-colors "naquadah-theme")
+(autoload 'php-mode "php-mode" nil t)
+(autoload 'po-mode "po-mode" nil t)
+(autoload 'pony-mode "pony-mode" nil t)
+(autoload 'sawfish-mode "sawfish" nil t)
+(autoload 'xmodmap-mode "xmodmap-mode" nil t)
+(autoload 'jabber-connect "jabber" nil t)
+
+(load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
+
+(define-key key-translation-map (kbd "C-j") (kbd "C-l"))
+(define-key key-translation-map (kbd "C-l") (kbd "C-j"))
+
+(defadvice org-agenda-redo (after org-agenda-redo-add-appts)
+ "Pressing `r' on the agenda will also add appointments."
+ (progn
+ (setq appt-time-msg-list nil)
+ (org-agenda-to-appt)))
+
+(defalias 'yes-or-no-p 'y-or-n-p)
+
+(defconst oni:c-outline-regex
+ (eval-when-compile
+ (concat
+ "\\(?:static\\s +\\)?\\(?:\\sw+\\(?: \\|\t\\|\n\\)*?\\*?\\)"
+ "\\(?:\\s \\|\t\\|\n\\)\\(?:\\sw\\|_\\)+([^)]*)[^;\n]*$"))
+ "Regex for command `outline-minor-mode' for `c-mode'.")
+
+(defconst oni:javascript-outline-regex "function \\(\\w\\|_\\)+("
+ "Regex for command `outline-minor-mode' for `js-mode'.")
+
+(defconst oni:php-outline-regex
+ (eval-when-compile
+ (concat
+ "^ *\\(\\(?:namespace\\|interface\\) [a-zA-Z0-9_]\\|\\(\\(abstract"
+ "\\|final\\) \\)?class [a-zA-Z0-9_]+\\( extends [\\a-zA-Z0-9_]+\\)?"
+ "\\|\\(abstract \\)?\\(public\\|private\\|protected\\)?"
+ "\\( static\\)? function [a-zA-Z0-9_]+(\\|/\\*\\*\\)"))
+ "Regex for command `outline-minor-mode' for `php-mode'.")
+
+(defconst oni:python-outline-regex
+ (eval-when-compile
+ (concat "^[ \t]*\\(?:@[a-zA-Z0-9_]+\\(?:([a-zA-Z0-9_=, ]*)\\)?"
+ "\n\\)*[ \t]*\\(?:\\(class\\|def\\)[ \t]+\\(\\sw\\|\\s_\\)+"
+ "\\(([^)]*):\\)?\\|\\#[ a-zA-Z0-9]*\\#\\)"))
+ "Regex for command `outline-minor-mode' for `python-mode'.")
+
+(defface oni:mode-line-buffer-column
+ '((t (:inherit font-lock-type-face)))
+ "Face for the column number in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-line
+ '((t (:inherit font-lock-type-face)))
+ "Face for the line number in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-position
+ '((t (:inherit font-lock-constant-face)))
+ "Face for the buffer position in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-buffer-state
+ '((t (:inherit font-lock-preprocessor-face)))
+ "Face for the state of the buffer in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-mode
+ '((t (:inherit font-lock-string-face)))
+ "Face for the major mode in the mode-line"
+ :group 'local)
+
+(defface oni:mode-line-modified
+ '((t (:inherit font-lock-warning-face)))
+ "Face for the modified state in the mode-line"
+ :group 'local)
+
+(defmacro oni:define-mailbox (name email &optional signature longname)
+ "Define a mailbox function for mailbox NAME with address EMAIL.
+Optionally set signature to SIGNATURE and use LONGNAME as the
+actual account name."
+ `(defun ,(make-symbol (concat "oni:" name "-mailbox")) ()
+ ,(concat "Settings for " name " mailbox")
+ (setq mu4e-mu-home ,(expand-file-name (concat "~/.mu/" name))
+ mu4e-maildir ,(expand-file-name (concat "~/documents/mail/"
+ (or longname name)))
+ mu4e-get-mail-command ,(concat "offlineimap -oa " (or longname
+ name))
+ mu4e~main-buffer-name ,(concat "*mu4e-" name "*")
+ user-mail-address ,email
+ message-sendmail-extra-arguments '("-a" ,name)
+ message-signature-file ,signature)))
+
+(defmacro oni:email (user at host dot com)
+ "Turn arguments into an email address.
+The resulting email address will look like: USER@HOST.COM, AT and DOT are
+intentionally being skipped."
+ (concat (symbol-name user) "@" (symbol-name host) "."
+ (symbol-name com)))
+
+(defmacro oni:generic-outline (regex)
+ "Prepare for enabling command `outline-minor-mode'.
+Argument REGEX will be used to set `outline-regexp' for this buffer."
+ `(progn
+ (when (buffer-file-name)
+ (outline-minor-mode)
+ (set (make-local-variable 'outline-regexp) ,regex)
+ (hide-body)
+ (local-set-key [C-tab] 'outline-toggle-children))))
+
+(defmacro oni:color (name)
+ "Fetch color NAME from the naquadah color theme."
+ `(naquadah-get-colors (quote ,name)))
+
+(defvar oni:mailbox-map
+ '("top" ("menu"
+ ("ryulash.org" . "ryuslash")
+ ("ninthfloor" . "ninthfloor")
+ ("gmail" . "gmail")
+ ("aethon" . "aethon")))
+ "A mailbox map for use with `tmm-prompt'.")
+
+(defvar oni:required-packages
+ '(graphviz-dot-mode htmlize magit rainbow-delimiters
+ rainbow-mode yasnippet markdown-mode flymake
+ flymake-cursor pony-mode sauron dispass
+ expand-region fill-column-indicator
+ git-auto-commit-mode idomenu magit smex)
+ "List of all the packages I have (want) installed.")
+
+(defun oni:after-save-func ()
+ "Function for `after-save-hook'."
+ (oni:compile-el)
+ (executable-make-buffer-file-executable-if-script-p)
+ (let ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile")))
+ (when dom-dir
+ (shell-command (concat "make -C " dom-dir " TAGS >/dev/null 2>&1")))))
+
+(defun oni:before-save-func ()
+ "Function for `before-save-hook'."
+ (if (eq major-mode 'html-mode)
+ (oni:replace-html-special-chars))
+ (if (not (eq major-mode 'markdown-mode))
+ (delete-trailing-whitespace)))
+
+(defun oni:c-mode-common-func ()
+ "Function for `c-mode-common-hook'."
+ (setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
+ (when (buffer-file-name)
+ (hs-minor-mode)))
+
+(defun oni:c-mode-func ()
+ "Function for `c-mode-hook'."
+ (local-set-key [f9] 'compile)
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(defun oni:close-client-window ()
+ "Close a client's frames."
+ (interactive)
+ (server-save-buffers-kill-terminal nil))
+
+(defun oni:compile-el ()
+ "Compile the current buffer file if it is an .el file."
+ (let* ((full-file-name (buffer-file-name))
+ (file-name (file-name-nondirectory full-file-name))
+ (suffix (file-name-extension file-name)))
+ (if (and (not (string-equal file-name ".dir-locals.el"))
+ (string-equal suffix "el"))
+ (byte-compile-file full-file-name))))
+
+(defun oni:css-mode-func ()
+ "Function for `css-mode-hook'."
+ (setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
+ (when (buffer-file-name)
+ (hs-minor-mode))
+ (local-set-key "\C-j" 'oni:newline-and-indent)
+ (rainbow-mode))
+
+(defun oni:diary-display-func ()
+ "Function for `diary-display-hook'."
+ (diary-fancy-display))
+
+(defun oni:emacs-lisp-mode-func ()
+ "Function for `emacs-lisp-mode-hook'."
+ (eldoc-mode)
+ (when (buffer-file-name)
+ (hs-minor-mode)))
+
+(defun oni:emms-toggle-playing ()
+ "Toggle between playing/paused states."
+ (interactive)
+ (if (eq emms-player-playing-p nil)
+ (emms-start)
+ (emms-pause)))
+
+(defun oni:erc-mode-func ()
+ "Function for `erc-mode-hook'."
+ (erc-fill-mode -1)
+ (visual-line-mode)
+ (setq truncate-lines nil))
+
+(defun oni:eshell-mode-func ()
+ "Function for `eshell-mode-hook'."
+ (setq truncate-lines nil))
+
+(defun oni:eshell-prompt-function ()
+ "Show a pretty shell prompt."
+ (let ((status (if (zerop eshell-last-command-status) ?+ ?-))
+ (hostname (shell-command-to-string "hostname"))
+ (dir (abbreviate-file-name (eshell/pwd)))
+ (branch
+ (shell-command-to-string
+ "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'"))
+ (userstatus (if (zerop (user-uid)) ?# ?$)))
+ (concat
+ (propertize (char-to-string status)
+ 'face `(:foreground ,(if (= status ?+)
+ (oni:color chameleon-1)
+ (oni:color scarlet-red-2))))
+ " "
+ (propertize (substring hostname 0 -1) 'face 'mode-line-buffer-id)
+ " "
+ (propertize (oni:shorten-dir dir) 'face 'font-lock-string-face)
+ " "
+ (when (not (string= branch ""))
+ (propertize
+ ;; Cut off "* " and "\n"
+ (substring branch 2 -1)
+ 'face 'font-lock-function-name-face))
+ " \n"
+ (propertize (char-to-string userstatus)
+ 'face `(:foreground ,(oni:color sky-blue-1)))
+ "> ")))
+
+(defun oni:flymake-mode-func ()
+ "Function for `flymake-mode-hook'."
+ (local-set-key [M-P] 'flymake-goto-prev-error)
+ (local-set-key [M-N] 'flymake-goto-next-error))
+
+(defun oni:flymake-pyflakes-init ()
+ "Initialize function for flymake with pyflakes."
+ (let* ((temp-file (flymake-init-create-temp-buffer-copy
+ 'flymake-create-temp-inplace))
+ (local-file (file-relative-name temp-file (file-name-directory
+ buffer-file-name))))
+ (list "pyflakes" (list local-file))))
+
+(defun oni:go-mode-func ()
+ "Function for `go-mode-hook'."
+ (setq indent-tabs-mode nil)
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(defun oni:gtags-mode-func ()
+ "Function for `gtags-mode-hook'."
+ (local-set-key "\M-," 'gtags-find-tag)
+ (local-set-key "\M-." 'gtags-find-rtag))
+
+(defun oni:hs-minor-mode-func ()
+ "Function for `hs-minor-mode-hook'."
+ (local-set-key [C-tab] 'hs-toggle-hiding)
+ (hs-hide-all))
+
+(defun oni:html-mode-func ()
+ "Function for `html-mode-hook'."
+ (fci-mode))
+
+(defun oni:indent-shift-left (start end &optional count)
+ "Rigidly indent region.
+Region is from START to END. Move
+COUNT number of spaces if it is non-nil otherwise use
+`tab-width'."
+ (interactive
+ (if mark-active
+ (list (region-beginning) (region-end) current-prefix-arg)
+ (list (line-beginning-position)
+ (line-end-position)
+ current-prefix-arg)))
+ (if count
+ (setq count (prefix-numeric-value count))
+ (setq count tab-width))
+ (when (> count 0)
+ (let ((deactivate-mark nil))
+ (save-excursion
+ (goto-char start)
+ (while (< (point) end)
+ (if (and (< (current-indentation) count)
+ (not (looking-at "[ \t]*$")))
+ (error "Can't shift all lines enough"))
+ (forward-line))
+ (indent-rigidly start end (- count))))))
+
+(defun oni:indent-shift-right (start end &optional count)
+ "Indent region between START and END rigidly to the right.
+If COUNT has been specified indent by that much, otherwise look at
+`tab-width'."
+ (interactive
+ (if mark-active
+ (list (region-beginning) (region-end) current-prefix-arg)
+ (list (line-beginning-position)
+ (line-end-position)
+ current-prefix-arg)))
+ (let ((deactivate-mark nil))
+ (if count
+ (setq count (prefix-numeric-value count))
+ (setq count tab-width))
+ (indent-rigidly start end count)))
+
+(defun oni:jabber-chat-mode-func ()
+ "Function for `jabber-chat-mode-hook'."
+ (visual-line-mode))
+
+(defun oni:java-mode-func ()
+ "Function for `java-mode-hook'."
+ (local-set-key "\C-j" 'oni:newline-and-indent))
+
+(defun oni:js-mode-func ()
+ "Function for `js-mode-hook'."
+ (oni:generic-outline oni:javascript-outline-regex)
+ (rainbow-delimiters-mode)
+ (local-set-key "\C-j" 'oni:newline-and-indent)
+ (pretty-symbols-mode -1))
+
+(defun oni:kill-region-or-backward-char ()
+ "Either `kill-region' or `backward-delete-char-untabify'."
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (backward-delete-char-untabify 1)))
+
+(defun oni:kill-region-or-forward-char ()
+ "Either `kill-region' or `delete-forward-char'."
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (delete-forward-char 1)))
+
+(defun oni:kill-region-or-line ()
+ "Either `kill-region' or `kill-line'."
+ (interactive)
+ (if (region-active-p)
+ (kill-region (region-beginning) (region-end))
+ (kill-line)))
+
+(defun oni:lisp-mode-func ()
+ "Function for `lisp-mode-hook'."
+ (when (buffer-file-name)
+ (hs-minor-mode)))
+
+(defun oni:magit-log-edit-mode-func ()
+ "Function for `magit-log-edit-mode-hook'."
+ (auto-fill-mode)
+ (font-lock-add-keywords
+ nil
+ '(("\\`\\(.\\{,50\\}\\)\\(.*\\)\n?\\(.*\\)$"
+ (1 'git-commit-summary-face)
+ (2 'git-commit-overlong-summary-face)
+ (3 'git-commit-nonempty-second-line-face))
+ ("`\\([^']+\\)'" 1 font-lock-constant-face))
+ t))
+
+(defun oni:markdown-mode-func ()
+ "Function for `markdown-mode-hook'."
+ (auto-fill-mode)
+ (whitespace-mode))
+
+(defun oni:message-mode-func ()
+ "Function for `message-mode-hook'."
+ (auto-fill-mode)
+ (flyspell-mode)
+ (ispell-change-dictionary (read-string "New dictionary: ")))
+
+(defun oni:mini-fix-timestamp-string (date-string)
+ "A minimal version of Xah Lee's `fix-timestamp-string'.
+Turn DATE-STRING into something else that can be worked with in
+code. Found at http://xahlee.org/emacs/elisp_parse_time.html"
+ (setq date-string (replace-regexp-in-string "Jan" "01" date-string)
+ date-string (replace-regexp-in-string "Feb" "02" date-string)
+ date-string (replace-regexp-in-string "Mar" "03" date-string)
+ date-string (replace-regexp-in-string "Apr" "04" date-string)
+ date-string (replace-regexp-in-string "May" "05" date-string)
+ date-string (replace-regexp-in-string "Jun" "06" date-string)
+ date-string (replace-regexp-in-string "Jul" "07" date-string)
+ date-string (replace-regexp-in-string "Aug" "08" date-string)
+ date-string (replace-regexp-in-string "Sep" "09" date-string)
+ date-string (replace-regexp-in-string "Oct" "10" date-string)
+ date-string (replace-regexp-in-string "Nov" "11" date-string)
+ date-string (replace-regexp-in-string "Dec" "12" date-string))
+ (string-match
+ "^\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{4\\}\\)$"
+ date-string)
+ (format "%s-%s-%s"
+ (match-string 3 date-string)
+ (match-string 2 date-string)
+ (match-string 1 date-string)))
+
+(defun oni:move-beginning-of-dwim ()
+ "Move to beginning of line either after indentation or before."
+ (interactive)
+ (let ((start (point)))
+ (back-to-indentation)
+ (if (= start (point))
+ (beginning-of-line))))
+
+(defun oni:move-end-of-dwim ()
+ "Move to end of line, either before any comments or after."
+ (interactive)
+ (let ((start (point))
+ (eolpos (line-end-position)))
+ (beginning-of-line)
+ (if (and comment-start
+ (comment-search-forward eolpos t))
+ (progn
+ (search-backward-regexp (concat "[^ \t" comment-start "]"))
+ (forward-char)
+
+ (when (or (bolp)
+ (= start (point)))
+ (end-of-line)))
+ (end-of-line))))
+
+(defun oni:myepisodes-formatter (plist)
+ "Format RSS items from MyEpisodes as org tasks.
+PLIST contains all the pertinent information."
+ (let ((str (plist-get plist :title)))
+ (string-match
+ "^\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]$"
+ str)
+ (let* ((title (match-string 1 str))
+ (episode (match-string 2 str))
+ (name (match-string 3 str))
+ (date (oni:mini-fix-timestamp-string (match-string 4 str))))
+ (format "* ACQUIRE %s %s - %s <%s>" title episode name date))))
+
+(defun oni:newline-and-indent ()
+ "`newline-and-indent', but with a twist.
+When dealing with braces, add another line and indent that too."
+ (interactive)
+ (if (and (not (or (= (point) (point-max))
+ (= (point) (point-min))))
+ (or (and (char-equal (char-before) ?{)
+ (char-equal (char-after) ?}))
+ (and (char-equal (char-before) ?\()
+ (char-equal (char-after) ?\)))))
+ (save-excursion (newline-and-indent)))
+ (newline-and-indent))
+
+(defun oni:org-mode-func ()
+ "Function for `org-mode-hook'."
+ (flyspell-mode)
+ (auto-fill-mode))
+
+(defun oni:php-mode-func ()
+ "Function for `php-mode-hook'."
+ (flymake-mode)
+ (local-set-key "\C-j" 'oni:newline-and-indent)
+ (c-set-offset 'arglist-intro '+)
+ (c-set-offset 'arglist-close '0)
+ (rainbow-delimiters-mode)
+ (setq fci-rule-column 81))
+
+(defun oni:prog-mode-func ()
+ "Function for `prog-mode-hook'."
+ (rainbow-delimiters-mode)
+ (fci-mode)
+ (pretty-symbols-mode)
+ (yas-minor-mode))
+
+(defun oni:python-mode-func ()
+ "Function for `python-mode-hook'."
+ (flymake-mode)
+ (local-set-key (kbd "C->") 'python-indent-shift-right)
+ (local-set-key (kbd "C-<") 'python-indent-shift-left)
+ (local-set-key [C-tab] 'outline-toggle-children)
+ (oni:generic-outline oni:python-outline-regex)
+ (set (make-local-variable 'electric-indent-chars) nil)
+ (rainbow-delimiters-mode)
+ (setq fci-rule-column 80
+ fill-column 72)
+ (fci-mode))
+
+(defun oni:raise-eshell ()
+ "Start or switch back to `eshell'.
+Also change directories to current working directory."
+ (interactive)
+ (let ((dir (file-name-directory
+ (or (buffer-file-name) "~/")))
+ (hasfile (not (eq (buffer-file-name) nil))))
+ (eshell)
+ (if (and hasfile (eq eshell-process-list nil))
+ (progn
+ (eshell/cd dir)
+ (eshell-reset)))))
+
+(defun oni:raise-scratch (&optional mode)
+ "Show the *scratch* buffer.
+If called with a universal argument, ask the user which mode to
+use. If MODE is not nil, open a new buffer with the name
+*MODE-scratch* and load MODE as its major mode."
+ (interactive (list (if current-prefix-arg
+ (read-string "Mode: ")
+ nil)))
+ (let* ((bname (if mode
+ (concat "*" mode "-scratch*")
+ "*scratch*"))
+ (buffer (get-buffer bname))
+ (mode-sym (intern (concat mode "-mode"))))
+
+ (unless buffer
+ (setq buffer (generate-new-buffer bname))
+ (with-current-buffer buffer
+ (when (fboundp mode-sym)
+ (funcall mode-sym))))
+
+ (switch-to-buffer buffer)))
+
+(defun oni:reload-buffer ()
+ "Reload current buffer."
+ (interactive)
+ (revert-buffer nil t nil))
+
+(defun oni:replace-html-special-chars ()
+ "Replace special characters with HTML escaped entities."
+ (oni:replace-occurrences "é" "é"))
+
+(defun oni:replace-occurrences (from to)
+ "Replace all occurrences of FROM with TO in the current buffer."
+ (save-excursion
+ (goto-char (point-min))
+ (while (search-forward from nil t)
+ (replace-match to))))
+
+(defun oni:required-packages-installed-p ()
+ "Check if all the packages I need are installed."
+ (let ((tmp-packages oni:required-packages)
+ (result t))
+ (while (and tmp-packages result)
+ (if (not (package-installed-p (car tmp-packages)))
+ (setq result nil))
+ (setq tmp-packages (cdr tmp-packages)))
+ result))
+
+(defun oni:scheme-mode-func ()
+ "Function for `scheme-mode-hook'."
+ (when (buffer-file-name)
+ (hs-minor-mode)))
+
+(defun oni:self-insert-dwim ()
+ "Execute self insert, but when the region is active call self
+insert at the end of the region and at the beginning."
+ (interactive)
+ (if (region-active-p)
+ (let ((electric-pair-mode nil)
+ (beginning (region-beginning))
+ (end (region-end)))
+ (goto-char end)
+ (self-insert-command 1)
+ (save-excursion
+ (goto-char beginning)
+ (self-insert-command 1)))
+ (self-insert-command 1)))
+
+(defun oni:shorten-dir (dir)
+ "Shorten a directory, (almost) like fish does it."
+ (while (string-match "\\(/\\.?[^./]\\)[^/]+/" dir)
+ (setq dir (replace-match "\\1/" nil nil dir)))
+ dir)
+
+(defun oni:term-mode-func ()
+ "Function for `term-mode-hook'."
+ (setq truncate-lines nil))
+
+(defun oni:texinfo-mode-func ()
+ "Function for `texinfo-mode-hook'."
+ (auto-fill-mode))
+
+(defun oni:view-mail ()
+ "Show a menu with all mailbox options from `oni:mailbox-map'
+for easy selection."
+ (interactive)
+ (require 'tmm)
+ (let* ((tmm-completion-prompt "Choose a mailbox\n")
+ (inbox (tmm-prompt oni:mailbox-map)))
+ (if inbox
+ (progn
+ (require 'mu4e)
+ (funcall (intern (concat "oni:" inbox "-mailbox")))
+ (mu4e)))))
+
+(defun oni:write-file-func ()
+ "Function for `write-file-hooks'."
+ (time-stamp))
+
+(defun oni:yas-minor-mode-func ()
+ "Function for `yas-minor-mode-hook'."
+ (yas-load-directory (car yas-snippet-dirs)))
+
+(eval-after-load "ebuff-menu"
+ '(define-key electric-buffer-menu-mode-map
+ (kbd "C-s") 'isearch-forward))
+
+(eval-after-load "em-term"
+ '(add-to-list 'eshell-visual-commands
+ "unison"))
+
+(eval-after-load "emms-source-file"
+ '(progn
+ (require 'emms-setup)
+
+ (emms-standard)
+ (require 'emms-player-mpd)
+
+ (setq emms-player-mpd-server-name "localhost")
+ (setq emms-player-mpd-server-port "6600")
+
+ (add-to-list 'emms-info-functions 'emms-info-mpd)
+ (add-to-list 'emms-player-list 'emms-player-mpd)
+ (setq emms-player-mpd-music-directory "/mnt/music/mp3")))
+
+(eval-after-load "flymake"
+ '(progn
+ (require 'flymake-cursor)
+
+ (add-to-list ; Make sure pyflakes is loaded
+ 'flymake-allowed-file-name-masks ; for python files.
+ '("\\.py\\'" oni:flymake-pyflakes-init))
+
+ (add-to-list ; Error line repexp for go
+ 'flymake-err-line-patterns ; compilation.
+ '("^\\([a-zA-Z0-9_]+\\.go\\):\\([0-9]+\\):\\(.*\\)$"
+ 1 2 nil 3))
+
+ (add-to-list ; Go uses makefiles, makes
+ 'flymake-allowed-file-name-masks ; flymaking 'easy'.
+ '("\\.go$" flymake-simple-make-init))))
+
+(eval-after-load "ido"
+ '(setq ido-ignore-buffers `(,@ido-ignore-buffers
+ "^\\*.*\\*$" "^irc\\." "^\\#")))
+
+(eval-after-load "info"
+ '(require 'info+))
+
+(eval-after-load "mu4e"
+ '(add-to-list
+ 'org-capture-templates
+ '("c" "Contact" entry (file "~/documents/org/misc/contacts.org")
+ (concat "* %(mu4e-view-snarf-from 'name)\n"
+ " :PROPERTIES:\n"
+ " :EMAIL: %(mu4e-view-snarf-from 'email)\n"
+ " :END:"))))
+
+(eval-after-load "org"
+ '(progn
+ (require 'appt)
+ (require 'org-protocol)
+ (require 'org-habit)
+ (require 'org-contacts)
+
+ (add-to-list 'org-modules 'habit)
+
+ (org-indent-mode t)
+
+ (org-agenda-to-appt)
+ (ad-activate 'org-agenda-redo)))
+
+(eval-after-load "org-crypt"
+ '(org-crypt-use-before-save-magic))
+
+(eval-after-load "sauron"
+ '(setq sauron-modules (append '(sauron-identica sauron-jabber)
+ sauron-modules)))
+
+(eval-after-load "smex"
+ '(progn
+ (global-set-key (kbd "M-x") 'smex)
+ (global-set-key (kbd "C-M-x") 'smex-major-mode-commands)))
+
+(oni:define-mailbox "aethon"
+ (oni:email thomas at aethon dot nl)
+ (expand-file-name "~/documents/work/aethon/signature.txt"))
+(oni:define-mailbox "gmail" (oni:email ryuslash at gmail dot com))
+(oni:define-mailbox "ninthfloor"
+ (oni:email ryuslash at ninthfloor dot org))
+(oni:define-mailbox "ryuslash" (oni:email tom at ryuslash dot org)
+ nil "ryuslash.org")
+
+(put 'upcase-region 'disabled nil)
+(put 'downcase-region 'disabled nil)
+(put 'narrow-to-region 'disabled nil)
+(put 'scroll-left 'disabled nil)
+
+(setq-default bidi-paragraph-direction 'left-to-right)
+(setq-default c-basic-offset 4)
+(setq-default fci-rule-column 73)
+(setq-default gac-automatically-push-p t)
+(setq-default indent-tabs-mode nil)
+(setq-default mode-line-format
+ (list
+ '(:eval
+ (if (and (buffer-modified-p) (buffer-file-name))
+ (propertize "!"
+ 'face 'oni:mode-line-modified
+ 'help-echo "Buffer has been modified")
+ " "))
+
+ '(:eval (propertize "%m"
+ 'face 'oni:mode-line-mode
+ 'help-echo buffer-file-coding-system))
+
+ ": "
+
+ '(:eval (propertize "%b "
+ 'face 'mode-line-buffer-id
+ 'help-echo (buffer-file-name)))
+
+ "("
+ (propertize "%p" 'face 'oni:mode-line-buffer-position) ":"
+ (propertize "%04l" 'face 'oni:mode-line-buffer-line) ","
+ (propertize "%02c" 'face 'oni:mode-line-buffer-column)
+ ") "
+
+ "["
+ '(:eval (propertize
+ (if buffer-read-only
+ "R"
+ (if overwrite-mode "O" "I"))
+ 'face 'oni:mode-line-buffer-state
+ 'help-echo (concat "Buffer is "
+ (if buffer-read-only
+ "read-only"
+ (if overwrite-mode
+ "in overwrite mode"
+ "in insert mode")))))
+
+ "] "
+
+ '(:eval
+ (propertize (format-time-string "%H:%M")
+ 'help-echo
+ (concat (format-time-string "%c; ")
+ (emacs-uptime "Uptime: %hh"))))
+ " --"
+ '(:eval global-mode-string)))
+(setq-default php-mode-warn-if-mumamo-off nil)
+(setq-default require-final-newline t)
+(setq-default tab-width 4)
+(setq-default truncate-lines t)
+
+(setq appt-display-diary nil)
+(setq auto-mode-case-fold nil)
+(setq auto-save-file-name-transforms
+ `((".*" ,temporary-file-directory t)))
+(setq avandu-article-render-function #'avandu-view-w3m)
+(setq backup-directory-alist
+ `((".*" . ,temporary-file-directory)))
+(setq browse-url-browser-function 'browse-url-generic)
+(setq browse-url-generic-program (getenv "BROWSER"))
+(setq custom-file "~/.emacs.d/custom.el")
+(setq custom-theme-directory "~/.emacs.d/themes")
+(setq default-frame-alist
+ `((border-width . 0)
+ (internal-border-width . 0)
+ (vertical-scroll-bars . nil)
+ (menu-bar-lines . nil)
+ (tool-bar-lines . nil)
+ (font . "LiberationMono:pixelsize=16")
+ (left-fringe . 0)))
+(setq emms-source-file-default-directory "/mnt/music/")
+(setq erc-autojoin-channels-alist
+ '(("freenode.net" "#herbstluftwm" "#ninthfloor" "#emacs"
+ "#dispass")))
+(setq erc-hide-list '("JOIN" "PART" "QUIT"))
+(setq erc-insert-timestamp-function 'erc-insert-timestamp-left)
+(setq erc-nick "ryuslash")
+(setq erc-timestamp-format "[%H:%M] ")
+(setq erc-timestamp-only-if-changed-flag nil)
+(setq eshell-highlight-prompt nil)
+(setq eshell-prompt-function 'oni:eshell-prompt-function)
+(setq eshell-prompt-regexp "^[#$]> ")
+(setq fci-rule-color "darkred")
+(setq flymake-gui-warnings-enabled nil)
+(setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
+(setq flymake-log-level 0)
+(setq frame-title-format '(:eval (concat "emacs: " (buffer-name))))
+(setq geiser-repl-history-filename "~/.emacs.d/geiser-history")
+(setq gtags-auto-update t)
+(setq help-at-pt-display-when-idle t)
+(setq ido-auto-merge-delay-time 1000000)
+(setq ido-default-buffer-method 'selected-window)
+(setq ido-max-window-height 1)
+(setq ido-save-directory-list-file nil)
+(setq ido-ubiquitous-exceptions '(tmm-prompt))
+(setq inferior-lisp-program "sbcl")
+(setq inhibit-default-init t)
+(setq inhibit-local-menu-bar-menus t)
+(setq inhibit-startup-message t)
+(setq initial-major-mode 'emacs-lisp-mode)
+(setq initial-scratch-message nil)
+(setq jabber-account-list '(("ryuslash@jabber.org")))
+(setq jabber-chat-buffer-format "*jabber:%n*")
+(setq jabber-chat-buffer-show-avatar nil)
+(setq jabber-chat-fill-long-lines nil)
+(setq jabber-chat-foreign-prompt-format "[%t] < ")
+(setq jabber-chat-local-prompt-format "[%t] > ")
+(setq jabber-chatstates-confirm nil)
+(setq jabber-history-dir "~/.emacs.d/jabber")
+(setq jabber-roster-show-bindings nil)
+(setq jit-lock-defer-time 0.2)
+(setq mail-header-separator "")
+(setq message-log-max 1000)
+(setq message-send-mail-function 'message-send-mail-with-sendmail)
+(setq mu4e-headers-date-format "%d-%m %H:%M")
+(setq mu4e-headers-fields '((:date . 11)
+ (:flags . 6)
+ (:to . 22)
+ (:from . 22)
+ (:subject)))
+(setq mu4e-headers-show-threads nil)
+(setq mu4e-headers-sort-revert nil)
+(setq mu4e-html2text-command "w3m -dump -T text/HTML -cols 72")
+(setq mu4e-my-email-addresses (list
+ (oni:email tom at ryuslash dot org)
+ (oni:email ryuslash at gmail dot com)
+ (oni:email ryuslash at ninthfloor dot org)
+ (oni:email thomas at aethon dot nl)))
+(setq org-agenda-custom-commands
+ '(("b" "Bookmarks to look at."
+ todo "LOOKAT")
+ ("w" "Work todo."
+ tags-todo "CATEGORY=\"Work\"")))
+(setq org-agenda-sorting-strategy
+ '((agenda habit-down time-up priority-down category-keep)
+ (todo priority-down category-up)
+ (tags priority-down category-keep)
+ (search category-keep)))
+(setq org-capture-templates
+ '(("t" "Task" entry (file "~/documents/org/tasks")
+ "* TODO %?")
+ ("h" "Habit" entry (file "")
+ (concat "* TODO %^{Description}\n"
+ " SCHEDULED: %^T\n"
+ " :PROPERTIES:\n"
+ " :STYLE: habit\n"
+ " :END:")
+ :immediate-finish t)
+ ("l" "Log" entry (file+headline "" "notes")
+ (concat "* %n %<%d-%m-%Y %H:%M:%S>\n"
+ " %a\n\n"
+ " %?")
+ :prepend t :empty-lines 1)
+ ("a" "Appointment" entry (file+headline "" "appointments")
+ "* %^{Description} %^T" :immediate-finish t)
+ ("b" "Bookmark" entry (file "~/documents/org/misc/bookmarks.org")
+ "* %c\n\n %:initial")))
+(setq org-contacts-files '("~/documents/org/misc/contacts.org"))
+(setq org-directory (expand-file-name "~/documents/org"))
+(setq org-agenda-files
+ `(,(concat org-directory "/org")
+ ,(concat org-directory "/misc/contacts.org")
+ ,(concat org-directory "/misc/bookmarks.org")))
+(setq org-default-notes-file (concat org-directory "/org"))
+(setq org-export-htmlize-output-type 'css)
+(setq org-feed-alist
+ '(("MyEpisodes"
+ "http://www.myepisodes.com/rss.php?feed=mylist&uid=Slash&pwdmd5=04028968e1f0b7ee678b748a4320ac17"
+ "~/documents/org/org" "MyEpisodes"
+ :formatter oni:myepisodes-formatter)))
+(setq org-hide-emphasis-markers t)
+(setq org-outline-path-complete-in-steps t)
+(setq org-refile-allow-creating-parent-nodes t)
+(setq org-refile-targets '((nil . (:maxlevel . 6))))
+(setq org-refile-use-outline-path 'file)
+(setq org-return-follows-link t)
+(setq org-src-fontify-natively t)
+(setq org-tags-exclude-from-inheritance '("crypt"))
+(setq org-todo-keyword-faces
+ '(("TODO" :foreground "red")
+ ("IN PROGRESS" :foreground "yellow")
+ ("DONE" :foreground "forest green")
+ ("SUCCEEDED" :foreground "forest green")
+ ("WAITING" :foreground "orange")
+ ("CANCELLED" :foreground "orangered")
+ ("FAILED" :foreground "orangered")))
+(setq org-todo-keywords
+ '((sequence "TODO(t)" "IN PROGRESS" "WAITING(@/!)" "|"
+ "DONE(!/!)" "CANCELLED(@/!)")))
+(setq org-use-fast-todo-selection t)
+(setq package-archives
+ '(("melpa" . "http://melpa.milkbox.net/packages/")
+ ("ELPA" . "http://tromey.com/elpa/")
+ ("gnu" . "http://elpa.gnu.org/packages/")
+ ("marmalade" . "http://marmalade-repo.org/packages/")))
+(setq package-load-list '((htmlize "1.39")
+ all))
+(setq php-function-call-face 'font-lock-function-name-face)
+(setq php-mode-force-pear t)
+(setq rainbow-delimiters-max-face-count 12)
+(setq redisplay-dont-pause t)
+(setq sauron-column-alist '((timestamp . 6)
+ (message)))
+(setq sauron-hide-mode-line t)
+(setq sauron-max-line-length 189)
+(setq sauron-timestamp-format "%H:%M")
+(setq sauron-watch-nicks '("ryuslash"))
+(setq sauron-watch-patterns '("ryuslash"))
+(setq scroll-conservatively 101)
+(setq send-mail-function 'smtpmail-send-it)
+(setq sendmail-program "/usr/bin/msmtp")
+(setq smex-save-file "~/.emacs.d/smex-items")
+(setq special-display-buffer-names '("*Sauron*"))
+(setq special-display-frame-alist '((minibuffer . nil)
+ (right-fringe . 0)))
+(setq split-height-threshold 40)
+(setq time-stamp-active t)
+(setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)")
+(setq uniquify-buffer-name-style 'post-forward)
+(setq use-dialog-box nil)
+(setq user-full-name "Tom Willemsen")
+(setq whitespace-style '(face trailing))
+(setq window-combination-resize t)
+(setq yas-prompt-functions '(yas-ido-prompt))
+
+(add-hook 'after-save-hook 'oni:after-save-func t)
+(add-hook 'before-save-hook 'oni:before-save-func)
+(add-hook 'c-mode-common-hook 'oni:c-mode-common-func)
+(add-hook 'c-mode-hook 'oni:c-mode-func)
+(add-hook 'css-mode-hook 'oni:css-mode-func)
+(add-hook 'diary-display-hook 'oni:diary-display-func)
+(add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func)
+(add-hook 'erc-mode-hook 'oni:erc-mode-func)
+(add-hook 'eshell-mode-hook 'oni:eshell-mode-func)
+(add-hook 'flymake-mode-hook 'oni:flymake-mode-func)
+(add-hook 'go-mode-hook 'oni:go-mode-func)
+(add-hook 'gtags-mode-hook 'oni:gtags-mode-func)
+(add-hook 'hs-minor-mode-hook 'oni:hs-minor-mode-func)
+(add-hook 'html-mode-hook 'oni:html-mode-func)
+(add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
+(add-hook 'java-mode-hook 'oni:java-mode-func)
+(add-hook 'js-mode-hook 'oni:js-mode-func)
+(add-hook 'lisp-mode-hook 'oni:lisp-mode-func)
+(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
+(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
+(add-hook 'message-mode-hook 'oni:message-mode-func)
+(add-hook 'org-mode-hook 'oni:org-mode-func)
+(add-hook 'php-mode-hook 'oni:php-mode-func)
+(add-hook 'prog-mode-hook 'oni:prog-mode-func)
+(add-hook 'python-mode-hook 'oni:python-mode-func)
+(add-hook 'scheme-mode-hook 'oni:scheme-mode-func)
+(add-hook 'term-mode-hook 'oni:term-mode-func)
+(add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func)
+(add-hook 'write-file-hooks 'oni:write-file-func)
+(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func)
+
+(global-set-key (kbd "'") 'oni:self-insert-dwim)
+(global-set-key (kbd "") 'emms-next)
+(global-set-key (kbd "") 'oni:emms-toggle-playing)
+(global-set-key (kbd "") 'emms-previous)
+(global-set-key (kbd "") 'emms-stop)
+(global-set-key (kbd "") 'oni:raise-scratch)
+(global-set-key (kbd "") 'oni:view-mail)
+(global-set-key (kbd "") 'emms)
+(global-set-key (kbd "") 'oni:reload-buffer)
+(global-set-key (kbd "") 'jabber-switch-to-roster-buffer)
+(global-set-key (kbd "") 'magit-status)
+(global-set-key (kbd "") 'oni:raise-eshell)
+(global-set-key (kbd "C-<") 'indent-shift-left)
+(global-set-key (kbd "C->") 'indent-shift-right)
+(global-set-key (kbd "C-@") 'er/expand-region)
+(global-set-key (kbd "C-M-d") 'kill-word)
+(global-set-key (kbd "C-M-w") 'backward-kill-word)
+(global-set-key (kbd "C-S-k") 'kill-whole-line)
+(global-set-key (kbd "C-a") 'oni:move-beginning-of-dwim)
+(global-set-key (kbd "C-c a") 'org-agenda)
+(global-set-key (kbd "C-c c") 'org-capture)
+(global-set-key (kbd "C-c i p") 'identica-update-status-interactive)
+(global-set-key (kbd "C-d") 'oni:kill-region-or-forward-char)
+(global-set-key (kbd "C-e") 'oni:move-end-of-dwim)
+(global-set-key (kbd "C-k") 'oni:kill-region-or-line)
+(global-set-key (kbd "C-w") 'oni:kill-region-or-backward-char)
+(global-set-key (kbd "C-x C-b") 'electric-buffer-list)
+(global-set-key (kbd "M-n") 'idomenu)
+(global-set-key (kbd "\"") 'oni:self-insert-dwim)
+
+(when (daemonp)
+ (global-set-key "\C-x\C-c" 'oni:close-client-window))
+
+(when (or window-system (daemonp))
+ (global-unset-key "\C-z"))
+
+(add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js-mode))
+(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?do?wn$" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
+(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
+(add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode))
+(add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode))
+(add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode))
+
+(add-to-list 'custom-theme-load-path
+ (concat custom-theme-directory "/naquadah-theme"))
+
+(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
+
+(unless (oni:required-packages-installed-p)
+ (message "%s" "Refreshing package database...")
+ (package-refresh-contents)
+ (message "%s" " done.")
+ (mapc #'(lambda (package)
+ (when (not (package-installed-p package))
+ (package-install package)))
+ oni:required-packages))
+
+(blink-cursor-mode -1)
+(menu-bar-mode -1)
+(scroll-bar-mode -1)
+(tool-bar-mode -1)
+(tooltip-mode -1)
+
+(electric-indent-mode)
+(electric-pair-mode)
+(ido-mode)
+(ido-ubiquitous)
+(savehist-mode)
+(show-paren-mode)
+(auto-insert-mode)
+
+(smex-initialize)
+(help-at-pt-set-timer)
+
+(load-theme 'naquadah t)
+
+(load custom-file)
+(load "rudel-loaddefs.el")
+(load (expand-file-name "~/quicklisp/slime-helper.el"))
+
+(provide 'init)
+
+;;; init.el ends here
diff --git a/.gitignore b/.gitignore
index d4280cd..18ca469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@
.dmenu_cache
.dvdcss/
.easytag/
-.emass.d/
.emacs-jabber/
.face
.filezilla/
@@ -101,7 +100,6 @@ var/
xhtml-loader.rnc
.unison/
.pencil/
-.emacs.d/
.cuyo
.lgames
.beetsmusic.blb
diff --git a/emacs/Makefile b/emacs/Makefile
deleted file mode 100644
index 51a55a4..0000000
--- a/emacs/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-EMACS = emacs
-
-files = init.el init.elc
-install-files = $(addprefix install-,$(files))
-submodules = eshell
-install-submodules = $(addprefix install-,$(submodules))
-
-.PHONY: all $(submodules) install $(install-submodules) $(install-files)
-
-all: $(files) $(submodules)
-
-$(submodules):
- $(MAKE) -C $@/
-
-$(filter %.elc,$(files)): %.elc: %.el
- $(EMACS) -batch -eval "(byte-compile-file \"$^\")"
-
-install: $(install-files) $(install-submodules)
-
-$(install-files): install-%: $*
- install -Dm 444 $* ${HOME}/.emacs.d/$*
-
-$(install-submodules): install-%:
- $(MAKE) -C $*/ install
diff --git a/emacs/eshell/Makefile b/emacs/eshell/Makefile
deleted file mode 100644
index a28a794..0000000
--- a/emacs/eshell/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-.PHONY: all install
-
-all:
-
-install:
- install -Dm 444 alias ${HOME}/.emacs.d/eshell/alias
diff --git a/emacs/eshell/alias b/emacs/eshell/alias
deleted file mode 100644
index 940108a..0000000
--- a/emacs/eshell/alias
+++ /dev/null
@@ -1,8 +0,0 @@
-alias git git --no-pager $*
-alias rm rm -v $*
-alias sudo *sudo $*
-alias ncmpcpp ansi-term ncmpcpp ncmpcpp
-alias listen eshell-exec-visual mplayer http://usa7-vn.mixstream.net/listen/8248.pls
-alias o find-file $1
-alias d dired $1
-alias newsbeuter ansi-term newsbeuter newsbeuter
diff --git a/emacs/gnus.el b/emacs/gnus.el
deleted file mode 100644
index 1f629b5..0000000
--- a/emacs/gnus.el
+++ /dev/null
@@ -1,74 +0,0 @@
-;; -*- eval: (git-auto-commit-mode 1) -*-
-(setq gnus-select-method '(nntp "news.eternal-september.org"))
-(setq gnus-secondary-select-methods
- '((nnmaildir "gmail"
- (directory "~/documents/mail/gmail/"))
- (nnmaildir "ninthfloor"
- (directory "~/documents/mail/ninthfloor/"))
- (nnmaildir "arch"
- (directory "~/documents/mail/arch/"))
- (nnmaildir "aethon"
- (directory "~/documents/mail/aethon/"))
- (nnmaildir "ryuslash"
- (directory "~/documents/mail/ryuslash.org/"))
- (nntp "news.gmane.org")))
-
-(setq gnus-auto-subscribed-groups nil)
-(setq gnus-save-newsrc-file nil)
-(setq gnus-read-newsrc-file nil)
-(setq gnus-novice-user t)
-(setq gnus-article-truncate-lines nil)
-
-(setq message-send-mail-function 'message-send-mail-with-sendmail)
-(setq sendmail-program "/usr/bin/msmtp")
-(setq message-sendmail-extra-arguments '("-a" "gmail"))
-
-;; (setq gnus-parameters
-;; '(("gmail"
-;; (display . all))
-;; ("aethon"
-;; (display . all)
-;; ("arch"
-;; (display . all)))))
-
-(setq gnus-permanently-visible-groups
- "\\(gmail\\|aethon\\|arch\\|ninthfloor\\|ryuslash\\):INBOX")
-
-(setq nntp-marks-is-evil t)
-
-(setq gnus-check-new-newsgroups nil)
-
-(setq gnus-posting-styles
- '((".*"
- (address "ryuslash@gmail.com")
- (eval (setq message-sendmail-extra-arguments '("-a" "gmail"))))
- ("ninthfloor:"
- (address "ryuslash@ninthfloor.org")
- (eval (setq message-sendmail-extra-arguments '("-a" "ninthfloor"))))
- ("arch:"
- (address "tom.willemsen@archlinux.us")
- (eval (setq message-sendmail-extra-arguments '("-a" "arch"))))
- ("aethon:"
- (address "thomas@aethon.nl")
- (signature-file "~/documents/work/aethon/signature.txt")
- (eval (setq message-sendmail-extra-arguments '("-a" "aethon"))))
- ("ryuslash:"
- (address "tom@ryuslash.org")
- (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash"))))))
-
-(setq user-mail-address "ryuslash@gmail.com")
-(setq user-full-name "Tom Willemsen")
-
-(add-hook 'gnus-summary-mode-hook '(lambda () (linum-mode -1)))
-(add-hook 'gnus-article-mode-hook '(lambda () (linum-mode -1)))
-(add-hook 'gnus-group-mode-hook '(lambda () (linum-mode -1)))
-
-;-----[ BBDB ]--------------------------------------------------------
-(require 'bbdb)
-(bbdb-initialize 'gnus 'message)
-(bbdb-insinuate-gnus)
-(setq bbdb-north-american-phone-numbers-p nil)
-
-;; Local Variables:
-;; no-update-autoloads: t
-;; End:
diff --git a/emacs/init.el b/emacs/init.el
deleted file mode 100644
index 41765af..0000000
--- a/emacs/init.el
+++ /dev/null
@@ -1,1062 +0,0 @@
-;;; init.el --- ryuslash's emacs init
-
-;;; Commentary:
-;; Does so much and changes so often
-
-(require 'geiser-install)
-(require 'iso-transl)
-(require 'newcomment)
-(require 'uniquify)
-(require 'w3m-load)
-
-;;; Code:
-
-(eval-and-compile
- (package-initialize)
-
- (mapc #'(lambda (directory)
- (add-to-list 'load-path directory)
- (let ((default-directory directory))
- (normal-top-level-add-subdirs-to-load-path)))
- '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
- (add-to-list 'load-path "~/.emacs.d/"))
-
-(autoload 'gtags-mode "gtags" nil t)
-(autoload 'identica-mode "identica-mode" nil t)
-(autoload 'mu4e "mu4e" nil t)
-(autoload 'naquadah-get-colors "naquadah-theme")
-(autoload 'php-mode "php-mode" nil t)
-(autoload 'po-mode "po-mode" nil t)
-(autoload 'pony-mode "pony-mode" nil t)
-(autoload 'sawfish-mode "sawfish" nil t)
-(autoload 'xmodmap-mode "xmodmap-mode" nil t)
-(autoload 'jabber-connect "jabber" nil t)
-
-(load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
-
-(define-key key-translation-map (kbd "C-j") (kbd "C-l"))
-(define-key key-translation-map (kbd "C-l") (kbd "C-j"))
-
-(defadvice org-agenda-redo (after org-agenda-redo-add-appts)
- "Pressing `r' on the agenda will also add appointments."
- (progn
- (setq appt-time-msg-list nil)
- (org-agenda-to-appt)))
-
-(defalias 'yes-or-no-p 'y-or-n-p)
-
-(defconst oni:c-outline-regex
- (eval-when-compile
- (concat
- "\\(?:static\\s +\\)?\\(?:\\sw+\\(?: \\|\t\\|\n\\)*?\\*?\\)"
- "\\(?:\\s \\|\t\\|\n\\)\\(?:\\sw\\|_\\)+([^)]*)[^;\n]*$"))
- "Regex for command `outline-minor-mode' for `c-mode'.")
-
-(defconst oni:javascript-outline-regex "function \\(\\w\\|_\\)+("
- "Regex for command `outline-minor-mode' for `js-mode'.")
-
-(defconst oni:php-outline-regex
- (eval-when-compile
- (concat
- "^ *\\(\\(?:namespace\\|interface\\) [a-zA-Z0-9_]\\|\\(\\(abstract"
- "\\|final\\) \\)?class [a-zA-Z0-9_]+\\( extends [\\a-zA-Z0-9_]+\\)?"
- "\\|\\(abstract \\)?\\(public\\|private\\|protected\\)?"
- "\\( static\\)? function [a-zA-Z0-9_]+(\\|/\\*\\*\\)"))
- "Regex for command `outline-minor-mode' for `php-mode'.")
-
-(defconst oni:python-outline-regex
- (eval-when-compile
- (concat "^[ \t]*\\(?:@[a-zA-Z0-9_]+\\(?:([a-zA-Z0-9_=, ]*)\\)?"
- "\n\\)*[ \t]*\\(?:\\(class\\|def\\)[ \t]+\\(\\sw\\|\\s_\\)+"
- "\\(([^)]*):\\)?\\|\\#[ a-zA-Z0-9]*\\#\\)"))
- "Regex for command `outline-minor-mode' for `python-mode'.")
-
-(defface oni:mode-line-buffer-column
- '((t (:inherit font-lock-type-face)))
- "Face for the column number in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-buffer-line
- '((t (:inherit font-lock-type-face)))
- "Face for the line number in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-buffer-position
- '((t (:inherit font-lock-constant-face)))
- "Face for the buffer position in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-buffer-state
- '((t (:inherit font-lock-preprocessor-face)))
- "Face for the state of the buffer in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-mode
- '((t (:inherit font-lock-string-face)))
- "Face for the major mode in the mode-line"
- :group 'local)
-
-(defface oni:mode-line-modified
- '((t (:inherit font-lock-warning-face)))
- "Face for the modified state in the mode-line"
- :group 'local)
-
-(defmacro oni:define-mailbox (name email &optional signature longname)
- "Define a mailbox function for mailbox NAME with address EMAIL.
-Optionally set signature to SIGNATURE and use LONGNAME as the
-actual account name."
- `(defun ,(make-symbol (concat "oni:" name "-mailbox")) ()
- ,(concat "Settings for " name " mailbox")
- (setq mu4e-mu-home ,(expand-file-name (concat "~/.mu/" name))
- mu4e-maildir ,(expand-file-name (concat "~/documents/mail/"
- (or longname name)))
- mu4e-get-mail-command ,(concat "offlineimap -oa " (or longname
- name))
- mu4e~main-buffer-name ,(concat "*mu4e-" name "*")
- user-mail-address ,email
- message-sendmail-extra-arguments '("-a" ,name)
- message-signature-file ,signature)))
-
-(defmacro oni:email (user at host dot com)
- "Turn arguments into an email address.
-The resulting email address will look like: USER@HOST.COM, AT and DOT are
-intentionally being skipped."
- (concat (symbol-name user) "@" (symbol-name host) "."
- (symbol-name com)))
-
-(defmacro oni:generic-outline (regex)
- "Prepare for enabling command `outline-minor-mode'.
-Argument REGEX will be used to set `outline-regexp' for this buffer."
- `(progn
- (when (buffer-file-name)
- (outline-minor-mode)
- (set (make-local-variable 'outline-regexp) ,regex)
- (hide-body)
- (local-set-key [C-tab] 'outline-toggle-children))))
-
-(defmacro oni:color (name)
- "Fetch color NAME from the naquadah color theme."
- `(naquadah-get-colors (quote ,name)))
-
-(defvar oni:mailbox-map
- '("top" ("menu"
- ("ryulash.org" . "ryuslash")
- ("ninthfloor" . "ninthfloor")
- ("gmail" . "gmail")
- ("aethon" . "aethon")))
- "A mailbox map for use with `tmm-prompt'.")
-
-(defvar oni:required-packages
- '(graphviz-dot-mode htmlize magit rainbow-delimiters
- rainbow-mode yasnippet markdown-mode flymake
- flymake-cursor pony-mode sauron dispass
- expand-region fill-column-indicator
- git-auto-commit-mode idomenu magit smex)
- "List of all the packages I have (want) installed.")
-
-(defun oni:after-save-func ()
- "Function for `after-save-hook'."
- (oni:compile-el)
- (executable-make-buffer-file-executable-if-script-p)
- (let ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile")))
- (when dom-dir
- (shell-command (concat "make -C " dom-dir " TAGS >/dev/null 2>&1")))))
-
-(defun oni:before-save-func ()
- "Function for `before-save-hook'."
- (if (eq major-mode 'html-mode)
- (oni:replace-html-special-chars))
- (if (not (eq major-mode 'markdown-mode))
- (delete-trailing-whitespace)))
-
-(defun oni:c-mode-common-func ()
- "Function for `c-mode-common-hook'."
- (setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
- (when (buffer-file-name)
- (hs-minor-mode)))
-
-(defun oni:c-mode-func ()
- "Function for `c-mode-hook'."
- (local-set-key [f9] 'compile)
- (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(defun oni:close-client-window ()
- "Close a client's frames."
- (interactive)
- (server-save-buffers-kill-terminal nil))
-
-(defun oni:compile-el ()
- "Compile the current buffer file if it is an .el file."
- (let* ((full-file-name (buffer-file-name))
- (file-name (file-name-nondirectory full-file-name))
- (suffix (file-name-extension file-name)))
- (if (and (not (string-equal file-name ".dir-locals.el"))
- (string-equal suffix "el"))
- (byte-compile-file full-file-name))))
-
-(defun oni:css-mode-func ()
- "Function for `css-mode-hook'."
- (setq hs-adjust-block-beginning 'hs-c-like-adjust-block-beginning)
- (when (buffer-file-name)
- (hs-minor-mode))
- (local-set-key "\C-j" 'oni:newline-and-indent)
- (rainbow-mode))
-
-(defun oni:diary-display-func ()
- "Function for `diary-display-hook'."
- (diary-fancy-display))
-
-(defun oni:emacs-lisp-mode-func ()
- "Function for `emacs-lisp-mode-hook'."
- (eldoc-mode)
- (when (buffer-file-name)
- (hs-minor-mode)))
-
-(defun oni:emms-toggle-playing ()
- "Toggle between playing/paused states."
- (interactive)
- (if (eq emms-player-playing-p nil)
- (emms-start)
- (emms-pause)))
-
-(defun oni:erc-mode-func ()
- "Function for `erc-mode-hook'."
- (erc-fill-mode -1)
- (visual-line-mode)
- (setq truncate-lines nil))
-
-(defun oni:eshell-mode-func ()
- "Function for `eshell-mode-hook'."
- (setq truncate-lines nil))
-
-(defun oni:eshell-prompt-function ()
- "Show a pretty shell prompt."
- (let ((status (if (zerop eshell-last-command-status) ?+ ?-))
- (hostname (shell-command-to-string "hostname"))
- (dir (abbreviate-file-name (eshell/pwd)))
- (branch
- (shell-command-to-string
- "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'"))
- (userstatus (if (zerop (user-uid)) ?# ?$)))
- (concat
- (propertize (char-to-string status)
- 'face `(:foreground ,(if (= status ?+)
- (oni:color chameleon-1)
- (oni:color scarlet-red-2))))
- " "
- (propertize (substring hostname 0 -1) 'face 'mode-line-buffer-id)
- " "
- (propertize (oni:shorten-dir dir) 'face 'font-lock-string-face)
- " "
- (when (not (string= branch ""))
- (propertize
- ;; Cut off "* " and "\n"
- (substring branch 2 -1)
- 'face 'font-lock-function-name-face))
- " \n"
- (propertize (char-to-string userstatus)
- 'face `(:foreground ,(oni:color sky-blue-1)))
- "> ")))
-
-(defun oni:flymake-mode-func ()
- "Function for `flymake-mode-hook'."
- (local-set-key [M-P] 'flymake-goto-prev-error)
- (local-set-key [M-N] 'flymake-goto-next-error))
-
-(defun oni:flymake-pyflakes-init ()
- "Initialize function for flymake with pyflakes."
- (let* ((temp-file (flymake-init-create-temp-buffer-copy
- 'flymake-create-temp-inplace))
- (local-file (file-relative-name temp-file (file-name-directory
- buffer-file-name))))
- (list "pyflakes" (list local-file))))
-
-(defun oni:go-mode-func ()
- "Function for `go-mode-hook'."
- (setq indent-tabs-mode nil)
- (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(defun oni:gtags-mode-func ()
- "Function for `gtags-mode-hook'."
- (local-set-key "\M-," 'gtags-find-tag)
- (local-set-key "\M-." 'gtags-find-rtag))
-
-(defun oni:hs-minor-mode-func ()
- "Function for `hs-minor-mode-hook'."
- (local-set-key [C-tab] 'hs-toggle-hiding)
- (hs-hide-all))
-
-(defun oni:html-mode-func ()
- "Function for `html-mode-hook'."
- (fci-mode))
-
-(defun oni:indent-shift-left (start end &optional count)
- "Rigidly indent region.
-Region is from START to END. Move
-COUNT number of spaces if it is non-nil otherwise use
-`tab-width'."
- (interactive
- (if mark-active
- (list (region-beginning) (region-end) current-prefix-arg)
- (list (line-beginning-position)
- (line-end-position)
- current-prefix-arg)))
- (if count
- (setq count (prefix-numeric-value count))
- (setq count tab-width))
- (when (> count 0)
- (let ((deactivate-mark nil))
- (save-excursion
- (goto-char start)
- (while (< (point) end)
- (if (and (< (current-indentation) count)
- (not (looking-at "[ \t]*$")))
- (error "Can't shift all lines enough"))
- (forward-line))
- (indent-rigidly start end (- count))))))
-
-(defun oni:indent-shift-right (start end &optional count)
- "Indent region between START and END rigidly to the right.
-If COUNT has been specified indent by that much, otherwise look at
-`tab-width'."
- (interactive
- (if mark-active
- (list (region-beginning) (region-end) current-prefix-arg)
- (list (line-beginning-position)
- (line-end-position)
- current-prefix-arg)))
- (let ((deactivate-mark nil))
- (if count
- (setq count (prefix-numeric-value count))
- (setq count tab-width))
- (indent-rigidly start end count)))
-
-(defun oni:jabber-chat-mode-func ()
- "Function for `jabber-chat-mode-hook'."
- (visual-line-mode))
-
-(defun oni:java-mode-func ()
- "Function for `java-mode-hook'."
- (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(defun oni:js-mode-func ()
- "Function for `js-mode-hook'."
- (oni:generic-outline oni:javascript-outline-regex)
- (rainbow-delimiters-mode)
- (local-set-key "\C-j" 'oni:newline-and-indent)
- (pretty-symbols-mode -1))
-
-(defun oni:kill-region-or-backward-char ()
- "Either `kill-region' or `backward-delete-char-untabify'."
- (interactive)
- (if (region-active-p)
- (kill-region (region-beginning) (region-end))
- (backward-delete-char-untabify 1)))
-
-(defun oni:kill-region-or-forward-char ()
- "Either `kill-region' or `delete-forward-char'."
- (interactive)
- (if (region-active-p)
- (kill-region (region-beginning) (region-end))
- (delete-forward-char 1)))
-
-(defun oni:kill-region-or-line ()
- "Either `kill-region' or `kill-line'."
- (interactive)
- (if (region-active-p)
- (kill-region (region-beginning) (region-end))
- (kill-line)))
-
-(defun oni:lisp-mode-func ()
- "Function for `lisp-mode-hook'."
- (when (buffer-file-name)
- (hs-minor-mode)))
-
-(defun oni:magit-log-edit-mode-func ()
- "Function for `magit-log-edit-mode-hook'."
- (auto-fill-mode)
- (font-lock-add-keywords
- nil
- '(("\\`\\(.\\{,50\\}\\)\\(.*\\)\n?\\(.*\\)$"
- (1 'git-commit-summary-face)
- (2 'git-commit-overlong-summary-face)
- (3 'git-commit-nonempty-second-line-face))
- ("`\\([^']+\\)'" 1 font-lock-constant-face))
- t))
-
-(defun oni:markdown-mode-func ()
- "Function for `markdown-mode-hook'."
- (auto-fill-mode)
- (whitespace-mode))
-
-(defun oni:message-mode-func ()
- "Function for `message-mode-hook'."
- (auto-fill-mode)
- (flyspell-mode)
- (ispell-change-dictionary (read-string "New dictionary: ")))
-
-(defun oni:mini-fix-timestamp-string (date-string)
- "A minimal version of Xah Lee's `fix-timestamp-string'.
-Turn DATE-STRING into something else that can be worked with in
-code. Found at http://xahlee.org/emacs/elisp_parse_time.html"
- (setq date-string (replace-regexp-in-string "Jan" "01" date-string)
- date-string (replace-regexp-in-string "Feb" "02" date-string)
- date-string (replace-regexp-in-string "Mar" "03" date-string)
- date-string (replace-regexp-in-string "Apr" "04" date-string)
- date-string (replace-regexp-in-string "May" "05" date-string)
- date-string (replace-regexp-in-string "Jun" "06" date-string)
- date-string (replace-regexp-in-string "Jul" "07" date-string)
- date-string (replace-regexp-in-string "Aug" "08" date-string)
- date-string (replace-regexp-in-string "Sep" "09" date-string)
- date-string (replace-regexp-in-string "Oct" "10" date-string)
- date-string (replace-regexp-in-string "Nov" "11" date-string)
- date-string (replace-regexp-in-string "Dec" "12" date-string))
- (string-match
- "^\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{4\\}\\)$"
- date-string)
- (format "%s-%s-%s"
- (match-string 3 date-string)
- (match-string 2 date-string)
- (match-string 1 date-string)))
-
-(defun oni:move-beginning-of-dwim ()
- "Move to beginning of line either after indentation or before."
- (interactive)
- (let ((start (point)))
- (back-to-indentation)
- (if (= start (point))
- (beginning-of-line))))
-
-(defun oni:move-end-of-dwim ()
- "Move to end of line, either before any comments or after."
- (interactive)
- (let ((start (point))
- (eolpos (line-end-position)))
- (beginning-of-line)
- (if (and comment-start
- (comment-search-forward eolpos t))
- (progn
- (search-backward-regexp (concat "[^ \t" comment-start "]"))
- (forward-char)
-
- (when (or (bolp)
- (= start (point)))
- (end-of-line)))
- (end-of-line))))
-
-(defun oni:myepisodes-formatter (plist)
- "Format RSS items from MyEpisodes as org tasks.
-PLIST contains all the pertinent information."
- (let ((str (plist-get plist :title)))
- (string-match
- "^\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]\\[ \\([^\]]+\\) \\]$"
- str)
- (let* ((title (match-string 1 str))
- (episode (match-string 2 str))
- (name (match-string 3 str))
- (date (oni:mini-fix-timestamp-string (match-string 4 str))))
- (format "* ACQUIRE %s %s - %s <%s>" title episode name date))))
-
-(defun oni:newline-and-indent ()
- "`newline-and-indent', but with a twist.
-When dealing with braces, add another line and indent that too."
- (interactive)
- (if (and (not (or (= (point) (point-max))
- (= (point) (point-min))))
- (or (and (char-equal (char-before) ?{)
- (char-equal (char-after) ?}))
- (and (char-equal (char-before) ?\()
- (char-equal (char-after) ?\)))))
- (save-excursion (newline-and-indent)))
- (newline-and-indent))
-
-(defun oni:org-mode-func ()
- "Function for `org-mode-hook'."
- (flyspell-mode)
- (auto-fill-mode))
-
-(defun oni:php-mode-func ()
- "Function for `php-mode-hook'."
- (flymake-mode)
- (local-set-key "\C-j" 'oni:newline-and-indent)
- (c-set-offset 'arglist-intro '+)
- (c-set-offset 'arglist-close '0)
- (rainbow-delimiters-mode)
- (setq fci-rule-column 81))
-
-(defun oni:prog-mode-func ()
- "Function for `prog-mode-hook'."
- (rainbow-delimiters-mode)
- (fci-mode)
- (pretty-symbols-mode)
- (yas-minor-mode))
-
-(defun oni:python-mode-func ()
- "Function for `python-mode-hook'."
- (flymake-mode)
- (local-set-key (kbd "C->") 'python-indent-shift-right)
- (local-set-key (kbd "C-<") 'python-indent-shift-left)
- (local-set-key [C-tab] 'outline-toggle-children)
- (oni:generic-outline oni:python-outline-regex)
- (set (make-local-variable 'electric-indent-chars) nil)
- (rainbow-delimiters-mode)
- (setq fci-rule-column 80
- fill-column 72)
- (fci-mode))
-
-(defun oni:raise-eshell ()
- "Start or switch back to `eshell'.
-Also change directories to current working directory."
- (interactive)
- (let ((dir (file-name-directory
- (or (buffer-file-name) "~/")))
- (hasfile (not (eq (buffer-file-name) nil))))
- (eshell)
- (if (and hasfile (eq eshell-process-list nil))
- (progn
- (eshell/cd dir)
- (eshell-reset)))))
-
-(defun oni:raise-scratch (&optional mode)
- "Show the *scratch* buffer.
-If called with a universal argument, ask the user which mode to
-use. If MODE is not nil, open a new buffer with the name
-*MODE-scratch* and load MODE as its major mode."
- (interactive (list (if current-prefix-arg
- (read-string "Mode: ")
- nil)))
- (let* ((bname (if mode
- (concat "*" mode "-scratch*")
- "*scratch*"))
- (buffer (get-buffer bname))
- (mode-sym (intern (concat mode "-mode"))))
-
- (unless buffer
- (setq buffer (generate-new-buffer bname))
- (with-current-buffer buffer
- (when (fboundp mode-sym)
- (funcall mode-sym))))
-
- (switch-to-buffer buffer)))
-
-(defun oni:reload-buffer ()
- "Reload current buffer."
- (interactive)
- (revert-buffer nil t nil))
-
-(defun oni:replace-html-special-chars ()
- "Replace special characters with HTML escaped entities."
- (oni:replace-occurrences "é" "é"))
-
-(defun oni:replace-occurrences (from to)
- "Replace all occurrences of FROM with TO in the current buffer."
- (save-excursion
- (goto-char (point-min))
- (while (search-forward from nil t)
- (replace-match to))))
-
-(defun oni:required-packages-installed-p ()
- "Check if all the packages I need are installed."
- (let ((tmp-packages oni:required-packages)
- (result t))
- (while (and tmp-packages result)
- (if (not (package-installed-p (car tmp-packages)))
- (setq result nil))
- (setq tmp-packages (cdr tmp-packages)))
- result))
-
-(defun oni:scheme-mode-func ()
- "Function for `scheme-mode-hook'."
- (when (buffer-file-name)
- (hs-minor-mode)))
-
-(defun oni:self-insert-dwim ()
- "Execute self insert, but when the region is active call self
-insert at the end of the region and at the beginning."
- (interactive)
- (if (region-active-p)
- (let ((electric-pair-mode nil)
- (beginning (region-beginning))
- (end (region-end)))
- (goto-char end)
- (self-insert-command 1)
- (save-excursion
- (goto-char beginning)
- (self-insert-command 1)))
- (self-insert-command 1)))
-
-(defun oni:shorten-dir (dir)
- "Shorten a directory, (almost) like fish does it."
- (while (string-match "\\(/\\.?[^./]\\)[^/]+/" dir)
- (setq dir (replace-match "\\1/" nil nil dir)))
- dir)
-
-(defun oni:term-mode-func ()
- "Function for `term-mode-hook'."
- (setq truncate-lines nil))
-
-(defun oni:texinfo-mode-func ()
- "Function for `texinfo-mode-hook'."
- (auto-fill-mode))
-
-(defun oni:view-mail ()
- "Show a menu with all mailbox options from `oni:mailbox-map'
-for easy selection."
- (interactive)
- (require 'tmm)
- (let* ((tmm-completion-prompt "Choose a mailbox\n")
- (inbox (tmm-prompt oni:mailbox-map)))
- (if inbox
- (progn
- (require 'mu4e)
- (funcall (intern (concat "oni:" inbox "-mailbox")))
- (mu4e)))))
-
-(defun oni:write-file-func ()
- "Function for `write-file-hooks'."
- (time-stamp))
-
-(defun oni:yas-minor-mode-func ()
- "Function for `yas-minor-mode-hook'."
- (yas-load-directory (car yas-snippet-dirs)))
-
-(eval-after-load "ebuff-menu"
- '(define-key electric-buffer-menu-mode-map
- (kbd "C-s") 'isearch-forward))
-
-(eval-after-load "em-term"
- '(add-to-list 'eshell-visual-commands
- "unison"))
-
-(eval-after-load "emms-source-file"
- '(progn
- (require 'emms-setup)
-
- (emms-standard)
- (require 'emms-player-mpd)
-
- (setq emms-player-mpd-server-name "localhost")
- (setq emms-player-mpd-server-port "6600")
-
- (add-to-list 'emms-info-functions 'emms-info-mpd)
- (add-to-list 'emms-player-list 'emms-player-mpd)
- (setq emms-player-mpd-music-directory "/mnt/music/mp3")))
-
-(eval-after-load "flymake"
- '(progn
- (require 'flymake-cursor)
-
- (add-to-list ; Make sure pyflakes is loaded
- 'flymake-allowed-file-name-masks ; for python files.
- '("\\.py\\'" oni:flymake-pyflakes-init))
-
- (add-to-list ; Error line repexp for go
- 'flymake-err-line-patterns ; compilation.
- '("^\\([a-zA-Z0-9_]+\\.go\\):\\([0-9]+\\):\\(.*\\)$"
- 1 2 nil 3))
-
- (add-to-list ; Go uses makefiles, makes
- 'flymake-allowed-file-name-masks ; flymaking 'easy'.
- '("\\.go$" flymake-simple-make-init))))
-
-(eval-after-load "ido"
- '(setq ido-ignore-buffers `(,@ido-ignore-buffers
- "^\\*.*\\*$" "^irc\\." "^\\#")))
-
-(eval-after-load "info"
- '(require 'info+))
-
-(eval-after-load "mu4e"
- '(add-to-list
- 'org-capture-templates
- '("c" "Contact" entry (file "~/documents/org/misc/contacts.org")
- (concat "* %(mu4e-view-snarf-from 'name)\n"
- " :PROPERTIES:\n"
- " :EMAIL: %(mu4e-view-snarf-from 'email)\n"
- " :END:"))))
-
-(eval-after-load "org"
- '(progn
- (require 'appt)
- (require 'org-protocol)
- (require 'org-habit)
- (require 'org-contacts)
-
- (add-to-list 'org-modules 'habit)
-
- (org-indent-mode t)
-
- (org-agenda-to-appt)
- (ad-activate 'org-agenda-redo)))
-
-(eval-after-load "org-crypt"
- '(org-crypt-use-before-save-magic))
-
-(eval-after-load "sauron"
- '(setq sauron-modules (append '(sauron-identica sauron-jabber)
- sauron-modules)))
-
-(eval-after-load "smex"
- '(progn
- (global-set-key (kbd "M-x") 'smex)
- (global-set-key (kbd "C-M-x") 'smex-major-mode-commands)))
-
-(oni:define-mailbox "aethon"
- (oni:email thomas at aethon dot nl)
- (expand-file-name "~/documents/work/aethon/signature.txt"))
-(oni:define-mailbox "gmail" (oni:email ryuslash at gmail dot com))
-(oni:define-mailbox "ninthfloor"
- (oni:email ryuslash at ninthfloor dot org))
-(oni:define-mailbox "ryuslash" (oni:email tom at ryuslash dot org)
- nil "ryuslash.org")
-
-(put 'upcase-region 'disabled nil)
-(put 'downcase-region 'disabled nil)
-(put 'narrow-to-region 'disabled nil)
-(put 'scroll-left 'disabled nil)
-
-(setq-default bidi-paragraph-direction 'left-to-right)
-(setq-default c-basic-offset 4)
-(setq-default fci-rule-column 73)
-(setq-default gac-automatically-push-p t)
-(setq-default indent-tabs-mode nil)
-(setq-default mode-line-format
- (list
- '(:eval
- (if (and (buffer-modified-p) (buffer-file-name))
- (propertize "!"
- 'face 'oni:mode-line-modified
- 'help-echo "Buffer has been modified")
- " "))
-
- '(:eval (propertize "%m"
- 'face 'oni:mode-line-mode
- 'help-echo buffer-file-coding-system))
-
- ": "
-
- '(:eval (propertize "%b "
- 'face 'mode-line-buffer-id
- 'help-echo (buffer-file-name)))
-
- "("
- (propertize "%p" 'face 'oni:mode-line-buffer-position) ":"
- (propertize "%04l" 'face 'oni:mode-line-buffer-line) ","
- (propertize "%02c" 'face 'oni:mode-line-buffer-column)
- ") "
-
- "["
- '(:eval (propertize
- (if buffer-read-only
- "R"
- (if overwrite-mode "O" "I"))
- 'face 'oni:mode-line-buffer-state
- 'help-echo (concat "Buffer is "
- (if buffer-read-only
- "read-only"
- (if overwrite-mode
- "in overwrite mode"
- "in insert mode")))))
-
- "] "
-
- '(:eval
- (propertize (format-time-string "%H:%M")
- 'help-echo
- (concat (format-time-string "%c; ")
- (emacs-uptime "Uptime: %hh"))))
- " --"
- '(:eval global-mode-string)))
-(setq-default php-mode-warn-if-mumamo-off nil)
-(setq-default require-final-newline t)
-(setq-default tab-width 4)
-(setq-default truncate-lines t)
-
-(setq appt-display-diary nil)
-(setq auto-mode-case-fold nil)
-(setq auto-save-file-name-transforms
- `((".*" ,temporary-file-directory t)))
-(setq avandu-article-render-function #'avandu-view-w3m)
-(setq backup-directory-alist
- `((".*" . ,temporary-file-directory)))
-(setq browse-url-browser-function 'browse-url-generic)
-(setq browse-url-generic-program (getenv "BROWSER"))
-(setq custom-file "~/.emacs.d/custom.el")
-(setq custom-theme-directory "~/.emacs.d/themes")
-(setq default-frame-alist
- `((border-width . 0)
- (internal-border-width . 0)
- (vertical-scroll-bars . nil)
- (menu-bar-lines . nil)
- (tool-bar-lines . nil)
- (font . "LiberationMono:pixelsize=16")
- (left-fringe . 0)))
-(setq emms-source-file-default-directory "/mnt/music/")
-(setq erc-autojoin-channels-alist
- '(("freenode.net" "#herbstluftwm" "#ninthfloor" "#emacs"
- "#dispass")))
-(setq erc-hide-list '("JOIN" "PART" "QUIT"))
-(setq erc-insert-timestamp-function 'erc-insert-timestamp-left)
-(setq erc-nick "ryuslash")
-(setq erc-timestamp-format "[%H:%M] ")
-(setq erc-timestamp-only-if-changed-flag nil)
-(setq eshell-highlight-prompt nil)
-(setq eshell-prompt-function 'oni:eshell-prompt-function)
-(setq eshell-prompt-regexp "^[#$]> ")
-(setq fci-rule-color "darkred")
-(setq flymake-gui-warnings-enabled nil)
-(setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
-(setq flymake-log-level 0)
-(setq frame-title-format '(:eval (concat "emacs: " (buffer-name))))
-(setq geiser-repl-history-filename "~/.emacs.d/geiser-history")
-(setq gtags-auto-update t)
-(setq help-at-pt-display-when-idle t)
-(setq ido-auto-merge-delay-time 1000000)
-(setq ido-max-window-height 1)
-(setq ido-save-directory-list-file nil)
-(setq ido-ubiquitous-exceptions '(tmm-prompt))
-(setq inferior-lisp-program "sbcl")
-(setq inhibit-default-init t)
-(setq inhibit-local-menu-bar-menus t)
-(setq inhibit-startup-message t)
-(setq initial-major-mode 'emacs-lisp-mode)
-(setq initial-scratch-message nil)
-(setq jabber-account-list '(("ryuslash@jabber.org")))
-(setq jabber-chat-buffer-format "*jabber:%n*")
-(setq jabber-chat-buffer-show-avatar nil)
-(setq jabber-chat-fill-long-lines nil)
-(setq jabber-chat-foreign-prompt-format "[%t] < ")
-(setq jabber-chat-local-prompt-format "[%t] > ")
-(setq jabber-chatstates-confirm nil)
-(setq jabber-history-dir "~/.emacs.d/jabber")
-(setq jabber-roster-show-bindings nil)
-(setq jit-lock-defer-time 0.2)
-(setq mail-header-separator "")
-(setq message-log-max 1000)
-(setq message-send-mail-function 'message-send-mail-with-sendmail)
-(setq mu4e-headers-date-format "%d-%m %H:%M")
-(setq mu4e-headers-fields '((:date . 11)
- (:flags . 6)
- (:to . 22)
- (:from . 22)
- (:subject)))
-(setq mu4e-headers-show-threads nil)
-(setq mu4e-headers-sort-revert nil)
-(setq mu4e-html2text-command "w3m -dump -T text/HTML -cols 72")
-(setq mu4e-my-email-addresses (list
- (oni:email tom at ryuslash dot org)
- (oni:email ryuslash at gmail dot com)
- (oni:email ryuslash at ninthfloor dot org)
- (oni:email thomas at aethon dot nl)))
-(setq org-agenda-custom-commands
- '(("b" "Bookmarks to look at."
- todo "LOOKAT")
- ("w" "Work todo."
- tags-todo "CATEGORY=\"Work\"")))
-(setq org-agenda-sorting-strategy
- '((agenda habit-down time-up priority-down category-keep)
- (todo priority-down category-up)
- (tags priority-down category-keep)
- (search category-keep)))
-(setq org-capture-templates
- '(("t" "Task" entry (file "~/documents/org/tasks")
- "* TODO %?")
- ("h" "Habit" entry (file "")
- (concat "* TODO %^{Description}\n"
- " SCHEDULED: %^T\n"
- " :PROPERTIES:\n"
- " :STYLE: habit\n"
- " :END:")
- :immediate-finish t)
- ("l" "Log" entry (file+headline "" "notes")
- (concat "* %n %<%d-%m-%Y %H:%M:%S>\n"
- " %a\n\n"
- " %?")
- :prepend t :empty-lines 1)
- ("a" "Appointment" entry (file+headline "" "appointments")
- "* %^{Description} %^T" :immediate-finish t)
- ("b" "Bookmark" entry (file "~/documents/org/misc/bookmarks.org")
- "* %c\n\n %:initial")))
-(setq org-contacts-files '("~/documents/org/misc/contacts.org"))
-(setq org-directory (expand-file-name "~/documents/org"))
-(setq org-agenda-files
- `(,(concat org-directory "/org")
- ,(concat org-directory "/misc/contacts.org")
- ,(concat org-directory "/misc/bookmarks.org")))
-(setq org-default-notes-file (concat org-directory "/org"))
-(setq org-export-htmlize-output-type 'css)
-(setq org-feed-alist
- '(("MyEpisodes"
- "http://www.myepisodes.com/rss.php?feed=mylist&uid=Slash&pwdmd5=04028968e1f0b7ee678b748a4320ac17"
- "~/documents/org/org" "MyEpisodes"
- :formatter oni:myepisodes-formatter)))
-(setq org-hide-emphasis-markers t)
-(setq org-outline-path-complete-in-steps t)
-(setq org-refile-allow-creating-parent-nodes t)
-(setq org-refile-targets '((nil . (:maxlevel . 6))))
-(setq org-refile-use-outline-path 'file)
-(setq org-return-follows-link t)
-(setq org-src-fontify-natively t)
-(setq org-tags-exclude-from-inheritance '("crypt"))
-(setq org-todo-keyword-faces
- '(("TODO" :foreground "red")
- ("IN PROGRESS" :foreground "yellow")
- ("DONE" :foreground "forest green")
- ("SUCCEEDED" :foreground "forest green")
- ("WAITING" :foreground "orange")
- ("CANCELLED" :foreground "orangered")
- ("FAILED" :foreground "orangered")))
-(setq org-todo-keywords
- '((sequence "TODO(t)" "IN PROGRESS" "WAITING(@/!)" "|"
- "DONE(!/!)" "CANCELLED(@/!)")))
-(setq org-use-fast-todo-selection t)
-(setq package-archives
- '(("melpa" . "http://melpa.milkbox.net/packages/")
- ("ELPA" . "http://tromey.com/elpa/")
- ("gnu" . "http://elpa.gnu.org/packages/")
- ("marmalade" . "http://marmalade-repo.org/packages/")))
-(setq package-load-list '((htmlize "1.39")
- all))
-(setq php-function-call-face 'font-lock-function-name-face)
-(setq php-mode-force-pear t)
-(setq rainbow-delimiters-max-face-count 12)
-(setq redisplay-dont-pause t)
-(setq sauron-column-alist '((timestamp . 6)
- (message)))
-(setq sauron-hide-mode-line t)
-(setq sauron-max-line-length 189)
-(setq sauron-timestamp-format "%H:%M")
-(setq sauron-watch-nicks '("ryuslash"))
-(setq sauron-watch-patterns '("ryuslash"))
-(setq scroll-conservatively 101)
-(setq send-mail-function 'smtpmail-send-it)
-(setq sendmail-program "/usr/bin/msmtp")
-(setq smex-save-file "~/.emacs.d/smex-items")
-(setq special-display-buffer-names '("*Sauron*"))
-(setq special-display-frame-alist '((minibuffer . nil)
- (right-fringe . 0)))
-(setq split-height-threshold 40)
-(setq time-stamp-active t)
-(setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)")
-(setq uniquify-buffer-name-style 'post-forward)
-(setq use-dialog-box nil)
-(setq user-full-name "Tom Willemsen")
-(setq whitespace-style '(face trailing))
-(setq window-combination-resize t)
-(setq yas-prompt-functions '(yas-ido-prompt))
-
-(add-hook 'after-save-hook 'oni:after-save-func t)
-(add-hook 'before-save-hook 'oni:before-save-func)
-(add-hook 'c-mode-common-hook 'oni:c-mode-common-func)
-(add-hook 'c-mode-hook 'oni:c-mode-func)
-(add-hook 'css-mode-hook 'oni:css-mode-func)
-(add-hook 'diary-display-hook 'oni:diary-display-func)
-(add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func)
-(add-hook 'erc-mode-hook 'oni:erc-mode-func)
-(add-hook 'eshell-mode-hook 'oni:eshell-mode-func)
-(add-hook 'flymake-mode-hook 'oni:flymake-mode-func)
-(add-hook 'go-mode-hook 'oni:go-mode-func)
-(add-hook 'gtags-mode-hook 'oni:gtags-mode-func)
-(add-hook 'hs-minor-mode-hook 'oni:hs-minor-mode-func)
-(add-hook 'html-mode-hook 'oni:html-mode-func)
-(add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
-(add-hook 'java-mode-hook 'oni:java-mode-func)
-(add-hook 'js-mode-hook 'oni:js-mode-func)
-(add-hook 'lisp-mode-hook 'oni:lisp-mode-func)
-(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
-(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
-(add-hook 'message-mode-hook 'oni:message-mode-func)
-(add-hook 'org-mode-hook 'oni:org-mode-func)
-(add-hook 'php-mode-hook 'oni:php-mode-func)
-(add-hook 'prog-mode-hook 'oni:prog-mode-func)
-(add-hook 'python-mode-hook 'oni:python-mode-func)
-(add-hook 'scheme-mode-hook 'oni:scheme-mode-func)
-(add-hook 'term-mode-hook 'oni:term-mode-func)
-(add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func)
-(add-hook 'write-file-hooks 'oni:write-file-func)
-(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func)
-
-(global-set-key (kbd "'") 'oni:self-insert-dwim)
-(global-set-key (kbd "") 'emms-next)
-(global-set-key (kbd "") 'oni:emms-toggle-playing)
-(global-set-key (kbd "") 'emms-previous)
-(global-set-key (kbd "") 'emms-stop)
-(global-set-key (kbd "") 'oni:raise-scratch)
-(global-set-key (kbd "") 'oni:view-mail)
-(global-set-key (kbd "") 'emms)
-(global-set-key (kbd "") 'oni:reload-buffer)
-(global-set-key (kbd "") 'jabber-switch-to-roster-buffer)
-(global-set-key (kbd "") 'magit-status)
-(global-set-key (kbd "") 'oni:raise-eshell)
-(global-set-key (kbd "C-<") 'indent-shift-left)
-(global-set-key (kbd "C->") 'indent-shift-right)
-(global-set-key (kbd "C-@") 'er/expand-region)
-(global-set-key (kbd "C-M-d") 'kill-word)
-(global-set-key (kbd "C-M-w") 'backward-kill-word)
-(global-set-key (kbd "C-S-k") 'kill-whole-line)
-(global-set-key (kbd "C-a") 'oni:move-beginning-of-dwim)
-(global-set-key (kbd "C-c a") 'org-agenda)
-(global-set-key (kbd "C-c c") 'org-capture)
-(global-set-key (kbd "C-c i p") 'identica-update-status-interactive)
-(global-set-key (kbd "C-d") 'oni:kill-region-or-forward-char)
-(global-set-key (kbd "C-e") 'oni:move-end-of-dwim)
-(global-set-key (kbd "C-k") 'oni:kill-region-or-line)
-(global-set-key (kbd "C-w") 'oni:kill-region-or-backward-char)
-(global-set-key (kbd "C-x C-b") 'electric-buffer-list)
-(global-set-key (kbd "M-n") 'idomenu)
-(global-set-key (kbd "\"") 'oni:self-insert-dwim)
-
-(when (daemonp)
- (global-set-key "\C-x\C-c" 'oni:close-client-window))
-
-(when (or window-system (daemonp))
- (global-unset-key "\C-z"))
-
-(add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode))
-(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js-mode))
-(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?do?wn$" . markdown-mode))
-(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
-(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
-(add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode))
-(add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode))
-(add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode))
-
-(add-to-list 'custom-theme-load-path
- (concat custom-theme-directory "/naquadah-theme"))
-
-(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
-
-(unless (oni:required-packages-installed-p)
- (message "%s" "Refreshing package database...")
- (package-refresh-contents)
- (message "%s" " done.")
- (mapc #'(lambda (package)
- (when (not (package-installed-p package))
- (package-install package)))
- oni:required-packages))
-
-(blink-cursor-mode -1)
-(menu-bar-mode -1)
-(scroll-bar-mode -1)
-(tool-bar-mode -1)
-(tooltip-mode -1)
-
-(electric-indent-mode)
-(electric-pair-mode)
-(ido-mode)
-(savehist-mode)
-(show-paren-mode)
-(auto-insert-mode)
-
-(smex-initialize)
-(help-at-pt-set-timer)
-
-(load-theme 'naquadah t)
-
-(load custom-file)
-(load "rudel-loaddefs.el")
-(load (expand-file-name "~/quicklisp/slime-helper.el"))
-
-(provide 'init)
-
-;;; init.el ends here
--
cgit v1.2.3-54-g00ecf
From ec47fc9fcd03421c65a1f33f12536ee636f40cf6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 11 Sep 2012 10:42:14 +0200
Subject: Moved stumpwm config
---
.stumpwmrc | 155 +++++++++++++++++++++++++++++++++++++++++++++++++
stumpwm/Makefile | 9 ---
stumpwm/stumpwmrc.lisp | 155 -------------------------------------------------
3 files changed, 155 insertions(+), 164 deletions(-)
create mode 100644 .stumpwmrc
delete mode 100644 stumpwm/Makefile
delete mode 100644 stumpwm/stumpwmrc.lisp
diff --git a/.stumpwmrc b/.stumpwmrc
new file mode 100644
index 0000000..4a08388
--- /dev/null
+++ b/.stumpwmrc
@@ -0,0 +1,155 @@
+;; -*- mode: lisp; -*-
+(require 'swank)
+
+(in-package :stumpwm)
+
+;; Naquadah
+(defun colour (key)
+ (let ((colours (list :aluminium-1 #xeeeeec
+ :aluminium-2 #xd3d7cf
+ :aluminium-3 #xbabdb6
+ :aluminium-4 #x888a85
+ :aluminium-5 #x555753
+ :aluminium-6 #x2e3436
+ :butter-1 #xfce94f
+ :butter-2 #xedd400
+ :butter-3 #xc4a000
+ :orange-1 #xfcaf3e
+ :orange-2 #xf57900
+ :orange-3 #xce5c00
+ :chocolate-1 #xe9b96e
+ :chocolate-2 #xc17d11
+ :chocolate-3 #x9f5902
+ :chameleon-1 #x8ae234
+ :chameleon-2 #x73d216
+ :chameleon-3 #x4e9a06
+ :sky-blue-1 #x729fcf
+ :sky-blue-2 #x3465a4
+ :sky-blue-3 #x204a87
+ :plum-1 #xad7fa8
+ :plum-2 #x75507b
+ :plum-3 #x5c3566
+ :scarlet-red-1 #xef2929
+ :scarlet-red-2 #xcc0000
+ :scarlet-red-3 #xa40000
+ :background #x252a2b
+ :black #x0c191c
+ :cyan "cyan3")))
+ (getf colours key)))
+
+(defvar *emacs-program* "emacsclient -c -a emacs"
+ "The executable to run to start Emacs.")
+(defvar *firefox-program* "firefox"
+ "The executable to run to start Firefox.")
+(defvar *urxvt-program* "urxvt"
+ "The executable to run to start URxvt.")
+(defvar *i3lock-program* "i3lock -c 000000"
+ "The executable to run to start i3lock.")
+
+(defun get-mail-count (mailbox &optional (inbox "inbox"))
+ "Check how many new messages there are in MAILBOX."
+ (length
+ (directory
+ (format nil "/home/slash/documents/mail/~A/~A/new/*.*"
+ mailbox inbox))))
+
+(defcommand run-emacs () ()
+ "Open Emacs"
+ (run-shell-command *emacs-program*))
+
+(defcommand raise-emacs () ()
+ "Open or show Emacs"
+ (run-or-raise *emacs-program* '(:class "Emacs")))
+
+(defcommand run-firefox () ()
+ "Open Firefox"
+ (run-shell-command *firefox-program*))
+
+(defcommand raise-firefox () ()
+ "Open or show Firefox"
+ (run-or-raise *firefox-program* '(:class "Firefox")))
+
+(defcommand run-urxvt () ()
+ "Open URxvt"
+ (run-shell-command *urxvt-program*))
+
+(defcommand raise-urxvt () ()
+ "Open URxvt"
+ (run-or-raise *urxvt-program* '(:class "URxvt")))
+
+(defcommand run-i3lock () ()
+ "Lock screen"
+ (run-shell-command *i3lock-program*))
+
+(set-bg-color (colour :background))
+(set-border-color (colour :aluminium-6))
+(set-fg-color (colour :aluminium-1))
+(set-float-focus-color (colour :black))
+(set-float-unfocus-color (colour :aluminium-6))
+(set-focus-color (colour :black))
+(set-font "-*-dejavu sans mono-medium-r-*-*-15-*-*-*-*-*-iso10646-*")
+(set-unfocus-color (colour :aluminium-6))
+(set-win-bg-color (colour :background))
+
+(setf *colors* (mapcar #'colour '(:black :scarlet-red-1 :chameleon-1
+ :butter-1 :sky-blue-1 :plum-1 :cyan
+ :aluminium-1)))
+(setf *input-window-gravity* :bottom-left)
+(setf *maxsize-border-width* 1)
+(setf *message-window-gravity* :top-right)
+(setf *mode-line-background-color* (colour :background))
+(setf *mode-line-border-color* (colour :aluminium-6))
+(setf *mode-line-foreground-color* (colour :aluminium-1))
+(setf *normal-border-width* 1)
+(setf *shell-program* (getenv "SHELL"))
+(setf *transient-border-width* 1)
+(setf *window-border-style* :tight)
+(setf *window-format* "%m%50t")
+(setf *screen-mode-line-format*
+ (list "[%n]"
+ '(:eval
+ (format nil " | ryu: ~D | gmail: ~D | aethon: ~D | 9f: ~D | "
+ (get-mail-count "ryuslash.org")
+ (get-mail-count "gmail")
+ (get-mail-count "aethon")
+ (get-mail-count "ninthfloor")))
+ '(:eval
+ (format-expand *window-formatters* *window-format*
+ (current-window)))))
+
+(set-prefix-key (kbd "C-z"))
+
+(define-key *top-map* (kbd "C-M-l") "run-i3lock")
+
+(define-key *root-map* (kbd "c") "raise-urxvt")
+(define-key *root-map* (kbd "C") "run-urxvt")
+(define-key *root-map* (kbd "e") "raise-emacs")
+(define-key *root-map* (kbd "E") "run-emacs")
+(define-key *root-map* (kbd "w") "raise-firefox")
+(define-key *root-map* (kbd "W") "run-firefox")
+
+(define-key *root-map* (kbd "C-b") "windowlist")
+(define-key *root-map* (kbd "M-b") "move-window left")
+(define-key *root-map* (kbd "M-f") "move-window right")
+(define-key *root-map* (kbd "M-n") "move-window down")
+(define-key *root-map* (kbd "M-p") "move-window up")
+(define-key *root-map* (kbd "b") "move-focus left")
+(define-key *root-map* (kbd "f") "move-focus right")
+(define-key *root-map* (kbd "n") "move-focus down")
+(define-key *root-map* (kbd "p") "move-focus up")
+
+(undefine-key *root-map* (kbd "C-a"))
+(undefine-key *root-map* (kbd "C-c"))
+(undefine-key *root-map* (kbd "C-e"))
+(undefine-key *root-map* (kbd "C-m"))
+
+(define-frame-preference "Default"
+ (0 t nil :class "Emacs")
+ (1 t nil :class "Firefox")
+ (1 t nil :class "URxvt")
+ (1 t nil :class "Conkeror"))
+
+(if (not (head-mode-line (current-head)))
+ (toggle-mode-line (current-screen) (current-head)))
+
+(swank:create-server)
diff --git a/stumpwm/Makefile b/stumpwm/Makefile
deleted file mode 100644
index 06c6d85..0000000
--- a/stumpwm/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-files = stumpwmrc.lisp
-install-files = $(addprefix install-,$(files))
-
-.PHONY: all install $(install-files)
-all:
-install: $(install-files)
-
-$(install-files): install-%.lisp:
- install -Dm 444 $*.lisp ${HOME}/.$*
diff --git a/stumpwm/stumpwmrc.lisp b/stumpwm/stumpwmrc.lisp
deleted file mode 100644
index 4a08388..0000000
--- a/stumpwm/stumpwmrc.lisp
+++ /dev/null
@@ -1,155 +0,0 @@
-;; -*- mode: lisp; -*-
-(require 'swank)
-
-(in-package :stumpwm)
-
-;; Naquadah
-(defun colour (key)
- (let ((colours (list :aluminium-1 #xeeeeec
- :aluminium-2 #xd3d7cf
- :aluminium-3 #xbabdb6
- :aluminium-4 #x888a85
- :aluminium-5 #x555753
- :aluminium-6 #x2e3436
- :butter-1 #xfce94f
- :butter-2 #xedd400
- :butter-3 #xc4a000
- :orange-1 #xfcaf3e
- :orange-2 #xf57900
- :orange-3 #xce5c00
- :chocolate-1 #xe9b96e
- :chocolate-2 #xc17d11
- :chocolate-3 #x9f5902
- :chameleon-1 #x8ae234
- :chameleon-2 #x73d216
- :chameleon-3 #x4e9a06
- :sky-blue-1 #x729fcf
- :sky-blue-2 #x3465a4
- :sky-blue-3 #x204a87
- :plum-1 #xad7fa8
- :plum-2 #x75507b
- :plum-3 #x5c3566
- :scarlet-red-1 #xef2929
- :scarlet-red-2 #xcc0000
- :scarlet-red-3 #xa40000
- :background #x252a2b
- :black #x0c191c
- :cyan "cyan3")))
- (getf colours key)))
-
-(defvar *emacs-program* "emacsclient -c -a emacs"
- "The executable to run to start Emacs.")
-(defvar *firefox-program* "firefox"
- "The executable to run to start Firefox.")
-(defvar *urxvt-program* "urxvt"
- "The executable to run to start URxvt.")
-(defvar *i3lock-program* "i3lock -c 000000"
- "The executable to run to start i3lock.")
-
-(defun get-mail-count (mailbox &optional (inbox "inbox"))
- "Check how many new messages there are in MAILBOX."
- (length
- (directory
- (format nil "/home/slash/documents/mail/~A/~A/new/*.*"
- mailbox inbox))))
-
-(defcommand run-emacs () ()
- "Open Emacs"
- (run-shell-command *emacs-program*))
-
-(defcommand raise-emacs () ()
- "Open or show Emacs"
- (run-or-raise *emacs-program* '(:class "Emacs")))
-
-(defcommand run-firefox () ()
- "Open Firefox"
- (run-shell-command *firefox-program*))
-
-(defcommand raise-firefox () ()
- "Open or show Firefox"
- (run-or-raise *firefox-program* '(:class "Firefox")))
-
-(defcommand run-urxvt () ()
- "Open URxvt"
- (run-shell-command *urxvt-program*))
-
-(defcommand raise-urxvt () ()
- "Open URxvt"
- (run-or-raise *urxvt-program* '(:class "URxvt")))
-
-(defcommand run-i3lock () ()
- "Lock screen"
- (run-shell-command *i3lock-program*))
-
-(set-bg-color (colour :background))
-(set-border-color (colour :aluminium-6))
-(set-fg-color (colour :aluminium-1))
-(set-float-focus-color (colour :black))
-(set-float-unfocus-color (colour :aluminium-6))
-(set-focus-color (colour :black))
-(set-font "-*-dejavu sans mono-medium-r-*-*-15-*-*-*-*-*-iso10646-*")
-(set-unfocus-color (colour :aluminium-6))
-(set-win-bg-color (colour :background))
-
-(setf *colors* (mapcar #'colour '(:black :scarlet-red-1 :chameleon-1
- :butter-1 :sky-blue-1 :plum-1 :cyan
- :aluminium-1)))
-(setf *input-window-gravity* :bottom-left)
-(setf *maxsize-border-width* 1)
-(setf *message-window-gravity* :top-right)
-(setf *mode-line-background-color* (colour :background))
-(setf *mode-line-border-color* (colour :aluminium-6))
-(setf *mode-line-foreground-color* (colour :aluminium-1))
-(setf *normal-border-width* 1)
-(setf *shell-program* (getenv "SHELL"))
-(setf *transient-border-width* 1)
-(setf *window-border-style* :tight)
-(setf *window-format* "%m%50t")
-(setf *screen-mode-line-format*
- (list "[%n]"
- '(:eval
- (format nil " | ryu: ~D | gmail: ~D | aethon: ~D | 9f: ~D | "
- (get-mail-count "ryuslash.org")
- (get-mail-count "gmail")
- (get-mail-count "aethon")
- (get-mail-count "ninthfloor")))
- '(:eval
- (format-expand *window-formatters* *window-format*
- (current-window)))))
-
-(set-prefix-key (kbd "C-z"))
-
-(define-key *top-map* (kbd "C-M-l") "run-i3lock")
-
-(define-key *root-map* (kbd "c") "raise-urxvt")
-(define-key *root-map* (kbd "C") "run-urxvt")
-(define-key *root-map* (kbd "e") "raise-emacs")
-(define-key *root-map* (kbd "E") "run-emacs")
-(define-key *root-map* (kbd "w") "raise-firefox")
-(define-key *root-map* (kbd "W") "run-firefox")
-
-(define-key *root-map* (kbd "C-b") "windowlist")
-(define-key *root-map* (kbd "M-b") "move-window left")
-(define-key *root-map* (kbd "M-f") "move-window right")
-(define-key *root-map* (kbd "M-n") "move-window down")
-(define-key *root-map* (kbd "M-p") "move-window up")
-(define-key *root-map* (kbd "b") "move-focus left")
-(define-key *root-map* (kbd "f") "move-focus right")
-(define-key *root-map* (kbd "n") "move-focus down")
-(define-key *root-map* (kbd "p") "move-focus up")
-
-(undefine-key *root-map* (kbd "C-a"))
-(undefine-key *root-map* (kbd "C-c"))
-(undefine-key *root-map* (kbd "C-e"))
-(undefine-key *root-map* (kbd "C-m"))
-
-(define-frame-preference "Default"
- (0 t nil :class "Emacs")
- (1 t nil :class "Firefox")
- (1 t nil :class "URxvt")
- (1 t nil :class "Conkeror"))
-
-(if (not (head-mode-line (current-head)))
- (toggle-mode-line (current-screen) (current-head)))
-
-(swank:create-server)
--
cgit v1.2.3-54-g00ecf
From 69cb5a6daf592314438f6c9b30cc27e66197abb9 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 11 Sep 2012 21:03:50 +0200
Subject: .emacs.d/init.el
---
.emacs.d/init.el | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 6957cd5..13b5435 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -346,6 +346,13 @@ If COUNT has been specified indent by that much, otherwise look at
(local-set-key "\C-j" 'oni:newline-and-indent)
(pretty-symbols-mode -1))
+(defun oni:js2-mode-func ()
+ "Function for `js2-mode-hook'."
+ (oni:prog-mode-func)
+ (oni:js-mode-func)
+ (local-set-key (kbd "") #'slime-js-reload)
+ (slime-js-minor-mode))
+
(defun oni:kill-region-or-backward-char ()
"Either `kill-region' or `backward-delete-char-untabify'."
(interactive)
@@ -815,7 +822,7 @@ for easy selection."
(setq ido-default-buffer-method 'selected-window)
(setq ido-max-window-height 1)
(setq ido-save-directory-list-file nil)
-(setq ido-ubiquitous-exceptions '(tmm-prompt))
+(setq ido-ubiquitous-command-exceptions '(oni:view-mail tmm-menubar))
(setq inferior-lisp-program "sbcl")
(setq inhibit-default-init t)
(setq inhibit-local-menu-bar-menus t)
@@ -963,6 +970,7 @@ for easy selection."
(add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
(add-hook 'java-mode-hook 'oni:java-mode-func)
(add-hook 'js-mode-hook 'oni:js-mode-func)
+(add-hook 'js2-mode-hook 'oni:js2-mode-func)
(add-hook 'lisp-mode-hook 'oni:lisp-mode-func)
(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
@@ -1014,7 +1022,7 @@ for easy selection."
(global-unset-key "\C-z"))
(add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode))
-(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js2-mode))
(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?do?wn$" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
--
cgit v1.2.3-54-g00ecf
From 0fe5824dbba8492687d218ad8d332cc7328cbf09 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 11 Sep 2012 23:27:45 +0200
Subject: .emacs.d/init.el
---
.emacs.d/init.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 13b5435..2235d24 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -927,6 +927,7 @@ for easy selection."
all))
(setq php-function-call-face 'font-lock-function-name-face)
(setq php-mode-force-pear t)
+(setq pony-tpl-indent-moves t)
(setq rainbow-delimiters-max-face-count 12)
(setq redisplay-dont-pause t)
(setq sauron-column-alist '((timestamp . 6)
@@ -1053,7 +1054,7 @@ for easy selection."
(electric-indent-mode)
(electric-pair-mode)
(ido-mode)
-(ido-ubiquitous)
+(ido-ubiquitous-mode)
(savehist-mode)
(show-paren-mode)
(auto-insert-mode)
--
cgit v1.2.3-54-g00ecf
From 634d5e4217c21b6f35d761accb6d943c637a65d1 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 12 Sep 2012 09:14:19 +0200
Subject: .zprofile
---
.zprofile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.zprofile b/.zprofile
index 4e25863..ebf90b7 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,5 +1,4 @@
-# -*- eval: (git-auto-commit-mode 1) -*-
-export BROWSER=firefox
+export BROWSER=conkeror
export EDITOR="emacsclient -c -a emacs"
export INFOPATH="${HOME}/documents/info:/usr/local/emacs/share/info:/usr/share/info:/usr/local/stumpwm/share/info"
--
cgit v1.2.3-54-g00ecf
From b07b19d057f0ce809ac06a9df9e68bf7a329595f Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 12 Sep 2012 09:19:19 +0200
Subject: .stumpwmrc
---
.stumpwmrc | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/.stumpwmrc b/.stumpwmrc
index 4a08388..e2f6662 100644
--- a/.stumpwmrc
+++ b/.stumpwmrc
@@ -37,14 +37,16 @@
:cyan "cyan3")))
(getf colours key)))
+(defvar *conkeror-program* "conkeror"
+ "The executable to run to start Conkeror.")
(defvar *emacs-program* "emacsclient -c -a emacs"
"The executable to run to start Emacs.")
(defvar *firefox-program* "firefox"
"The executable to run to start Firefox.")
-(defvar *urxvt-program* "urxvt"
- "The executable to run to start URxvt.")
(defvar *i3lock-program* "i3lock -c 000000"
"The executable to run to start i3lock.")
+(defvar *urxvt-program* "urxvt"
+ "The executable to run to start URxvt.")
(defun get-mail-count (mailbox &optional (inbox "inbox"))
"Check how many new messages there are in MAILBOX."
@@ -69,6 +71,14 @@
"Open or show Firefox"
(run-or-raise *firefox-program* '(:class "Firefox")))
+(defcommand run-conkeror () ()
+ "Open Conkeror"
+ (run-shell-command *conkeror-program*))
+
+(defcommand raise-conkeror () ()
+ "Open or show Conkeror"
+ (run-or-raise *conkeror-program* '(:class "Conkeror")))
+
(defcommand run-urxvt () ()
"Open URxvt"
(run-shell-command *urxvt-program*))
@@ -125,8 +135,8 @@
(define-key *root-map* (kbd "C") "run-urxvt")
(define-key *root-map* (kbd "e") "raise-emacs")
(define-key *root-map* (kbd "E") "run-emacs")
-(define-key *root-map* (kbd "w") "raise-firefox")
-(define-key *root-map* (kbd "W") "run-firefox")
+(define-key *root-map* (kbd "w") "raise-conkeror")
+(define-key *root-map* (kbd "W") "run-conkeror")
(define-key *root-map* (kbd "C-b") "windowlist")
(define-key *root-map* (kbd "M-b") "move-window left")
--
cgit v1.2.3-54-g00ecf
From cc9491a610f57b6f58f4c04d9d01576536c3f48b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 12 Sep 2012 21:14:08 +0200
Subject: Add conkeror config
---
.conkerorrc/gtk2rc | 11 ++
.conkerorrc/init.js | 152 +++++++++++++++++++++
.../themes/naquadah/conkeror--scrollbars.css | 36 +++++
.conkerorrc/themes/naquadah/hints--url-panel.css | 17 +++
.conkerorrc/themes/naquadah/minibuffer.css | 52 +++++++
.conkerorrc/themes/naquadah/mode-line.css | 11 ++
.conkerorrc/themes/naquadah/new-tabs.css | 54 ++++++++
.conkerorrc/themes/naquadah/tab-bar.css | 41 ++++++
.conkerorrc/themes/naquadah/theme.json | 9 ++
9 files changed, 383 insertions(+)
create mode 100644 .conkerorrc/gtk2rc
create mode 100644 .conkerorrc/init.js
create mode 100644 .conkerorrc/themes/naquadah/conkeror--scrollbars.css
create mode 100644 .conkerorrc/themes/naquadah/hints--url-panel.css
create mode 100644 .conkerorrc/themes/naquadah/minibuffer.css
create mode 100644 .conkerorrc/themes/naquadah/mode-line.css
create mode 100644 .conkerorrc/themes/naquadah/new-tabs.css
create mode 100644 .conkerorrc/themes/naquadah/tab-bar.css
create mode 100644 .conkerorrc/themes/naquadah/theme.json
diff --git a/.conkerorrc/gtk2rc b/.conkerorrc/gtk2rc
new file mode 100644
index 0000000..fd511e5
--- /dev/null
+++ b/.conkerorrc/gtk2rc
@@ -0,0 +1,11 @@
+include "/home/slash/.gtkrc-2.0"
+
+style "noscrollbars" {
+ GtkScrollbar::slider-width=0
+ GtkScrollbar::trough-border=0
+ GtkScrollbar::has-backward-stepper=0
+ GtkScrollbar::has-forward-stepper=0
+ GtkScrollbar::has-secondary-backward-stepper=0
+ GtkScrollbar::has-secondary-forward-stepper=0
+}
+widget "MozillaGtkWidget.*" style "noscrollbars"
diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js
new file mode 100644
index 0000000..1639c1e
--- /dev/null
+++ b/.conkerorrc/init.js
@@ -0,0 +1,152 @@
+require("favicon");
+
+theme_load_paths.push("/home/slash/.conkerorrc/themes/");
+
+define_browser_object_class(
+ "history-url", null,
+ function (I, prompt) {
+ check_buffer(I.buffer, content_buffer);
+ var result = yield I.buffer.window.minibuffer.read_url(
+ $prompt = prompt, $use_webjumps = false, $use_history = true,
+ $use_bookmarks = false, $sort_order = 'date_descending'
+ );
+ yield co_return(result);
+ }
+);
+
+function oni_before_quit_func() {
+ var w = get_recent_conkeror_window();
+ var result = (w == null) ||
+ "y" == (yield w.minibuffer.read_single_character_option(
+ $prompt="Quit Conkeror? (y/n)",
+ $options=["y", "n"]));
+ yield co_return(result);
+}
+
+function oni_escape(str) {
+ return str.replace(/(["$`])/g, '\\$1');
+}
+
+function oni_linkwave_add(I) {
+ check_buffer(I.buffer, content_buffer);
+ let url =
+ load_spec_uri_string(load_spec(I.buffer.top_frame));
+ let title = escape(yield I.minibuffer.read(
+ $prompt = "name (required): ",
+ $initial_value = I.buffer.title));
+ let tags = escape(yield I.minibuffer.read(
+ $prompt = "tags (space delimited): "));
+ let description = escape(yield I.minibuffer.read(
+ $prompt = "extended description: "));
+ let command =
+ '/home/slash/development/projects/linkwave/src/linkwave "'
+ + url + '" "' + title + '" "' + description + '"';
+ I.window.minibuffer.message(command);
+}
+interactive("linkwave-add", "Bookmark the page in linkwave",
+ oni_linkwave_add);
+
+function oni_linkwave_add_link(I) {
+ bo = yield read_browser_object(I);
+ let url = load_spec_uri_string(
+ load_spec(encodeURIComponent(bo)));
+ check_buffer(I.buffer, content_buffer);
+ let title = escape(yield I.minibuffer.read(
+ $prompt = "name (required): ",
+ $initial_value = bo.textContent));
+ let tags = escape(yield I.minibuffer.read(
+ $prompt = "tags (space delimited): "));
+ let description = escape(yield I.minibuffer.read(
+ $prompt = "extended description: "));
+ let command =
+ '/home/slash/development/projects/linkwave/src/linkwave "'
+ + url + '" "' + title + '" "' + description + '"';
+ let result = yield shell_command(command);
+
+ if (!result)
+ I.window.minibuffer.message('Added to linkwave');
+ else
+ I.window.minibuffer.message('Couldn\'t add to linkwave');
+}
+interactive("linkwave-add-link", "Bookmark the a link in linkwave",
+ oni_linkwave_add_link);
+
+function oni_org_store_link(I) {
+ var cmd_str = 'emacsclient \"org-protocol://store-link://'
+ + encodeURIComponent(I.buffer.display_uri_string) + '/'
+ + encodeURIComponent(I.buffer.document.title) + '\"';
+
+ if (I.window != null) {
+ window.minibuffer.message('Issuing ' + cmd_str);
+ }
+
+ shell_command_blind(cmd_str);
+}
+interactive("org-store-link",
+ "Stores [[url][title]] as org link and copies url to emacs "
+ + "kill ring",
+ oni_org_store_link);
+
+interactive("find-url-from-history",
+ "Find a page from history in the current buffer",
+ "find-url",
+ $browser_object = browser_object_history_url);
+interactive("find-url-from-history-new-buffer",
+ "Find a page from history in a new buffer",
+ "find-url-new-buffer",
+ $browser_object = browser_object_history_url);
+
+define_webjump("emacswiki",
+ "http://www.google.com/cse?cx=004774160799092323420%3A6-ff2s0o6yi&q=%s",
+ $alternative="http://www.emacswiki.org");
+define_webjump("php",
+ "http://www.php.net/manual-lookup.php?pattern=%s&scope=quickref",
+ $alternative="http://www.php.net");
+define_webjump("python",
+ "http://docs.python.org/search.html?q=%s&check_keywords=yes&area=default",
+ $alternative="http://www.python.org");
+define_webjump("ddg",
+ "https://duckduckgo.com/?q=%s",
+ $alternative="https://duckduckgo.com");
+define_webjump("metal-archives",
+ "http://www.metal-archives.com/search?searchString=%s&type=band_name",
+ $alternative="http://www.metal-arhives.com");
+define_webjump("djangodocs",
+ "https://docs.djangoproject.com/search/?q=%s&release=5",
+ $alternative="https://docs.djangoproject.com/");
+define_webjump("google",
+ "https://duckduckgo.com?q=!google%%20%s");
+define_webjump("github",
+ "https://github.com/search?q=%s&type=Everything&repo=&langOverride=&start_value=1",
+ $alternative="https://github.com");
+// Archlinux
+define_webjump("arch/wiki",
+ "https://wiki.archlinux.org/index.php?search=%s",
+ $alternative="https://wiki.archlinux.org");
+define_webjump("arch/aur",
+ "https://aur.archlinux.org/packages.php?O=0&K=%s&do_Search=Go",
+ $alternative="https://aur.archlinux.org");
+define_webjump("arch/packages",
+ "https://www.archlinux.org/packages/?sort=&q=%s&limit=50",
+ $alternative="https://packages.archlinux.org");
+
+cwd = make_file("/home/slash/downloads/");
+url_remoting_fn = load_url_in_new_buffer;
+read_buffer_show_icons = true;
+hint_digits = "arstdhneio";
+
+define_key(content_buffer_normal_keymap, "h",
+ "find-url-from-history-new-buffer");
+define_key(content_buffer_normal_keymap, "H",
+ "find-url-from-history");
+define_key(default_base_keymap, "C-x f", "follow-new-buffer");
+
+add_hook("before_quit_hook", oni_before_quit_func);
+add_hook("mode_line_hook", mode_line_adder(buffer_count_widget, true));
+add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget, true));
+add_hook("mode_line_hook", mode_line_adder(downloads_status_widget));
+
+remove_hook("download_added_hook", open_download_buffer_automatically);
+
+hints_minibuffer_annotation_mode(true);
+theme_load("naquadah");
diff --git a/.conkerorrc/themes/naquadah/conkeror--scrollbars.css b/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
new file mode 100644
index 0000000..0f70e96
--- /dev/null
+++ b/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
@@ -0,0 +1,36 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* The "background" behind the scrolling part of the scrollbar. */
+scrollbar {
+ background-color: #222;
+}
+
+/* corner between horizontal and vertical scrollbars */
+scrollcorner {
+ background-color: black;
+}
+
+/* The scroll up/down buttons. */
+scrollbarbutton {
+ background-color: #666;
+}
+
+/* The actual scrolling part of the scrollbar. */
+thumb {
+ background-color: #666;
+}
+
+thumb, scrollbarbutton {
+ -moz-border-bottom-colors: #000 #333;
+ -moz-border-left-colors: #aaa #888;
+ -moz-border-right-colors: #000 #333;
+ -moz-border-top-colors: #aaa #888;
+}
+
+scrollbarbutton:hover:active, scrollbarbutton[active="true"] {
+ -moz-border-bottom-colors: #aaa #888;
+ -moz-border-left-colors: #000 #333;
+ -moz-border-right-colors: #aaa #888;
+ -moz-border-top-colors: #000 #333;
+}
diff --git a/.conkerorrc/themes/naquadah/hints--url-panel.css b/.conkerorrc/themes/naquadah/hints--url-panel.css
new file mode 100644
index 0000000..143f3c1
--- /dev/null
+++ b/.conkerorrc/themes/naquadah/hints--url-panel.css
@@ -0,0 +1,17 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.panel {
+ border-top: 4px double #333333;
+ color: white;
+ background-color: black;
+}
+
+.panel .panel-row-label {
+ font-weight: bold;
+}
+
+.panel .url-panel-label {
+ font-weight: bold;
+}
+
diff --git a/.conkerorrc/themes/naquadah/minibuffer.css b/.conkerorrc/themes/naquadah/minibuffer.css
new file mode 100644
index 0000000..c882f3e
--- /dev/null
+++ b/.conkerorrc/themes/naquadah/minibuffer.css
@@ -0,0 +1,52 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#minibuffer {
+ background-color: #252A2E;
+ border: 0px none #444;
+ border-top: 0;
+ color: #EEEEEC;
+ font: 11px Tahoma;
+}
+
+#minibuffer-input, #minibuffer-input * {
+ color: #EEEEEC;
+}
+
+#minibuffer-prompt {
+ color: #EEEEEC;
+}
+
+/* Completions display */
+
+tree.completions treechildren { border: none !important; }
+
+tree.completions treecol { -moz-binding: none !important; }
+tree.completions {
+ -moz-appearance: none !important;
+ border: 0px none !important;
+ border-top: 4px double #333333 !important;
+ background-color: #252A2E !important;
+ -moz-border-top-colors: -moz-initial !important;
+ color: #EEEEEC !important;
+}
+
+tree.completions treechildren::-moz-tree-row {
+ background-color: #252A2E !important;
+ border: none;
+}
+
+tree.completions treechildren::-moz-tree-row(current) {
+ background-color: #0C191C !important;
+ color: #EEEEEC;
+}
+
+tree.completions treechildren::-moz-tree-cell-text(completion-description) {
+ color: green !important;
+ font-weight: bold !important;
+}
+
+tree.completions treechildren::-moz-tree-cell-text(current) {
+ color: #EEEEEC !important;
+}
+
diff --git a/.conkerorrc/themes/naquadah/mode-line.css b/.conkerorrc/themes/naquadah/mode-line.css
new file mode 100644
index 0000000..7e1ed45
--- /dev/null
+++ b/.conkerorrc/themes/naquadah/mode-line.css
@@ -0,0 +1,11 @@
+.mode-line {
+ font: 11px Tahoma;
+ padding: 0px;
+ border: 1px solid #2E3436;
+ color: #EEEEEC;
+ background-color: #0C191C;
+}
+
+.mode-line label {
+ color: #EEEEEC;
+}
diff --git a/.conkerorrc/themes/naquadah/new-tabs.css b/.conkerorrc/themes/naquadah/new-tabs.css
new file mode 100644
index 0000000..f5d30c0
--- /dev/null
+++ b/.conkerorrc/themes/naquadah/new-tabs.css
@@ -0,0 +1,54 @@
+#tab2-bar {
+ background: #222;
+}
+
+.tab2 {
+ margin: 2px 0px 0px 2px;
+ padding: 0px;
+ height: 22px;
+ border-width: 2px;
+ border-bottom-width: 0;
+ border-style: solid;
+ -moz-border-radius: 3px 3px 0 0;
+ -moz-border-left-colors: #888 #555;
+ -moz-border-right-colors: #000 #171717;
+ -moz-border-top-colors: #888 #555;
+ background: #333;
+ min-width: 200px;
+ max-width: 200px;
+ overflow: hidden; /* Chops end of label */
+}
+
+.tab2[selected=true] {
+ -moz-border-left-colors: #aaa #888;
+ -moz-border-right-colors: #000 #333;
+ -moz-border-top-colors: #aaa #888;
+ background: #666;
+}
+
+.tab2:hover {
+ -moz-border-left-colors: #eee #bbb;
+ -moz-border-right-colors: #333 #666;
+ -moz-border-top-colors: #eee #bbb;
+ background: #999;
+}
+
+.tab2-label {
+ margin-left: 4px;
+ padding-top: 1px;
+ color: #fff;
+ font: 11px Tahoma;
+}
+
+.tab2-icon {
+ margin: 1px !important;
+ padding: 1px;
+ width: 20px;
+ height: 15px;
+ max-height: 15px;
+ -moz-border-radius: 1px;
+ background: black;
+ color: white;
+ font: 900 11px Tahoma;
+ text-align: center;
+}
diff --git a/.conkerorrc/themes/naquadah/tab-bar.css b/.conkerorrc/themes/naquadah/tab-bar.css
new file mode 100644
index 0000000..c451778
--- /dev/null
+++ b/.conkerorrc/themes/naquadah/tab-bar.css
@@ -0,0 +1,41 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* TABS */
+#tab2-bar {
+ background: #000;
+}
+
+#tab2-bar .tab2 {
+ margin: 0;
+ padding: 0;
+ border: none;
+ /*height: 19px;
+ border: 1px solid #666;
+ min-width: 200px;
+ max-width: 200px;*/
+ background: #333;
+ overflow: hidden;
+}
+
+#tab2-bar .tab2-label {
+ margin: 0;
+ color: white;
+ font: 11px Tahoma;
+}
+
+#tab2-bar .tab2-icon {
+ height: 16px;
+ width: 16px;
+ background: #222;
+ color: white;
+ border: 1px solid #999;
+ font: 900 11px Tahoma;
+ text-align: center;
+}
+
+#tab2-bar .tab2[selected=true] {
+ border: 1px solid white;
+ background: #666;
+ border: 1px solid #999;
+}
diff --git a/.conkerorrc/themes/naquadah/theme.json b/.conkerorrc/themes/naquadah/theme.json
new file mode 100644
index 0000000..bb74ee1
--- /dev/null
+++ b/.conkerorrc/themes/naquadah/theme.json
@@ -0,0 +1,9 @@
+{ "sheets" : [
+ "conkeror--scrollbars.css",
+ "new-tabs.css",
+ "minibuffer.css",
+ "mode-line.css",
+ "hints--url-panel.css",
+ "tab-bar.css"
+ ]
+}
--
cgit v1.2.3-54-g00ecf
From ab1346c7a8d0fefca62d57fb9aba2d042af793a1 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 12 Sep 2012 23:15:44 +0200
Subject: Add awesome config
---
.config/awesome/bowl.lua | 205 ++++++++++++++++++++++
.config/awesome/infoline.lua | 183 +++++++++++++++++++
.config/awesome/keychain.lua | 334 +++++++++++++++++++++++++++++++++++
.config/awesome/rc.lua | 410 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 1132 insertions(+)
create mode 100644 .config/awesome/bowl.lua
create mode 100644 .config/awesome/infoline.lua
create mode 100644 .config/awesome/keychain.lua
create mode 100644 .config/awesome/rc.lua
diff --git a/.config/awesome/bowl.lua b/.config/awesome/bowl.lua
new file mode 100644
index 0000000..bf6af7b
--- /dev/null
+++ b/.config/awesome/bowl.lua
@@ -0,0 +1,205 @@
+-- -*- coding: utf-8 -*-
+--------------------------------------------------------------------------------
+-- @author Nicolas Berthier <nberthier@gmail.com>
+-- @copyright 2010 Nicolas Berthier
+--------------------------------------------------------------------------------
+--
+-- Bowls are kind of helpers that can be drawn (at the bottom --- for now) of an
+-- area, and displaying the current key prefix. It is inspired by emacs'
+-- behavior, that prints prefix keys in the minibuffer after a certain time.
+--
+-- I call it `bowl' as a reference to the bowl that one might have at home,
+-- where one puts its actual keys... A more serious name would be `hint' or
+-- `tooltip' (but they do not fit well for this usage).
+--
+-- Example usage: see `rc.lua' file.
+--
+--------------------------------------------------------------------------------
+
+--{{{ Grab environment (mostly aliases)
+local setmetatable = setmetatable
+local ipairs = ipairs
+local type = type
+local pairs = pairs
+local string = string
+local print = print
+local error = error
+
+local capi = capi
+local client = client
+local awesome = awesome
+local root = root
+local timer = timer
+
+local infoline = require ("infoline")
+--}}}
+
+module ("bowl")
+
+-- Privata data: we use weak keys in order to allow collection of private data
+-- if keys (clients) are collected (i.e., no longer used, after having been
+-- killed for instance)
+local data = setmetatable ({}, { __mode = 'k' })
+
+--{{{ Default values
+
+--- Default modifier filter
+local modfilter = {
+ ["Mod1"] = "M",
+ ["Mod4"] = "S",
+ ["Control"] = "C",
+ ["Shift"] = string.upper,
+}
+
+-- Timers configuration
+local use_timers = true
+local timeout = 2.0
+
+--}}}
+
+--{{{ Keychain pretty-printing
+
+function mod_to_string (mods, k)
+ local ret, k = "", k
+ for _, mod in ipairs (mods) do
+ if modfilter[mod] then
+ local t = type (modfilter[mod])
+ if t == "function" then
+ k = modfilter[mod](k)
+ elseif t == "string" then
+ ret = ret .. modfilter[mod] .. "-"
+ else
+ error ("Invalid modifier key filter: got a " .. t)
+ end
+ else
+ ret = ret .. mod .. "-"
+ end
+ end
+ return ret, k
+end
+
+function ks_to_string (m, k)
+ local m, k = mod_to_string (m, k)
+ return m .. k
+end
+
+--}}}
+
+--{{{ Timer management
+
+local function delete_timer_maybe (d)
+ if d.timer then -- stop and remove the timer
+ d.timer:remove_signal ("timeout", d.timer_function)
+ d.timer:stop ()
+ d.timer = nil
+ d.timer_expired = true
+ end
+end
+
+local function delayed_call_maybe (d, f)
+ if use_timers then
+ if not d.timer_expired and not d.timer then
+ -- create and start the timer
+ d.timer = timer ({ timeout = timeout })
+ d.timer_function = function () f (); delete_timer_maybe (d) end
+ d.timer:add_signal ("timeout", d.timer_function)
+ d.timer:start ()
+ d.timer_expired = false
+ elseif not d.timer_expired then
+ -- restart the timer...
+
+ -- XXX: What is the actual semantics of the call to `start' (ie,
+ -- does it restart the timer with the initial timeout)?
+ d.timer:stop ()
+ d.timer.timeout = timeout -- reset timeout
+ d.timer:start ()
+ end
+ else -- timers disabled
+ f () -- call the given function directly
+ end
+end
+
+--}}}
+
+--{{{ Infoline management
+
+function dispose (w)
+ local d = data[w]
+ if d.bowl then -- if bowl was enabled... (should always be true...)
+ infoline.dispose (d.bowl)
+ d.bowl = nil
+ end
+ delete_timer_maybe (d)
+ data[w] = nil
+end
+
+function append (w, m, k)
+ local d = data[w]
+ local pretty_ks = ks_to_string (m, k) .. " "
+ infoline.set_text (d.bowl, infoline.get_text (d.bowl) .. pretty_ks)
+
+ local function enable_bowl ()
+ -- XXX: is there a possible bad interleaving that could make
+ -- this function execute while the bowl has already been
+ -- disposed of? in which case the condition should be checked
+ -- first...
+
+ -- if d.bowl then
+ infoline.attach (d.bowl, w)
+ -- end
+ end
+
+ delayed_call_maybe (d, enable_bowl)
+end
+
+function create (w)
+ -- XXX: Note the prefix text could be customizable...
+ data[w] = { bowl = infoline.new (" ") }
+end
+
+--}}}
+
+
+--- Initializes the bowl module, with given properties; should be called before
+--- ANY other function of this module.
+-- Configurations fields include:
+--
+-- `use_timers', `timeout': A boolean defining whether bowls drawing should be
+-- delayed, along with a number being this time shift, in seconds (Default
+-- values are `true' and `2').
+--
+-- `modfilter': A table associating modifiers (Mod1, Mod4, Control, Shift, etc.)
+-- with either a string (in this case it will replace the modifier when printed
+-- in heplers) or functions (in this case the key string will be repaced by a
+-- call to this function with the key string as parameter). Default value is:
+-- { ["Mod1"] = "M", ["Mod4"] = "S", ["Control"] = "C", ["Shift"] =
+-- string.upper }
+--
+-- @param c The table of properties.
+function init (c)
+ local c = c or { }
+ modfilter = c.modfilter and c.modfilter or modfilter
+ if c.use_timers ~= nil then use_timers = c.use_timers end
+ if use_timers then
+ timeout = c.timeout ~= nil and c.timeout or timeout
+ end
+end
+
+--- Setup signal listeners, that trigger appropriate functions for a default
+--- behavior.
+function default_setup ()
+ local function to_root (f) return function (...) f (root, ...) end end
+ client.add_signal ("keychain::enter", create)
+ client.add_signal ("keychain::append", append)
+ client.add_signal ("keychain::leave", dispose)
+ awesome.add_signal ("keychain::enter", to_root (create))
+ awesome.add_signal ("keychain::append", to_root (append))
+ awesome.add_signal ("keychain::leave", to_root (dispose))
+end
+
+-- Local variables:
+-- indent-tabs-mode: nil
+-- fill-column: 80
+-- lua-indent-level: 4
+-- End:
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/.config/awesome/infoline.lua b/.config/awesome/infoline.lua
new file mode 100644
index 0000000..2b8e00c
--- /dev/null
+++ b/.config/awesome/infoline.lua
@@ -0,0 +1,183 @@
+-- -*- coding: utf-8 -*-
+--------------------------------------------------------------------------------
+-- @author Nicolas Berthier <nberthier@gmail.com>
+-- @copyright 2010 Nicolas Berthier
+--------------------------------------------------------------------------------
+--
+-- This is a module for defining infolines in awesome. An infoline is a wibox
+-- attached to a region (typically, a client or the root window).
+--
+-- Remarks:
+--
+-- - It has not been tested with multiple screens yet.
+--
+-- Example usage: (TODO --- read the comments for now, there are not many
+-- functions)
+--
+--------------------------------------------------------------------------------
+
+--{{{ Grab environment (mostly aliases)
+local setmetatable = setmetatable
+local ipairs = ipairs
+local type = type
+local pairs = pairs
+local string = string
+local print = print
+local error = error
+local io = io
+
+local client = client
+local awesome = awesome
+local wibox = wibox
+local widget = widget
+local root = root
+local screen = screen
+local mouse = mouse
+--}}}
+
+module ("infoline")
+
+-- Privata data: we use weak keys in order to allow collection of private data
+-- if keys (clients) are collected (i.e., no longer used, after having been
+-- killed for instance).
+--
+-- XXX: For now, we have at most one infoline per client, but it could be
+-- interesting to create several types of infolines (identified by indexes to be
+-- allocated by this module), and associated to, e.g., different configuration
+-- flags and positioning routine...
+local data = setmetatable ({}, { __mode = 'k' })
+
+--{{{ Infoline positioning
+
+-- XXX: this is a hack that positions an infoline at the bottom of a given area.
+local function setup_position (wb, geom)
+ local b = wb:geometry ()
+ b.x = geom.x
+ b.width = geom.width
+ b.y = geom.y + geom.height - awesome.font_height
+ b.height = awesome.font_height
+ wb:geometry (b)
+end
+
+--}}}
+
+--{{{ Configurations:
+
+-- When true, this flag indicates that an infoline is hidden if its attached
+-- client loses its focus. Otherwise, it remains always visible.
+follow_focus = true
+
+--}}}
+
+--{{{ Infoline updates
+
+function get_text (il) return il.wb.widgets[1].text end
+function set_text (il, text) il.wb.widgets[1].text = text end
+
+-- Forces a refresh of the given infoline.
+function update (il)
+ local wb = il.wb
+ local c = il.cli
+
+ if il.enabled then
+ -- XXX: Note this could be much better if we had some sort of root and
+ -- client interface unification: the following involves a priori useless
+ -- code duplication...
+ if c == root then
+ wb.screen = mouse.screen -- XXX: is this the behavior we need?
+ wb.visible = true
+ setup_position (wb, screen[mouse.screen].workarea)
+ else
+ if c:isvisible () and (not follow_focus or client.focus == c) then
+ wb.screen = c.screen
+ wb.visible = true
+ setup_position (wb, c:geometry ())
+ else -- do we have to hide it?
+ wb.visible = false
+ end
+ end
+ elseif wb.visible then --otherwise we need to hide it.
+ wb.visible = false
+ end
+end
+
+local function update_from_client (c)
+ -- Note that we may not have an infoline for this client, hence the
+ -- conditional...
+ if data[c] then update (data[c]) end
+end
+
+-- Force execution of the above function on client state modification.
+client.add_signal ("focus", update_from_client)
+client.add_signal ("unfocus", update_from_client)
+client.add_signal ("unmanage", update_from_client)
+
+--}}}
+
+--{{{ Infoline management
+
+--- Creates a new infoline, with the given initial text. Note it is not visible
+--- by default, and not attached to any client.
+function new (text)
+ local il = {
+ wb = wibox ({
+ ontop = true, -- XXX: setting a depth when attaching to
+ --a client would be much better
+ widgets = {
+ widget ({ type = "textbox", align="left" })
+ },
+ })
+ }
+ -- these will remain false until the infoline is attached to a client.
+ il.wb.visible = false
+ il.enabled = false
+ set_text (il, text or "")
+ return il
+end
+
+-- Attached infolines will react to the following client-related signals, and
+-- automatically setup their position according to the client's geometry.
+local csignals = { "property::geometry", "property::minimized",
+ "property::visible", "property::focus", "property::screen", }
+
+-- Attaches an infoline to a client. Note the infoline becomes visible at that
+-- time, if the client is currently visible (and if it has focus, when
+-- `follow_focus' holds).
+function attach (il, c)
+ data[c] = il
+ il.cli = c
+ il.enabled = true
+ update (il)
+ if c ~= root then
+ -- subscribe to client-related signals
+ for _, s in ipairs (csignals) do
+ c:add_signal (s, update_from_client)
+ end
+ end
+end
+
+--- Detach the given infoline from its client, if any.
+function dispose (il)
+ local c = il.cli
+ if c then -- note c can be nil here, if the given infoline has not been
+ --attached to any client...
+ il.enabled = false
+ update (il) -- a shortcut here would be: `il.wb.visible = false'
+ data[c] = nil
+ if c ~= root then
+ -- unsubscribe from client-related signals
+ for _, s in ipairs (csignals) do
+ c:remove_signal (s, update_from_client)
+ end
+ end
+ end
+end
+
+--}}}
+
+-- Local variables:
+-- indent-tabs-mode: nil
+-- fill-column: 80
+-- lua-indent-level: 4
+-- End:
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/.config/awesome/keychain.lua b/.config/awesome/keychain.lua
new file mode 100644
index 0000000..86ce7b2
--- /dev/null
+++ b/.config/awesome/keychain.lua
@@ -0,0 +1,334 @@
+-- -*- coding: utf-8 -*-
+--------------------------------------------------------------------------------
+-- @author Nicolas Berthier <nberthier@gmail.com>
+-- @copyright 2010 Nicolas Berthier
+--------------------------------------------------------------------------------
+--
+-- This is a module for defining keychains à la emacs in awesome. I was also
+-- inspired by ion3 behavior when designing it.
+--
+-- Remarks:
+--
+-- - This module does not handle `release' key bindings, but is it useful for
+-- keychains?
+--
+-- - It has not been tested with multiple screens yet.
+--
+-- - There might (... must) be incompatibilities with the shifty module. Also,
+-- defining global and per-client keychains with the same prefix is not
+-- allowed (or leads to unspecified behaviors... --- in practice: the
+-- per-client ones are ignored). However, I do think separation of per-client
+-- and global keys is a bad idea if client keys do not have a higher priority
+-- than the global ones...
+--
+-- Example usage: see `rc.lua' file.
+--
+--------------------------------------------------------------------------------
+
+--{{{ Grab environment (mostly aliases)
+local setmetatable = setmetatable
+local ipairs = ipairs
+local type = type
+local pairs = pairs
+local string = string
+local print = print
+local error = error
+local io = io
+
+local capi = capi
+local client = client
+local awesome = awesome
+local root = root
+
+local akey = require ("awful.key")
+local join = awful.util.table.join
+local clone = awful.util.table.clone
+--}}}
+
+module ("keychain")
+
+-- Privata data: we use weak keys in order to allow collection of private data
+-- if keys (clients) are collected (i.e., no longer used, after having been
+-- killed for instance)
+local data = setmetatable ({}, { __mode = 'k' })
+
+--{{{ Functional Tuples
+-- see http://lua-users.org/wiki/FunctionalTuples for details
+
+--- Creates a keystroke representation to fill the `escape' table configuration
+--- property.
+-- @param m Modifiers table.
+-- @param k The key itself.
+-- @return A keystroke representation (only for the escape sequence, for now?).
+function keystroke (m, k)
+ if type (m) ~= "table" then
+ error ("Keystroke modifiers must be given a table (got a "..
+ type (m)..")")
+ end
+ if type (k) ~= "string" then
+ error ("Keystroke key must be given a string (got a "..
+ type (m)..")")
+ end
+ return function (fn) return fn (m, k) end
+end
+
+-- keystroke accessors
+local function ks_mod (_m, _k) return _m end
+local function ks_key (_m, _k) return _k end
+
+-- ---
+
+--- Creates a final keychain binding to fill the keychain binding tables,
+--- meaning that the given function will be executed at the end of the keychain.
+-- @param m Modifiers table.
+-- @param k The key.
+-- @param cont The function to be bound to the given keys.
+-- @return A "final" key binding.
+function key (m, k, cont)
+ if type (cont) ~= "function" then
+ error ("Final binding must be given a function (got a "..
+ type (cont)..")")
+ end
+ return function (fn) return fn (keystroke (m, k), cont, true) end
+end
+
+--- Creates an intermediate (prefix) keychain binding.
+-- @param m Modifiers table.
+-- @param k The key.
+-- @param sub The subchain description table to be bound to the given keys.
+-- @return An "intermediate" key binding.
+function subchain (m, k, sub)
+ if type (sub) ~= "table" then
+ error ("Subchain binding must be given a table (got a "..
+ type (sub)..")")
+ end
+ return function (fn) return fn (keystroke (m, k), sub, false) end
+end
+
+-- key/subchain binding accessors
+local function binding_ks (ks, cont, leaf) return ks end
+local function binding_cont (ks, cont, leaf) return cont end
+local function binding_leaf (ks, cont, leaf) return leaf end
+
+--- Creates an intermediate keychain if sub is a table, or a final key binding
+--- otherwise (and then sub must be a function).
+-- @param m Modifiers table.
+-- @param k The key.
+-- @param sub Either the subchain description table, or the function, to be
+-- bound to the given keys.
+function sub (m, k, sub)
+ if type (sub) == "table" then
+ return subchain (m, k, sub)
+ else
+ return key (m, k, sub)
+ end
+end
+
+--}}}
+
+--{{{ Default values
+
+--- Default escape sequences (S-g is inspired by emacs...)
+local escape_keystrokes = {
+ keystroke ( { }, "Escape" ),
+ keystroke ( { "Mod4" }, "g" ),
+}
+
+--}}}
+
+--{{{ Key table management facilities
+
+local function set_keys (c, k)
+ if c == root then root.keys (k) else c:keys (k) end
+end
+
+local function keys_of (c)
+ if c == root then return root.keys () else return c:keys () end
+end
+
+--}}}
+
+--{{{ Signal emission helper
+
+local function notif (sig, w, ...)
+ if w ~= root then
+ client.emit_signal (sig, w, ...)
+ else -- we use global signals otherwise
+ awesome.emit_signal (sig, ...)
+ end
+end
+
+--}}}
+
+--{{{ Client/Root-related state management
+
+local function init_client_state_maybe (w)
+ if data[w] == nil then
+ local d = { }
+ d.keys = keys_of (w) -- save client keys
+ data[w] = d -- register client
+ notif ("keychain::enter", w)
+ end
+end
+
+local function restore_client_state (c)
+ local w = c or root
+ local d = data[w]
+ -- XXX: Turns out that `d' can be nil already here, in case the keyboard has
+ -- been grabbed since the previous call to this funtion... (that also seems
+ -- to be called again upon release…)
+ if d then
+ set_keys (w, d.keys) -- restore client keys
+ data[w] = nil -- unregister client
+ end
+end
+
+local function leave (c)
+ local w = c or root
+
+ -- Destroy notifier structures if needed
+ if data[w] then -- XXX: necessary test?
+ notif ("keychain::leave", w)
+ end
+end
+
+-- force disposal of resources when clients are killed
+client.add_signal ("unmanage", leave)
+
+--}}}
+
+--{{{ Key binding tree access helpers
+
+local function make_on_entering (m, k, subchain) return
+ function (c)
+ local w = c or root
+
+ -- Register and initialize client state, if not already in a keychain
+ init_client_state_maybe (w)
+
+ -- Update notifier text, and trigger its drawing if necessary
+ notif ("keychain::append", w, m, k)
+
+ -- Setup subchain
+ set_keys (w, subchain)
+ end
+end
+
+local function on_leaving (c)
+ -- Trigger disposal routine
+ leave (c)
+
+ -- Restore initial key mapping of client
+ restore_client_state (c)
+end
+
+--}}}
+
+--{{{ Configuration
+
+-- Flag to detect late initialization error
+local already_used = false
+
+-- Escape binding table built once upon initialization
+local escape_bindings = { }
+
+--- Fills the escape bindings table with actual `awful.key' elements triggering
+--- execution of `on_leaving'.
+local function init_escape_bindings ()
+ escape_bindings = { }
+ for _, e in ipairs (escape_keystrokes) do
+ escape_bindings = join (escape_bindings,
+ akey (e (ks_mod), e (ks_key), on_leaving))
+ end
+end
+
+-- Call it once upon module loading to initialize escape_bindings (in case
+-- `init' is not called).
+init_escape_bindings ()
+
+
+--- Initializes the keychain module, with given properties; to be called before
+--- ANY other function of this module.
+-- Configurations fields include:
+--
+-- `escapes': A table of keystrokes (@see keychain.keystroke) escaping keychains
+-- (defaults are `Mod4-g' and `Escape').
+--
+-- @param c The table of properties.
+function init (c)
+ local c = c or { }
+
+ if already_used then
+ -- heum... just signal the error: "print" or "error"?
+ return print ("E: keychain: Call to `init' AFTER having bound keys!")
+ end
+
+ escape_keystrokes = c.escapes and c.escapes or escape_keystrokes
+
+ -- Now, fill the escape bindings table again with actual `awful.key'
+ -- elements triggering `on_leaving' executions, in case escape keys has
+ -- changed.
+ init_escape_bindings ()
+end
+
+--}}}
+
+--{{{ Keychain creation
+
+--- Creates a new keychain binding.
+-- @param m Modifiers table.
+-- @param k The key.
+-- @param chains A table of keychains, describing either final bindings (see
+-- key constructor) or subchains (see subchain constructor). If arg is not a
+-- table, then `awful.key' is called directly with the arguments.
+-- @return A key binding for the `awful.key' module.
+-- @see awful.key
+function new (m, k, chains)
+
+ -- If the argument is a function, then we need to return an actual awful.key
+ -- directly.
+ if type (chains) ~= "table" then
+ return akey (m, k, chains)
+ end
+
+ -- This table will contain the keys to be mapped upon keystroke. It
+ -- initially contains the escape bindings, so that one can still rebind them
+ -- differently in `chains'.
+ local subchain = clone (escape_bindings)
+
+ already_used = true -- subsequent init avoidance flag...
+
+ -- For each entry of the given chains, add a corresponding `awful.key'
+ -- element in the subchain
+ for _, e in ipairs (chains) do
+ local ks = e (binding_ks)
+ if e (binding_leaf) then
+ -- We encountered a leaf in the chains.
+ local function on_leaf (c) on_leaving (c); e (binding_cont) (c) end
+ subchain = join (subchain, akey (ks (ks_mod), ks (ks_key), on_leaf))
+ else
+ -- Recursively call subchain creation. "Funny" detail: I think there
+ -- is no way of creating ill-structured keychain descriptors that
+ -- would produce infinite recursive calls here, since we control
+ -- their creation with functional tuples, that cannot lead to cyclic
+ -- structures...
+ local subch = new (ks (ks_mod), ks (ks_key), e (binding_cont))
+ subchain = join (subchain, subch)
+ end
+ end
+
+ -- Then return an actual `awful.key', triggering the `on_entering' routine
+ return akey (m, k, make_on_entering (m, k, subchain))
+end
+--}}}
+
+-- Setup `__call' entry in module's metatable so that we can create new prefix
+-- binding using `keychain (m, k, ...)' directly.
+setmetatable (_M, { __call = function (_, ...) return new (...) end })
+
+-- Local variables:
+-- indent-tabs-mode: nil
+-- fill-column: 80
+-- lua-indent-level: 4
+-- End:
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
new file mode 100644
index 0000000..674e5c0
--- /dev/null
+++ b/.config/awesome/rc.lua
@@ -0,0 +1,410 @@
+-- Standard awesome library
+require("awful")
+require("awful.autofocus")
+require("awful.rules")
+-- Theme handling library
+require("beautiful")
+-- Notification library
+require("naughty")
+require("bowl")
+require("keychain")
+
+-- {{{ Error handling
+-- Check if awesome encountered an error during startup and fell back to
+-- another config (This code will only ever execute for the fallback config)
+if awesome.startup_errors then
+ naughty.notify({ preset = naughty.config.presets.critical,
+ title = "Oops, there were errors during startup!",
+ text = awesome.startup_errors })
+end
+
+-- Handle runtime errors after startup
+do
+ local in_error = false
+ awesome.add_signal("debug::error", function (err)
+ -- Make sure we don't go into an endless error loop
+ if in_error then return end
+ in_error = true
+
+ naughty.notify({ preset = naughty.config.presets.critical,
+ title = "Oops, an error happened!",
+ text = err })
+ in_error = false
+ end)
+end
+-- }}}
+
+-- {{{ Variable definitions
+-- Themes define colours, icons, and wallpapers
+beautiful.init("/usr/share/awesome/themes/default/theme.lua")
+
+bowl.init({ use_timers = true, timeout = 1 })
+bowl.default_setup()
+
+-- This is used later as the default terminal and editor to run.
+terminal = "urxvt"
+editor = os.getenv("EDITOR") or "nano"
+editor_cmd = terminal .. " -e " .. editor
+
+-- Default modkey.
+-- Usually, Mod4 is the key with a logo between Control and Alt.
+-- If you do not like this or do not have such a key,
+-- I suggest you to remap Mod4 to another key using xmodmap or other tools.
+-- However, you can use another modifier like Mod1, but it may interact with others.
+modkey = "Mod4"
+
+-- Table of layouts to cover with awful.layout.inc, order matters.
+layouts =
+{
+ awful.layout.suit.tile,
+ awful.layout.suit.tile.left,
+ awful.layout.suit.tile.bottom,
+ awful.layout.suit.tile.top,
+ awful.layout.suit.fair,
+ awful.layout.suit.fair.horizontal,
+ awful.layout.suit.spiral,
+ awful.layout.suit.spiral.dwindle,
+ awful.layout.suit.max,
+ awful.layout.suit.max.fullscreen,
+ awful.layout.suit.magnifier,
+ awful.layout.suit.floating
+}
+-- }}}
+
+-- {{{ Tags
+-- Define a tag table which hold all screen tags.
+tags = {}
+for s = 1, screen.count() do
+ -- Each screen has its own tag table.
+ tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s, layouts[1])
+end
+-- }}}
+
+-- {{{ Menu
+-- Create a laucher widget and a main menu
+myawesomemenu = {
+ { "manual", terminal .. " -e man awesome" },
+ { "edit config", editor_cmd .. " " .. awesome.conffile },
+ { "restart", awesome.restart },
+ { "quit", awesome.quit }
+}
+
+mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
+ { "open terminal", terminal }
+ }
+ })
+
+mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
+ menu = mymainmenu })
+-- }}}
+
+-- {{{ Wibox
+-- Create a textclock widget
+mytextclock = awful.widget.textclock({ align = "right" })
+
+-- Create a systray
+mysystray = widget({ type = "systray" })
+
+-- Create a wibox for each screen and add it
+mywibox = {}
+mypromptbox = {}
+mylayoutbox = {}
+mytaglist = {}
+mytaglist.buttons = awful.util.table.join(
+ awful.button({ }, 1, awful.tag.viewonly),
+ awful.button({ modkey }, 1, awful.client.movetotag),
+ awful.button({ }, 3, awful.tag.viewtoggle),
+ awful.button({ modkey }, 3, awful.client.toggletag),
+ awful.button({ }, 4, awful.tag.viewnext),
+ awful.button({ }, 5, awful.tag.viewprev)
+ )
+mytasklist = {}
+mytasklist.buttons = awful.util.table.join(
+ awful.button({ }, 1, function (c)
+ if c == client.focus then
+ c.minimized = true
+ else
+ if not c:isvisible() then
+ awful.tag.viewonly(c:tags()[1])
+ end
+ -- This will also un-minimize
+ -- the client, if needed
+ client.focus = c
+ c:raise()
+ end
+ end),
+ awful.button({ }, 3, function ()
+ if instance then
+ instance:hide()
+ instance = nil
+ else
+ instance = awful.menu.clients({ width=250 })
+ end
+ end),
+ awful.button({ }, 4, function ()
+ awful.client.focus.byidx(1)
+ if client.focus then client.focus:raise() end
+ end),
+ awful.button({ }, 5, function ()
+ awful.client.focus.byidx(-1)
+ if client.focus then client.focus:raise() end
+ end))
+
+for s = 1, screen.count() do
+ -- Create a promptbox for each screen
+ mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright })
+ -- Create an imagebox widget which will contains an icon indicating which layout we're using.
+ -- We need one layoutbox per screen.
+ mylayoutbox[s] = awful.widget.layoutbox(s)
+ mylayoutbox[s]:buttons(awful.util.table.join(
+ awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
+ awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
+ awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
+ awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
+ -- Create a taglist widget
+ mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.all, mytaglist.buttons)
+
+ -- Create a tasklist widget
+ mytasklist[s] = awful.widget.tasklist(function(c)
+ return awful.widget.tasklist.label.currenttags(c, s)
+ end, mytasklist.buttons)
+
+ -- Create the wibox
+ mywibox[s] = awful.wibox({ position = "top", screen = s })
+ -- Add widgets to the wibox - order matters
+ mywibox[s].widgets = {
+ {
+ mylauncher,
+ mytaglist[s],
+ mypromptbox[s],
+ layout = awful.widget.layout.horizontal.leftright
+ },
+ mylayoutbox[s],
+ mytextclock,
+ s == 1 and mysystray or nil,
+ mytasklist[s],
+ layout = awful.widget.layout.horizontal.rightleft
+ }
+end
+-- }}}
+
+-- {{{ Mouse bindings
+root.buttons(awful.util.table.join(
+ awful.button({ }, 3, function () mymainmenu:toggle() end),
+ awful.button({ }, 4, awful.tag.viewnext),
+ awful.button({ }, 5, awful.tag.viewprev)
+))
+-- }}}
+
+function keyhandler (mod, key, event)
+ if event == "release" then return true end
+
+ if key == "o" then
+ awful.client.focus.byidx(1)
+ if client.focus then client.focus:raise() end
+ elseif key == "O" then
+ awful.screen.focus_relative(1)
+ elseif key == "f" then
+ awful.client.focus.bydirection("right")
+ if client.focus then client.focus:raise() end
+ elseif key == "b" then
+ awful.client.focus.bydirection("left")
+ if client.focus then client.focus:raise() end
+ elseif key == "n" then
+ awful.client.focus.bydirection("down")
+ if client.focus then client.focus:raise() end
+ elseif key == "p" then
+ awful.client.focus.bydirection("up")
+ if client.focus then client.focus:raise() end
+ else
+ naughty.notify({text=key})
+ end
+
+ return false
+end
+
+-- {{{ Key bindings
+local bind = keychain
+local sub = keychain.sub
+globalkeys = awful.util.table.join(
+ bind({ "Control", }, "z",
+ { sub({ }, "o",
+ function ()
+ awful.client.focus.byidx(1)
+ if client.focus then client.focus:raise() end
+ end),
+ sub({ "Shift", }, "o",
+ function ()
+ awful.screen.focus_relative(1)
+ end),
+ sub({ }, "f",
+ function ()
+ awful.client.focus.bydirection("right")
+ if client.focus then client.focus:raise() end
+ end) }),
+ awful.key({ modkey, }, "Left", awful.tag.viewprev ),
+ awful.key({ modkey, }, "Right", awful.tag.viewnext ),
+ awful.key({ modkey, }, "Escape", awful.tag.history.restore),
+
+ awful.key({ modkey, }, "w", function () mymainmenu:show({keygrabber=true}) end),
+
+ -- Layout manipulation
+ awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end),
+ awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end),
+ awful.key({ modkey, }, "u", awful.client.urgent.jumpto),
+ awful.key({ modkey, }, "Tab",
+ function ()
+ awful.client.focus.history.previous()
+ if client.focus then
+ client.focus:raise()
+ end
+ end),
+
+ -- Standard program
+ awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end),
+ awful.key({ modkey, "Control" }, "r", awesome.restart),
+ awful.key({ modkey, "Shift" }, "q", awesome.quit),
+
+ awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end),
+ awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end),
+ awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end),
+ awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end),
+ awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end),
+ awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end),
+ awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end),
+ awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
+
+ awful.key({ modkey, "Control" }, "n", awful.client.restore),
+
+ -- Prompt
+ awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
+
+ awful.key({ modkey }, "x",
+ function ()
+ awful.prompt.run({ prompt = "Run Lua code: " },
+ mypromptbox[mouse.screen].widget,
+ awful.util.eval, nil,
+ awful.util.getdir("cache") .. "/history_eval")
+ end)
+)
+
+clientkeys = awful.util.table.join(
+ awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end),
+ awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end),
+ awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ),
+ awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
+ awful.key({ modkey, }, "o", awful.client.movetoscreen ),
+ awful.key({ modkey, "Shift" }, "r", function (c) c:redraw() end),
+ awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end),
+ awful.key({ modkey, }, "n",
+ function (c)
+ -- The client currently has the input focus, so it cannot be
+ -- minimized, since minimized clients can't have the focus.
+ c.minimized = true
+ end),
+ awful.key({ modkey, }, "m",
+ function (c)
+ c.maximized_horizontal = not c.maximized_horizontal
+ c.maximized_vertical = not c.maximized_vertical
+ end)
+)
+
+-- Compute the maximum number of digit we need, limited to 9
+keynumber = 0
+for s = 1, screen.count() do
+ keynumber = math.min(9, math.max(#tags[s], keynumber));
+end
+
+-- Bind all key numbers to tags.
+-- Be careful: we use keycodes to make it works on any keyboard layout.
+-- This should map on the top row of your keyboard, usually 1 to 9.
+for i = 1, keynumber do
+ globalkeys = awful.util.table.join(globalkeys,
+ awful.key({ modkey }, "#" .. i + 9,
+ function ()
+ local screen = mouse.screen
+ if tags[screen][i] then
+ awful.tag.viewonly(tags[screen][i])
+ end
+ end),
+ awful.key({ modkey, "Control" }, "#" .. i + 9,
+ function ()
+ local screen = mouse.screen
+ if tags[screen][i] then
+ awful.tag.viewtoggle(tags[screen][i])
+ end
+ end),
+ awful.key({ modkey, "Shift" }, "#" .. i + 9,
+ function ()
+ if client.focus and tags[client.focus.screen][i] then
+ awful.client.movetotag(tags[client.focus.screen][i])
+ end
+ end),
+ awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+ function ()
+ if client.focus and tags[client.focus.screen][i] then
+ awful.client.toggletag(tags[client.focus.screen][i])
+ end
+ end))
+end
+
+clientbuttons = awful.util.table.join(
+ awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+ awful.button({ modkey }, 1, awful.mouse.client.move),
+ awful.button({ modkey }, 3, awful.mouse.client.resize))
+
+-- Set keys
+root.keys(globalkeys)
+-- }}}
+
+-- {{{ Rules
+awful.rules.rules = {
+ -- All clients will match this rule.
+ { rule = { },
+ properties = { border_width = beautiful.border_width,
+ border_color = beautiful.border_normal,
+ focus = true,
+ keys = clientkeys,
+ buttons = clientbuttons } },
+ { rule = { class = "MPlayer" },
+ properties = { floating = true } },
+ { rule = { class = "pinentry" },
+ properties = { floating = true } },
+ { rule = { class = "gimp" },
+ properties = { floating = true } },
+ -- Set Firefox to always map on tags number 2 of screen 1.
+ -- { rule = { class = "Firefox" },
+ -- properties = { tag = tags[1][2] } },
+}
+-- }}}
+
+-- {{{ Signals
+-- Signal function to execute when a new client appears.
+client.add_signal("manage", function (c, startup)
+ -- Add a titlebar
+ -- awful.titlebar.add(c, { modkey = modkey })
+
+ -- Enable sloppy focus
+ c:add_signal("mouse::enter", function(c)
+ if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
+ and awful.client.focus.filter(c) then
+ client.focus = c
+ end
+ end)
+
+ if not startup then
+ -- Set the windows at the slave,
+ -- i.e. put it at the end of others instead of setting it master.
+ -- awful.client.setslave(c)
+
+ -- Put windows in a smart way, only if they does not set an initial position.
+ if not c.size_hints.user_position and not c.size_hints.program_position then
+ awful.placement.no_overlap(c)
+ awful.placement.no_offscreen(c)
+ end
+ end
+end)
+
+client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
+-- }}}
--
cgit v1.2.3-54-g00ecf
From f7f8460b8334a8c3c820e6e6095471b2b723f22b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 12 Sep 2012 23:26:52 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 674e5c0..d61195d 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -223,6 +223,11 @@ function keyhandler (mod, key, event)
return false
end
+function focus_raise(direction)
+ awful.client.focus.bydirection(direction)
+ if client.focus then client.focus:raise() end
+end
+
-- {{{ Key bindings
local bind = keychain
local sub = keychain.sub
@@ -234,14 +239,11 @@ globalkeys = awful.util.table.join(
if client.focus then client.focus:raise() end
end),
sub({ "Shift", }, "o",
- function ()
- awful.screen.focus_relative(1)
- end),
- sub({ }, "f",
- function ()
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- end) }),
+ function () awful.screen.focus_relative(1) end),
+ sub({ }, "f", function () focus_raise("right") end),
+ sub({ }, "b", function () focus_raise("left") end),
+ sub({ }, "n", function () focus_raise("down") end),
+ sub({ }, "p", function () focus_raise("up") end)}),
awful.key({ modkey, }, "Left", awful.tag.viewprev ),
awful.key({ modkey, }, "Right", awful.tag.viewnext ),
awful.key({ modkey, }, "Escape", awful.tag.history.restore),
--
cgit v1.2.3-54-g00ecf
From af2ad2ac32bdac686dfa149965381f3db966281c Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 12 Sep 2012 23:27:44 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index d61195d..b89934a 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -196,33 +196,6 @@ root.buttons(awful.util.table.join(
))
-- }}}
-function keyhandler (mod, key, event)
- if event == "release" then return true end
-
- if key == "o" then
- awful.client.focus.byidx(1)
- if client.focus then client.focus:raise() end
- elseif key == "O" then
- awful.screen.focus_relative(1)
- elseif key == "f" then
- awful.client.focus.bydirection("right")
- if client.focus then client.focus:raise() end
- elseif key == "b" then
- awful.client.focus.bydirection("left")
- if client.focus then client.focus:raise() end
- elseif key == "n" then
- awful.client.focus.bydirection("down")
- if client.focus then client.focus:raise() end
- elseif key == "p" then
- awful.client.focus.bydirection("up")
- if client.focus then client.focus:raise() end
- else
- naughty.notify({text=key})
- end
-
- return false
-end
-
function focus_raise(direction)
awful.client.focus.bydirection(direction)
if client.focus then client.focus:raise() end
--
cgit v1.2.3-54-g00ecf
From b08f6026edcc8c7918aa50ad3e830593c055538b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 12 Sep 2012 23:32:08 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index b89934a..12ddae7 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -213,10 +213,12 @@ globalkeys = awful.util.table.join(
end),
sub({ "Shift", }, "o",
function () awful.screen.focus_relative(1) end),
+ sub({ "Shift", }, "1",
+ function () mypromptbox[mouse.screen]:run() end),
sub({ }, "f", function () focus_raise("right") end),
sub({ }, "b", function () focus_raise("left") end),
sub({ }, "n", function () focus_raise("down") end),
- sub({ }, "p", function () focus_raise("up") end)}),
+ sub({ }, "p", function () focus_raise("up") end) }),
awful.key({ modkey, }, "Left", awful.tag.viewprev ),
awful.key({ modkey, }, "Right", awful.tag.viewnext ),
awful.key({ modkey, }, "Escape", awful.tag.history.restore),
--
cgit v1.2.3-54-g00ecf
From 0228c95a0b433216382334194852fb0e70da82ff Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 13 Sep 2012 01:57:14 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 99 ++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 88 insertions(+), 11 deletions(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 12ddae7..099d3c5 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -9,6 +9,8 @@ require("naughty")
require("bowl")
require("keychain")
+oni = { } -- Container for custom functions.
+
-- {{{ Error handling
-- Check if awesome encountered an error during startup and fell back to
-- another config (This code will only ever execute for the fallback config)
@@ -34,6 +36,71 @@ do
end
-- }}}
+function oni.focus_raise(direction)
+ awful.client.focus.bydirection(direction)
+ if client.focus then client.focus:raise() end
+end
+
+-- Returns true if all pairs in table1 are present in table2
+function match(table1, table2)
+ for k, v in pairs(table1) do
+ if table[k] ~= v and not table2[k]:find(v) then
+ return false
+ end
+ end
+
+ return true
+end
+
+--- Spawns cmd if no client can be found matching properties
+-- If such a client can be found, pop to first tag where it is
+-- visible, and give it focus
+function oni.run_or_raise(cmd, properties)
+ local clients = client.get()
+ local focused = awful.client.next(0)
+ local findex = 0
+ local matched_clients = { }
+ local n = 0
+
+ for i, c in pairs(clients) do
+ -- make an array of matched clients
+ if match(properties, c) then
+ n = n + 1
+ matched_clients[n] = c
+
+ if n == focused then
+ findex = n
+ end
+ end
+ end
+
+ if n > 0 then
+ local c = matched_clients[1]
+
+ -- if the focused window matched switch focus to next in list
+ if 0 < findex and findex < n then
+ c = matched_clients[findex + 1]
+ end
+
+ local ctags = c:tags()
+
+ if table.getn(ctags) == 0 then
+ -- ctags is empty, show client on current tag
+ local curtag = awful.tag.selected()
+ awful.client.movetotag(curtag, c)
+ else
+ -- Otherwise, pop to first tag client is visible on
+ awful.tag.viewonly(ctags[1])
+ end
+
+ -- And then focus the client
+ client.focus = c
+ c:raise()
+ return
+ end
+ awful.util.spawn(cmd)
+end
+
-- {{{ Variable definitions
-- Themes define colours, icons, and wallpapers
beautiful.init("/usr/share/awesome/themes/default/theme.lua")
@@ -196,11 +263,6 @@ root.buttons(awful.util.table.join(
))
-- }}}
-function focus_raise(direction)
- awful.client.focus.bydirection(direction)
- if client.focus then client.focus:raise() end
-end
-
-- {{{ Key bindings
local bind = keychain
local sub = keychain.sub
@@ -215,10 +277,19 @@ globalkeys = awful.util.table.join(
function () awful.screen.focus_relative(1) end),
sub({ "Shift", }, "1",
function () mypromptbox[mouse.screen]:run() end),
- sub({ }, "f", function () focus_raise("right") end),
- sub({ }, "b", function () focus_raise("left") end),
- sub({ }, "n", function () focus_raise("down") end),
- sub({ }, "p", function () focus_raise("up") end) }),
+ sub({ }, "f", function () oni.focus_raise("right") end),
+ sub({ }, "b", function () oni.focus_raise("left") end),
+ sub({ }, "n", function () oni.focus_raise("down") end),
+ sub({ }, "p", function () oni.focus_raise("up") end),
+ sub({ }, "e",
+ function () oni.run_or_raise("emacsclient -c -a emacs",
+ { class = "Emacs" }) end),
+ sub({ }, "c",
+ function () oni.run_or_raise("urxvt",
+ { class = "URxvt" }) end),
+ sub({ }, "w",
+ function () oni.run_or_raise("conkeror",
+ { class = "Conkeror" }) end) }),
awful.key({ modkey, }, "Left", awful.tag.viewprev ),
awful.key({ modkey, }, "Right", awful.tag.viewnext ),
awful.key({ modkey, }, "Escape", awful.tag.history.restore),
@@ -349,9 +420,15 @@ awful.rules.rules = {
properties = { floating = true } },
{ rule = { class = "gimp" },
properties = { floating = true } },
+ { rule = { class = "Emacs" },
+ properties = { tag = tags[1][1] } },
-- Set Firefox to always map on tags number 2 of screen 1.
- -- { rule = { class = "Firefox" },
- -- properties = { tag = tags[1][2] } },
+ { rule = { class = "Firefox" },
+ properties = { tag = tags[2][1] } },
+ { rule = { class = "Conkeror" },
+ properties = { tag = tags[2][1] } },
+ { rule = { class = "URxvt" },
+ properties = { tag = tags[2][1] } },
}
-- }}}
--
cgit v1.2.3-54-g00ecf
From 5a36f207f6529b072742da9c42d95eee25b1fae0 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 13 Sep 2012 02:43:47 +0200
Subject: .conkerorrc/init.js
---
.conkerorrc/init.js | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js
index 1639c1e..438f402 100644
--- a/.conkerorrc/init.js
+++ b/.conkerorrc/init.js
@@ -1,3 +1,4 @@
+require("content-policy.js");
require("favicon");
theme_load_paths.push("/home/slash/.conkerorrc/themes/");
@@ -23,6 +24,17 @@ function oni_before_quit_func() {
yield co_return(result);
}
+function oni_block_flash(content_type, content_location) {
+ var Y = content_policy_accept, N = content_policy_reject;
+ var action = ({ "youtube.com": Y }
+ [content_location.host] || N);
+
+ if (action == N)
+ dumpln("blocked flash: " + content_location.spec);
+
+ return action;
+}
+
function oni_escape(str) {
return str.replace(/(["$`])/g, '\\$1');
}
@@ -130,10 +142,11 @@ define_webjump("arch/packages",
"https://www.archlinux.org/packages/?sort=&q=%s&limit=50",
$alternative="https://packages.archlinux.org");
+content_policy_bytype_table.object = oni_block_flash;
cwd = make_file("/home/slash/downloads/");
-url_remoting_fn = load_url_in_new_buffer;
-read_buffer_show_icons = true;
hint_digits = "arstdhneio";
+read_buffer_show_icons = true;
+url_remoting_fn = load_url_in_new_buffer;
define_key(content_buffer_normal_keymap, "h",
"find-url-from-history-new-buffer");
@@ -142,6 +155,7 @@ define_key(content_buffer_normal_keymap, "H",
define_key(default_base_keymap, "C-x f", "follow-new-buffer");
add_hook("before_quit_hook", oni_before_quit_func);
+add_hook("content_policy_hook", content_policy_bytype);
add_hook("mode_line_hook", mode_line_adder(buffer_count_widget, true));
add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget, true));
add_hook("mode_line_hook", mode_line_adder(downloads_status_widget));
--
cgit v1.2.3-54-g00ecf
From ddff03f5ecf8a06c0e57feef2f03103fa0c1b467 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 13 Sep 2012 10:32:33 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 099d3c5..b602eb7 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -1,15 +1,15 @@
--- Standard awesome library
require("awful")
require("awful.autofocus")
require("awful.rules")
--- Theme handling library
require("beautiful")
--- Notification library
-require("naughty")
require("bowl")
require("keychain")
+require("lfs")
+require("naughty")
+
+oni = { } -- Container for custom functions.
-oni = { } -- Container for custom functions.
+oni.maildirfmt = "/home/slash/documents/mail/%s/inbox/new/"
-- {{{ Error handling
-- Check if awesome encountered an error during startup and fell back to
@@ -41,8 +41,21 @@ function oni.focus_raise(direction)
if client.focus then client.focus:raise() end
end
+function oni.mailcount(account)
+ local i = 0
+ local dir = string.format(oni.maildirfmt, account)
+
+ for file in lfs.dir(dir) do
+ if file ~= "." and file ~= ".." then
+ i = i + 1
+ end
+ end
+
+ return i
+end
+
-- Returns true if all pairs in table1 are present in table2
-function match(table1, table2)
+function oni.match(table1, table2)
for k, v in pairs(table1) do
if table[k] ~= v and not table2[k]:find(v) then
return false
@@ -64,7 +77,7 @@ function oni.run_or_raise(cmd, properties)
for i, c in pairs(clients) do
-- make an array of matched clients
- if match(properties, c) then
+ if oni.match(properties, c) then
n = n + 1
matched_clients[n] = c
@@ -108,6 +121,11 @@ beautiful.init("/usr/share/awesome/themes/default/theme.lua")
bowl.init({ use_timers = true, timeout = 1 })
bowl.default_setup()
+keychain.init({ escapes = {
+ keychain.keystroke ({ }, "Escape"),
+ keychain.keystroke ({ "Control", }, "g")
+} })
+
-- This is used later as the default terminal and editor to run.
terminal = "urxvt"
editor = os.getenv("EDITOR") or "nano"
--
cgit v1.2.3-54-g00ecf
From 377b0ea4c289ade36cae192c9b10129c2f3d167b Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 13 Sep 2012 10:38:37 +0200
Subject: .emacs.d/init.el
---
.emacs.d/init.el | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 2235d24..e84ed30 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -31,6 +31,8 @@
(autoload 'sawfish-mode "sawfish" nil t)
(autoload 'xmodmap-mode "xmodmap-mode" nil t)
(autoload 'jabber-connect "jabber" nil t)
+(autoload 'define-slime-contrib "slime")
+(autoload 'slime-js-minor-mode "slime-js" nil t)
(load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
@@ -379,6 +381,12 @@ If COUNT has been specified indent by that much, otherwise look at
(when (buffer-file-name)
(hs-minor-mode)))
+(defun oni:lua-mode-func()
+ "Function for `lisp-mode-hook'."
+ (local-unset-key (kbd ")"))
+ (local-unset-key (kbd "]"))
+ (local-unset-key (kbd "}")))
+
(defun oni:magit-log-edit-mode-func ()
"Function for `magit-log-edit-mode-hook'."
(auto-fill-mode)
@@ -673,6 +681,11 @@ for easy selection."
(eval-after-load "info"
'(require 'info+))
+(eval-after-load "lua-mode"
+ `(progn
+ (modify-syntax-entry ?- "< 12" lua-mode-syntax-table)
+ (modify-syntax-entry ?\n ">" lua-mode-syntax-table)))
+
(eval-after-load "mu4e"
'(add-to-list
'org-capture-templates
@@ -973,6 +986,7 @@ for easy selection."
(add-hook 'js-mode-hook 'oni:js-mode-func)
(add-hook 'js2-mode-hook 'oni:js2-mode-func)
(add-hook 'lisp-mode-hook 'oni:lisp-mode-func)
+(add-hook 'lua-mode-hook 'oni:lua-mode-func)
(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
(add-hook 'message-mode-hook 'oni:message-mode-func)
--
cgit v1.2.3-54-g00ecf
From adf8e13bb0e722ca6e98d85182b41a47a6e26621 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 13 Sep 2012 10:57:37 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index b602eb7..b544d93 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -54,6 +54,15 @@ function oni.mailcount(account)
return i
end
+function oni.mailcount_text()
+ return string.format("ryu: %d aet: %d gmail: %d 9f: %d",
+ oni.mailcount("ryuslash.org"),
+ oni.mailcount("aethon"),
+ oni.mailcount("gmail"),
+ oni.mailcount("ninthfloor"))
+end
+
+
-- Returns true if all pairs in table1 are present in table2
function oni.match(table1, table2)
for k, v in pairs(table1) do
@@ -190,6 +199,16 @@ mytextclock = awful.widget.textclock({ align = "right" })
-- Create a systray
mysystray = widget({ type = "systray" })
+-- Create a mailbox widget
+mymailbox = widget({ type = "textbox" })
+mymailbox.text = oni.mailcount_text()
+mymailboxtimer = timer({ timeout = 60 })
+mymailboxtimer:add_signal("timeout",
+ function ()
+ mymailbox.text = oni.mailcount_text()
+ end)
+mymailboxtimer:start()
+
-- Create a wibox for each screen and add it
mywibox = {}
mypromptbox = {}
@@ -267,6 +286,7 @@ for s = 1, screen.count() do
mylayoutbox[s],
mytextclock,
s == 1 and mysystray or nil,
+ s == 1 and mymailbox or nil,
mytasklist[s],
layout = awful.widget.layout.horizontal.rightleft
}
--
cgit v1.2.3-54-g00ecf
From 802607545beea16c5db8fdf4d2947e32aa04d3a6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 13 Sep 2012 17:14:39 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index b544d93..03067e2 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -11,7 +11,7 @@ oni = { } -- Container for custom functions.
oni.maildirfmt = "/home/slash/documents/mail/%s/inbox/new/"
--- {{{ Error handling
+--- Error handling
-- Check if awesome encountered an error during startup and fell back to
-- another config (This code will only ever execute for the fallback config)
if awesome.startup_errors then
@@ -34,8 +34,8 @@ do
in_error = false
end)
end
--- }}}
+--- Functions
function oni.focus_raise(direction)
awful.client.focus.bydirection(direction)
if client.focus then client.focus:raise() end
@@ -118,6 +118,7 @@ function oni.run_or_raise(cmd, properties)
-- And then focus the client
client.focus = c
c:raise()
+ awful.screen.focus(c.screen)
return
end
awful.util.spawn(cmd)
--
cgit v1.2.3-54-g00ecf
From f7f9f0dcd0f5b1dfd5f2929c8789d46de65e50de Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 14 Sep 2012 01:55:41 +0200
Subject: .emacs.d/init.el
---
.emacs.d/init.el | 44 +++++++++++++++++++++++++-------------------
1 file changed, 25 insertions(+), 19 deletions(-)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e84ed30..22e79d2 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -121,8 +121,8 @@ actual account name."
(defmacro oni:email (user at host dot com)
"Turn arguments into an email address.
-The resulting email address will look like: USER@HOST.COM, AT and DOT are
-intentionally being skipped."
+The resulting email address will look like: USER@HOST.COM, AT and
+DOT are intentionally being skipped."
(concat (symbol-name user) "@" (symbol-name host) "."
(symbol-name com)))
@@ -606,6 +606,14 @@ insert at the end of the region and at the beginning."
(setq dir (replace-match "\\1/" nil nil dir)))
dir)
+(defun oni:start-emms ()
+ "Check to see if the function `emms' exists, if not call
+`emms-player-mpd-connect' and assume that will have loaded it."
+ (interactive)
+ (unless (fboundp 'emms)
+ (emms-player-mpd-connect))
+ (emms))
+
(defun oni:term-mode-func ()
"Function for `term-mode-hook'."
(setq truncate-lines nil))
@@ -614,18 +622,19 @@ insert at the end of the region and at the beginning."
"Function for `texinfo-mode-hook'."
(auto-fill-mode))
-(defun oni:view-mail ()
+(defun oni:view-mail (inbox)
"Show a menu with all mailbox options from `oni:mailbox-map'
for easy selection."
- (interactive)
- (require 'tmm)
- (let* ((tmm-completion-prompt "Choose a mailbox\n")
- (inbox (tmm-prompt oni:mailbox-map)))
- (if inbox
- (progn
- (require 'mu4e)
- (funcall (intern (concat "oni:" inbox "-mailbox")))
- (mu4e)))))
+ (interactive
+ (list (progn
+ (require 'tmm)
+ (let ((tmm-completion-prompt "Choose a mailbox\n"))
+ (tmm-prompt oni:mailbox-map)))))
+ (if inbox
+ (progn
+ (require 'mu4e)
+ (funcall (intern (concat "oni:" inbox "-mailbox")))
+ (mu4e))))
(defun oni:write-file-func ()
"Function for `write-file-hooks'."
@@ -681,11 +690,6 @@ for easy selection."
(eval-after-load "info"
'(require 'info+))
-(eval-after-load "lua-mode"
- `(progn
- (modify-syntax-entry ?- "< 12" lua-mode-syntax-table)
- (modify-syntax-entry ?\n ">" lua-mode-syntax-table)))
-
(eval-after-load "mu4e"
'(add-to-list
'org-capture-templates
@@ -809,7 +813,7 @@ for easy selection."
(vertical-scroll-bars . nil)
(menu-bar-lines . nil)
(tool-bar-lines . nil)
- (font . "LiberationMono:pixelsize=16")
+ (font . "osaka_unicode:pixelsize=18")
(left-fringe . 0)))
(setq emms-source-file-default-directory "/mnt/music/")
(setq erc-autojoin-channels-alist
@@ -937,6 +941,7 @@ for easy selection."
("gnu" . "http://elpa.gnu.org/packages/")
("marmalade" . "http://marmalade-repo.org/packages/")))
(setq package-load-list '((htmlize "1.39")
+ (lua-mode "20111107")
all))
(setq php-function-call-face 'font-lock-function-name-face)
(setq php-mode-force-pear t)
@@ -953,6 +958,7 @@ for easy selection."
(setq scroll-conservatively 101)
(setq send-mail-function 'smtpmail-send-it)
(setq sendmail-program "/usr/bin/msmtp")
+(setq smex-key-advice-ignore-menu-bar t)
(setq smex-save-file "~/.emacs.d/smex-items")
(setq special-display-buffer-names '("*Sauron*"))
(setq special-display-frame-alist '((minibuffer . nil)
@@ -1007,7 +1013,7 @@ for easy selection."
(global-set-key (kbd "") 'emms-stop)
(global-set-key (kbd "") 'oni:raise-scratch)
(global-set-key (kbd "") 'oni:view-mail)
-(global-set-key (kbd "") 'emms)
+(global-set-key (kbd "") 'oni:start-emms)
(global-set-key (kbd "") 'oni:reload-buffer)
(global-set-key (kbd "") 'jabber-switch-to-roster-buffer)
(global-set-key (kbd "") 'magit-status)
--
cgit v1.2.3-54-g00ecf
From d5836762a01d8c75460b6c58aaa16c4ad15e60f4 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 14 Sep 2012 09:55:58 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 03067e2..99d6751 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -126,7 +126,7 @@ end
-- {{{ Variable definitions
-- Themes define colours, icons, and wallpapers
-beautiful.init("/usr/share/awesome/themes/default/theme.lua")
+beautiful.init("/home/slash/.config/awesome/themes/custom/theme.lua")
bowl.init({ use_timers = true, timeout = 1 })
bowl.default_setup()
@@ -329,6 +329,8 @@ globalkeys = awful.util.table.join(
sub({ }, "w",
function () oni.run_or_raise("conkeror",
{ class = "Conkeror" }) end) }),
+ awful.key({ "Control", "Mod1" }, "l",
+ function () awful.util.spawn("i3lock -c 000000") end),
awful.key({ modkey, }, "Left", awful.tag.viewprev ),
awful.key({ modkey, }, "Right", awful.tag.viewnext ),
awful.key({ modkey, }, "Escape", awful.tag.history.restore),
--
cgit v1.2.3-54-g00ecf
From 6cd580c3befca69b3eac6780679a368c1cbaefc6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 14 Sep 2012 09:56:35 +0200
Subject: .emacs.d/init.el
---
.emacs.d/init.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 22e79d2..fd03cd2 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1036,8 +1036,9 @@ for easy selection."
(global-set-key (kbd "M-n") 'idomenu)
(global-set-key (kbd "\"") 'oni:self-insert-dwim)
-(when (daemonp)
- (global-set-key "\C-x\C-c" 'oni:close-client-window))
+(if (daemonp)
+ (global-set-key "\C-x\C-c" 'oni:close-client-window)
+ (server-start))
(when (or window-system (daemonp))
(global-unset-key "\C-z"))
--
cgit v1.2.3-54-g00ecf
From a01ee2b496a8c2e50418343661d23479fbd67212 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 14 Sep 2012 09:56:52 +0200
Subject: Makefile
---
Makefile | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 Makefile
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f0b7b81..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-modules = emacs stumpwm cower
-install-modules = $(addprefix install-,$(modules))
-
-.PHONY: all install $(modules) $(install-modules)
-
-all: $(modules)
-install: $(install-modules)
-
-$(modules):
- $(MAKE) -C $@/
-
-$(install-modules): install-%:
- $(MAKE) -C $*/ install
--
cgit v1.2.3-54-g00ecf
From a5689e945dd73839f587dadbf373e4621949f6bc Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Fri, 14 Sep 2012 10:31:10 +0200
Subject: .config/awesome/
---
.config/awesome/rc.lua | 2 +-
.config/awesome/themes/custom/README | 3 ++
.config/awesome/themes/custom/theme.lua | 96 +++++++++++++++++++++++++++++++++
3 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 .config/awesome/themes/custom/README
create mode 100644 .config/awesome/themes/custom/theme.lua
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 99d6751..47de684 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -55,7 +55,7 @@ function oni.mailcount(account)
end
function oni.mailcount_text()
- return string.format("ryu: %d aet: %d gmail: %d 9f: %d",
+ return string.format(" ryu: %d aet: %d gmail: %d 9f: %d --",
oni.mailcount("ryuslash.org"),
oni.mailcount("aethon"),
oni.mailcount("gmail"),
diff --git a/.config/awesome/themes/custom/README b/.config/awesome/themes/custom/README
new file mode 100644
index 0000000..1ddb349
--- /dev/null
+++ b/.config/awesome/themes/custom/README
@@ -0,0 +1,3 @@
+Background images:
+ Mikael Eriksson
+ Licensed under CC-BY-SA-3.0
diff --git a/.config/awesome/themes/custom/theme.lua b/.config/awesome/themes/custom/theme.lua
new file mode 100644
index 0000000..3cdb9ca
--- /dev/null
+++ b/.config/awesome/themes/custom/theme.lua
@@ -0,0 +1,96 @@
+---------------------------
+-- Default awesome theme --
+---------------------------
+
+theme = {}
+
+theme.font = "osaka_unicode 10"
+
+theme.bg_normal = "#222222"
+theme.bg_focus = "#535d6c"
+theme.bg_urgent = "#ff0000"
+theme.bg_minimize = "#444444"
+
+theme.fg_normal = "#aaaaaa"
+theme.fg_focus = "#ffffff"
+theme.fg_urgent = "#ffffff"
+theme.fg_minimize = "#ffffff"
+
+theme.border_width = "1"
+theme.border_normal = "#000000"
+theme.border_focus = "#535d6c"
+theme.border_marked = "#91231c"
+
+-- There are other variable sets
+-- overriding the default one when
+-- defined, the sets are:
+-- [taglist|tasklist]_[bg|fg]_[focus|urgent]
+-- titlebar_[bg|fg]_[normal|focus]
+-- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
+-- mouse_finder_[color|timeout|animate_timeout|radius|factor]
+-- Example:
+--theme.taglist_bg_focus = "#ff0000"
+
+-- Display the taglist squares
+theme.taglist_squares_sel = "/home/slash/.config/awesome/themes/custom/taglist/squarefw.png"
+theme.taglist_squares_unsel = "/home/slash/.config/awesome/themes/custom/taglist/squarew.png"
+
+theme.tasklist_floating_icon = "/home/slash/.config/awesome/themes/custom/tasklist/floatingw.png"
+
+-- Variables set for theming the menu:
+-- menu_[bg|fg]_[normal|focus]
+-- menu_[border_color|border_width]
+theme.menu_submenu_icon = "/home/slash/.config/awesome/themes/custom/submenu.png"
+theme.menu_height = "15"
+theme.menu_width = "100"
+
+-- You can add as many variables as
+-- you wish and access them by using
+-- beautiful.variable in your rc.lua
+--theme.bg_widget = "#cc0000"
+
+-- Define the image to load
+theme.titlebar_close_button_normal = "/home/slash/.config/awesome/themes/custom/titlebar/close_normal.png"
+theme.titlebar_close_button_focus = "/home/slash/.config/awesome/themes/custom/titlebar/close_focus.png"
+
+theme.titlebar_ontop_button_normal_inactive = "/home/slash/.config/awesome/themes/custom/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive = "/home/slash/.config/awesome/themes/custom/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = "/home/slash/.config/awesome/themes/custom/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active = "/home/slash/.config/awesome/themes/custom/titlebar/ontop_focus_active.png"
+
+theme.titlebar_sticky_button_normal_inactive = "/home/slash/.config/awesome/themes/custom/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive = "/home/slash/.config/awesome/themes/custom/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = "/home/slash/.config/awesome/themes/custom/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active = "/home/slash/.config/awesome/themes/custom/titlebar/sticky_focus_active.png"
+
+theme.titlebar_floating_button_normal_inactive = "/home/slash/.config/awesome/themes/custom/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive = "/home/slash/.config/awesome/themes/custom/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = "/home/slash/.config/awesome/themes/custom/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active = "/home/slash/.config/awesome/themes/custom/titlebar/floating_focus_active.png"
+
+theme.titlebar_maximized_button_normal_inactive = "/home/slash/.config/awesome/themes/custom/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive = "/home/slash/.config/awesome/themes/custom/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = "/home/slash/.config/awesome/themes/custom/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active = "/home/slash/.config/awesome/themes/custom/titlebar/maximized_focus_active.png"
+
+-- You can use your own command to set your wallpaper
+theme.wallpaper_cmd = { "awsetbg -u hsetroot /home/slash/pictures/wallpapers/3600x1080/wallpaper-1085607.jpg" }
+
+-- You can use your own layout icons like this:
+theme.layout_fairh = "/home/slash/.config/awesome/themes/custom/layouts/fairhw.png"
+theme.layout_fairv = "/home/slash/.config/awesome/themes/custom/layouts/fairvw.png"
+theme.layout_floating = "/home/slash/.config/awesome/themes/custom/layouts/floatingw.png"
+theme.layout_magnifier = "/home/slash/.config/awesome/themes/custom/layouts/magnifierw.png"
+theme.layout_max = "/home/slash/.config/awesome/themes/custom/layouts/maxw.png"
+theme.layout_fullscreen = "/home/slash/.config/awesome/themes/custom/layouts/fullscreenw.png"
+theme.layout_tilebottom = "/home/slash/.config/awesome/themes/custom/layouts/tilebottomw.png"
+theme.layout_tileleft = "/home/slash/.config/awesome/themes/custom/layouts/tileleftw.png"
+theme.layout_tile = "/home/slash/.config/awesome/themes/custom/layouts/tilew.png"
+theme.layout_tiletop = "/home/slash/.config/awesome/themes/custom/layouts/tiletopw.png"
+theme.layout_spiral = "/home/slash/.config/awesome/themes/custom/layouts/spiralw.png"
+theme.layout_dwindle = "/home/slash/.config/awesome/themes/custom/layouts/dwindlew.png"
+
+theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
+
+return theme
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
--
cgit v1.2.3-54-g00ecf
From ab024745fa51b03e3cc4fff01d0c0e6203174f3a Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 15 Sep 2012 02:04:23 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 2 --
1 file changed, 2 deletions(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 47de684..0cc96ae 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -157,8 +157,6 @@ layouts =
awful.layout.suit.tile.top,
awful.layout.suit.fair,
awful.layout.suit.fair.horizontal,
- awful.layout.suit.spiral,
- awful.layout.suit.spiral.dwindle,
awful.layout.suit.max,
awful.layout.suit.max.fullscreen,
awful.layout.suit.magnifier,
--
cgit v1.2.3-54-g00ecf
From 1391c88fe889d8c92cddaf1f1d3a5983ffb81f33 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 15 Sep 2012 02:04:55 +0200
Subject: .emacs.d/init.el
---
.emacs.d/init.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index fd03cd2..983d384 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -497,7 +497,7 @@ When dealing with braces, add another line and indent that too."
(c-set-offset 'arglist-intro '+)
(c-set-offset 'arglist-close '0)
(rainbow-delimiters-mode)
- (setq fci-rule-column 81))
+ (setq fci-rule-column 80))
(defun oni:prog-mode-func ()
"Function for `prog-mode-hook'."
--
cgit v1.2.3-54-g00ecf
From 96149a8546b20ab2cb6174e6ea68595d9a7923ca Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 15 Sep 2012 13:38:08 +0200
Subject: .emacs.d/init.el
---
.emacs.d/init.el | 118 +++++++++++++++++++++++++++++++------------------------
1 file changed, 66 insertions(+), 52 deletions(-)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 983d384..be1626e 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -21,18 +21,21 @@
'("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
(add-to-list 'load-path "~/.emacs.d/"))
+(require 'auto-complete-config)
+
+(autoload 'define-slime-contrib "slime")
(autoload 'gtags-mode "gtags" nil t)
(autoload 'identica-mode "identica-mode" nil t)
+(autoload 'jabber-connect "jabber" nil t)
(autoload 'mu4e "mu4e" nil t)
(autoload 'naquadah-get-colors "naquadah-theme")
(autoload 'php-mode "php-mode" nil t)
(autoload 'po-mode "po-mode" nil t)
(autoload 'pony-mode "pony-mode" nil t)
(autoload 'sawfish-mode "sawfish" nil t)
-(autoload 'xmodmap-mode "xmodmap-mode" nil t)
-(autoload 'jabber-connect "jabber" nil t)
-(autoload 'define-slime-contrib "slime")
+(autoload 'server-running-p "server")
(autoload 'slime-js-minor-mode "slime-js" nil t)
+(autoload 'xmodmap-mode "xmodmap-mode" nil t)
(load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
@@ -335,7 +338,15 @@ If COUNT has been specified indent by that much, otherwise look at
(defun oni:jabber-chat-mode-func ()
"Function for `jabber-chat-mode-hook'."
- (visual-line-mode))
+ (visual-line-mode)
+ (setq mode-line-format (append (cddr jabber-chat-header-line-format)
+ '(global-mode-string))
+ header-line-format nil))
+
+(defun oni:jabber-roster-mode-func ()
+ "Function for `jabber-roster-mode-hook'."
+ (setq mode-line-format
+ (list (propertize " %m" 'face 'mode-line-buffer-id))))
(defun oni:java-mode-func ()
"Function for `java-mode-hook'."
@@ -744,58 +755,59 @@ for easy selection."
(setq-default fci-rule-column 73)
(setq-default gac-automatically-push-p t)
(setq-default indent-tabs-mode nil)
-(setq-default mode-line-format
- (list
- '(:eval
- (if (and (buffer-modified-p) (buffer-file-name))
- (propertize "!"
- 'face 'oni:mode-line-modified
- 'help-echo "Buffer has been modified")
- " "))
-
- '(:eval (propertize "%m"
- 'face 'oni:mode-line-mode
- 'help-echo buffer-file-coding-system))
-
- ": "
-
- '(:eval (propertize "%b "
- 'face 'mode-line-buffer-id
- 'help-echo (buffer-file-name)))
-
- "("
- (propertize "%p" 'face 'oni:mode-line-buffer-position) ":"
- (propertize "%04l" 'face 'oni:mode-line-buffer-line) ","
- (propertize "%02c" 'face 'oni:mode-line-buffer-column)
- ") "
-
- "["
- '(:eval (propertize
- (if buffer-read-only
- "R"
- (if overwrite-mode "O" "I"))
- 'face 'oni:mode-line-buffer-state
- 'help-echo (concat "Buffer is "
- (if buffer-read-only
- "read-only"
- (if overwrite-mode
- "in overwrite mode"
- "in insert mode")))))
-
- "] "
-
- '(:eval
- (propertize (format-time-string "%H:%M")
- 'help-echo
- (concat (format-time-string "%c; ")
- (emacs-uptime "Uptime: %hh"))))
- " --"
- '(:eval global-mode-string)))
+;; (setq-default mode-line-format
+;; (list
+;; '(:eval
+;; (if (and (buffer-modified-p) (buffer-file-name))
+;; (propertize "!"
+;; 'face 'oni:mode-line-modified
+;; 'help-echo "Buffer has been modified")
+;; " "))
+
+;; '(:eval (propertize "%m"
+;; 'face 'oni:mode-line-mode
+;; 'help-echo buffer-file-coding-system))
+
+;; ": "
+
+;; '(:eval (propertize "%b "
+;; 'face 'mode-line-buffer-id
+;; 'help-echo (buffer-file-name)))
+
+;; "("
+;; (propertize "%p" 'face 'oni:mode-line-buffer-position) ":"
+;; (propertize "%04l" 'face 'oni:mode-line-buffer-line) ","
+;; (propertize "%02c" 'face 'oni:mode-line-buffer-column)
+;; ") "
+
+;; "["
+;; '(:eval (propertize
+;; (if buffer-read-only
+;; "R"
+;; (if overwrite-mode "O" "I"))
+;; 'face 'oni:mode-line-buffer-state
+;; 'help-echo (concat "Buffer is "
+;; (if buffer-read-only
+;; "read-only"
+;; (if overwrite-mode
+;; "in overwrite mode"
+;; "in insert mode")))))
+
+;; "] "
+
+;; '(:eval
+;; (propertize (format-time-string "%H:%M")
+;; 'help-echo
+;; (concat (format-time-string "%c; ")
+;; (emacs-uptime "Uptime: %hh"))))
+;; " --"
+;; '(:eval global-mode-string)))
(setq-default php-mode-warn-if-mumamo-off nil)
(setq-default require-final-newline t)
(setq-default tab-width 4)
(setq-default truncate-lines t)
+(setq ac-use-quick-help nil)
(setq appt-display-diary nil)
(setq auto-mode-case-fold nil)
(setq auto-save-file-name-transforms
@@ -1038,7 +1050,8 @@ for easy selection."
(if (daemonp)
(global-set-key "\C-x\C-c" 'oni:close-client-window)
- (server-start))
+ (unless (server-running-p)
+ (server-start)))
(when (or window-system (daemonp))
(global-unset-key "\C-z"))
@@ -1082,6 +1095,7 @@ for easy selection."
(smex-initialize)
(help-at-pt-set-timer)
+(ac-config-default)
(load-theme 'naquadah t)
--
cgit v1.2.3-54-g00ecf
From 1c3aacb1400d2d1e6ec3318716e02c38432cee59 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 15 Sep 2012 13:38:27 +0200
Subject: .Xdefaults
---
.Xdefaults | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 75 insertions(+)
create mode 100644 .Xdefaults
diff --git a/.Xdefaults b/.Xdefaults
new file mode 100644
index 0000000..3b8c604
--- /dev/null
+++ b/.Xdefaults
@@ -0,0 +1,75 @@
+
+urxvt.internalBorder: 0
+
+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
+
+urxvt.perl-lib: /usr/lib/urxvt/perl/
+urxvt.perl-ext-common: default,matcher,searchable-scrollback
+urxvt.urlLauncher: firefox
+urxvt.matcher.button: 1
+
+urxvt.font: xft:osaka_unicode:weight=medium:pixelsize=18
+urxvt.boldFont: xft:osaka_unicode:weight=black:pixelsize=18
+urxvt.italicFont: xft:osaka_unicode:slant=italic:pixelsize=18
+! urxvt.transparent: true
+
+urxvt.background: #252a2b
+urxvt.foreground: #eeeeec
+
+urxvt.color0: #0c191c
+urxvt.color8: #2e3436
+
+urxvt.color1: #a40000
+urxvt.color9: #ef2929
+
+urxvt.color2: #4e9a06
+urxvt.color10: #8ae234
+
+urxvt.color3: #c4a000
+urxvt.color11: #fce94f
+
+urxvt.color4: #204a87
+urxvt.color12: #729fcf
+
+urxvt.color5: #5c3566
+urxvt.color13: #ad7fa8
+
+urxvt.color6: #9f5902
+urxvt.color14: #e9b96e
+
+urxvt.color7: #babdb6
+urxvt.color15: #d3d7cf
+
+Xft.antialias: true
+Xft.rgba: rgb
+Xft.hinting: true
+Xft.hintstyle: hintslight
+
+Emacs.font: DejaVu Sans Mono:weight=medium:pixelsize=18
+Emacs.menuBar: off
+Emacs.toolbar: off
+Emacs.useXIM: off
+Emacs.background: #252a2b
+
+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\
+}
--
cgit v1.2.3-54-g00ecf
From bbc17210a1d3b0c69c36207891d9fb18fd8759f9 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 15 Sep 2012 14:28:45 +0200
Subject: .config/awesome/rc.lua
---
.config/awesome/rc.lua | 44 +++++++++++++++++++++++++++++++++++++-------
1 file changed, 37 insertions(+), 7 deletions(-)
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 0cc96ae..e3d4548 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -62,6 +62,22 @@ function oni.mailcount_text()
oni.mailcount("ninthfloor"))
end
+function oni.mailcount_widgets(label, account, name)
+ widgets = {}
+ widgets.label = widget({ type = "textbox" })
+ widgets.label.text = string.format(" %s: ", label)
+ widgets.count = widget({ type = "textbox" })
+ widgets.count.text = string.format(" %d ", oni.mailcount(account))
+ widgets.count.bg = beautiful.bg_focus
+ widgets.count:buttons(
+ awful.util.table.join(
+ awful.button({ }, 1,
+ function (c)
+ awful.util.spawn("emacsclient -e '(oni:view-mail \"" .. name .. "\")'")
+ end)))
+
+ return widgets
+end
-- Returns true if all pairs in table1 are present in table2
function oni.match(table1, table2)
@@ -199,13 +215,20 @@ mytextclock = awful.widget.textclock({ align = "right" })
mysystray = widget({ type = "systray" })
-- Create a mailbox widget
-mymailbox = widget({ type = "textbox" })
-mymailbox.text = oni.mailcount_text()
+myryumailbox = oni.mailcount_widgets("ryu", "ryuslash.org", "ryuslash")
+myaethonmailbox = oni.mailcount_widgets("aet", "aethon", "aethon")
+mygmailmailbox = oni.mailcount_widgets("gmail", "gmail", "gmail")
+my9fmailbox = oni.mailcount_widgets("9f", "ninthfloor", "ninthfloor")
+
mymailboxtimer = timer({ timeout = 60 })
-mymailboxtimer:add_signal("timeout",
- function ()
- mymailbox.text = oni.mailcount_text()
- end)
+mymailboxtimer:add_signal(
+ "timeout",
+ function ()
+ myryumailbox.count.text = string.format(" %d ", oni.mailcount("ryuslash.org"))
+ myaethonmailbox.count.text = string.format(" %d ", oni.mailcount("aethon"))
+ mygmailmailbox.count.text = string.format(" %d ", oni.mailcount("gmail"))
+ my9fmailbox.count.text = string.format(" %d ", oni.mailcount("ninthfloor"))
+ end)
mymailboxtimer:start()
-- Create a wibox for each screen and add it
@@ -285,7 +308,14 @@ for s = 1, screen.count() do
mylayoutbox[s],
mytextclock,
s == 1 and mysystray or nil,
- s == 1 and mymailbox or nil,
+ s == 1 and my9fmailbox.count or nil,
+ s == 1 and my9fmailbox.label or nil,
+ s == 1 and mygmailmailbox.count or nil,
+ s == 1 and mygmailmailbox.label or nil,
+ s == 1 and myaethonmailbox.count or nil,
+ s == 1 and myaethonmailbox.label or nil,
+ s == 1 and myryumailbox.count or nil,
+ s == 1 and myryumailbox.label or nil,
mytasklist[s],
layout = awful.widget.layout.horizontal.rightleft
}
--
cgit v1.2.3-54-g00ecf