From: Olivier Tétard <olivier.tetard@miskin.fr>
Date: Sat, 11 Feb 2012 11:45:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://miskin.fr/home/toutoune25/scm/git/dotfiles2
X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;h=b4a16b96a6a812d151a37c9e4fdd9659e175fef9;hp=ec2b4d82916cca5a8ae30e2a4745cbdbe5b48198;p=dotfiles2.git

Merge branch 'master' of ssh://miskin.fr/home/toutoune25/scm/git/dotfiles2
---

diff --git a/.gitignore b/.gitignore
index b25c15b..6302bc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *~
+*.elc
diff --git a/emacs.el b/emacs.el
index c70ec79..89fff19 100644
--- a/emacs.el
+++ b/emacs.el
@@ -167,6 +167,7 @@ The function is not passed any arguments. The function honours restrictions."
 	    (let ((n twittering-new-tweets-count))
 	      (start-process "twittering-notify" nil "notify-send"
 			     "-i" "/usr/share/pixmaps/gnome-emacs.png"
+			     "--hint=int:transient:1"
 			     "New tweets"
 			     (format "You have %d new tweet%s"
 				     n (if (> n 1) "s" ""))))))
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..f4d2cfb
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,9 @@
+[giggle]
+	main-window-maximized = false
+	main-window-geometry = 1230x854+183+25
+	history-view-vpane-position = 539
+	file-view-vpane-position = 766
+	main-window-view = HistoryView
+[user]
+	name = Olivier Tétard
+	email = olivier.tetard@miskin.fr
diff --git a/zshenv b/zshenv
index 565a70f..2799ae5 100644
--- a/zshenv
+++ b/zshenv
@@ -3,9 +3,9 @@
 # Formation Debian GNU/Linux par Alexis de Lattre
 # http://www.via.ecp.fr/~alexis/formation-linux/
 
-export PATH="/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:$HOME/apps/bin/:."
+export PATH="/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:$HOME/.local/bin/:$HOME/apps/bin/:."
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export PYTHONPATH=$PYTHONPATH:$HOME/apps/lib/python:$HOME/apps/lib/python2.6/site-packages
+export PYTHONPATH=$PYTHONPATH:$HOME/apps/lib/python:$HOME/apps/lib/python2.6/site-packages:$HOME/.local/lib/python2.7/site-packages
 
 export VISUAL="emacsclient"
 export EDITOR="emacsclient"