From 9e7b00648f7dfa58020cba285af403c229e0ccfa Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Sat, 22 Feb 2014 00:29:03 +0900
Subject: [PATCH] add conf/user-dirs.dirs

---
 conf/user-dirs.dirs | 17 +++++++++++++++++
 xinitrc             | 10 +---------
 2 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 conf/user-dirs.dirs

diff --git a/conf/user-dirs.dirs b/conf/user-dirs.dirs
new file mode 100644
index 0000000..5834357
--- /dev/null
+++ b/conf/user-dirs.dirs
@@ -0,0 +1,17 @@
+# ln -s <this_file> ~/.config/
+
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+
+XDG_DESKTOP_DIR="$HOME/"
+XDG_DOWNLOAD_DIR="$HOME/"
+XDG_TEMPLATES_DIR="$HOME/"
+XDG_PUBLICSHARE_DIR="$HOME/"
+XDG_DOCUMENTS_DIR="$HOME/"
+XDG_MUSIC_DIR="$HOME/"
+XDG_PICTURES_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME/"
diff --git a/xinitrc b/xinitrc
index 2367b4b..afddd4a 100755
--- a/xinitrc
+++ b/xinitrc
@@ -38,20 +38,12 @@ xset dpms 1810 1820 1830
 unset LC_MESSAGES
 export LANG=ja_JP.utf8
 export BROWSER=firefox
-export DMENU_FONT='-*-dejavu sans mono-*-r-*-*-11-*-*-*-*-*-*-*'
+#export DMENU_FONT='-*-dejavu sans mono-*-r-*-*-11-*-*-*-*-*-*-*'
 
 __upper(){
     echo $1 | tr '[:lower:]' '[:upper:]'
 }
 
-XDG_DIRS=$HOME/.xdg-dirs
-
-for f in Desktop Download Templates Publicshare Documents Music Pictures Videos
-do
-    export XDG_`__upper $f`_DIR=$XDG_DIRS/$f
-    mkdir -p $XDG_DIRS/$f
-done
-
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
   for f in /etc/X11/xinit/xinitrc.d/*; do
     [ -x "$f" ] && . "$f"