diff --git a/.config/fish/config.fish b/.config/fish/config.fish
deleted file mode 100755
index 247daad..0000000
--- a/.config/fish/config.fish
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /usr/bin/fish
-
-function fish_prompt -d "Write out the prompt"
-    set last_status $status
-    set current_directory (prompt_pwd)
-    set git_branch (git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
-    set pac_cnt (cat /var/cache/pacman/updates.cnt)
-    set aur_cnt (cat /var/cache/pacman/aur.cnt)
-    set cnormal (set_color white)
-
-    echo -n $cnormal
-
-    if test $pac_cnt -gt 0 -o $aur_cnt -gt 0
-        printf '%s%d%s/%s%d%s:' (set_color cyan) $pac_cnt $cnormal (set_color cyan) $aur_cnt $cnormal
-    end
-
-    printf '%s%s%s' (set_color magenta) (hostname|cut -d . -f 1) $cnormal
-
-    if test -n "$current_directory"
-        printf ':%s%s%s' (set_color $fish_color_cwd) $current_directory $cnormal
-    end
-
-    if test -n "$git_branch"
-        printf '@%s%s%s' (set_color yellow) $git_branch $cnormal
-    end
-
-    if test $last_status -eq 0
-        printf '%s%s' (set_color --bold green)
-    else
-        printf '%s%s' (set_color --bold red)
-    end
-
-    printf '>%s ' (set_color normal)
-end
-
-function cower
-    /usr/bin/cower --color=always --target=$HOME/var/aur $argv
-end
-
-function grep
-    /bin/grep --color=always $argv
-end
-
-function less
-    /bin/less -FXRS $argv
-end
-
-function ls
-    /bin/ls -F --color=always $argv
-end
-
-function mysql
-    /usr/bin/mysql --pager $argv
-end
-
-function slrn
-    set -x NNTPSERVER 'news.gmane.org'
-    /usr/bin/slrn $argv
-end
-
-function shutdown
-    dbus-send --system --print-reply \
-        --dest="org.freedesktop.ConsoleKit" \
-        /org/freedesktop/ConsoleKit/Manager \
-        org.freedesktop.ConsoleKit.Manager.Stop
-end
-
-function reboot
-    dbus-send --system --print-reply \
-        --dest="org.freedesktop.ConsoleKit" \
-        /org/freedesktop/ConsoleKit/Manager \
-        org.freedesktop.ConsoleKit.Manager.Restart
-end
-
-function engage
-    play -n -c1 synth whitenoise band -n 100 20 band -n 50 20 gain +25 fade h 1 864000 1
-end
-
-function lscompmod -d "List kernel modules used by hardware"
-    lspci -mvk | awk '/^Module/ {print $2}' | sort -u
-end
-
-set -x PAGER 'less -FXRS'
-set -x BROWSER firefox
-set -x EDITOR 'emacs -nw'
diff --git a/.config/htop/htoprc b/.config/htop/htoprc
deleted file mode 100644
index 7b72477..0000000
--- a/.config/htop/htoprc
+++ /dev/null
@@ -1,23 +0,0 @@
-# Beware! This file is rewritten by htop when settings are changed in the interface.
-# The parser is also very primitive, and not human-friendly.
-fields=38 0 48 17 18 38 39 40 2 46 47 49 1 
-sort_key=47
-sort_direction=1
-hide_threads=0
-hide_kernel_threads=1
-hide_userland_threads=0
-shadow_other_users=1
-show_thread_names=0
-highlight_base_name=1
-highlight_megabytes=1
-highlight_threads=1
-tree_view=1
-header_margin=1
-detailed_cpu_time=0
-cpu_count_from_zero=0
-color_scheme=0
-delay=15
-left_meters=AllCPUs Memory Swap 
-left_meter_modes=1 1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2 
diff --git a/.xinitrc b/.xinitrc
deleted file mode 100644
index 73bb22f..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1,20 +0,0 @@
-xmodmap ~/.Xmodmap
-
-xsetroot -solid "#000000"
-numlockx &
-emacs --daemon &
-
-pidof mpdscribble >& /dev/null
-if [ $? -ne 0 ]
-then
-    mpdscribble &
-fi
-
-wm=$1
-test -n "$wm" || wm=herbstluftwm
-
-exec ck-launch-session $wm
-# Local Variables:
-# mode: shell-script
-# eval: (git-auto-commit-mode 1)
-# End: