From 6cfa665f6274256e55b75efb0eda492b141dcd9e Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Tue, 15 Oct 2013 20:59:15 +0200
Subject: [PATCH] bashrc mutt alias

---
 Utils/octopus.sh   | 10 +++++++---
 bashrc             | 12 ++++++++++++
 mutt/account.aei   |  6 +++---
 mutt/account.frank |  2 ++
 mutt/colors.test1  |  2 +-
 xinitrc            |  6 ++++--
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Utils/octopus.sh b/Utils/octopus.sh
index 637d9a7..fb11bf0 100755
--- a/Utils/octopus.sh
+++ b/Utils/octopus.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -x
 #OCTOPUS=~/Programmation/Utils/octopus.sh
 #This octopus handles all the actions like volume up, refresh status bar, etc..
 
@@ -88,7 +88,9 @@ case $1 in
 		else
 			$0 monitor extern
 		fi
-		$0 init-wifi
+
+		$0 init-wifi &
+		$0 init-ethernet &
 		$0 init-mouse
 		$0 wallpaper
 		;;
@@ -98,8 +100,10 @@ case $1 in
 		;;
 
 	"init-wifi")
-		sudo wpa_supplicant -iwlan0 -c/etc/wpa_supplicant/wpa_supplicant.conf &
+		sudo killall wpa_supplicant
+		sudo ifconfig wlan0 up &
 		sudo dhcpcd wlan0 &
+		sudo wpa_supplicant -iwlan0 -c/etc/wpa_supplicant/wpa_supplicant.conf
 		;;
 	"init-ethernet")
 		sudo ifconfig eth0 up &
diff --git a/bashrc b/bashrc
index bbb3cd8..6fe3c87 100644
--- a/bashrc
+++ b/bashrc
@@ -367,6 +367,18 @@ function xournal() {
 	fi
 }
 
+function mutt() {
+	if [ $# -eq 0 ]; then
+		if [ "$(pidof mutt)" ]; then
+			echo -e "Mutt already running !\nLaunch it with -R !"
+		else
+			/usr/bin/mutt
+		fi;
+	else
+		/usr/bin/mutt $@
+	fi;
+}
+
 # }}}
 
 SSHAGENT=/usr/bin/ssh-agent
diff --git a/mutt/account.aei b/mutt/account.aei
index 81bd7f6..66f3804 100644
--- a/mutt/account.aei
+++ b/mutt/account.aei
@@ -1,6 +1,6 @@
 set from="aei-cui@unige.ch"
-set realname="Association des Etudiants en Informatique"
-set hostname="unige.ch"
+set use_from
+set realname="Association des Étudiants en Informatique"
 
 set folder="imaps://aei@outlook.unige.ch:993/"
 #set imap_user="aei"
@@ -12,7 +12,7 @@ set signature="~/.mutt/signature.aei"
 set smtp_url="smtp://aei@outlook.unige.ch:587"
 
 my_hdr X-URL: http://aei.unige.ch
-my_hdr X-Sender: Frank
+my_hdr X-Author: Frank
 
 set smtp_pass=$my_aei_stmp_pass
 set imap_pass=$my_aei_imap_pass
diff --git a/mutt/account.frank b/mutt/account.frank
index 229c510..0e46c56 100644
--- a/mutt/account.frank
+++ b/mutt/account.frank
@@ -11,6 +11,8 @@ set signature="~/.signature"
 set smtp_url="smtp://frank_mail@villaro-dixon.eu:587"
 
 my_hdr X-URL: http://frank.villaro-dixon.eu
+my_hdr X-Message-Flag: This message violates the USA PATRIOT Act (HR 3162), section 811(c). Intercepted by CARNIVORE/3.0
+my_hdr Reply-By: Wed,  1 Apr 2000 12:00:00 -0500
 
 set smtp_pass = $my_frank_smtp_pass
 set imap_pass = $my_frank_imap_pass
diff --git a/mutt/colors.test1 b/mutt/colors.test1
index b0997b5..2f2e348 100644
--- a/mutt/colors.test1
+++ b/mutt/colors.test1
@@ -40,12 +40,12 @@ color header yellow black "^Organization:"
 color header yellow black "^Organisation:"
 color header yellow black "^User-Agent:"
 color header yellow black "^message-id: .*pine"
-color header yellow black "^X-Fnord:"
 color header yellow black "^X-WebTV-Stationery:"
 color header yellow black "^X-Message-Flag:"
 color header yellow black "^X-Spam-Status:"
 color header yellow black "^X-SpamProbe:"
 color header red black "^X-SpamProbe: SPAM"
+color header red black "^X-Author:"
 
 
 # Coloring quoted text - coloring the first 7 levels:
diff --git a/xinitrc b/xinitrc
index 3df1cbb..729f7f6 100644
--- a/xinitrc
+++ b/xinitrc
@@ -17,7 +17,6 @@ export PATH=~/.my_utils/:$PATH
 
 source ~/.bashrc
 
-$OCTOPUS init-all
 
 #Java
 wmname LG3D
@@ -30,15 +29,18 @@ setxkbmap -model pc104 -layout ch -variant fr -option compose:lwin
 #	xmodmap ~/.Xmodmap
 #fi
 
+$OCTOPUS init-all 1>&2 /dev/shm/Octopus_logs
+
 while true; do
 	$OCTOPUS refresh
 	sleep 50
 done &
 
 while true; do
-	$OCTOPUS wallpaper
 	sleep 240
+	$OCTOPUS wallpaper
 done &
+
 xautolock -time 60 -locker "systemctl suspend" &
 redshift -l 46:6&