dot

packages and services management
Log | Files | Refs | README

commit 17ab7a82091082f33866893ab85a0856c1251db6
parent 69fef782e94b46bb055e131e7b661356720fb1df
Author: Josuah Demangeon <josuah.demangeon@gandi.net>
Date:   Fri, 30 Jun 2017 06:38:43 +0200

Merge branch 'master' of http://github.com/josuah/etc

Diffstat:
Mbin/calendar-import | 2+-
Mbin/calendar-update | 4++--
Mshell/rc | 8+++-----
Mst/build | 2+-
4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bin/calendar-import b/bin/calendar-import @@ -1,4 +1,4 @@ -# store an ical one file per event +# store an ical one line per event exec awk ' diff --git a/bin/calendar-update b/bin/calendar-update @@ -1,4 +1,4 @@ # pull calendar data from various sources -wget -O- 'http://planning.univ-rennes1.fr/jsp/custom/modules/plannings/cal.jsp?data=8241fc3873200214d3ba247351a161f5bd72d825015315fe5d6496b849150f14ec7f554d6ed7ba1bbad7b9bdf5b7bdb27fbb53e06bf966cea3b3f4c7cc4cd75b8af069ff1fd12df97e86aed5fc16ce3b8edd3cda7b61e593' | -calendar-import | sed 's/ (Exp.*//' > "$CONFIG/cal/university" +wget -qO- 'http://planning.univ-rennes1.fr/jsp/custom/modules/plannings/cal.jsp?data=8241fc3873200214d3ba247351a161f5bd72d825015315fe5d6496b849150f14ec7f554d6ed7ba1bbad7b9bdf5b7bdb27fbb53e06bf966cea3b3f4c7cc4cd75b8af069ff1fd12df97e86aed5fc16ce3b8edd3cda7b61e593' | +calendar-import | sed 's/ (Exp.*//' > "$VAR/cal/university" diff --git a/shell/rc b/shell/rc @@ -1,8 +1,6 @@ -PS1=' -$( - [ "$?" = 0 ] && printf "█" || printf "\033[31;1m█\033[m" -) $(hostname) $(pwd) $(type git-status > /dev/null 2>&1 && git-status) -█ ' +PS1='$(err=$?; [ $err = 0 ] || printf " \033[31;1m%s\033[m\n " $err) +| $(hostname) $(pwd) $(type git-status > /dev/null 2>&1 && git-status) +| ' PS2='... ' PS3='... ' diff --git a/st/build b/st/build @@ -2,7 +2,7 @@ cp -f "$ETC/build/st/config.mk" config.mk find "$ETC/build/st/" -name '*.diff' | xargs patch -N -p 1 -i -sed 's/gray90/#ffeedd/; s/black/#001115/' config.def.h > config.h +sed 's/gray90/#ffffff/; s/black/#001722/; s/white/#ffffaa/' config.def.h > config.h make PREFIX="$PREFIX" install