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

diff --git a/clean/.local/bin/rmabc.sh b/clean/.local/bin/rmabc.sh
index bd7f372..7d37a15 100755 (executable)
--- a/clean/.local/bin/rmabc.sh
+++ b/clean/.local/bin/rmabc.sh
@@ -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 --git a/config.h/dwm/dwm b/config.h/dwm/dwm
index bb2e722..61bb8b2 160000 (submodule)
--- a/config.h/dwm/dwm
+++ b/config.h/dwm/dwm
@@ -1 +1 @@
-Subproject commit bb2e7222baeec7776930354d0e9f210cc2aaad5f
+Subproject commit 61bb8b2241d4db08bea4261c82e27cd9797099e7

diff --git a/config.h/slstatus/config.h b/config.h/slstatus/config.h
index 719bf16..5846931 100644 (file)
--- a/config.h/slstatus/config.h
+++ b/config.h/slstatus/config.h
@@ -1,4 +1,5 @@
 /* See LICENSE file for copyright and license details. */
+#define LAPTOP
 
 /* interval between updates (in ms) */
 const unsigned int interval = 30*1000;

diff --git a/pgp/.gnupg/gpg-agent.conf b/pgp/.gnupg/gpg-agent.conf
index bd4e2a0..e83e18b 100644 (file)
--- a/pgp/.gnupg/gpg-agent.conf
+++ b/pgp/.gnupg/gpg-agent.conf
@@ -1,3 +1,4 @@
 default-cache-ttl 3600
 enable-ssh-support
 disable-scdaemon
+pinentry-program /usr/bin/pinentry-gtk-2

diff --git a/shell/.bashrc b/shell/.bashrc
index 6ebfb8f..0670f6a 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -24,10 +24,9 @@ export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 export CLEAN_HOME=/opt/clean-x64
 
 export PATH=~/.local/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

diff --git a/texlive.profile b/texlive.profile
index 68c56af..300f2c1 100644 (file)
--- a/texlive.profile
+++ b/texlive.profile
@@ -2,12 +2,12 @@
 # It will NOT be updated and reflects only the
 # installation profile at installation time.
 selected_scheme scheme-infraonly
-TEXDIR /opt/texlive/2018
+TEXDIR /opt/texlive/2020
 TEXMFCONFIG ~/.local/share/texlive/texmf-config
 TEXMFHOME ~/.local/share/texlive/texmf
 TEXMFLOCAL /opt/texlive/texmf-local
-TEXMFSYSCONFIG /opt/texlive/2018/texmf-config
-TEXMFSYSVAR /opt/texlive/2018/texmf-var
+TEXMFSYSCONFIG /opt/texlive/2020/texmf-config
+TEXMFSYSVAR /opt/texlive/2020/texmf-var
 TEXMFVAR ~/.local/share/texlive/texmf-var
 binary_x86_64-linux 1
 instopt_adjustpath 0

diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic
index 0336c35..6374164 160000 (submodule)
--- a/vim/.vim/pack/plugins/start/syntastic
+++ b/vim/.vim/pack/plugins/start/syntastic
@@ -1 +1 @@
-Subproject commit 0336c35c0b10b46d85cdd9c3df721f978429e82c
+Subproject commit 63741646a9e87bbe105674747555aded6f52c490

diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean
index 14b26f9..d371c06 160000 (submodule)
--- a/vim/.vim/pack/plugins/start/vim-clean
+++ b/vim/.vim/pack/plugins/start/vim-clean
@@ -1 +1 @@
-Subproject commit 14b26f918ceff5c3cd37c502bde9e3b960132d19
+Subproject commit d371c06a0e4450fcbe03ca6192e800c2172123a1

diff --git a/x/.local/bin/xrandr-clone-hdmi.sh b/x/.local/bin/xrandr-clone-hdmi.sh
index a5eec97..456defb 100755 (executable)
--- a/x/.local/bin/xrandr-clone-hdmi.sh
+++ b/x/.local/bin/xrandr-clone-hdmi.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output eDP1 --auto --output HDMI1 --same-as eDP1 --auto
+xrandr --output eDP-1 --auto --output HDMI-1 --same-as eDP-1 --auto

diff --git a/x/.local/bin/xrandr-extend-hdmi.sh b/x/.local/bin/xrandr-extend-hdmi.sh
index 00abe20..e567214 100755 (executable)
--- a/x/.local/bin/xrandr-extend-hdmi.sh
+++ b/x/.local/bin/xrandr-extend-hdmi.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output eDP1 --auto --output HDMI1 --right-of eDP1 --auto
+xrandr --output eDP-1 --auto --output HDMI-1 --right-of eDP-1 --auto

diff --git a/x/.local/bin/xrandr-merge-hdmi.sh b/x/.local/bin/xrandr-merge-hdmi.sh
index 38f78bd..638d3d4 100644 (file)
--- a/x/.local/bin/xrandr-merge-hdmi.sh
+++ b/x/.local/bin/xrandr-merge-hdmi.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-xrandr --output eDP1 --auto --output HDMI1 --right-of eDP1 --auto
-xrandr --setmonitor virt auto eDP1,HDMI1
+xrandr --output eDP-1 --auto --output HDMI-1 --right-of eDP-1 --auto
+xrandr --setmonitor virt auto eDP-1,HDMI-1

diff --git a/x/.local/bin/xrandr-multiview.sh b/x/.local/bin/xrandr-multiview.sh
index 5fa2bdc..accbfa0 100755 (executable)
--- a/x/.local/bin/xrandr-multiview.sh
+++ b/x/.local/bin/xrandr-multiview.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-xrandr --setmonitor Presentation 3840/1040x1080/640+0+0 eDP1,HDMI1
-xrandr --output eDP1 --auto --output HDMI1 --right-of eDP1 --mode 1920x1080
+xrandr --setmonitor Presentation 3840/1040x1080/640+0+0 eDP-1,HDMI-1
+xrandr --output eDP-1 --auto --output HDMI-1 --right-of eDP-1 --mode 1920x1080
 killall dwm

diff --git a/x/.local/bin/xrandr-only-laptop.sh b/x/.local/bin/xrandr-only-laptop.sh
index de1baf2..3060bbd 100755 (executable)
--- a/x/.local/bin/xrandr-only-laptop.sh
+++ b/x/.local/bin/xrandr-only-laptop.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output eDP1 --auto --output HDMI1 --off
+xrandr --output eDP-1 --auto --output HDMI-1 --off