From 175d9fda39a1f5c77e80025863f9e63f1f1ebdba Mon Sep 17 00:00:00 2001 From: Frank Villaro-Dixon Date: Thu, 15 Sep 2016 22:15:55 +0200 Subject: [PATCH] oauueoa --- Utils/octopus.sh | 8 +------- crap/.signature | 3 +-- vim/.vim/skeletons/skel.c | 2 +- vim/.vim/skeletons/skel.cpp | 2 +- vim/.vim/skeletons/skel.h | 2 +- vim/.vim/skeletons/skel.java | 2 +- vim/.vim/skeletons/skel.js | 2 +- vim/.vim/skeletons/skel.m | 2 +- vim/.vim/skeletons/skel.pas | 11 ----------- vim/.vim/spell/en.utf-8.add | 4 ++++ vim/.vim/vimrc | 6 ++++++ 11 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 vim/.vim/skeletons/skel.pas diff --git a/Utils/octopus.sh b/Utils/octopus.sh index c8a3145..2400cd3 100755 --- a/Utils/octopus.sh +++ b/Utils/octopus.sh @@ -89,7 +89,7 @@ case $1 in "dual") xrandr --output $LVDS --auto --rotate normal \ --output $VGA --auto --rotate normal \ - --left-of $LVDS + --right-of $LVDS ;; "CV") xrandr --output $LVDS --auto --rotate normal \ @@ -137,12 +137,6 @@ case $1 in fi ############ BTC=`BTC_stats.sh` - if [ -n `mpc | grep paused` ]; then - STAT="♫" - else - STAT="" - fi; - MEMFREE=`awk '/MemFree/ {printf( "%.0f", $2 / 1024 )}' /proc/meminfo` MEMCACHED=`awk '/Cached/ {printf( "%.0f", $2 / 10240 )}' /proc/meminfo` MEMFT=`echo "$MEMFREE + $MEMCACHED" | bc` diff --git a/crap/.signature b/crap/.signature index 3b4c7e7..dbc9a9a 100644 --- a/crap/.signature +++ b/crap/.signature @@ -1,3 +1,2 @@ -frank.villaro-dixon.eu - PGP: 6F36914A +frank.villaro-dixon.eu Envie d'électricité 100% verte ? Enercoop.fr -What is a Velomobile ? www.sans-essence.eu diff --git a/vim/.vim/skeletons/skel.c b/vim/.vim/skeletons/skel.c index 87d338f..d49e356 100644 --- a/vim/.vim/skeletons/skel.c +++ b/vim/.vim/skeletons/skel.c @@ -2,7 +2,7 @@ * @file <+FILENAME+> * @brief <+DESC+> * - * 2015 - Frank Villaro-Dixon + * <+YEAR+> - Frank Villaro-Dixon */ #include diff --git a/vim/.vim/skeletons/skel.cpp b/vim/.vim/skeletons/skel.cpp index dfcef5c..5530cfa 100644 --- a/vim/.vim/skeletons/skel.cpp +++ b/vim/.vim/skeletons/skel.cpp @@ -3,7 +3,7 @@ ** ** <+DESC+> ** -** 2014 - Frank Villaro-Dixon +** <+YEAR+> - Frank Villaro-Dixon */ #include diff --git a/vim/.vim/skeletons/skel.h b/vim/.vim/skeletons/skel.h index f35aca5..035cde4 100644 --- a/vim/.vim/skeletons/skel.h +++ b/vim/.vim/skeletons/skel.h @@ -1,7 +1,7 @@ /** * <+FILENAME+> * @brief <+DESC+> - * 2015 - Frank Villaro-Dixon + * <+YEAR+> - Frank Villaro-Dixon */ #ifndef <+HEADERNAME+> diff --git a/vim/.vim/skeletons/skel.java b/vim/.vim/skeletons/skel.java index bcc6c3b..53a8af5 100644 --- a/vim/.vim/skeletons/skel.java +++ b/vim/.vim/skeletons/skel.java @@ -3,7 +3,7 @@ ** ** <+DESC+> ** -** 2014 - Frank Villaro-Dixon +** <+YEAR+> - Frank Villaro-Dixon */ class <+CLASSNAME+> { diff --git a/vim/.vim/skeletons/skel.js b/vim/.vim/skeletons/skel.js index 4d46229..fd33ba3 100644 --- a/vim/.vim/skeletons/skel.js +++ b/vim/.vim/skeletons/skel.js @@ -1,6 +1,6 @@ /* <+FILENAME+> * <+DESCRIPTION+> - * Copyright Frank Villaro-Dixon, BSD Simplified, 2014 + * Copyright Frank Villaro-Dixon, BSD Simplified, <+YEAR+> */ diff --git a/vim/.vim/skeletons/skel.m b/vim/.vim/skeletons/skel.m index e3b0a90..3455bbc 100644 --- a/vim/.vim/skeletons/skel.m +++ b/vim/.vim/skeletons/skel.m @@ -5,7 +5,7 @@ function [<+OUTPUTS+>] = <+MFNAME+>(<+INPUTS+>) % Outputs: % <+OUTPUT1+> % -%Copyright Frank Villaro-Dixon Creative Commons BY-SA 4.0 2014 +%Copyright Frank Villaro-Dixon Creative Commons BY-SA 4.0 <+YEAR+> <+CODE+> diff --git a/vim/.vim/skeletons/skel.pas b/vim/.vim/skeletons/skel.pas deleted file mode 100644 index 35b7722..0000000 --- a/vim/.vim/skeletons/skel.pas +++ /dev/null @@ -1,11 +0,0 @@ -(** - * <+FILENAME+> - <+DESC+> - * - * (C) 2010 - Gillieron Kevin - *) - -program <+PROGNAME+>; - -begin - <+CODE+> -end. diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index 8aedad0..8c30a9e 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -95,3 +95,7 @@ Aurelia Victorinox kevlar bbox +wristpads +PV +PHES +penstock diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index a469dfb..db3e2d0 100644 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -146,11 +146,13 @@ autocmd BufNewFile * \ let hn = substitute(hn, "\\.", "_", "g") | \ let hn = substitute(hn, "/", "_", "g") | \ let mfn = substitute(fn, ".m", "", "") | + \ let year= strftime('%Y') | \ let cn = expand("%:t:r") | \ %s/<+FILENAME+>/\=fn/Ige | \ %s/<+HEADERNAME+>/\=hn/Ige | \ %s/<+CLASSNAME+>/\=cn/Ige | \ %s/<+MFNAME+>/\=mfn/Ige | + \ %s/<+YEAR+>/\=year/Ige | \ unlet fn hn cn | \ endif | \ unlet skel | @@ -173,6 +175,10 @@ autocmd BufRead,BufNewFile *.xml set ts=4 sw=4 autocmd BufRead,BufNewFile *.html set ts=4 sw=4 autocmd BufRead,BufNewFile *.md set filetype=markdown tw=80 fo+=aw + +au BufRead,BufNewFile *.utpl set filetype=html +au BufRead,BufNewFile *.utpl set syntax=underscore_template + "autocmd BufRead,BufNewFile *.m set nospell