From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 9 Oct 2018 06:13:48 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=40cb4bb8a128ed51b9b41b97d3d6f75fdf13820b;hp=-c;p=dotfiles.git

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

40cb4bb8a128ed51b9b41b97d3d6f75fdf13820b
diff --combined shell/.bashrc
index 1ae8742,e5e5995..3e31b10
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@@ -17,7 -17,7 +17,7 @@@ export NOTMUCH_CONFIG=~/.config/notmuch
  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/2018/bin/x86_64-linux
+ export PATH=$PATH:/opt/texlive/2018/bin/x86_64-linux:/opt/zotero
  
  export GTK_IM_MODULE=xim
  export QT_IM_MODULE=xim
@@@ -28,7 -28,6 +28,7 @@@ alias vi=vi
  alias latexmk='make -f ~/.local/bin/latex.mk'
  export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
  alias tmux='tmux -f ~/.config/tmux/config'
 +alias shutdown="echo \"Are you sure? I\'m Ygdrassil\" && read && shutdown"
  
  . /etc/bash_completion