From: Mart Lubbers <mart@martlubbers.net>
Date: Fri, 17 Apr 2020 10:38:33 +0000 (+0200)
Subject: todoman conf, tmux passmenu, texlive 2020
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=678bc50c4eb21c38aa22c40bc31fd26800b6e96e;p=dotfiles.git

todoman conf, tmux passmenu, texlive 2020
---

diff --git a/cal/.config/todoman/todoman.conf b/cal/.config/todoman/todoman.conf
index 3ad60b9..e58ff26 100644
--- a/cal/.config/todoman/todoman.conf
+++ b/cal/.config/todoman/todoman.conf
@@ -1,2 +1,7 @@
 [main]
 path = ~/.local/share/vdirsyncer/tasks/default
+humanize = true
+default_list = default
+default_due = 0
+date_format = %Y-%m-%d
+time_format = %H:%M
diff --git a/config.h/dwm/config.h b/config.h/dwm/config.h
index 81e60a4..efc9fb1 100644
--- a/config.h/dwm/config.h
+++ b/config.h/dwm/config.h
@@ -61,8 +61,8 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn()
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "st", NULL };
 static const char *quitcmd[]  = { "killall", "xinit", NULL };
-static const char *passmenu[]  = { "/usr/share/doc/pass/examples/dmenu/passmenu", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-static const char *passmenu_type[]  = { "/usr/share/doc/pass/examples/dmenu/passmenu", "--type", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *passmenu[]  = { "passmenu", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *passmenu_tmux[]  = { "passmenu", "--tmux", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *scr[] = { "scr", NULL };
 static const char *scr_sel[] = { "scr", "selection", NULL };
 static const char *lock[] = { "xautolock", "-locknow", NULL };
@@ -78,7 +78,7 @@ static Key keys[] = {
 	{ MODKEY,           XK_p,      spawn,          {.v = dmenucmd } },
 	{ MODKEY|ShiftMask, XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY,           XK_y,      spawn,          {.v = passmenu } },
-	{ MODKEY|ShiftMask, XK_y,      spawn,          {.v = passmenu_type } },
+	{ MODKEY|ShiftMask, XK_y,      spawn,          {.v = passmenu_tmux } },
 	{ MODKEY|ShiftMask, XK_l,      spawn,          {.v = lock } },
 	{ MODKEY,           XK_b,      togglebar,      {0} },
 	{ MODKEY,           XK_j,      focusstack,     {.i = +1 } },
diff --git a/shell/.bashrc b/shell/.bashrc
index 4457267..29b3d3f 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -24,9 +24,9 @@ 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:/opt/firefox
+export PATH=$PATH:/opt/texlive/2020/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
+export MANPATH=~/.local/share/man:/opt/texlive/2020/texmf-dist/doc/man:./arduino/java/man:$MANPATH
 
 export GTK_IM_MODULE=xim
 export QT_IM_MODULE=xim
diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index d8d0f51..94288f3 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -22,3 +22,5 @@ arities
 microcontrollers
 unary
 composable
+deserialization
+tagless
diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl
index cff9601..7ca8289 100644
Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ
diff --git a/x/.local/bin/passmenu b/x/.local/bin/passmenu
new file mode 100755
index 0000000..1a6f15f
--- /dev/null
+++ b/x/.local/bin/passmenu
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+shopt -s nullglob globstar
+
+typeit=0
+if [[ $1 == "--type" ]]; then
+	typeit=1
+	shift
+elif [[ $1 == "--tmux" ]]; then
+	typeit=2
+	shift
+fi
+
+prefix=${PASSWORD_STORE_DIR-~/.password-store}
+password_files=( "$prefix"/**/*.gpg )
+password_files=( "${password_files[@]#"$prefix"/}" )
+password_files=( "${password_files[@]%.gpg}" )
+
+password=$(printf '%s\n' "${password_files[@]}" | dmenu "$@")
+
+[[ -n $password ]] || exit
+
+if [[ $typeit -eq 0 ]]; then
+	pass show -c "$password" 2>/dev/null
+elif [[ $typeit -eq 1 ]]; then
+	pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } |
+		xdotool type --clearmodifiers --file -
+else
+	tmux set-buffer "$(pass show "$password")"
+fi