Merge branch 'master' into lenovo-y480

awesome/pravitekeys.lua

@@ -55,7 +55,7 @@ pravitekeys = awful.util.table.join(
 
    awful.key({ altkey, "Control" }, "r",
       function ()
-         run_or_raise("st", {class = "St"})
+         run_or_raise("xterm", {class = "XTerm"})
    end),
 
    awful.key({ modkey }, "e",

awesome/rc.lua

@@ -89,7 +89,7 @@ local themes = {
 local chosen_theme = themes[5]
 local modkey       = "Mod4"
 local altkey       = "Mod1"
-local terminal     = "st"
+local terminal     = "xterm"
 local vi_focus     = false -- vi-like client focus - https://github.com/lcpz/awesome-copycats/issues/275
 local cycle_prev   = true -- cycle trough all previous client or just the first -- https://github.com/lcpz/awesome-copycats/issues/274
 local editor       = os.getenv("EDITOR") or "vim"

dot/.Xresources

@@ -14,13 +14,16 @@ XTerm.termName: xterm-256color
 XTerm*background: black
 XTerm*foreground: white
 XTerm*xftAntialias: true
-XTerm*faceName: xft:SaraSa Mono SC:antialias=True:autohint=True:size=14
+XTerm*faceName: xft:Sarasa Mono SC:antialias=True:autohint=True:size=14
 XTerm*forceBoxChars: true
 
 ! Alt键设置
 XTerm*metaSendsEscape: true
 XTerm*eightBitInput: false
 
+! Backspace 键设置
+XTerm*backarrowKey: false
+
 XTerm*saveLines: 1000000
 XTerm*selectToClipboard: true
 ! XTerm*faceName: xft:Operator Mono:style=Book:size=14

dot/.bashrc

@@ -35,7 +35,16 @@ if [[ -e $PROXY_SHELL_FILE ]] ; then
     . $PROXY_SHELL_FILE
 fi
 
-if [[ "${TERM}" != "tmux-256color" ]] && [[ -x $(type -p tmux) ]]; then
+if [[ "$TERM" == "linux" ]]; then
+    PS1="(tty) $PS1"
+elif [[ "$TERM" == "fbterm" ]]; then
+    PS1="(fbterm) $PS1"
+fi
+
+# use fbterm to show CJK charactor in tty
+if [[ "$TERM" == "linux" ]] && [[ -x $(type -p fbterm) ]]; then
+    fbterm
+elif [[ "${TERM}" != "tmux-256color" ]] && [[ -z "${TERM_PROGRAM}" ]] && [[ -x $(type -p tmux) ]]; then
     tmux
 fi
 

dot/.tmux.conf

@@ -6,3 +6,10 @@ bind-key M-Space send-prefix
 # set ` as secondary prefix
 set -g prefix2 `
 bind-key ` send-prefix -2
+
+bind '"' split-window -c "#{pane_current_path}"
+bind % split-window -hc "#{pane_current_path}"
+
+# show all text of pane_title
+set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,}\"#{pane_title}\" %Y-%m-%d %H:%M"
+set -g status-right-length 0

gentoo_portage/package.accept_keywords

@@ -25,6 +25,12 @@ dev-libs/nspr ~amd64
 dev-libs/nss ~amd64
 www-client/firefox ~amd64
 
+# wechat
+net-im/wechat ~amd64
+
+# tencent meeting
+net-im/wemeet ~amd64
+
 media-fonts/sarasa-gothic ~amd64
 media-sound/bluez-alsa ~amd64
 

gentoo_portage/package.license

@@ -18,6 +18,7 @@ net-im/deepin-wine-wechat Tencent
 net-im/dingtalk all-rights-reserved
 net-im/wechat all-rights-reserved
 net-im/wechat-universal-bwrap all-rights-reserved
+net-im/wemeet wemeet_license
 net-misc/anydesk AnyDesk-TOS
 net-misc/baidunetdisk BaiduNetDisk
 net-misc/teamviewer TeamViewer

gentoo_portage/package.use

@@ -112,3 +112,6 @@ sys-apps/fwupd bash-completion gnutls logitech nvme synaptics
 # llvm and clang
 llvm-core/clang xml
 llvm-core/llvm xml
+
+# freetype
+media-libs/freetype harfbuzz