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 59d5e9f..c343572 100755 (executable)
--- a/clean/.local/bin/install_clean.sh
+++ b/clean/.local/bin/install_clean.sh
@@ -77,50 +77,46 @@ EOPATCH
 
 echo "Adding the iTasks-git environment"
 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
+--- IDEEnvs.orig       2019-11-19 08:13:53.243123284 +0100
++++ IDEEnvs    2019-11-19 08:15:02.819053965 +0100
+@@ -61,6 +61,39 @@
                        Path:   {Application}/lib/ABCInterpreter
                        Path:   {Application}/lib/GraphCopy
--                      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
+                       Path:   {Application}/lib/iTasks
++                      Path:   {Application}/lib/Gast
++              EnvironmentCompiler:    lib/exe/cocl-itasks::-dynamics
++              EnvironmentCodeGen:     lib/exe/cg
++              EnvironmentLinker:      /usr/bin/gcc::-Wl,--gc-sections|lib/exe/itasks-web-collector
++              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:   {Application}/lib/ABCInterpreter
++                      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-itasks::-dynamics
                EnvironmentCodeGen:     lib/exe/cg
-               EnvironmentLinker:      lib/exe/linker|lib/exe/itasks-web-collector
+               EnvironmentLinker:      /usr/bin/gcc::-Wl,--gc-sections|lib/exe/itasks-web-collector
 EOPATCH

diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex
index b2385ed..cf6ac50 160000 (submodule)
--- a/vim/.vim/pack/plugins/start/vimtex
+++ b/vim/.vim/pack/plugins/start/vimtex
@@ -1 +1 @@
-Subproject commit b2385ed9016442a27c8ce028ab566de864ee1910
+Subproject commit cf6ac500f45d7cce4a52d6bdb4ecbec811922fbc

diff --git a/x/.local/bin/scr b/x/.local/bin/scr
index f34ccaf..ab6e6c2 100755 (executable)
--- a/x/.local/bin/scr
+++ b/x/.local/bin/scr
@@ -1,6 +1,5 @@
 #!/bin/sh -e
-[ "$#" -eq 1 ] && CROP="$(slop -t 0 -f "-crop %g")"
+[ "$#" -ne 1 ] && CROP="" || CROP="-window root"
 URL="scr/$(date +%F_%H-%M-%S).png"
-import -window root $CROP png:- | \
-       ssh helheim cat \> /var/www/martlubbers.net/$URL
+import $CROP png:- | ssh helheim cat \> /var/www/martlubbers.net/$URL
 echo "http://martlubbers.net/$URL" | cloo.gl | xclip -f | xargs -I{} notify-send {}