From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 30 Nov 2020 07:12:41 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=48449dd95b7ef3826bd6cdbe91ed73a9bd0fa8c4;p=dotfiles.git

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

48449dd95b7ef3826bd6cdbe91ed73a9bd0fa8c4
diff --cc clean/.local/bin/rmabc.sh
index bd7f372,bd7f372..7d37a15
--- a/clean/.local/bin/rmabc.sh
+++ b/clean/.local/bin/rmabc.sh
@@@ -1,2 -1,2 +1,2 @@@
  #!/bin/sh
--find . "$CLEAN_HOME" -type f -name "*.abc" -not -name "_system.abc" -delete
++find "${1:-.}" "$CLEAN_HOME" -type f -name "*.abc" -not -name "_system.abc" -delete
diff --cc shell/.bashrc
index 96202f5,5df7160..060ac34
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@@ -23,10 -24,10 +24,9 @@@ export TMUX_TMPDIR="$XDG_RUNTIME_DIR
  export CLEAN_HOME=/opt/clean-x64
  
  export PATH=~/.local/bin:$PATH
- export PATH=$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin:$PATH
 -export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
 -export PATH=$PATH:/opt/texlive/2020/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/firefox
 +export PATH=/opt/texlive/2020/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin:/opt/firefox:$PATH
  
--export MANPATH=~/.local/share/man:/opt/texlive/2020/texmf-dist/doc/man:./arduino/java/man:$MANPATH
++export MANPATH=~/.local/share/man:/opt/texlive/2020/texmf-dist/doc/man:/opt/arduino/java/man:$MANPATH
  
  export GTK_IM_MODULE=xim
  export QT_IM_MODULE=xim