From cffd3418e966f62915d87a1b50e3c470a0a03f83 Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Sun, 2 Jun 2013 20:38:35 +0200
Subject: [PATCH] Little things

---
 vimrc   |  4 ++--
 xinitrc | 27 ++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/vimrc b/vimrc
index 5f15bd5..3898540 100644
--- a/vimrc
+++ b/vimrc
@@ -23,8 +23,8 @@ set foldmethod=marker
 
 "set cul "souligner la ligne actuelle
 
-"color desert
-colorscheme wombat256modv1
+color desert
+"colorscheme wombat256modv1
 "color darkblue
 set cursorline
 hi CursorLine term=bold cterm=bold guibg=Grey40
diff --git a/xinitrc b/xinitrc
index cbb2ae2..05ad071 100644
--- a/xinitrc
+++ b/xinitrc
@@ -11,12 +11,33 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
-#exec gnome-session
+#DWM
+
+#First, choose the wallpaper (important, isn't it ? :p)
+wallpaper_path=/home/frank/Pictures/wallpapers/
+image=$(ls $wallpaper_path | grep -E '(jpg|png)$' | sort -R | tail -1)
+feh --bg-scale $wallpaper_path/$image &
+
+
+
 while true; do
-	xsetroot -name "$( date +"%F %R" )"
-	sleep 1m    # Update time every minute
+	DATE=`date +"%F, %H:%M:%S - %s"`
+	BATT=$( acpi -b | sed 's/.*[charg.|], \([0-9]*\)%.*/\1/gi' )
+#	STATUS=$( acpi -b | sed 's/.*: \([a-zA-Z]*\),.*/\1/gi' )
+
+
+	xsetroot -name "$MEM :: $BATT :: $DATE"
+	sleep 2
 done &
+
+
+
 exec /home/frank/Programmation/dwm/dwm
+
+
+
+
+#exec gnome-session
 # exec startkde
 # exec startxfce4
 # ...or the Window Manager of your choice