15 files changed, 91 insertions, 49 deletions

diff --git a/Makefile b/Makefile
index aa9cfff..8ab9257 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ mutt: ~/.local/share/application
         pass mail/mutt.hooks >mutt/hooks.topo
 
 tmux:
-        ln -sf `pwd`/misc/tmux.conf ~/.tmux.conf
+        ln -sf `pwd`/tmux/tmux.conf ~/.tmux.conf
 
 crontab:
         (crontab -l 2>/dev/null; cat bin/cron/* | sed '/^#/ d') | crontab -
@@ -73,7 +73,6 @@ console:
         sudo ln -sf `pwd`/misc/vconsole.conf /etc/vconsole.conf
         sudo systemctl restart systemd-vconsole-setup.service
 
-
 task:
         ln -sf $(HOME)/.task/taskrc $(HOME)/.taskrc
         if [ ! -d "$(HOME)/.task/.git" ]; then
@@ -91,6 +90,14 @@ theme:
 
 openbox: theme
         ln -sf `pwd`/X11/openbox/rc.xml ~/.config/openbox/
+        cat <<EOF >~/.xprofile
+        export XMODIFIERS=@im=fcitx
+        export QT_IM_MODULE=fcitx
+        export GTK_IM_MODULE=fcitx
+        fcitx &
+        picom &
+        ~/.fechbg
+        EOF
 
 rofi:
         ln -sf `pwd`/X11/rofi/config.rasi ~/.config/rofi/config.rasi
diff --git a/X11/openbox/rc.xml b/X11/openbox/rc.xml
index 256f234..ffc6c67 100644
--- a/X11/openbox/rc.xml
+++ b/X11/openbox/rc.xml
@@ -112,7 +112,7 @@
             -o "window.dimensions.lines=32" \
             -o "window.dimensions.columns=70" \
             -o 'env.fullrc="false"' \
-            -e nvim ~/.config/openbox/rc.xml;
+            -e vim ~/.config/openbox/rc.xml;
             openbox --reconfigure
           '
         </command>
@@ -543,7 +543,7 @@
       <action name="Execute">
         <!-- Copy to CLIPBOARD -->
         <command>
-          alacritty --title @CLIPBORD -o 'env.fullrc="false"' -e nvim -c 'r !xsel -ob' -c 'normal A' -c 'startinsert' -c 'nmap &lt;C-c&gt; :w !xsel -ib&lt;CR&gt;:qa!&lt;CR&gt;'
+          alacritty --title @CLIPBORD -o 'env.fullrc="false"' -e vim -c 'r !xsel -ob' -c 'normal A' -c 'startinsert' -c 'nmap &lt;C-c&gt; :w !xsel -ib&lt;CR&gt;:qa!&lt;CR&gt;'
         </command>
       </action>
     </keybind>
@@ -616,7 +616,7 @@
     <!-- Rofi -->
     <keybind key="A-F1">
       <action name="Execute">
-        <command>launcher</command>
+        <command>rofi -show drun -modes run</command>
       </action>
     </keybind>
     <keybind key="W-n">
@@ -702,7 +702,7 @@
     </keybind>
     <keybind key="W-r">
       <action name="Execute">
-        <command>runner</command>
+        <command>rofi -show run</command>
       </action>
     </keybind>
     <keybind key="W-g">
@@ -758,7 +758,7 @@
     </keybind>
     <keybind key="C-A-n">
       <action name="Execute">
-        <command>alacritty -e nvim</command>
+        <command>alacritty -e vim</command>
       </action>
     </keybind>
     <keybind key="W-S-r">
diff --git a/X11/rofi/pass.edit b/X11/rofi/pass.edit
index bfbdc31..a1a091d 100755
--- a/X11/rofi/pass.edit
+++ b/X11/rofi/pass.edit
@@ -16,5 +16,6 @@ fi
 
 # Use detected terminal emulator to edit password
 coproc (
-    EDITOR=nvim $terminal -e pass edit $1 && $(dirname $0)/pass.get $1
+    terminal=${terminal:-alacritty}
+    EDITOR=vim $terminal -e pass edit $1 && $(dirname $0)/pass.get $1
 )
diff --git a/alias b/alias
index 6706cfd..7e87c88 100644
--- a/alias
+++ b/alias
@@ -55,6 +55,7 @@ alias j='sudo -i journalctl -xeu'
 alias jf='sudo -i journalctl -xfeu'
 alias fb{.,''}conf='sudo vim /etc/fail2ban/jail.d/jail.local'
 alias fb='sudo -i fail2ban-client'
+alias vps.test='curl -sL https://yabs.sh | bash'
 
 # }}}
 # Nginx{{{
@@ -116,6 +117,7 @@ rm() {
   /bin/rm $@
 }
 config(){ cd ~/.config/$1; }
+alias cdapp='cd /usr/share/applications/'
 alias sound="echo -ne '\a'"
 alias hg='history | grep'
 prompt-vim() {
@@ -363,9 +365,10 @@ if which nvim &>/dev/null; then
 else
   alias v='vim'
 fi
-alias vu='vim -u NONE'
+alias vu='vim -u NONE "+set nowrap"'
 alias sv='sudo vim'
 alias vr='vim -R'
+alias vm='vim Makefile'
 # Edit last file
 alias vl="vim -c 'norm '"
 # Use Telescope to select recent files
@@ -607,6 +610,11 @@ fix() { which $1 && grep -Po 'FIXME.*' $(which $1); }
 alias monitor.light='ddcutil --permit-unknown-feature setvcp 10'
 alias cdosm='cd /srv/osm'
 alias y='yazi'
+acme.issue() {
+  acme.sh --issue -d $1 -w $2
+}
+alias recall='cd /srv/recall'
+alias river='rclone mount r2:/river ~/Downloads/river'
 # }}}
 
 # vim:fdm=marker fdl=0
diff --git a/bin/mail/deliver.sh b/bin/mail/deliver.sh
index d101602..52c5d01 100755
--- a/bin/mail/deliver.sh
+++ b/bin/mail/deliver.sh
@@ -2,6 +2,7 @@
 
 # Deliver incoming mail to proper mailbox
 # TODO image/audio mail part
+# TODO CJK Subject in index/pager mode: tofo or backslash
 
 epoch=$(date +%s)
 mail_date="$(date --rfc-email -d @${epoch})"
@@ -106,45 +107,54 @@ done <<<"$header"
 # decide mailbox by vars {{{
 if [[ "$SENDER" = pham@topo.tw && -n $CHAT_VERSION ]]; then
   private_message
+elif [[ "${FROM}" =~ riverbien ]]; then
+  mailbox=river
+elif [[ "${FROM}" =~ MAILER-DAEMON|accounts ]]; then
+  mailbox=
+elif [[ "${FROM}" =~ taiwandreamer|imtaiwanese18741130|recall ]]; then
+  mailbox=recall
 elif [[ "${TO}" =~ '+'|'=' ]]; then
   mailbox=${TO#*[+=]}       # remove chars before symbol of mailbox
   mailbox=${mailbox%@*}     # remove suffix for mail address
 elif [[ "${FROM}${RETURN_PATH}" =~ notifications@github.com|noreply@github.com ]]; then
-  mailbox=DEV/github
+  mailbox=zd/github
 elif [[ "${FROM}" =~ jgbsmart.com ]]; then
   mailbox=rent
-elif [[ "${SUBJECT}" =~ 帳單|轉帳|對帳|付款|發票|消費|繳費|收據|費用|Invoice|Billing ]]; then
+elif [[ "${SUBJECT}" =~ 帳單|轉帳|對帳|付款|發票|消費|繳費|收據|費用|簽帳|Invoice|Billing ]]; then
   mailbox=pay
 elif [[ "${TO}" =~ dmarc@topo.tw ]]; then
-  mailbox=DEV/dmarc
+  mailbox=zd/dmarc
 elif [[ "${LIST_ID}" =~ ^'Open Street Map Taiwan' ]]; then
   mailbox=FOSS/osm
 elif [[ "${TO}" =~ talk-ja@openstreetmap.org ]]; then
-  mailbox=LIST/talk-ja
-elif [[ "${LIST_ID}" =~ ^~rjarry/aerc-discuss ]]; then
-  mailbox=LIST/aerc
+  mailbox=zl/talk-ja
+elif [[ "${LIST_ID}" =~ rjarry/aerc-discuss ]]; then
+  mailbox=zl/aerc
 elif [[ "${LIST_ID}" =~ mutt-users.mutt.org ]]; then
-  mailbox=LIST/mutt
+  mailbox=zl/mutt
+elif [[ "${RECEIVED}" =~ lists.archlinux.org ]]; then
+  mailbox=zl/arch
 elif [[ "${SUBJECT}" =~ 啟用 ]]; then
   mailbox=service
 elif [[
-        "${SUBJECT}" =~  電子報|快訊|newsletter ||
-        "${FROM}${TO}" =~ substack|service@kucw.io \
+  "${SUBJECT}" =~  電子報|快訊|newsletter ||
+  "${FROM}${TO}" =~ substack|service@kucw.io|linuxhandbook
   ]]; then
   mailbox=news
-elif [[ "${SUBJECT}" =~ 密碼|安全性警示|登入|存取|驗證|login|verify|sign-in ]]; then
+elif [[ "${SUBJECT}" =~ 密碼|安全性警示|登入|存取|驗證|確認|login|verif|sign-in ]]; then
   mailbox=login
 elif [[ "${TO}" = cloudflare@topo.tw ]]; then
   mailbox=SRV/cloudflare
 elif [[
-        "${SUBJECT}" =~ 通知|提及|未讀|更新|核對|嘟文|unread|summary|mention|introduc  ||
-        "${FROM}" =~ notification[s]?@|no-reply@hackmd.io \
+  "${SUBJECT}" =~ 通知|提及|未讀|更新|核對|嘟文|unread|summary|mention|introduc  ||
+  "${FROM}" =~ iservice@narlabs.org.tw ||
+  "${FROM}" =~ notification[s]?@|no-reply@hackmd.io
   ]]; then
   mailbox=update
 elif [[
-        "${SUBJECT}${FROM}" =~ 優惠|快訊|願望清單|期待|活動|eDM ||
-        -n "${LIST_ID}${LIST_UNSUBSCRIBE}" ||
-        ${TO} =~ tienling.chou@topo.tw \
+  "${SUBJECT}${FROM}" =~ 優惠|快訊|願望清單|期待|活動|eDM|invitation ||
+  ${FROM} =~ cora.computer|noreply@steampowered.com ||
+  -n "${LIST_ID}${LIST_UNSUBSCRIBE}${FEEDBACK_ID}${THREAD_INDEX}${X_MAILGUN_TAG}${X_SFMC_STACK}"
   ]]; then
   mailbox=promote
 fi
diff --git a/gitconfig b/gitconfig
index 51e5478..a7b23a3 100644
--- a/gitconfig
+++ b/gitconfig
@@ -40,3 +40,6 @@
 
 [core]
         excludesFile = /srv/git/www/gitignore
+
+[safe]
+        directory = ~/Downloads/recall171
diff --git a/misc/vconsole.conf b/misc/vconsole.conf
index 8a1e7e7..8e118a0 100644
--- a/misc/vconsole.conf
+++ b/misc/vconsole.conf
@@ -1,2 +1,2 @@
 KEYMAP=/usr/share/kbd/keymaps/i386/qwerty/us.map
-FONT=ter-218b
+FONT=ter-132b
diff --git a/mutt/default b/mutt/default
index 5d7369b..8a3df31 100644
--- a/mutt/default
+++ b/mutt/default
@@ -10,6 +10,7 @@ set header_cache = ~/.cache/mutt
 set message_cachedir = ~/.cache/mutt.message
 set edit_headers = yes
 set mailcap_path = ~/.config/mutt/mailcap
+set recall = no
 
 # This allows to reply with "To: " in header
 set reverse_name = yes
@@ -31,6 +32,7 @@ set my_keep_lines2 = 12
 set pager_index_lines = $my_keep_lines1
 set markers = no # Remove '+' for long links with limited terminal width
 # set reply_with_xorig = true
+set text_flowed = yes
 
 # Index format
 #set index_format = "%4C %8Y %Z %(%b %d) %-15.15L (%?l?%4l&%4c?) %s"
@@ -51,7 +53,9 @@ macro pager l "v/(html|zip)<Return>xq<Return>" "Open html file"
 # Vim-style key binding, \c means Ctrl
 macro index,pager c '<change-folder>='
 macro index q '<change-folder>?'
+bind attach g exit
 bind index o sort-reverse
+bind index R group-chat-reply
 bind index O sort-mailbox
 bind index,pager <Return> sync-mailbox
 bind index x tag-entry
@@ -195,6 +199,7 @@ color index         blue            green         "~N~v~(~F)"                 #
 color index         yellow          red           "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
 color index         magenta         black         "~h Stay"                   # marked as Stay
 color index         lightblack            black         "~h Done"                   # marked as Done
+color index         lightblack            black         "~y done"                   # marked as Done
 
 # color header
 color header        green           black         "^(From)"
diff --git a/mutt/muttrc.topo b/mutt/muttrc.topo
index 9b2d2f1..f3e81bf 100644
--- a/mutt/muttrc.topo
+++ b/mutt/muttrc.topo
@@ -33,16 +33,18 @@ mailboxes   -label 'INBOX' -poll + \
             -poll +act\
             -poll +box \
             -poll +continue \
-            -poll -label '[r]' +river \
-            -poll -label '[h]' +hiking \
+            -poll -label '[r]iver'      +river \
+            -poll -label '[h]ome'       +home \
+            -poll -label '[R]ecall'     +recall \
             "+-- Permanent ---" \
-            -poll -label 'de[v]' +DEV \
-            -poll -label '[t]alk 🍺' +talk \
-            -poll -label '[n]ews 📰' +news \
-            -poll -label '[p]ay  💲' +pay \
-            -poll -label '[l]ogin' +login \
-            -poll -label '[u]pdate' +update \
-            -poll -label '[R]ent' +rent \
+            -poll -label '[n]ews'       +news \
+            -poll -label '[p]ay'        +pay \
+            -poll -label '[t]alk'       +talk \
+            -poll -label '[d]ev'        +zd \
+            -poll -label '[u]pdate'     +update \
+            -poll -label '[l]ogin'      +login \
+            -poll -label '[P]romote'    +promote \
+            -poll -label '[C]omment'    +comment \
 
 # Keybinding
 macro index,pager <f4> '<sync-mailbox><enter-command>source ~/.config/mutt/muttrc.topo<enter><change-folder>!<enter>'
@@ -58,21 +60,22 @@ macro index,pager   gi      "<change-folder>+<Return>" "Switch to INBOX folder"
 macro index,pager   ga      "<change-folder>+act<Return>"
 macro index,pager   gb      "<change-folder>+box<Return>"
 macro index,pager   gc      "<change-folder>+continue<Return>"
-macro index,pager   gd      "<change-folder>+done<Return>"
+macro index,pager   gD      "<change-folder>+done<Return>"
 
 macro index,pager   gt      "<change-folder>+talk<Return>"
 macro index,pager   gk      "<change-folder>+keep<Return>"
 macro index,pager   gn      "<change-folder>+news<Return>"
-macro index,pager   gh      "<change-folder>+hiking<Return>"
+macro index,pager   gH      "<change-folder>+hiking<Return>"
 macro index,pager   gp      "<change-folder>+pay<Return>"
 macro index,pager   gs      "<change-folder>+Sent<Return>"
 macro index,pager   gr      "<change-folder>+river<Return>"
-macro index,pager   gv      "<change-folder>+DEV<Return>"
+macro index,pager   gR      "<change-folder>+recall<Return>"
+macro index,pager   gd      "<change-folder>+zd<Return>"
 macro index,pager   gu      "<change-folder>+update<Return>"
+macro index,pager   gh      "<change-folder>+home<Return>"
 
-macro index,pager   gP      "<change-folder>+MISC/promote<Return>"
+macro index,pager   gP      "<change-folder>+promote<Return>"
 macro index,pager   gT      "<change-folder>+Trash<Return>"
 macro index,pager   gl      "<change-folder>+login<Return>"
 macro index,pager   gf      "<change-folder>+feedback<Return>"
-macro index,pager   gR      "<change-folder>+rent<Return>"
-macro index,pager   gS      "<change-folder>+spam<Return>"
+macro index,pager   gC      "<change-folder>+comment<Return>"
diff --git a/profile b/profile
index 3950fb7..03b8f9b 100644
--- a/profile
+++ b/profile
@@ -1,6 +1,7 @@
 # trap 'exit.sh' EXIT
 
 export PATH=~/.local/bin:$PATH
+export PATH=~/go/bin:$PATH
 export SETTING_DIR=${SETTING_DIR:=$HOME/helper}
 export TERM=xterm-256color
 export XDG_CONFIG_HOME=~/.config
diff --git a/snippets/gitconfig_receive_deny b/snippets/gitconfig_receive_deny
new file mode 100644
index 0000000..a616427
--- /dev/null
+++ b/snippets/gitconfig_receive_deny
@@ -0,0 +1,2 @@
+[receive]
+        denyCurrentBranch = false
diff --git a/snippets/html_template_map_leaderline b/snippets/html_template_map_leaderline
index afcec6d..02affef 100644
--- a/snippets/html_template_map_leaderline
+++ b/snippets/html_template_map_leaderline
@@ -5,12 +5,12 @@
   <meta charset='utf-8'>
   <title>Leader Line with Markdown</title>
 
-  <meta property="og:description" content="Add a default marker to the map." />
+  <meta property="og:description" content="門牌分布地圖" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <link rel='stylesheet' href='https://unpkg.com/maplibre-gl@4.5.2/dist/maplibre-gl.css' />
+  <link rel='stylesheet' href='https://unpkg.com/maplibre-gl@5.4.0/dist/maplibre-gl.css' />
 
-  <script src='https://unpkg.com/maplibre-gl@4.5.2/dist/maplibre-gl.js'></script>
+  <script src='https://unpkg.com/maplibre-gl@5.4.0/dist/maplibre-gl.js'></script>
   <script src='https://cdnjs.cloudflare.com/ajax/libs/leader-line/1.0.7/leader-line.min.js'></script>
   <script src='https://cdnjs.cloudflare.com/ajax/libs/marked/14.0.0/marked.min.js'></script>
   <style>
@@ -26,12 +26,13 @@
     #markdown {
       height: 100%;
     }
-
-    #map,
+    #map {
+      flex: 70%;
+    }
     #markdown {
-      flex: 50%;
+      flex: 30%;
+      padding: 0.5em 1em;
     }
-
     pre {
       display: none;
     }
diff --git a/tigrc b/tigrc
index 1641d2e..2e2863e 100644
--- a/tigrc
+++ b/tigrc
@@ -224,8 +224,8 @@ bind blob m >tig --follow -- %(file)
 
 # }}}
 # status view {{{
-bind status j :/^[MCADRUT?]
-bind status k :?^[MCADRUT?]
+bind status j :/^[MADRT?]
+bind status k :?^[MADRT?]
 
 # use vscode to edit a file
 bind status E !>code %(file)
diff --git a/misc/tmux.conf b/tmux/tmux.conf
index 1ddc877..1ddc877 100644
--- a/misc/tmux.conf
+++ b/tmux/tmux.conf
diff --git a/web/bookmarklet/contextmenu b/web/bookmarklet/contextmenu
new file mode 100644
index 0000000..8bdf4c6
--- /dev/null
+++ b/web/bookmarklet/contextmenu
@@ -0,0 +1 @@
+javascript:(function(w){     var arr = ['contextmenu','copy','cut','paste','mousedown','mouseup','beforeunload','beforeprint'];     for(var i = 0, x; x = arr[i]; i++){         if(w['on' + x])w['on' + x] = null;         w.addEventListener(x, function(e){e.stopPropagation()}, true);     };     for(var j = 0, f; f = w.frames[j]; j++){try{arguments.callee(f)}catch(e){}}})(window);