From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 29 Oct 2018 09:18:55 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=907122ffdf547aaf278270f2621bfc1d1112bf74;p=dotfiles.git

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

907122ffdf547aaf278270f2621bfc1d1112bf74
diff --cc config.h/dwm/config.h
index fee5179,0ee2c80..3ebd358
--- a/config.h/dwm/config.h
+++ b/config.h/dwm/config.h
@@@ -58,11 -58,11 +58,11 @@@ static const Layout layouts[] = 
  
  /* commands */
  static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 +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[]  = { "passmenu", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
- static const char *passmenu_type[]  = { "passmenu", "--type", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 -static const char *passmenu[]  = { "/usr/share/doc/pass/examples/dmenu/passmenu", NULL };
 -static const char *passmenu_type[]  = { "/usr/share/doc/pass/examples/dmenu/passmenu", "--type", 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 *scr[] = { "scr", NULL };
  static const char *scr_sel[] = { "scr", "selection", NULL };
  static const char *lock[] = { "slock", NULL };
diff --cc email/.mutt/muttrc
index 6b27ab8,15e8295..e0a8bb1
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@@ -17,11 -17,12 +17,14 @@@ set sendmail="/home/mrl/.mutt/checkatta
  set send_charset="us-ascii:utf-8"
  macro index,pager $ "<shell-escape>/home/mrl/.mutt/force_sync.sh<enter><sync-mailbox>" "Force refresh"
  macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
- send2-hook "~f mart@martlubbers.net"\
- 	"set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\""
++
+ macro compose <esc>1 "<esc>f^UMart Lubbers <mart@martlubbers.net><enter>ps"
 -macro compose <esc>2 "<esc>f^UMart Lubbers <mart@cs.ru.nl><enter>pc"
+ send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\""
++
++macro compose <esc>2 "<esc>f^UMart Lubbers <mart@cs.ru.nl><enter>pc"
  send2-hook "~f m.lubbers@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
  send2-hook "~f m.lubbers@science.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
 -send2-hook "~f mart@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
 +send2-hook "~f mart@cs.ru.nl"  "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
  
  #folder-hook . push "<delete-pattern>~=<enter>$"
  
diff --cc shell/.bashrc
index 51cd06a,b887157..09a6848
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@@ -15,10 -15,9 +15,10 @@@ export SUDO_ASKPASS=/usr/lib/ssh/ssh-as
  export NOTMUCH_CONFIG=~/.config/notmuch/config
  
  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:/opt/zotero
+ export PATH=$PATH:/opt/texlive/2018/bin/x86_64-linux:/opt/zotero:/opt/arduino
  
  export GTK_IM_MODULE=xim
  export QT_IM_MODULE=xim