From: Mart Lubbers <mart@martlubbers.net>
Date: Sun, 11 Aug 2019 16:31:53 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=b0f816d157b400b7b3a7b93a7ce71f57b483d7a5;hp=6cb112512b80989877d67193e3576b5e48cc8f89;p=dotfiles.git

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

diff --git a/clean/.local/bin/install_clean.sh b/clean/.local/bin/install_clean.sh
index 0bcd7f3..7b4617e 100755
--- a/clean/.local/bin/install_clean.sh
+++ b/clean/.local/bin/install_clean.sh
@@ -75,53 +75,51 @@ patch /opt/clean/lib/StdEnv/StdGeneric.icl <<EOPATCH
 EOPATCH
 
 echo "Adding the iTasks-git environment"
-patch /opt/clean/etc/IDEEnvs <<EOPATCH
---- IDEEnvs	2018-12-17 11:58:48.876039159 +0100
-+++ IDEEnvs	2018-12-17 12:00:52.384066455 +0100
-@@ -35,13 +35,44 @@
- 			Path:	{Application}/lib/StdEnv
- 			Path:	{Application}/lib/Dynamics
- 			Path:	{Application}/lib/TCPIP
-+			Path:	{Application}/lib/Gast
- 			Path:	{Application}/lib/Platform
- 			Path:	{Application}/lib/Platform/Deprecated/Generics
-+			Path:	{Application}/lib/Platform/Deprecated/ArgEnv
-+			Path:	{Application}/lib/Platform/Deprecated/MersenneTwister
+patch  /opt/clean/etc/IDEEnvs <<EOPATCH
+--- 	2019-07-24 02:47:02.000000000 +0200
++++ IDEEnvs	2019-07-24 08:22:52.713808372 +0200
+@@ -45,7 +45,42 @@
  			Path:	{Application}/lib/Platform/Deprecated/StdLib
- 			Path:	{Application}/lib/Sapl
+ 			Path:	{Application}/lib/ABCInterpreter
  			Path:	{Application}/lib/GraphCopy
- 			Path:	{Application}/lib/iTasks
--		EnvironmentCompiler:	lib/exe/cocl::-dynamics -sapl
-+		EnvironmentCompiler:	lib/exe/cocl:-h 500m -s 20m:-dynamics -sapl
-+		EnvironmentCodeGen:	lib/exe/cg
-+		EnvironmentLinker:	lib/exe/linker|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
-+		EnvironmentDynLink:	lib/exe/linker
-+		EnvironmentVersion:	920
-+		EnvironmentRedirect:	False
-+		EnvironmentCompileMethod:	Pers
-+		EnvironmentProcessor:	I386
-+		Environment64BitProcessor:	True
-+	Environment
-+		EnvironmentName:	iTasks-git
-+		EnvironmentPaths
-+			Path:	{Application}/lib/StdEnv
-+			Path:	{Application}/lib/Dynamics
-+			Path:	{Application}/lib/TCPIP
-+			Path:	{Application}/lib/Sapl
-+			Path:	{Application}/lib/GraphCopy
-+			Path:	{Application}/lib/Gast
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/Platform-x86
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Posix
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Linux
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Linux-64
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/Generics
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/StdLib
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/ArgEnv
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/MersenneTwister
-+			Path:	/home/mrl/projects/clean/iTasks-SDK/Libraries
-+		EnvironmentCompiler:	lib/exe/cocl:-h 500m -s 20m:-dynamics -sapl
+-			Path:	{Application}/lib/iTasks
++  			Path:	{Application}/lib/iTasks
++ 			Path:	{Application}/lib/Gast
++ 		EnvironmentCompiler:	lib/exe/cocl::-dynamics
++ 		EnvironmentCodeGen:	lib/exe/cg
++ 		EnvironmentLinker:	lib/exe/linker|lib/exe/itasks-web-collector
++ 		EnvironmentDynLink:	lib/exe/linker
++ 		EnvironmentABCOptimise:	lib/exe/abcopt
++ 		EnvironmentByteCodeGen:	lib/exe/bcgen
++ 		EnvironmentByteCodeLink:	lib/exe/bclink
++ 		EnvironmentByteCodeStrip:	lib/exe/bcstrip
++ 		EnvironmentByteCodePrelink:	lib/exe/bcprelink
++ 		EnvironmentVersion:	920
++ 		EnvironmentRedirect:	False
++ 		EnvironmentCompileMethod:	Pers
++ 		EnvironmentProcessor:	I386
++ 		Environment64BitProcessor:	True
++ 	Environment
++ 		EnvironmentName:	iTasks-git
++ 		EnvironmentPaths
++ 			Path:	{Application}/lib/StdEnv
++ 			Path:	{Application}/lib/Dynamics
++ 			Path:	{Application}/lib/TCPIP
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/Platform-x86
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Posix
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Linux
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Linux-64
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/Generics
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/StdLib
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/ArgEnv
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/MersenneTwister
++ 			Path:	{Application}/lib/ABCInterpreter
++ 			Path:	{Application}/lib/GraphCopy
++ 			Path:	/home/mrl/projects/clean/iTasks-SDK/Libraries
++ 			Path:	{Application}/lib/iTasks
++ 			Path:	{Application}/lib/Gast
+ 		EnvironmentCompiler:	lib/exe/cocl::-dynamics
  		EnvironmentCodeGen:	lib/exe/cg
