From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 5 Aug 2019 09:18:31 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=925db2b9797e720f138db17c292389d245f2b596;hp=8a098d0edf56fcbcd680ce68329afb1f707f2243;p=dotfiles.git

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

diff --git a/shell/.bashrc b/shell/.bashrc
index 0d2a2c9..4457267 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -24,7 +24,7 @@ export CLEAN_HOME=/opt/clean
 
 export PATH=~/.local/bin:$PATH
 export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
-export PATH=$PATH:/opt/texlive/2019/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin
+export PATH=$PATH:/opt/texlive/2019/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin:/opt/firefox
 
 export MANPATH=~/.local/share/man:/opt/texlive/2019/texmf-dist/doc/man:./arduino/java/man:$MANPATH
 
diff --git a/shell/.local/bin/update b/shell/.local/bin/update
index 453a6e5..c73968f 100755
--- a/shell/.local/bin/update
+++ b/shell/.local/bin/update
@@ -7,4 +7,4 @@ cmd() {
 }
 
 sudo sh -c "$(cmd)"
-sh -c "tlmgr update --all --self && offlineimap -o -u ttyui && khal $NUL && khard $NUL && pass git pull origin master"
+sh -c "tlmgr update --all && offlineimap -o -u ttyui && khal $NUL && khard $NUL && pass git pull origin master"
diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic
index 0d25f4f..0336c35 160000
--- a/vim/.vim/pack/plugins/start/syntastic
+++ b/vim/.vim/pack/plugins/start/syntastic
@@ -1 +1 @@
-Subproject commit 0d25f4fb4203e600a28e776847d4beca254d3f84
+Subproject commit 0336c35c0b10b46d85cdd9c3df721f978429e82c
diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean
index 3fcd8f1..14b26f9 160000
--- a/vim/.vim/pack/plugins/start/vim-clean
+++ b/vim/.vim/pack/plugins/start/vim-clean
@@ -1 +1 @@
-Subproject commit 3fcd8f1e786ba61dd6cecd97d67f59dc8009fc5b
+Subproject commit 14b26f918ceff5c3cd37c502bde9e3b960132d19
diff --git a/vim/.vim/pack/plugins/start/vim-gnupg b/vim/.vim/pack/plugins/start/vim-gnupg
index 08c4f51..6219a5a 160000
--- a/vim/.vim/pack/plugins/start/vim-gnupg
+++ b/vim/.vim/pack/plugins/start/vim-gnupg
@@ -1 +1 @@
-Subproject commit 08c4f516e8a5dbfa187188d24ccd425c14d97011
+Subproject commit 6219a5a0d70dbc10c5e70289a2c400d6d8b62762
diff --git a/vim/.vim/pack/plugins/start/vim-spl b/vim/.vim/pack/plugins/start/vim-spl
index a25c101..6b49975 160000
--- a/vim/.vim/pack/plugins/start/vim-spl
+++ b/vim/.vim/pack/plugins/start/vim-spl
@@ -1 +1 @@
-Subproject commit a25c1016acee43bba34a458c467206b8922b4714
+Subproject commit 6b4997596f0c1a891dd08745a68cbcc4bbf68bdf
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 867005b..2d9e2a3 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -14,3 +14,8 @@ iTasks
 mTask
 IOT
 preinstalled
+microcontrolles
+typeclass
+arity
+nullary
+arities
diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl
new file mode 100644
index 0000000..cff9601
Binary files /dev/null and b/vim/.vim/spell/en.utf-8.add.spl differ
diff --git a/x/.local/bin/lock.sh b/x/.local/bin/lock.sh
index c6b9096..8693157 100755
--- a/x/.local/bin/lock.sh
+++ b/x/.local/bin/lock.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 echo RELOADAGENT | gpg-connect-agent
-i3lock
+slock
diff --git a/x/.xinitrc b/x/.xinitrc
index 2d7271d..0132dab 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -11,8 +11,8 @@ eval "$(gpg-agent --daemon)"
 # XResources
 xrdb -merge ~/.Xresources
 
-# auto locking but not on laptop
-if [ $(hostname) != "ygdrassil" ]; then
+# auto locking but only on laptop
+if [ $(hostname) != ygdrassil ]; then
 	xautolock -locker slock -time 10 &
 fi