From 7e7fa989f775e842dd31512f797a900b85b7c5b5 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Wed, 22 May 2013 17:35:54 +0200
Subject: [PATCH] Homeinit: smarter conditions. Emacs: backward compatibility
 with Emacs 23. Mutt: fixed regex incompatibility on some build of mutt.
 Xresource: set URxvt plugin folder.

---
 .Xresources       |  3 +++
 .emacs.d/main.el  |  3 ++-
 .emacs.d/theme.el |  6 +++--
 .gitconfig        |  4 +--
 .muttrc           |  4 +--
 .scripts/homeinit | 68 +++++++++++++++++++++++++++++------------------
 .shell.d/main_rc  |  1 +
 7 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/.Xresources b/.Xresources
index 28dd806f..7ad4361b 100644
--- a/.Xresources
+++ b/.Xresources
@@ -12,6 +12,9 @@
 !! url-select, clipboard and keyboard-select are provided in Muennich s perl
 !! plugins.
 
+!! Plucin dir.
+URxvt.perl-lib: .config/urxvt/
+
 ! URxvt*modifier: alt
 URxvt.iso14755: False
 URxvt*saveLines: 5000
diff --git a/.emacs.d/main.el b/.emacs.d/main.el
index 23608bbb..c151b156 100644
--- a/.emacs.d/main.el
+++ b/.emacs.d/main.el
@@ -144,7 +144,8 @@
 (setq semantic-complete-inline-analyzer-displayor-class 'semantic-displayor-ghost)
 
 ;; Electric Pairs to auto-complete () [] {} "" etc. You can use it on regions.
-(electric-pair-mode 1)
+(if (string-match "^24.*" emacs-version )
+    (electric-pair-mode 1))
 
 ;; Run ranger asynchronously.
 (define-key my-keys-minor-mode-map (kbd "C-x D")
diff --git a/.emacs.d/theme.el b/.emacs.d/theme.el
index d7eed051..0eb7ee99 100644
--- a/.emacs.d/theme.el
+++ b/.emacs.d/theme.el
@@ -10,12 +10,14 @@
 (set-face-underline-p 'link                        t)
 (set-face-foreground  'minibuffer-prompt           "brightcyan" )
 (set-face-background  'region                      "color-235")
-(set-face-foreground  'error                       "red")
-(set-face-bold-p      'error                       t)
 (set-face-background  'shadow                      "color-234" ) ;; For line numbers.
 (set-face-background  'isearch                     "color-17" )
 (set-face-foreground  'isearch                     nil )
 (set-face-background  'isearch-lazy-highlight-face "color-237" )
+(if (string-match "^24.*" emacs-version )
+    (progn 
+      (set-face-foreground  'error                       "red")
+      (set-face-bold-p      'error                       t)))
 
 ;; Programming
 (set-face-foreground  'font-lock-builtin-face           "color-75" )
diff --git a/.gitconfig b/.gitconfig
index 4efbdda4..31bca9d0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,8 +14,8 @@
 	m = mergetool
 	r = remote -v
 	s = status -uno
-[push]
-	default = simple
+# [push]
+# 	default = simple
 
 ## Ediff merge tool.
 ## See:
diff --git a/.muttrc b/.muttrc
index 874b92c8..4499c8c4 100644
--- a/.muttrc
+++ b/.muttrc
@@ -207,8 +207,8 @@ set user_agent = yes
 ## See 'man 3 strftime' and 'man 3 printf'.
 # set index_format="%?M?_%M_ ?%Z %2C %.13d (%-68.68F) %-68.68s %?M?_%M_&(%c/%l?"
 set date_format="%y-%m-%d %T"
-folder-hook *[sS]ent* 'set index_format="%2C | %Z [%d] %-30.30t (%-4.4c) %s"'
-folder-hook ! *[sS]ent* 'set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s"'
+folder-hook .*[sS]ent.* 'set index_format="%2C | %Z [%d] %-30.30t (%-4.4c) %s"'
+folder-hook ! .*[sS]ent.* 'set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s"'
 
 ## Colors
 source "~/.mutt.d/colorset.sh|"
diff --git a/.scripts/homeinit b/.scripts/homeinit
index e4758c72..1caae93e 100755
--- a/.scripts/homeinit
+++ b/.scripts/homeinit
@@ -9,7 +9,9 @@ SOURCEDIR="${HOME}/personal/dataperso"
 [ -z "$XDG_DATA_DIRS" ] && XDG_DATA_DIRS="/usr/local/share"
 
 ## Temp folder
+echo "==> 'temp' folder"
 mkdir -p temp
+echo
 
 ## Emacsclient launcher. Required for best emacsclient integration.  For a fully
 ## functional daemon, you should write a file like this and set 'EDITOR=em'.
@@ -20,22 +22,32 @@ emacsclient -a \"\" -t \"\$@\"' > '/usr/local/bin/em'; chmod 755 /usr/local/bin/
     echo
 fi
 
-echo "==> Abook"
-[ -d "$SOURCEDIR" ] && ln -snf "$(realpath ${SOURCEDIR}/contacts)" "${HOME}/.abook"
-echo
+if [ -d "$SOURCEDIR" ]; then
+    echo "==> Abook"
+    # [ -d "$SOURCEDIR" ] && ln -snf "$(realpath ${SOURCEDIR}/contacts)" "${HOME}/.abook"
+    ln -snf "${SOURCEDIR}/contacts" "${HOME}/.abook"
+    echo
+fi
 
-echo "==> Mutt"
-[ -d "$SOURCEDIR" ] && ln -snf "$(realpath ${SOURCEDIR}/mails)" "${HOME}/.mutt"
-mkdir -p "${HOME}/.cache/mutt/hcache"
-echo
+if [ -n "$(command -v mutt)" ]; then
+    echo "==> Mutt"
+    # [ -d "$SOURCEDIR" ] && ln -snf "$(realpath ${SOURCEDIR}/mails)" "${HOME}/.mutt"
+    [ -d "$SOURCEDIR" ] && ln -snf "${SOURCEDIR}/mails" "${HOME}/.mutt"
+    mkdir -p "${HOME}/.cache/mutt/hcache"
+    echo
+fi
 
-echo "==> To-Do"
-[ -d "$SOURCEDIR" ] && ln -snf "${SOURCEDIR}/todo/todo.org" "${HOME}/todo.org"
-echo
+if [ -d "$SOURCEDIR" ]; then
+    echo "==> To-Do"
+    ln -snf "${SOURCEDIR}/todo/todo.org" "${HOME}/todo.org"
+    echo
+fi
 
-echo "==> rtorrent"
-[ -n "$(command -v rtorrent)" ] && mkdir -p "${HOME}/.session"
-echo
+if [ -n "$(command -v rtorrent)" ]; then
+    echo "==> rtorrent"
+    mkdir -p "${HOME}/.session"
+    echo
+fi
 
 ## Luakit -- Install the adblock modules
 if [ -n "$(command -v luakit)" ]; then
@@ -63,18 +75,20 @@ if [ -n "$(command -v dwb)" ]; then
 fi
 
 ## Bookmarks
-echo "==> Bookmarks"
-if [ -z "$BROWSER" ]; then
-    echo "Variable BROWSER is not set."
-else
-    BROWSER_DATA_DIR="$XDG_DATA_HOME/$BROWSER/"
-    if [ "$BROWSER" = "dwb" ]; then
-        BROWSER_DATA_DIR="$XDG_CONFIG_HOME/$BROWSER/default/"
+if [ -d "$SOURCEDIR" ]; then
+    echo "==> Bookmarks"
+    if [ -z "$BROWSER" ]; then
+        echo "Variable BROWSER is not set."
+    else
+        BROWSER_DATA_DIR="$XDG_DATA_HOME/$BROWSER/"
+        if [ "$BROWSER" = "dwb" ]; then
+            BROWSER_DATA_DIR="$XDG_CONFIG_HOME/$BROWSER/default/"
+        fi
+        [ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/bookmarks/bookmarks" "$BROWSER_DATA_DIR"
+        [ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/bookmarks/quickmarks" "$BROWSER_DATA_DIR"
     fi
-    [ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/bookmarks/bookmarks" "$BROWSER_DATA_DIR"
-    [ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/bookmarks/quickmarks" "$BROWSER_DATA_DIR"
+    echo
 fi
-echo
 
 ## News
 if [ -n "$(command -v newsbeuter)" ]; then
@@ -86,6 +100,8 @@ if [ -n "$(command -v newsbeuter)" ]; then
 fi
 
 ## Launchers
-echo "==> Launchers"
-[ -d "$SOURCEDIR" ] && ln -snf "${SOURCEDIR}/launchers" "${HOME}/.launchers"
-echo
+if [ -d "$SOURCEDIR" ]; then
+    echo "==> Launchers"
+    ln -snf "${SOURCEDIR}/launchers" "${HOME}/.launchers"
+    echo
+fi
\ No newline at end of file
diff --git a/.shell.d/main_rc b/.shell.d/main_rc
index b2f1b2dc..fb3c3ed6 100644
--- a/.shell.d/main_rc
+++ b/.shell.d/main_rc
@@ -95,6 +95,7 @@ fi
 export EDITOR
 
 ## Internet Browser
+[ -n "$(command -v luakit)" ] && export BROWSER="luakit"
 [ -n "$(command -v dwb)" ] && export BROWSER="dwb"
 
 ## Title