- 		EnvironmentLinker:	lib/exe/linker|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
- 		EnvironmentDynLink:	lib/exe/linker
+ 		EnvironmentLinker:	lib/exe/linker|lib/exe/itasks-web-collector
 EOPATCH
diff --git a/newsboat/.config/newsboat/urls b/newsboat/.config/newsboat/urls
index 3c6ece6..90b2222 100644
--- a/newsboat/.config/newsboat/urls
+++ b/newsboat/.config/newsboat/urls
@@ -24,3 +24,4 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCSE6yilNScIz1SLTNQvrXMw yt
 https://www.youtube.com/feeds/videos.xml?channel_id=UCnCE0-pPZuit8aud1l9rhkA yt "Whisky.com"
 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
diff --git a/shell/.bash_completion.d/cpm b/shell/.bash_completion.d/cpm
index b4ce889..3b24d6d 100644
--- a/shell/.bash_completion.d/cpm
+++ b/shell/.bash_completion.d/cpm
@@ -97,6 +97,7 @@ _cpm()
 					exec)
 						;;
 					create)
+						_filedir prt
 						;;
 					show)
 						;;
diff --git a/shell/.local/bin/flacfix b/shell/.local/bin/flacfix
new file mode 100755
index 0000000..d07e3b9
--- /dev/null
+++ b/shell/.local/bin/flacfix
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]
+then
+	echo "Usage: $0 flacfile [flacfile [flacfile ...]]" >&2
+	exit 1
+fi
+
+while [ "$#" -ge 1 ];
+do
+	samplerate="$(metaflac --show-sample-rate "$1")"
+	bitdepth="$(metaflac --show-bps "$1")"
+	if ! [ "$samplerate" = 44100 -o "$samplerate" = 4800 -a $bitdepth = 16 ]
+	then
+		tfile="$(mktemp --tmpdir --suffix=.flac)"
+		sox "$1" -r 44100 -b 16 "$tfile"
+		mv -v "$tfile" "$1"
+	fi
+	shift
+done
diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex
index cf6ac50..b2385ed 160000
--- a/vim/.vim/pack/plugins/start/vimtex
+++ b/vim/.vim/pack/plugins/start/vimtex
@@ -1 +1 @@
-Subproject commit cf6ac500f45d7cce4a52d6bdb4ecbec811922fbc
+Subproject commit b2385ed9016442a27c8ce028ab566de864ee1910
diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index 3b1aecd..2d9e2a3 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -13,6 +13,7 @@ backends
 iTasks
 mTask
 IOT
+preinstalled
 microcontrolles
 typeclass
 arity