From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 9 Sep 2019 12:37:31 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=37a88a14fd119cb8ef43b2f421c268aef436e5f4;hp=b0f816d157b400b7b3a7b93a7ce71f57b483d7a5;p=dotfiles.git

Merge branch 'master' of github.com:dopefishh/dotfiles
---

diff --git a/cal/.config/khal/config b/cal/.config/khal/config
index de980a5..eac76d6 100644
--- a/cal/.config/khal/config
+++ b/cal/.config/khal/config
@@ -25,10 +25,10 @@ path = ~/.local/share/khal/khal.db
 
 [locale]
 timeformat = %H:%M
-dateformat = %d.%m.
-longdateformat = %d.%m.%Y
-datetimeformat =  %d.%m. %H:%M
-longdatetimeformat = %d.%m.%Y %H:%M
+dateformat = %m-%d-
+longdateformat = %Y-%m-%d
+datetimeformat =  %m-%d- %H:%M
+longdatetimeformat = %Y-%m-%d %H:%M
 
 firstweekday = 0
 
diff --git a/clean/.local/bin/install_clean.sh b/clean/.local/bin/install_clean.sh
index 7b4617e..59d5e9f 100755
--- a/clean/.local/bin/install_clean.sh
+++ b/clean/.local/bin/install_clean.sh
@@ -3,19 +3,20 @@ set -e
 
 DISTRO="https://ftp.cs.ru.nl/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz"
 TAGS="https://gitlab.science.ru.nl/cloogle/cloogle-tags/-/jobs/artifacts/master/raw/cloogletags?job=build"
-CLM="https://gitlab.science.ru.nl/mlubbers/clm/builds/artifacts/master/raw/clm?job=compile"
-CLM1="https://gitlab.science.ru.nl/mlubbers/clm/builds/artifacts/master/raw/clm.1?job=compile"
+CLMMAN="https://gitlab.science.ru.nl/clean-and-itasks/clm/raw/master/clm.1"
+CP2CG="https://gitlab.science.ru.nl/clean-and-itasks/cleanprof2callgrind/-/jobs/artifacts/master/raw/cleanprof2callgrind?job=test"
 CLEAN_HOME="${CLEAN_HOME:-/opt/clean}"
 
 echo "Cleaning up the old distro"
 rm -rf "$CLEAN_HOME"/*
 echo "Downloading clean"
 curl -sSL "$DISTRO" | tar -C "$CLEAN_HOME" --strip-components=1 -xz
-echo "Replacing clm"
-curl -sSLo "$CLEAN_HOME/bin/clm" "$CLM"
 echo "Installing manpages"
 mkdir -p ~/.local/man/man1
-curl -sSLo ~/.local/man/man1/clm.1 "$CLM1"
+curl -sSLo ~/.local/man/man1/clm.1 "$CLMMAN"
+echo "Downloading cleanprof2callgrind"
+curl -sSLo "$CLEAN_HOME/bin/cleanprof2callgrind" "$CP2CG"
+chmod +x "$CLEAN_HOME"/bin/cleanprof2callgrind
 echo "Downloading cloogletags"
 curl -sSLo "$CLEAN_HOME"/bin/cloogletags "$TAGS"
 chmod +x "$CLEAN_HOME"/bin/cloogletags
diff --git a/newsboat/.config/newsboat/urls b/newsboat/.config/newsboat/urls
index 90b2222..4460b74 100644
--- a/newsboat/.config/newsboat/urls
+++ b/newsboat/.config/newsboat/urls
@@ -25,3 +25,4 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCnCE0-pPZuit8aud1l9rhkA yt
 https://www.youtube.com/feeds/videos.xml?channel_id=UCb45YJUy9zAzhPaduyMM-_w yt "Janet Devlin"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCxDZs_ltFFvn0FDHT6kmoXA yt "Bald and bankrupt"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCxzC4EngIsMrPmbm6Nxvb-A yt "Scott Manley
+https://www.youtube.com/feeds/videos.xml?channel_id=UC8vR6VP-3o_SpdnEBrpYGiQ yt "AuthenticSound"
diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index 2d9e2a3..ae346fb 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -19,3 +19,5 @@ typeclass
 arity
 nullary
 arities
+microcontrollers
+unary