From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 17 Apr 2018 05:44:23 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=4ec32116d32f8b4457fffc431b9c2828be54e19c;hp=4309b3dadf581b3dcd51b91a8373262990fb4175;p=dotfiles.git

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

diff --git a/email/.mutt/mailcap b/email/.mutt/mailcap
index e8892f5..25c914e 100644
--- a/email/.mutt/mailcap
+++ b/email/.mutt/mailcap
@@ -1,6 +1,6 @@
 # Fork off a process
 application/pdf; evince %s;
-text/html; firefox -new-tab %s & sleep 5;
+text/html; firefox -new-tab %s & sleep 2;
 
 # Open document formats
 application/vnd.oasis.opendocument.text; libreoffice '%s';
diff --git a/newsbeuter/.config/newsbeuter/urls b/newsbeuter/.config/newsbeuter/urls
index 9bfdcef..0f76f7e 100644
--- a/newsbeuter/.config/newsbeuter/urls
+++ b/newsbeuter/.config/newsbeuter/urls
@@ -14,3 +14,4 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCyabCqc2M3J9HItEroLOTvA yt
 https://www.youtube.com/feeds/videos.xml?channel_id=UCVZlxkKqlvVqzRJXhAGq42Q yt "JoergSprave"
 https://www.youtube.com/feeds/videos.xml?channel_id=UC4btfgUBD9hxTNX2d1QydcQ yt "Last Gamer"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCJc3p1FsUXycsocQSQ2-_mg yt "dumpert"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCpB27-wOnjRwUOtqQ4L3Tlw yt "Joshimuz"
diff --git a/shell/.bashrc b/shell/.bashrc
index bce6795..7db3f56 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -6,7 +6,7 @@ export HISTSIZE=NOTHING
 shopt -s histappend
 export PROMPT_COMMAND='history -a'
 
-export TERMINAL=urxvtc
+export TERMINAL=~/projects/st/st
 export EDITOR="vim -p"
 export TERM=screen
 export BROWSER=firefox
@@ -30,6 +30,7 @@ export COLORFGBG="default;default"
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias vi=vim
+export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 alias tmux='tmux -f ~/.config/tmux/config'
 
 set_prompt(){
diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex
index f42ceea..17d8097 160000
--- a/vim/.vim/pack/plugins/start/vimtex
+++ b/vim/.vim/pack/plugins/start/vimtex
@@ -1 +1 @@
-Subproject commit f42ceea9dd096bda560a6ca711a8abb7cd7b4413
+Subproject commit 17d809706edcb277f1ee7fa5e33aff3619926fe4