5 files changed, 8 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 9ede844..798e99d 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,7 @@ console:
         sudo ln -sf `pwd`/misc/vconsole.conf /etc/vconsole.conf
 
 zsh:
-        ln -sf `pwd`/zsh/zshenv ~/.zshenv
-        mkdir -p ~/.config/zsh
-        ln -sf `pwd`/zsh/zshrc ~/.config/zsh/.zshrc
+        curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | bash
 
 fzf:
         if [ ! -d "$(HOME)/.fzf" ]; then 
diff --git a/alias b/alias
index c4a9e66..94703a4 100644
--- a/alias
+++ b/alias
@@ -6,10 +6,6 @@ eval "${shell}rc(){
   local RCFILE=$XDG_CONFIG_HOME/${shell}/.${shell}rc
   vim \$RCFILE && source \$RCFILE
 }"
-eval "${shell}env(){
-  local ENVFILE=~/.${shell}env
-  vim \$ENVFILE && source \$ENVFILE
-}"
 alias vimrc='vim ~/.vimrc'
 alias tigrc="vim ~/.tigrc"
 alias muttrc='vim ~/.config/mutt/muttrc'
diff --git a/mutt/muttrc.topo b/mutt/muttrc.topo
index 2fb5f35..b0a50a2 100644
--- a/mutt/muttrc.topo
+++ b/mutt/muttrc.topo
@@ -2,9 +2,8 @@ source ~/.config/mutt/default
 
 # IMAP/SMTP settings
 set my_user = "pham@mail.topo.tw"; setenv my_user "$my_user"
-set folder = "imaps://$my_user:993/"
+set folder = ~/Maildir/
 set smtp_url = "smtp://$my_user:587"
-set imap_pass = `pass mail/$my_user`
 set smtp_pass = "$imap_pass"
 
 # Identify meself
@@ -33,6 +32,7 @@ set mask="!(INBOX|mbox|Sent|Trash|Drafts|DeltaChat|hometeach|osm|arch-general|mu
 
 # Sidebar
 mailboxes  +INBOX \
+           -label TRIP +trip \
            +mbox \
            -label DC +DeltaChat \
            "+---- Watch -----" \
diff --git a/tigrc b/tigrc
index a6d2e0a..0d387cc 100644
--- a/tigrc
+++ b/tigrc
@@ -137,8 +137,9 @@ bind main gs ?@git merge %(branch) --squash
 
 # push
 bind main p none # override default pager binding
-bind main pp ?git push -u %(remote) %(branch):%(branch)
-bind main pr ?git push -u '%(prompt Which remote? )' %(branch):%(branch)
+bind main pp ?git push
+bind main pP ?git push -u %(remote) %(branch):%(branch)
+bind main pr ?git push -u %(remote) %(branch):%(branch)
 bind main pc ?git push -u %(remote) %(commit):%(branch)
 bind main pR !git push -u '%(prompt Which remote? )' %(branch):'%(prompt Which branch? )'
 bind main pF ?git push --force
diff --git a/tools/wiki/diary b/tools/wiki/diary
index 04cf5b6..3995ecf 100755
--- a/tools/wiki/diary
+++ b/tools/wiki/diary
@@ -18,7 +18,7 @@ specify_date() {
   done
 
   FILE=~/log/diary/20$YEAR-$MONTH-$DAY.md
-  vim $FILE
+  vim -c 'Goyo' $FILE
 }
 
 print_today() {
@@ -27,7 +27,7 @@ print_today() {
 }
 
 edit_today() {
-  vim $today
+  vim -c Goyo $today
 }
 
 add_entry() {