diff --git a/Utils/octopus.sh b/Utils/octopus.sh index 64a5c6e..a1c9363 100755 --- a/Utils/octopus.sh +++ b/Utils/octopus.sh @@ -58,8 +58,9 @@ case $1 in MEMFREE=`awk '/MemFree/ {printf( "%.0f", $2 / 1024 )}' /proc/meminfo` MEMCACHED=`awk '/Cached/ {printf( "%.0f", $2 / 10240 )}' /proc/meminfo` MEMFT=`echo "$MEMFREE + $MEMCACHED" | bc` + BEAT_TIME=`beat -v` - xsetroot -name "Vol $VOLUME :: $MEMFT Mb Free :: Bat $BATT_PCT $BATT_TIME :: $DATE" + xsetroot -name "Vol $VOLUME :: $MEMFT Mb Free :: Bat $BATT_PCT $BATT_TIME :: $DATE (@$BEAT_TIME)" ;; "wallpaper") diff --git a/bashrc b/bashrc index 5afd78f..b697519 100644 --- a/bashrc +++ b/bashrc @@ -49,7 +49,7 @@ else MY_HOST_COL='[34m' fi -PS1='\[\e[0;36m\]\T \[\e[1;30m\][\[\e$MY_HOST_COL\]\u@\H\[\e[1;30m\]\[\e[0;32m\]\[\e[1;30m\]] \[\e[1;37m\]\w\[\e[0;37m\] \n$ ' +PS1='\[\e[0;36m\]\t \[\e[1;30m\][\[\e$MY_HOST_COL\]\u@\H\[\e[1;30m\]\[\e[0;32m\]\[\e[1;30m\]] \[\e[1;37m\]\w\[\e[0;37m\] \n$ ' #PS1='\[\e[0;36m\] \T \[\e[1;30m\][\[\e$MY_HOST_COL\]\u@\H\[\e[1;30m\]\[\e[0;32m\]\[\e[1;30m\]] \[\e[1;37m\]\w\[\e[0;37m\] \n$ ' diff --git a/mutt/muttrc b/mutt/muttrc index 582077a..38fd773 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -3,7 +3,7 @@ ############################ ##### ATTENTION - /!\ ###### # Fichier sur git, # -# Accessible publiquement # +# Accessible publijuement # # Ne pas mettre de mdp en # # clair ! # ############################ @@ -61,7 +61,7 @@ ignore "DKIM-Signature:" hdr_order Date From To Cc alternative_order text/plain text/html * auto_view text/html -bind editor complete-query +#bind editor complete-query bind editor ^T complete bind editor noop @@ -79,3 +79,22 @@ set tmpdir=/dev/shm/ source ~/.mutt/colors.test1 source ~/.mutt/crypto + + +# LISTE DE CONTACTS + +#Alias +set alias_file=~/.mutt/alias +set sort_alias = alias +set reverse_alias = yes +source $alias_file + +#ou abook XOR +#set query_command= "abook --mutt-query '%s'" +#macro index,pager a "abook --add-email-quiet" "Add this sender to Abook" +#bind editor complete-query + +set date_format="%y-%m-%d %T" +set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s" + +set sleep_time=0 diff --git a/vim/spell/fr.utf-8.add b/vim/spell/fr.utf-8.add index 4eb37ee..80dc47e 100644 --- a/vim/spell/fr.utf-8.add +++ b/vim/spell/fr.utf-8.add @@ -4,3 +4,5 @@ dixon PGP F36914A Enercoop +exams +proba diff --git a/vim/spell/fr.utf-8.add.spl b/vim/spell/fr.utf-8.add.spl index 5bc5f53..dcf33b6 100644 Binary files a/vim/spell/fr.utf-8.add.spl and b/vim/spell/fr.utf-8.add.spl differ diff --git a/vimrc b/vimrc index 91a4e20..9c9d36f 100644 --- a/vimrc +++ b/vimrc @@ -3,6 +3,9 @@ "set grepprg=grep\ -nH\ $* "let g:tex_flavor = "latex" +"execute pathogen#infect() + + syntax on "set spelllang=en,fr @@ -29,6 +32,7 @@ set foldmethod=marker color desert "colorscheme wombat256modv1 "color darkblue + set cursorline hi CursorLine term=bold cterm=bold guibg=Grey40 diff --git a/xinitrc b/xinitrc index 1e8a6e7..44f9af8 100644 --- a/xinitrc +++ b/xinitrc @@ -32,6 +32,7 @@ while true; do sleep 240 done & xautolock -time 60 -locker "systemctl suspend" & +redshift -l 46:6& ssh-agent -t 10 /home/frank/Programmation/dotfiles/dwm/dwm