From 3f8d4e3a27d2a4c093d93e3f218652300fbf1054 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 9 Jul 2020 09:11:12 +0800 Subject: [PATCH 01/79] Update firefox UI: Visual Tabs --- .mozilla/firefox/profile/chrome/userContent.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index 5219570..95f8560 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -46,6 +46,12 @@ margin-left: auto !important; margin-right: auto !important; } + #tabbox #tabList[mode="compact"] .tab[discarded="true"] { + padding-bottom: 0 !important; + } + #tabbox #tabList[mode="compact"] .tab[discarded="true"] .thumbnail { + display: none !important; + } /* 自动隐藏关闭按钮 */ #tabbox #tabList[mode="compact"] .tab:not(:hover) button.close { display: none !important; From 30a67dcf973d3dfc54901bd796493a6043edf77f Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 9 Jul 2020 10:37:51 +0800 Subject: [PATCH 02/79] Update pam_environment --- .pam_environment | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.pam_environment b/.pam_environment index 711766c..94acce6 100644 --- a/.pam_environment +++ b/.pam_environment @@ -38,6 +38,10 @@ RANDFILE DEFAULT=${XDG_DATA_HOME}/openssl/randfile # wine WINEPREFIX DEFAULT=${XDG_DATA_HOME}/wine +# adb +ANDROID_SDK_HOME DEFAULT=${XDG_CONFIG_HOME}/android +ADB_VENDOR_KEY DEFAULT=${XDG_CONFIG_HOME}/android + # golang GO111MODULE DEFAULT=on GOPROXY DEFAULT=https://goproxy.cn,direct @@ -48,7 +52,7 @@ GOBIN DEFAULT=@{HOME}/bin/go # python PYTHONSTARTUP DEFAULT=${XDG_CONFIG_HOME}/python/repl_startup.py PYTHONPYCACHEPREFIX DEFAULT=@{HOME}/.cache/python -PYTHONUSERBASE DEFAULT=@{HOME}/.packages/python +PYTHONUSERBASE DEFAULT=@{HOME}/.packages/python # ipython IPYTHONDIR DEFAULT=${XDG_CONFIG_HOME}/jupyter JUPYTER_CONFIG_DIR DEFAULT=${XDG_CONFIG_HOME}/jupyter @@ -57,6 +61,9 @@ PYLINTHOME DEFAULT=${XDG_CACHE_HOME}/pylint # mypy MYPY_CACHE_DIR DEFAULT=${XDG_CACHE_HOME}/mypy +# node +NODE_REPL_HISTORY DEFAULT=${XDG_DATA_HOME}/node_repl_history + # npm NPM_CONFIG_USERCONFIG DEFAULT=${XDG_CONFIG_HOME}/npm/npmrc From 8fe8b0f02ff6343ba61b339d61613b98448be289 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sun, 19 Jul 2020 09:40:15 +0800 Subject: [PATCH 03/79] Update firefox UI: Visual Tabs --- .mozilla/firefox/profile/chrome/userContent.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index 95f8560..2eeff72 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -25,6 +25,7 @@ #tabbox #tabList[mode="compact"] .tab { padding-top: 0 !important; padding-left: 0 !important; + padding-bottom: 0 !important; margin-bottom: 15px !important; border-bottom: none !important; } @@ -41,7 +42,7 @@ display: none !important; } #tabbox #tabList[mode="compact"] .tab .thumbnail { - width: 80% !important; + width: 90% !important; margin-top: 5px !important; margin-left: auto !important; margin-right: auto !important; @@ -49,6 +50,7 @@ #tabbox #tabList[mode="compact"] .tab[discarded="true"] { padding-bottom: 0 !important; } + #tabbox #tabList[mode="compact"] .tab[url="about:blank"] .thumbnail, #tabbox #tabList[mode="compact"] .tab[discarded="true"] .thumbnail { display: none !important; } From 5b1b80268e3be5e08a71781a0671dd125c69e48a Mon Sep 17 00:00:00 2001 From: rydesun Date: Sun, 19 Jul 2020 14:31:39 +0800 Subject: [PATCH 04/79] Update firefox UI: Visual Tabs --- .../firefox/profile/chrome/userContent.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index 2eeff72..d05c91c 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -20,6 +20,17 @@ } #tabbox #pinList:not(:empty) .tab { margin-bottom: 15px !important; + border-right-color: #d0d0ff !important; + background: white !important; + } + #tabbox #pinList:not(:empty) .tab[selected="true"] { + background: #d0d0ff !important; + } + #tabbox #pinList:not(:empty) .tab .line1 { + display: none !important; + } + #tabbox #pinList:not(:empty) .tab .line2 { + height: 2px !important; } #tabbox #tabList[mode="compact"] .tab { @@ -63,4 +74,11 @@ #newTab { display: none !important; } + + #menu #contexts { + border-left: none !important; + } + #menu #contexts button { + color: #a0a0a0 !important; + } } From c9539eaf02f62575f961b758f200c5c182cbef30 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 27 Jul 2020 00:45:42 +0800 Subject: [PATCH 05/79] Update git config: use https instead of git protocol --- .config/git/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/git/config b/.config/git/config index aea81d6..b58bf7f 100644 --- a/.config/git/config +++ b/.config/git/config @@ -25,3 +25,5 @@ rebase = true [credential] helper = cache +[url "https://github.com"] + insteadOf = git://github.com From 1bcb55d9718cba2b1a575d26d06b6a28f916cfb7 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 7 Aug 2020 17:05:04 +0800 Subject: [PATCH 06/79] Update firefox user.js --- .mozilla/firefox/profile/user.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mozilla/firefox/profile/user.js b/.mozilla/firefox/profile/user.js index 23f25bd..e81b2a3 100644 --- a/.mozilla/firefox/profile/user.js +++ b/.mozilla/firefox/profile/user.js @@ -6,6 +6,8 @@ user_pref("browser.startup.homepage", "about:blank"); user_pref("browser.newtabpage.enabled", false); /* 所有情况下都启用跟踪保护 */ user_pref("privacy.trackingprotection.enabled", true); +/* 阻止重定向形式的跟踪(效果有限) */ +user_pref("privacy.purge_trackers.enabled", true); /* 打开about:config页面不警告 */ user_pref("browser.aboutConfig.showWarning", false); From 9048ae863e8a02bd05299edd7b97938980db17f6 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 7 Aug 2020 17:08:45 +0800 Subject: [PATCH 07/79] Add cargo config --- .cargo/config | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .cargo/config diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 0000000..401c3ce --- /dev/null +++ b/.cargo/config @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = 'tuna' + +[source.tuna] +registry = "https://mirrors.tuna.tsinghua.edu.cn/git/crates.io-index.git" From e23d61e6b1dca0cf28b01a96693660ebaecbbda8 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 7 Aug 2020 17:10:30 +0800 Subject: [PATCH 08/79] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 76ca7a2..d9cbee9 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ ### 以及配置 +- [x] `cargo` - [x] `fontconfig` - [x] `npm` - [x] `python` From 17d86628a37138e5de5bc1f2db51e1eaea040007 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sat, 15 Aug 2020 13:57:00 +0800 Subject: [PATCH 09/79] Update fontconfig --- .config/fontconfig/fonts.conf | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 4e5564a..77b682c 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -206,7 +206,7 @@ monospace - + Iosevka Term SS04 Noto Sans Mono CJK SC Emoji @@ -256,13 +256,10 @@ alacritty - Emoji + monospace - Noto Sans + Iosevka Term SS04 Symbols Nerd Font - Font Awesome 5 Brands - Font Awesome 5 Free - Twitter Color Emoji From 12a14954b2b07cf21fb74546cc945813aa155f8f Mon Sep 17 00:00:00 2001 From: rydesun Date: Sat, 3 Oct 2020 22:08:59 +0800 Subject: [PATCH 10/79] Rewrite fontconfig --- .config/fontconfig/fonts.conf | 315 ++++++---------------------------- 1 file changed, 57 insertions(+), 258 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 77b682c..3f408b9 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -2,265 +2,64 @@ - - - - false - + + + mono + monospace + + + Source Code + monospace + + + + sans + sans + + + Cantarell + sans + + + Microsoft Yahei + sans + + + + serif + serif + + + SimSun + serif - - - - - DejaVu Sans - - - DejaVu Serif - - - DejaVu Sans Mono - - - - - - - /usr/share/fonts/adobe-source-code-pro/* - - - - - - /usr/share/fonts/wps-office/* - - - - - - Microsoft Yahei - - Noto Sans CJK SC - - - - SimSun - - Noto Serif CJK SC - - - - SimSun-18030 - - Noto Serif CJK SC - - - - Source Code Pro - - Iosevka Term SS04 - - - - - - - zh - sans-serif - - Noto Sans CJK SC - - - - zh - serif - - Noto Serif CJK SC - - - - zh - monospace - - Iosevka Term SS04 - Noto Sans Mono CJK SC - - - - - zh-HK - sans-serif - - Noto Sans CJK HK - - - - zh-HK - serif - - Noto Serif CJK HK - - - - zh-HK - monospace - - Iosevka Term SS04 - Noto Sans Mono CJK HK - - - - - zh-TW - sans-serif - - Noto Sans CJK TC - - - - zh-TW - serif - - Noto Serif CJK TC - - - - zh-TW - monospace - - Iosevka Term SS04 - Noto Sans Mono CJK TC - - - - - ja - sans-serif - - Noto Sans CJK JP - - - - ja - serif - - Noto Serif CJK JP - - - - ja - monospace - - Iosevka Term SS04 - Noto Sans Mono CJK JP - - - - - ko - sans-serif - - Noto Sans CJK KR - - - - ko - serif - - Noto Serif CJK KR - - - - ko - monospace - - Iosevka Term SS04 - Noto Sans Mono CJK KR - - - - - - - sans-serif - - - Noto Sans CJK SC - Noto Sans - Emoji - - - - - - serif - - - Noto Serif CJK SC - Noto Serif - Emoji - - - - - - monospace - - - Iosevka Term SS04 - Noto Sans Mono CJK SC - Emoji - - - - - - - Emoji - - - Noto Sans - Font Awesome 5 Brands - Font Awesome 5 Free - Twitter Color Emoji - Symbols Nerd Font - - - - - - Symbola - - - Emoji - - - - - EmojiSymbols - - - Emoji - - - - - - regular - medium - - - Firefox - 400 - - - - alacritty - monospace - - Iosevka Term SS04 - Symbols Nerd Font - - + + + monospace + + Iosevka Fixed SS04 Extended + Noto Sans Mono CJK SC + Symbols Nerd Font + + + + + sans + + Noto Sans + Noto Sans CJK SC + Symbols Nerd Font + + + + + serif + + Noto Serif + Noto Serif CJK SC + Symbols Nerd Font + + From 39998286013859aac593f845c3d40494ada212d4 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 5 Oct 2020 20:12:29 +0800 Subject: [PATCH 11/79] Change alacritty letter spacing --- .config/alacritty/alacritty.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index bc30635..b93805c 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -5,6 +5,8 @@ window: instance: Terminal Emulator font: size: 12 + offset: + y: 5 # colorscheme: Material colors: # Default colors From 8133d4499d1ec103c9c77d3d52d78a5b4f2e6fa2 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 5 Oct 2020 20:16:50 +0800 Subject: [PATCH 12/79] Update fontconfig: use Iosevka Custom --- .config/fontconfig/fonts.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 3f408b9..b49a08b 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -38,14 +38,14 @@ monospace - Iosevka Fixed SS04 Extended + Iosevka Custom Noto Sans Mono CJK SC Symbols Nerd Font - sans + sans-serif Noto Sans Noto Sans CJK SC From 60bae40e69f3b019ef30babc09fa7cc513ba3edd Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 5 Oct 2020 20:25:24 +0800 Subject: [PATCH 13/79] Update fontconfig: blocklist only --- .config/fontconfig/fonts.conf | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index b49a08b..aa53092 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -3,32 +3,20 @@ - - mono - monospace - Source Code monospace - - sans - sans - Cantarell - sans + sans-serif Microsoft Yahei - sans + sans-serif - - serif - serif - SimSun serif From fabf5fe2d60878d9aea4daccf4756f8f1cb46b6b Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 5 Oct 2020 20:43:45 +0800 Subject: [PATCH 14/79] Update zshrc: add nvm hint --- .config/zsh/.zshrc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 8ae73e2..8e0e4ac 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -130,10 +130,16 @@ precmd() { fi # python virtualenv标志 if [ -n "$VIRTUAL_ENV" ]; then - PROMPT_pyvenv="%{$bg[cyan]$fg[black]%} pyvenv %{$reset_color%}" + PROMPT_pyvenv="%{$bg[cyan]$fg[white]%} pyvenv %{$reset_color%}" else PROMPT_pyvenv="" fi + # nvm标志 + if [ -n "$NVM_BIN" ]; then + PROMPT_nvm="%{$bg[cyan]$fg[white]%} nvm %{$reset_color%}" + else + PROMPT_nvm="" + fi if command -v __git_ps1 &>/dev/null; then PROMPT_git=$(__git_ps1 " %s${_icon_gitdir:-)}") fi @@ -145,7 +151,7 @@ precmd() { fi PROMPT="${_color_host}▒${PROMPT_git} ${PROMPT_cwd}${PROMPT_tail}${_color_reset}" - RPROMPT="${PROMPT_err}${PROMPT_pyvenv}${PROMPT_tmux}${PROMPT_ssh}${PROMPT_host}" + RPROMPT="${PROMPT_err}${PROMPT_pyvenv}${PROMPT_nvm}${PROMPT_tmux}${PROMPT_ssh}${PROMPT_host}" # 设置终端标题 print -n "\e]0;zsh ( ${_collapsed_pwd} )\a" From 0dc4d93ce93fd6081687d4f53899d953dc71faea Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 5 Oct 2020 20:55:22 +0800 Subject: [PATCH 15/79] Update pam_environment: add nvm --- .pam_environment | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pam_environment b/.pam_environment index 94acce6..3734386 100644 --- a/.pam_environment +++ b/.pam_environment @@ -66,6 +66,8 @@ NODE_REPL_HISTORY DEFAULT=${XDG_DATA_HOME}/node_repl_history # npm NPM_CONFIG_USERCONFIG DEFAULT=${XDG_CONFIG_HOME}/npm/npmrc +# nvm +NVM_DIR DEFAULT=${XDG_DATA_HOME}/nvm # ruby bundler BUNDLE_USER_CONFIG DEFAULT=${XDG_CONFIG_HOME}/bundle From d434bbe75f7dd2cd40c3f4eebb0dedd612b94c20 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 5 Oct 2020 23:14:00 +0800 Subject: [PATCH 16/79] Update fontconfig: add other languages --- .config/fontconfig/fonts.conf | 86 +++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index aa53092..06abdfc 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -50,4 +50,90 @@ + + + zh-HK + Noto Sans Mono CJK SC + + Noto Sans Mono CJK HK + + + + zh-HK + Noto Sans CJK SC + + Noto Sans CJK HK + + + + zh-HK + Noto Serif CJK SC + + Noto Serif CJK HK + + + + zh-TW + Noto Sans Mono CJK SC + + Noto Sans Mono CJK TW + + + + zh-TW + Noto Sans CJK SC + + Noto Sans CJK TW + + + + zh-TW + Noto Serif CJK SC + + Noto Serif CJK TW + + + + ja + Noto Sans Mono CJK SC + + Noto Sans Mono CJK JP + + + + ja + Noto Sans CJK SC + + Noto Sans CJK JP + + + + ja + Noto Serif CJK SC + + Noto Serif CJK JP + + + + ko + Noto Sans Mono CJK SC + + Noto Sans Mono CJK KR + + + + ko + Noto Sans CJK SC + + Noto Sans CJK KR + + + + ko + Noto Serif CJK SC + + Noto Serif CJK KR + + + From 3ec986f3b70833a10648bf3819c5bb749256e83f Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 6 Oct 2020 11:32:18 +0800 Subject: [PATCH 17/79] Update fontconfig: alternate fonts --- .config/fontconfig/fonts.conf | 69 +++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 06abdfc..4ec8f8f 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -2,26 +2,6 @@ - - - Source Code - monospace - - - - Cantarell - sans-serif - - - Microsoft Yahei - sans-serif - - - - SimSun - serif - - monospace @@ -136,4 +116,53 @@ + + + Cantarell + Noto Sans + + + Arial + Noto Sans + + + Tahoma + Noto Sans + + + Calibri + Noto Sans + + + Microsoft YaHei + Noto Sans CJK SC + + + SimHei + Noto Sans CJK SC + + + + Times New Roman + Noto Serif + + + SimSun + Noto Serif CJK SC + + + FangSong + Noto Serif CJK SC + + + + Source Code + Iosevka Custom + + + + KaiTi + AR PL UKai CN + + From f93264a47e3a8dd4b1d0c18738ededfb80b80c6c Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 6 Oct 2020 15:34:19 +0800 Subject: [PATCH 18/79] Update fontconfig: fix Noto CJK TC --- .config/fontconfig/fonts.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 4ec8f8f..4919380 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -56,21 +56,21 @@ zh-TW Noto Sans Mono CJK SC - Noto Sans Mono CJK TW + Noto Sans Mono CJK TC zh-TW Noto Sans CJK SC - Noto Sans CJK TW + Noto Sans CJK TC zh-TW Noto Serif CJK SC - Noto Serif CJK TW + Noto Serif CJK TC From 062420c18e96ec1934afbf95d91b5561dac16ea0 Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 6 Oct 2020 17:44:59 +0800 Subject: [PATCH 19/79] Update fontconfig: prefer latin fonts --- .config/fontconfig/fonts.conf | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 4919380..352f7ae 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -135,11 +135,17 @@ Microsoft YaHei - Noto Sans CJK SC + + Noto Sans + Noto Sans CJK SC + SimHei - Noto Sans CJK SC + + Noto Sans + Noto Sans CJK SC + @@ -148,11 +154,17 @@ SimSun - Noto Serif CJK SC + + Noto Serif + Noto Serif CJK SC + FangSong - Noto Serif CJK SC + + Noto Serif + Noto Serif CJK SC + @@ -162,7 +174,10 @@ KaiTi - AR PL UKai CN + + Noto Serif + AR PL UKai CN + From f8307c47fdf8469efe0bfb9d55df5d401b636ce2 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 7 Oct 2020 12:02:26 +0800 Subject: [PATCH 20/79] Update fontconfig: format --- .config/fontconfig/fonts.conf | 66 +++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 352f7ae..e87ab69 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -2,16 +2,7 @@ - - - monospace - - Iosevka Custom - Noto Sans Mono CJK SC - Symbols Nerd Font - - - + sans-serif @@ -20,6 +11,7 @@ Symbols Nerd Font + serif @@ -30,14 +22,17 @@ + + + monospace + + Iosevka Custom + Noto Sans Mono CJK SC + Symbols Nerd Font + + + - - zh-HK - Noto Sans Mono CJK SC - - Noto Sans Mono CJK HK - - zh-HK Noto Sans CJK SC @@ -53,12 +48,13 @@ - zh-TW + zh-HK Noto Sans Mono CJK SC - Noto Sans Mono CJK TC + Noto Sans Mono CJK HK + zh-TW Noto Sans CJK SC @@ -74,12 +70,13 @@ - ja + zh-TW Noto Sans Mono CJK SC - Noto Sans Mono CJK JP + Noto Sans Mono CJK TC + ja Noto Sans CJK SC @@ -95,12 +92,13 @@ - ko + ja Noto Sans Mono CJK SC - Noto Sans Mono CJK KR + Noto Sans Mono CJK JP + ko Noto Sans CJK SC @@ -115,8 +113,15 @@ Noto Serif CJK KR + + ko + Noto Sans Mono CJK SC + + Noto Sans Mono CJK KR + + - + Cantarell Noto Sans @@ -147,6 +152,7 @@ Noto Sans CJK SC + Times New Roman @@ -166,12 +172,6 @@ Noto Serif CJK SC - - - Source Code - Iosevka Custom - - KaiTi @@ -180,4 +180,10 @@ + + + Source Code + Iosevka Custom + + From a04455e7891e925dcd9daea5e70527a91a549112 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 7 Oct 2020 22:34:00 +0800 Subject: [PATCH 21/79] Update fontconfig: system-ui --- .config/fontconfig/fonts.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index e87ab69..5b4ad5e 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -2,6 +2,14 @@ + + + system-ui + + sans-serif + + + sans-serif From 7f4a7a5872ce7212631e65ef1f4f40793f3d4d43 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 8 Oct 2020 14:24:37 +0800 Subject: [PATCH 22/79] Update fontconfig: kaiti fallback --- .config/fontconfig/fonts.conf | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 5b4ad5e..5f412dd 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -180,13 +180,6 @@ Noto Serif CJK SC - - KaiTi - - Noto Serif - AR PL UKai CN - - @@ -194,4 +187,25 @@ Iosevka Custom + + + + KaiTi + + Noto Serif + AR PL UKai CN + Noto Serif CJK SC + + + + + AR PL UKai + + Noto Serif + + + Noto Serif CJK SC + + + From 9b9c3248a532d37182892f61084fd32a6ef8ad98 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 8 Oct 2020 19:54:27 +0800 Subject: [PATCH 23/79] Update fontconfig: format --- .config/fontconfig/fonts.conf | 239 +++++++++++++++++++++++----------- 1 file changed, 165 insertions(+), 74 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 5f412dd..c2b4bf3 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -1,129 +1,185 @@ - + - - system-ui - - sans-serif - - + + + system-ui + + + sans-serif + + - - sans-serif - - Noto Sans - Noto Sans CJK SC - Symbols Nerd Font - - + + + sans-serif + + + Noto Sans + Noto Sans CJK SC + Symbols Nerd Font + + - - serif - - Noto Serif - Noto Serif CJK SC - Symbols Nerd Font - - + + + serif + + + Noto Serif + Noto Serif CJK SC + Symbols Nerd Font + + - - monospace - - Iosevka Custom - Noto Sans Mono CJK SC - Symbols Nerd Font - - + + + monospace + + + Iosevka Custom + Noto Sans Mono CJK SC + Symbols Nerd Font + + - zh-HK - Noto Sans CJK SC + + zh-HK + + + Noto Sans CJK SC + Noto Sans CJK HK - zh-HK - Noto Serif CJK SC + + zh-HK + + + Noto Serif CJK SC + Noto Serif CJK HK - zh-HK - Noto Sans Mono CJK SC + + zh-HK + + + Noto Sans Mono CJK SC + Noto Sans Mono CJK HK - zh-TW - Noto Sans CJK SC + + zh-TW + + + Noto Sans CJK SC + Noto Sans CJK TC - zh-TW - Noto Serif CJK SC + + zh-TW + + + Noto Serif CJK SC + Noto Serif CJK TC - zh-TW - Noto Sans Mono CJK SC + + zh-TW + + + Noto Sans Mono CJK SC + Noto Sans Mono CJK TC - ja - Noto Sans CJK SC + + ja + + + Noto Sans CJK SC + Noto Sans CJK JP - ja - Noto Serif CJK SC + + ja + + + Noto Serif CJK SC + Noto Serif CJK JP - ja - Noto Sans Mono CJK SC + + ja + + + Noto Sans Mono CJK SC + Noto Sans Mono CJK JP - ko - Noto Sans CJK SC + + ko + + + Noto Sans CJK SC + Noto Sans CJK KR - ko - Noto Serif CJK SC + + ko + + + Noto Serif CJK SC + Noto Serif CJK KR - ko - Noto Sans Mono CJK SC + + ko + + + Noto Sans Mono CJK SC + Noto Sans Mono CJK KR @@ -131,30 +187,50 @@ - Cantarell - Noto Sans + + Cantarell + + + Noto Sans + - Arial - Noto Sans + + Arial + + + Noto Sans + - Tahoma - Noto Sans + + Tahoma + + + Noto Sans + - Calibri - Noto Sans + + Calibri + + + Noto Sans + - Microsoft YaHei + + Microsoft YaHei + Noto Sans Noto Sans CJK SC - SimHei + + SimHei + Noto Sans Noto Sans CJK SC @@ -163,18 +239,26 @@ - Times New Roman - Noto Serif + + Times New Roman + + + Noto Serif + - SimSun + + SimSun + Noto Serif Noto Serif CJK SC - FangSong + + FangSong + Noto Serif Noto Serif CJK SC @@ -183,14 +267,19 @@ - Source Code - Iosevka Custom + + Source Code + + + Iosevka Custom + - - KaiTi + + KaiTi + Noto Serif AR PL UKai CN @@ -199,7 +288,9 @@ - AR PL UKai + + AR PL UKai + Noto Serif From 6ee4143307af9f77453fb9a68baf3b5ffd1b43d3 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 12 Oct 2020 13:29:18 +0800 Subject: [PATCH 24/79] Update fontconfig: prefer latin fonts --- .config/fontconfig/fonts.conf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index c2b4bf3..405bf9f 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -299,4 +299,17 @@ + + + + Noto + + + CJK + + + Noto Sans + + + From 158df700cab4aae8e4b12e1ababd3f2b64b9c95b Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 12 Oct 2020 13:38:52 +0800 Subject: [PATCH 25/79] Update fontconfig: replace fonts for familylang cn --- .config/fontconfig/fonts.conf | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 405bf9f..79f2e5f 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -227,6 +227,15 @@ Noto Sans CJK SC + + + 微软雅黑 + + + Noto Sans + Noto Sans CJK SC + + SimHei @@ -236,6 +245,15 @@ Noto Sans CJK SC + + + 黑体 + + + Noto Sans + Noto Sans CJK SC + + @@ -255,6 +273,15 @@ Noto Serif CJK SC + + + 宋体 + + + Noto Serif + Noto Serif CJK SC + + FangSong @@ -264,6 +291,15 @@ Noto Serif CJK SC + + + 仿宋 + + + Noto Serif + Noto Serif CJK SC + + @@ -298,6 +334,17 @@ Noto Serif CJK SC + + + 楷体 + + + Noto Serif + + + Noto Serif CJK SC + + From 69c2ca399c3d9b1ba417edcd9e0b65978e8ce81e Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 12 Oct 2020 14:43:41 +0800 Subject: [PATCH 26/79] Fix fontconfig: serif CJK fallback --- .config/fontconfig/fonts.conf | 42 ++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 79f2e5f..a1a491a 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -322,6 +322,16 @@ Noto Serif CJK SC + + + 楷体 + + + Noto Serif + AR PL UKai CN + Noto Serif CJK SC + + @@ -334,29 +344,31 @@ Noto Serif CJK SC - - - 楷体 - - - Noto Serif - - - Noto Serif CJK SC - - - Noto - - - CJK + Noto Sans CJK Noto Sans + + + Noto Serif CJK + + + Noto Serif + + + + + Noto Sans Mono CJK + + + Iosevka Custom + + From 1792f63f889ed1945f6b9f1f6d5db049e2e30d49 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 15 Oct 2020 12:20:17 +0800 Subject: [PATCH 27/79] Update fontconfig: emoji fonts --- .config/fontconfig/fonts.conf | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index a1a491a..e613d8b 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -20,7 +20,7 @@ Noto Sans Noto Sans CJK SC - Symbols Nerd Font + emoji @@ -32,7 +32,7 @@ Noto Serif Noto Serif CJK SC - Symbols Nerd Font + emoji @@ -44,6 +44,17 @@ Iosevka Custom Noto Sans Mono CJK SC + emoji + + + + + + + monospace + + + Blobmoji Symbols Nerd Font From 3f0f68ae25d655d90ee62b1dd1f20bdceb9ecee2 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 15 Oct 2020 19:38:47 +0800 Subject: [PATCH 28/79] Fix fontconfig: emoji fonts --- .config/fontconfig/fonts.conf | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index e613d8b..44a1414 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -51,7 +51,7 @@ - monospace + emoji Blobmoji @@ -382,4 +382,17 @@ + + + + Noto Color Emoji + + + firefox + + + Blobmoji + + + From 2cd66fc11c05b42e19ab5d636b8d760fc8838095 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 16 Oct 2020 00:17:05 +0800 Subject: [PATCH 29/79] Update firefox: sidebar --- .mozilla/firefox/profile/chrome/userChrome.css | 4 ++++ .mozilla/firefox/profile/chrome/userContent.css | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index 58f016d..ad1dd0b 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -25,6 +25,10 @@ background-color: unset !important; } +#sidebar { + min-width: 11em !important; +} + /* 暗色侧边栏 */ #sidebar-header { -moz-appearance: none !important; diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index d05c91c..7860773 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -56,7 +56,7 @@ width: 90% !important; margin-top: 5px !important; margin-left: auto !important; - margin-right: auto !important; + margin-right: 0 !important; } #tabbox #tabList[mode="compact"] .tab[discarded="true"] { padding-bottom: 0 !important; From 325f9160377c86cbd2b70867b766b3a5401d4378 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 16 Oct 2020 11:42:04 +0800 Subject: [PATCH 30/79] Mini updates --- .config/X11/Xresources | 3 +-- .config/pikaur.conf | 2 ++ .pam_environment | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.config/X11/Xresources b/.config/X11/Xresources index c785b5d..d54c138 100644 --- a/.config/X11/Xresources +++ b/.config/X11/Xresources @@ -7,8 +7,7 @@ Xft.hintstyle: hintslight Xft.hinting: 1 Xft.antialias: 1 Xft.rgba: rgb -*.font: xft:Iosevka Term SS04:pixelsize=18,\ - xft:Noto Sans CJK SC:pixelsize=18 +*.font: xft:monospace:size=12 !--- colorscheme: material ---! ! special diff --git a/.config/pikaur.conf b/.config/pikaur.conf index 235c7d6..199ea86 100644 --- a/.config/pikaur.conf +++ b/.config/pikaur.conf @@ -31,6 +31,8 @@ privilegeescalationtool = sudo aururl = https://aur.tuna.tsinghua.edu.cn newsurl = https://www.archlinux.org/feeds/news/ socks5proxy = +aurhttpproxy = +aurhttpsproxy = [review] donteditbydefault = no diff --git a/.pam_environment b/.pam_environment index 3734386..7d2865c 100644 --- a/.pam_environment +++ b/.pam_environment @@ -1,7 +1,7 @@ # default EDITOR DEFAULT=nvim BROWSER DEFAULT=firefox -MANPAGER DEFAULT="nvim -c 'set ft=man' -" +MANPAGER DEFAULT="nvim +Man!" # xdg base directory XDG_CONFIG_HOME DEFAULT=@{HOME}/.config From 6db1ba128a762123afa9c5a4a5f94054104bb9e3 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sat, 17 Oct 2020 19:48:20 +0800 Subject: [PATCH 31/79] Update fontconfig: remove config --- .config/fontconfig/conf.d/09-autohint-if-no-hinting.conf | 1 - .config/fontconfig/conf.d/70-no-bitmaps.conf | 1 - 2 files changed, 2 deletions(-) delete mode 120000 .config/fontconfig/conf.d/09-autohint-if-no-hinting.conf delete mode 120000 .config/fontconfig/conf.d/70-no-bitmaps.conf diff --git a/.config/fontconfig/conf.d/09-autohint-if-no-hinting.conf b/.config/fontconfig/conf.d/09-autohint-if-no-hinting.conf deleted file mode 120000 index e9a60a4..0000000 --- a/.config/fontconfig/conf.d/09-autohint-if-no-hinting.conf +++ /dev/null @@ -1 +0,0 @@ -/etc/fonts/conf.avail/09-autohint-if-no-hinting.conf \ No newline at end of file diff --git a/.config/fontconfig/conf.d/70-no-bitmaps.conf b/.config/fontconfig/conf.d/70-no-bitmaps.conf deleted file mode 120000 index d6c7fc1..0000000 --- a/.config/fontconfig/conf.d/70-no-bitmaps.conf +++ /dev/null @@ -1 +0,0 @@ -/etc/fonts/conf.avail/70-no-bitmaps.conf \ No newline at end of file From 63e5d43ccbaab5c431585d094f5a5aa717561c81 Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 27 Oct 2020 15:54:40 +0800 Subject: [PATCH 32/79] Update fontconfig: add vim modeline --- .config/fontconfig/fonts.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 44a1414..bf73bdf 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -396,3 +396,6 @@ + + From 57e63c9cc4c46032bf4b09307011c65f5b31c564 Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 27 Oct 2020 18:59:06 +0800 Subject: [PATCH 33/79] Fix fontconfig: chrome fallback bug --- .config/fontconfig/fonts.conf | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index bf73bdf..b7cc257 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -234,7 +234,6 @@ Microsoft YaHei - Noto Sans Noto Sans CJK SC @@ -243,7 +242,6 @@ 微软雅黑 - Noto Sans Noto Sans CJK SC @@ -252,7 +250,6 @@ SimHei - Noto Sans Noto Sans CJK SC @@ -261,7 +258,6 @@ 黑体 - Noto Sans Noto Sans CJK SC @@ -280,7 +276,6 @@ SimSun - Noto Serif Noto Serif CJK SC @@ -289,7 +284,6 @@ 宋体 - Noto Serif Noto Serif CJK SC @@ -298,7 +292,6 @@ FangSong - Noto Serif Noto Serif CJK SC @@ -307,7 +300,6 @@ 仿宋 - Noto Serif Noto Serif CJK SC @@ -328,7 +320,6 @@ KaiTi - Noto Serif AR PL UKai CN Noto Serif CJK SC @@ -338,7 +329,6 @@ 楷体 - Noto Serif AR PL UKai CN Noto Serif CJK SC @@ -348,9 +338,6 @@ AR PL UKai - - Noto Serif - Noto Serif CJK SC @@ -361,6 +348,9 @@ Noto Sans CJK + + chrome + Noto Sans @@ -369,6 +359,9 @@ Noto Serif CJK + + chrome + Noto Serif @@ -377,6 +370,9 @@ Noto Sans Mono CJK + + chrome + Iosevka Custom From 6853b85762746adffd246be1b57360b4210d1f69 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 9 Nov 2020 20:31:50 +0800 Subject: [PATCH 34/79] New look --- .config/X11/Xresources | 2 +- .config/X11/xinitrc | 6 ------ .config/alacritty/alacritty.yml | 2 +- .config/xsettingsd/xsettingsd.conf | 4 ++++ 4 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 .config/xsettingsd/xsettingsd.conf diff --git a/.config/X11/Xresources b/.config/X11/Xresources index d54c138..f630f78 100644 --- a/.config/X11/Xresources +++ b/.config/X11/Xresources @@ -1,4 +1,4 @@ -Xft.dpi: 115 +Xcursor.theme: Breeze-Adapta-Cursor !--- font ---! Xft.autohint: 0 diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index 9ea4f53..e5710c6 100644 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -30,10 +30,4 @@ setxkbmap -option caps:swapescape setxkbmap -option ctrl:rctrl_ralt setxkbmap -option ctrl:ralt_rctrl -# Use NVIDIA graphics only -# https://wiki.archlinux.org/index.php/NVIDIA_Optimus#Use_NVIDIA_graphics_only -xrandr --setprovideroutputsource modesetting NVIDIA-0 -xrandr --auto -export VDPAU_DRIVER=nvidia - exec qtile diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index b93805c..d28cb20 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -4,7 +4,7 @@ window: class: instance: Terminal Emulator font: - size: 12 + size: 9 offset: y: 5 # colorscheme: Material diff --git a/.config/xsettingsd/xsettingsd.conf b/.config/xsettingsd/xsettingsd.conf new file mode 100644 index 0000000..46d4730 --- /dev/null +++ b/.config/xsettingsd/xsettingsd.conf @@ -0,0 +1,4 @@ +Xft/Hinting 1 +Xft/HintStyle "hintslight" +Xft/Antialias 1 +Xft/RGBA "rgb" From 67fc425793700bb6fa9c9300f88edfb2cec82e8c Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 11 Nov 2020 18:20:45 +0800 Subject: [PATCH 35/79] Enable VA-API support for firefox --- .config/X11/xinitrc | 2 ++ .mozilla/firefox/profile/user.js | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index e5710c6..6bbb7d6 100644 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -23,6 +23,8 @@ export XMODIFIERS=@im=fcitx export QT_QPA_PLATFORMTHEME=qt5ct export BROWSER=firefox +# Enable VA-API support for firefox +export MOZ_X11_EGL=1 # swap Caps_Lock and Escape setxkbmap -option caps:swapescape diff --git a/.mozilla/firefox/profile/user.js b/.mozilla/firefox/profile/user.js index e81b2a3..88c1b24 100644 --- a/.mozilla/firefox/profile/user.js +++ b/.mozilla/firefox/profile/user.js @@ -46,3 +46,13 @@ user_pref("media.peerconnection.enabled", false); /* 禁止获取媒体设备列表API * 注意: 需要同时禁止WebRTC */ user_pref("media.navigator.enabled", false); + +/*==== 硬件视频加速 ====*/ +/* 开启WebRender */ +user_pref("gfx.webrender.all", true); +/* 使用VA-API */ +user_pref("media.ffmpeg.vaapi.enabled", true); +/* 禁用firefox内置的VP8/VP9解码 */ +user_pref("media.ffvpx.enabled", false); +/* 显卡不支持AV1解码 */ +user_pref("media.av1.enabled", false); From 8d6c809a1f8a64e8bcf271326299673a38717138 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sat, 14 Nov 2020 15:10:36 +0800 Subject: [PATCH 36/79] Update theme --- .config/alacritty/alacritty.yml | 2 +- .mozilla/firefox/profile/chrome/userChrome.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index d28cb20..66d133e 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -6,7 +6,7 @@ window: font: size: 9 offset: - y: 5 + y: 4 # colorscheme: Material colors: # Default colors diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index ad1dd0b..e0aa5c9 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -26,7 +26,7 @@ } #sidebar { - min-width: 11em !important; + min-width: 10em !important; } /* 暗色侧边栏 */ @@ -45,6 +45,7 @@ treechildren::-moz-tree-separator { border-color: #333 !important } #sidebar-splitter { + width: 4px !important; border: 0px !important; background-color: var(--frame-background-color) !important; } From 7b90079d7b39b56e22b451eb198063834d361354 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sat, 14 Nov 2020 15:11:03 +0800 Subject: [PATCH 37/79] Set antibody data dir --- .pam_environment | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.pam_environment b/.pam_environment index 7d2865c..752f03b 100644 --- a/.pam_environment +++ b/.pam_environment @@ -14,6 +14,9 @@ GTK2_RC_FILES DEFAULT=${XDG_CONFIG_HOME}/gtk-2.0/gtkrc # readline INPUTRC DEFAULT=${XDG_CONFIG_HOME}/readline/inputrc +# antibody +ANTIBODY_HOME DEFAULT=${XDG_DATA_HOME}/antibody + # xorg-xauth XAUTHORITY DEFAULT=${XDG_RUNTIME_DIR}/Xauthority From 0aeb174c6083801b04746aa6b104a603ec68cb9f Mon Sep 17 00:00:00 2001 From: rydesun Date: Sat, 14 Nov 2020 15:12:13 +0800 Subject: [PATCH 38/79] Add zsh alias --- .config/zsh/.zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 8e0e4ac..93e72ae 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -190,6 +190,7 @@ alias g='git' && compdef g=git alias py='python' && compdef py=python alias config='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME' && compdef config=git alias ssh='TERM=xterm-256color ssh' +alias mountdisk="mount | grep -E '^(/dev/sd|/dev/nvme|/dev/mmcblk|gvfsd-fuse)' | awk '{print \$1 \"\t\" \$5 \"\t\" \$3 \"\n\t\t\" \$6}'" # >>>----------------------------------- # vim: foldmethod=marker:foldmarker=<<<---,>>>--- From 3f3b15f40178fe2af27967a0690c7bb210fbd519 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 18 Nov 2020 18:12:32 +0800 Subject: [PATCH 39/79] better autostart --- .config/X11/xserverrc | 2 +- .config/zsh/.zprofile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.config/X11/xserverrc b/.config/X11/xserverrc index b4de252..790c916 100644 --- a/.config/X11/xserverrc +++ b/.config/X11/xserverrc @@ -1,2 +1,2 @@ #!/bin/sh -exec /usr/bin/X -nolisten tcp "$@" +exec /usr/bin/Xorg -nolisten tcp -nolisten local -keeptty "$@" vt$XDG_VTNR diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 670e587..d7de27c 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -1,3 +1,4 @@ +# Autostart X if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then - xinit -- vt$XDG_VTNR + xinit fi From cee11f1aa6eae0262d5ba4b7d54247978bfb56a3 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 18 Nov 2020 18:12:46 +0800 Subject: [PATCH 40/79] Update zshrc: set word delimiter and fzf default command --- .config/zsh/.zshrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 93e72ae..ce3a630 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -70,7 +70,7 @@ if [[ -f /usr/share/fzf/completion.zsh ]]; then source /usr/share/fzf/completion.zsh fi export FZF_COMPLETION_TRIGGER='~~' -export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden' +export FZF_DEFAULT_COMMAND='fd -uu -E .git -E .node_modules' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" # >>>----------------------------------- @@ -81,6 +81,8 @@ bindkey -e if [[ -f /usr/share/fzf/key-bindings.zsh ]]; then source /usr/share/fzf/key-bindings.zsh fi +# 默认 WORDCHARS='*?_-.[]~=/&;!#$%^(){}<>' +export WORDCHARS='*?_-.[]~=&;!#$%^(){}<>' # >>>----------------------------------- # 提示符 <<<---------------------------- From c07e1ec9243ece6bdb6b8e4d7dda0e59caacaa28 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 19 Nov 2020 16:19:22 +0800 Subject: [PATCH 41/79] Fix env var: PATH --- .pam_environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pam_environment b/.pam_environment index 752f03b..30553e6 100644 --- a/.pam_environment +++ b/.pam_environment @@ -82,4 +82,4 @@ DOCKER_CONFIG DEFAULT=${XDG_CONFIG_HOME}/docker # PATH PATH DEFAULT=@{HOME}/bin:${GOBIN}:${PYTHONUSERBASE}/bin:@{HOME}/.packages/node_modules/.bin\ -:/usr/bin:/usr/local/bin +:/usr/local/sbin:/usr/local/bin:/usr/bin From 0a917164b53f674c97657fc66fd222463829758d Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 19 Nov 2020 19:10:31 +0800 Subject: [PATCH 42/79] Split xinitrc --- .config/X11/xinitrc | 19 +++++-------------- .config/X11/xprofile | 7 +++++++ .pam_environment | 12 ++++++++++++ 3 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 .config/X11/xprofile diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index 6bbb7d6..a8145a8 100644 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -16,20 +16,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi # ================================== -export LANG=zh_CN.UTF-8 -export GTK_IM_MODULE=fcitx -export QT_IM_MODULE=fcitx -export XMODIFIERS=@im=fcitx -export QT_QPA_PLATFORMTHEME=qt5ct +source ${XDG_CONFIG_HOME}/X11/xprofile -export BROWSER=firefox -# Enable VA-API support for firefox -export MOZ_X11_EGL=1 - -# swap Caps_Lock and Escape -setxkbmap -option caps:swapescape -# swap Ctrl_R and Alt_R -setxkbmap -option ctrl:rctrl_ralt -setxkbmap -option ctrl:ralt_rctrl +# alternative program +if [[ -n "$@" ]]; then + exec "$@" +fi exec qtile diff --git a/.config/X11/xprofile b/.config/X11/xprofile new file mode 100644 index 0000000..af132d4 --- /dev/null +++ b/.config/X11/xprofile @@ -0,0 +1,7 @@ +export LANG=zh_CN.UTF-8 + +# swap Caps_Lock and Escape +setxkbmap -option caps:swapescape +# swap Ctrl_R and Alt_R +setxkbmap -option ctrl:rctrl_ralt +setxkbmap -option ctrl:ralt_rctrl diff --git a/.pam_environment b/.pam_environment index 30553e6..c4d9faf 100644 --- a/.pam_environment +++ b/.pam_environment @@ -11,6 +11,18 @@ XDG_DATA_HOME DEFAULT=@{HOME}/.data # gtk2 GTK2_RC_FILES DEFAULT=${XDG_CONFIG_HOME}/gtk-2.0/gtkrc +# qt5 +QT_QPA_PLATFORMTHEME DEFAULT=qt5ct + +# fcitx +GTK_IM_MODULE DEFAULT=fcitx +QT_IM_MODULE DEFAULT=fcitx +XMODIFIERS DEFAULT=@im=fcitx + +# firefox +# Enable VA-API support +MOZ_X11_EGL DEFAULT=1 + # readline INPUTRC DEFAULT=${XDG_CONFIG_HOME}/readline/inputrc From 2813adb28a23af9b4bc4b5a5fc1f49cc9c69c6c5 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 19 Nov 2020 20:34:10 +0800 Subject: [PATCH 43/79] manage session --- .config/X11/{xprofile => profile} | 0 .config/X11/{Xresources => resources} | 0 .config/X11/{xserverrc => serverrc} | 0 .config/X11/session | 15 +++++++++++++++ .config/X11/xinitrc | 26 -------------------------- .config/zsh/.zprofile | 2 +- .pam_environment | 4 ++-- 7 files changed, 18 insertions(+), 29 deletions(-) rename .config/X11/{xprofile => profile} (100%) rename .config/X11/{Xresources => resources} (100%) rename .config/X11/{xserverrc => serverrc} (100%) create mode 100644 .config/X11/session delete mode 100644 .config/X11/xinitrc diff --git a/.config/X11/xprofile b/.config/X11/profile similarity index 100% rename from .config/X11/xprofile rename to .config/X11/profile diff --git a/.config/X11/Xresources b/.config/X11/resources similarity index 100% rename from .config/X11/Xresources rename to .config/X11/resources diff --git a/.config/X11/xserverrc b/.config/X11/serverrc similarity index 100% rename from .config/X11/xserverrc rename to .config/X11/serverrc diff --git a/.config/X11/session b/.config/X11/session new file mode 100644 index 0000000..ed56ac5 --- /dev/null +++ b/.config/X11/session @@ -0,0 +1,15 @@ +#!/bin/sh + +resources=${XDG_CONFIG_HOME}/X11/resources +if [ -f "$resources" ]; then xrdb -merge "$resources"; fi +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && source "$f" + done; unset f +fi + +source ${XDG_CONFIG_HOME}/X11/profile + +if [[ -n "$@" ]]; then + exec "$@" +fi diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc deleted file mode 100644 index a8145a8..0000000 --- a/.config/X11/xinitrc +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# ==== DO NOT edit this section ==== -userresources=${XDG_CONFIG_HOME}/X11/Xresources -usermodmap=${XDG_CONFIG_HOME}/X11/Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap -if [ -f $sysresources ]; then xrdb -merge $sysresources; fi -if [ -f $sysmodmap ]; then xmodmap $sysmodmap; fi -if [ -f "$userresources" ]; then xrdb -merge "$userresources"; fi -if [ -f "$usermodmap" ]; then xmodmap "$usermodmap"; fi -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done; unset f -fi -# ================================== - -source ${XDG_CONFIG_HOME}/X11/xprofile - -# alternative program -if [[ -n "$@" ]]; then - exec "$@" -fi - -exec qtile diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index d7de27c..42f2280 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -1,4 +1,4 @@ # Autostart X if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then - xinit + xinit qtile fi diff --git a/.pam_environment b/.pam_environment index c4d9faf..c64da03 100644 --- a/.pam_environment +++ b/.pam_environment @@ -33,8 +33,8 @@ ANTIBODY_HOME DEFAULT=${XDG_DATA_HOME}/antibody XAUTHORITY DEFAULT=${XDG_RUNTIME_DIR}/Xauthority # xinit -XINITRC DEFAULT=${XDG_CONFIG_HOME}/X11/xinitrc -XSERVERRC DEFAULT=${XDG_CONFIG_HOME}/X11/xserverrc +XINITRC DEFAULT=${XDG_CONFIG_HOME}/X11/session +XSERVERRC DEFAULT=${XDG_CONFIG_HOME}/X11/serverrc # less LESSKEY DEFAULT=${XDG_CONFIG_HOME}/less/lesskey From a0d6a76bfd7ccbbd7f46e98a68995a0306452fbd Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 18 Jan 2021 13:10:34 +0800 Subject: [PATCH 44/79] Manage desktop applications via systemd --- .config/X11/session | 2 ++ .config/systemd/user/Xorg.target | 4 ++++ .config/systemd/user/copyq.service | 9 +++++++++ .config/systemd/user/fcitx.service | 10 ++++++++++ .config/systemd/user/nm-applet.service | 9 +++++++++ .config/systemd/user/picom.service | 9 +++++++++ .config/systemd/user/policykit-agent.service | 9 +++++++++ .config/systemd/user/qv2ray.service | 9 +++++++++ .config/systemd/user/v2ray.service | 10 ++++++++++ .config/systemd/user/xsettingsd.service | 9 +++++++++ 10 files changed, 80 insertions(+) create mode 100644 .config/systemd/user/Xorg.target create mode 100644 .config/systemd/user/copyq.service create mode 100644 .config/systemd/user/fcitx.service create mode 100644 .config/systemd/user/nm-applet.service create mode 100644 .config/systemd/user/picom.service create mode 100644 .config/systemd/user/policykit-agent.service create mode 100644 .config/systemd/user/qv2ray.service create mode 100644 .config/systemd/user/v2ray.service create mode 100644 .config/systemd/user/xsettingsd.service diff --git a/.config/X11/session b/.config/X11/session index ed56ac5..ec39c12 100644 --- a/.config/X11/session +++ b/.config/X11/session @@ -10,6 +10,8 @@ fi source ${XDG_CONFIG_HOME}/X11/profile +systemctl start --user Xorg.target + if [[ -n "$@" ]]; then exec "$@" fi diff --git a/.config/systemd/user/Xorg.target b/.config/systemd/user/Xorg.target new file mode 100644 index 0000000..0e21d6b --- /dev/null +++ b/.config/systemd/user/Xorg.target @@ -0,0 +1,4 @@ +[Unit] +Description=Launch desktop applications +Requires=default.target +After=default.target diff --git a/.config/systemd/user/copyq.service b/.config/systemd/user/copyq.service new file mode 100644 index 0000000..2b0a04e --- /dev/null +++ b/.config/systemd/user/copyq.service @@ -0,0 +1,9 @@ +[Unit] +Description=Clipboard manager with searchable and editable history + +[Service] +Environment="LANG=zh_CN.UTF-8" +ExecStart=/usr/bin/copyq + +[Install] +WantedBy=Xorg.target diff --git a/.config/systemd/user/fcitx.service b/.config/systemd/user/fcitx.service new file mode 100644 index 0000000..3472166 --- /dev/null +++ b/.config/systemd/user/fcitx.service @@ -0,0 +1,10 @@ +[Unit] +Description=Input method framework + +[Service] +Type=forking +Environment="LANG=zh_CN.UTF-8" +ExecStart=/usr/bin/fcitx-autostart + +[Install] +WantedBy=Xorg.target diff --git a/.config/systemd/user/nm-applet.service b/.config/systemd/user/nm-applet.service new file mode 100644 index 0000000..2c73ea2 --- /dev/null +++ b/.config/systemd/user/nm-applet.service @@ -0,0 +1,9 @@ +[Unit] +Description=Applet for managing network connections + +[Service] +Environment="LANG=zh_CN.UTF-8" +ExecStart=/usr/bin/nm-applet + +[Install] +WantedBy=Xorg.target diff --git a/.config/systemd/user/picom.service b/.config/systemd/user/picom.service new file mode 100644 index 0000000..290c4d1 --- /dev/null +++ b/.config/systemd/user/picom.service @@ -0,0 +1,9 @@ +[Unit] +Description=X compositor + +[Service] +Environment="LANG=zh_CN.UTF-8" +ExecStart=/usr/bin/picom + +[Install] +WantedBy=Xorg.target diff --git a/.config/systemd/user/policykit-agent.service b/.config/systemd/user/policykit-agent.service new file mode 100644 index 0000000..9a65846 --- /dev/null +++ b/.config/systemd/user/policykit-agent.service @@ -0,0 +1,9 @@ +[Unit] +Description=The LXQt policykit authentication agent + +[Service] +Environment="LANG=zh_CN.UTF-8" +ExecStart=/usr/bin/lxqt-policykit-agent + +[Install] +WantedBy=Xorg.target diff --git a/.config/systemd/user/qv2ray.service b/.config/systemd/user/qv2ray.service new file mode 100644 index 0000000..0f902f0 --- /dev/null +++ b/.config/systemd/user/qv2ray.service @@ -0,0 +1,9 @@ +[Unit] +Description=Cross-platform V2ray Client written in Qt + +[Service] +Environment="LANG=zh_CN.UTF-8" +ExecStart=/usr/bin/qv2ray + +[Install] +WantedBy=Xorg.target diff --git a/.config/systemd/user/v2ray.service b/.config/systemd/user/v2ray.service new file mode 100644 index 0000000..0a41b53 --- /dev/null +++ b/.config/systemd/user/v2ray.service @@ -0,0 +1,10 @@ +[Unit] +Description=A platform for building proxies to bypass network restrictions Service +After=default.target + +[Service] +; Rewrite config from qv2ray +ExecStart=/usr/bin/v2ray -config %h/.config/qv2ray/generated/config.gen.json -config %h/.config/v2ray/config.json + +[Install] +WantedBy=default.target diff --git a/.config/systemd/user/xsettingsd.service b/.config/systemd/user/xsettingsd.service new file mode 100644 index 0000000..7e8e77d --- /dev/null +++ b/.config/systemd/user/xsettingsd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Provides settings to X11 applications via the XSETTINGS specification + +[Service] +Environment="LANG=zh_CN.UTF-8" +ExecStart=/usr/bin/xsettingsd + +[Install] +WantedBy=Xorg.target From 52a717478cecc4174ef090cbe48cc67f7e5d2050 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 18 Jan 2021 13:16:53 +0800 Subject: [PATCH 45/79] trivia --- .config/alacritty/alacritty.yml | 2 -- .config/pikaur.conf | 3 +++ .config/zsh/.zshrc | 20 +++++++++++++------- .config/zsh/hostrc.d/.gitignore | 2 +- .config/zsh/hostrc.d/arch.zsh | 8 -------- 5 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 .config/zsh/hostrc.d/arch.zsh diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 66d133e..a7d27b5 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -1,5 +1,3 @@ -env: - LANG: en_US.UTF-8 window: class: instance: Terminal Emulator diff --git a/.config/pikaur.conf b/.config/pikaur.conf index 199ea86..ac6ab02 100644 --- a/.config/pikaur.conf +++ b/.config/pikaur.conf @@ -21,6 +21,9 @@ versiondiffnew = 9 requireenterconfirm = yes printcommands = no reversesearchsorting = yes +aursearchsorting = hottest +displaylastupdated = no +groupbyrepository = yes [misc] sudoloopinterval = 59 diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index ce3a630..1f0f735 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -3,13 +3,6 @@ setopt no_beep # 不响铃 setopt correct # 修正命令 setopt interactive_comments # 交互模式支持注释 -# 与当前主机相关的配置 -if [[ -d ${XDG_CONFIG_HOME}/zsh/hostrc.d ]]; then - for f in ${XDG_CONFIG_HOME}/zsh/hostrc.d/?*.zsh; do - source $f - done; unset f -fi - # 插件 <<<------------------------------ command -v antibody &>/dev/null && source <(antibody init) && \ antibody bundle <>>----------------------------------- # 按键绑定 <<<-------------------------- @@ -93,6 +92,11 @@ autoload -Uz colors colors setopt transient_rprompt # 右提示符只出现一次 +_ZSH_HOSTRC_PROMPT=${XDG_CONFIG_HOME}/zsh/hostrc.d/colors.zsh +if [[ -e $_ZSH_HOSTRC_PROMPT ]]; then + source $_ZSH_HOSTRC_PROMPT +fi + if [[ -n ${_SPEC_color_host} ]]; then _color_host=${_SPEC_color_host} else @@ -185,12 +189,14 @@ alias l='ls -l' alias la='ls -Al' mcd() { mkdir -p $1 && cd $1 } +alias x='xdg-open' alias v='nvim -R -c "nnoremap q :exit"' && compdef v=nvim # 使用neovim作为pager alias e='nvim' && compdef e=nvim alias es='nvim -S' && compdef es=nvim alias g='git' && compdef g=git alias py='python' && compdef py=python alias config='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME' && compdef config=git +alias config.edit='GIT_DIR=$HOME/.myconf GIT_WORK_TREE=$HOME nvim' && compdef config.edit=nvim alias ssh='TERM=xterm-256color ssh' alias mountdisk="mount | grep -E '^(/dev/sd|/dev/nvme|/dev/mmcblk|gvfsd-fuse)' | awk '{print \$1 \"\t\" \$5 \"\t\" \$3 \"\n\t\t\" \$6}'" # >>>----------------------------------- diff --git a/.config/zsh/hostrc.d/.gitignore b/.config/zsh/hostrc.d/.gitignore index 5709d6b..aca4384 100644 --- a/.config/zsh/hostrc.d/.gitignore +++ b/.config/zsh/hostrc.d/.gitignore @@ -1 +1 @@ -/individual.zsh +/colors.zsh diff --git a/.config/zsh/hostrc.d/arch.zsh b/.config/zsh/hostrc.d/arch.zsh deleted file mode 100644 index 28a0103..0000000 --- a/.config/zsh/hostrc.d/arch.zsh +++ /dev/null @@ -1,8 +0,0 @@ -# Arch Linux -alias pmq='pacman -Qs' -alias pms='pacman -Ss' -pmi() { pacman -Qi $1 2>/dev/null || pacman -Sii $1 } -pmo() { pacman -Qoq $1 2>/dev/null || pkgfile -i $1 } -pml() { (pacman -Qlq $1 2>/dev/null || pkgfile -lq $1) | sed '/\/$/d' } -pmb() { (pacman -Qlq $1 2>/dev/null || pkgfile -lq $1) | awk -F/ '/\/usr\/bin\/.+[^/]$/{print $NF}' } - From d40561f8da69f71ce3bc99b54f7e4ebd40b17f3e Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 18 Jan 2021 13:24:08 +0800 Subject: [PATCH 46/79] Update gitignore for zsh --- .config/zsh/.gitignore | 1 + .config/zsh/hostrc.d/.gitignore | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .config/zsh/.gitignore delete mode 100644 .config/zsh/hostrc.d/.gitignore diff --git a/.config/zsh/.gitignore b/.config/zsh/.gitignore new file mode 100644 index 0000000..2fb1066 --- /dev/null +++ b/.config/zsh/.gitignore @@ -0,0 +1 @@ +/hostrc.d/ diff --git a/.config/zsh/hostrc.d/.gitignore b/.config/zsh/hostrc.d/.gitignore deleted file mode 100644 index aca4384..0000000 --- a/.config/zsh/hostrc.d/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/colors.zsh From 48b27d9753f3aa8896b32d3ed499e6e776a4d427 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sun, 24 Jan 2021 17:25:48 +0800 Subject: [PATCH 47/79] Update pam_environment: golang env --- .pam_environment | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pam_environment b/.pam_environment index c64da03..a2cb181 100644 --- a/.pam_environment +++ b/.pam_environment @@ -61,7 +61,8 @@ ADB_VENDOR_KEY DEFAULT=${XDG_CONFIG_HOME}/android GO111MODULE DEFAULT=on GOPROXY DEFAULT=https://goproxy.cn,direct GOCACHE DEFAULT=${XDG_CACHE_HOME}/go -GOPATH DEFAULT=${GOCACHE} +GOMODCACHE DEFAULT=${XDG_DATA_HOME}/go +GOPATH DEFAULT=${XDG_DATA_HOME}/go GOBIN DEFAULT=@{HOME}/bin/go # python From 73cac240e6b2b6c2a4e8836b6c558db7ca787d78 Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 26 Jan 2021 15:37:04 +0800 Subject: [PATCH 48/79] Add script for updating zsh plugins --- .config/zsh/update.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 .config/zsh/update.sh diff --git a/.config/zsh/update.sh b/.config/zsh/update.sh new file mode 100755 index 0000000..448cfca --- /dev/null +++ b/.config/zsh/update.sh @@ -0,0 +1,11 @@ +#!/bin/zsh -e + +if command -v antibody &>/dev/null; then + echo Updating plugins... + antibody update +else + echo antibody is missing >&2 +fi + +echo +echo Done. From e287203dd6cd34e42d77f7b0d00ccca924f45ebb Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 4 Feb 2021 18:02:24 +0800 Subject: [PATCH 49/79] Update pam_environment --- .pam_environment | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.pam_environment b/.pam_environment index a2cb181..0c959b7 100644 --- a/.pam_environment +++ b/.pam_environment @@ -68,7 +68,7 @@ GOBIN DEFAULT=@{HOME}/bin/go # python PYTHONSTARTUP DEFAULT=${XDG_CONFIG_HOME}/python/repl_startup.py PYTHONPYCACHEPREFIX DEFAULT=@{HOME}/.cache/python -PYTHONUSERBASE DEFAULT=@{HOME}/.packages/python +PYTHONUSERBASE DEFAULT=@{HOME}/.data/python # ipython IPYTHONDIR DEFAULT=${XDG_CONFIG_HOME}/jupyter JUPYTER_CONFIG_DIR DEFAULT=${XDG_CONFIG_HOME}/jupyter @@ -94,5 +94,4 @@ BUNDLE_USER_PLUGIN DEFAULT=${XDG_DATA_HOME}/bundle DOCKER_CONFIG DEFAULT=${XDG_CONFIG_HOME}/docker # PATH -PATH DEFAULT=@{HOME}/bin:${GOBIN}:${PYTHONUSERBASE}/bin:@{HOME}/.packages/node_modules/.bin\ -:/usr/local/sbin:/usr/local/bin:/usr/bin +PATH DEFAULT=@{HOME}/bin:${GOBIN}:/usr/local/sbin:/usr/local/bin:/usr/bin From 8e33d2f5f7a702ae113a54ac1ed1aa379c1e146c Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 4 Feb 2021 20:52:21 +0800 Subject: [PATCH 50/79] Update zsh config --- .config/zsh/.gitignore | 2 +- .config/zsh/.zshrc | 28 +++++++++++++------ .config/zsh/functions/_pm | 6 ++++ ...h_collapsed_pwd.zsh => fish_collapsed_pwd} | 6 ++-- .config/zsh/hostrc.d/funcs.zsh | 8 ++++++ 5 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 .config/zsh/functions/_pm rename .config/zsh/functions/{fish_collapsed_pwd.zsh => fish_collapsed_pwd} (95%) create mode 100644 .config/zsh/hostrc.d/funcs.zsh diff --git a/.config/zsh/.gitignore b/.config/zsh/.gitignore index 2fb1066..8535af7 100644 --- a/.config/zsh/.gitignore +++ b/.config/zsh/.gitignore @@ -1 +1 @@ -/hostrc.d/ +/hostrc.d/colors.zsh diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 1f0f735..e5f0fd9 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,8 +1,10 @@ -# zle基础配置 +# 基础配置 setopt no_beep # 不响铃 setopt correct # 修正命令 setopt interactive_comments # 交互模式支持注释 +fpath=(${ZDOTDIR}/functions $fpath) + # 插件 <<<------------------------------ command -v antibody &>/dev/null && source <(antibody init) && \ antibody bundle <>>----------------------------------- # 历史记录 <<<-------------------------- @@ -52,6 +52,9 @@ if [[ ! -d ${XDG_CACHE_HOME}/zsh/ ]]; then mkdir -p ${XDG_CACHE_HOME}/zsh/ fi compinit -d ${XDG_CACHE_HOME}/zsh/zcompdump-${ZSH_VERSION} + +# 补全失败时的提示 +zstyle ':completion:*:warnings' format $'\e[31m -- No Matches Found --\e[0m' setopt complete_aliases # 补全别名 setopt list_packed # 补全列表压缩列宽 zstyle :compinstall filename ${XDG_CONFIG_HOME}/zsh/.zshrc @@ -66,6 +69,8 @@ export FZF_COMPLETION_TRIGGER='~~' export FZF_DEFAULT_COMMAND='fd -uu -E .git -E .node_modules' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +compdef proxychains=command + # 当前环境的配置 _ZSH_HOSTRC_COMMAND=${XDG_CONFIG_HOME}/zsh/hostrc.d/funcs.zsh if [[ -e $_ZSH_HOSTRC_COMMAND ]]; then @@ -76,6 +81,10 @@ fi # 按键绑定 <<<-------------------------- # 默认Emacs bindkey -e +# 用$EDITOR编辑命令 +autoload -Uz edit-command-line +zle -N edit-command-line +bindkey '^X^E' edit-command-line # fzf if [[ -f /usr/share/fzf/key-bindings.zsh ]]; then source /usr/share/fzf/key-bindings.zsh @@ -118,8 +127,8 @@ precmd() { PROMPT_err="" fi - if command -v _fish_collapsed_pwd &>/dev/null; then - _collapsed_pwd=$(_fish_collapsed_pwd) + if command -v fish_collapsed_pwd &>/dev/null; then + _collapsed_pwd=$(fish_collapsed_pwd) fi PROMPT_host="${_color_host}${_color_invert} %n@%m ${_color_reset}" # ssh标志 @@ -191,8 +200,11 @@ mcd() { mkdir -p $1 && cd $1 } alias x='xdg-open' alias v='nvim -R -c "nnoremap q :exit"' && compdef v=nvim # 使用neovim作为pager -alias e='nvim' && compdef e=nvim -alias es='nvim -S' && compdef es=nvim +if [[ -e $VIMRUNTIME ]]; then + alias e='nvr' +else + alias e='nvim' && compdef e=nvim +fi alias g='git' && compdef g=git alias py='python' && compdef py=python alias config='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME' && compdef config=git diff --git a/.config/zsh/functions/_pm b/.config/zsh/functions/_pm new file mode 100644 index 0000000..46d7f27 --- /dev/null +++ b/.config/zsh/functions/_pm @@ -0,0 +1,6 @@ +#compdef pactree pmq pms pmi pml pmb pmd + +source /usr/share/zsh/site-functions/_pacman + +compdef _pacman_completions_installed_packages pactree pmq +compdef _pacman_completions_all_packages pms pmi pml pmb pmd diff --git a/.config/zsh/functions/fish_collapsed_pwd.zsh b/.config/zsh/functions/fish_collapsed_pwd similarity index 95% rename from .config/zsh/functions/fish_collapsed_pwd.zsh rename to .config/zsh/functions/fish_collapsed_pwd index 411cec4..8b38cff 100644 --- a/.config/zsh/functions/fish_collapsed_pwd.zsh +++ b/.config/zsh/functions/fish_collapsed_pwd @@ -1,7 +1,5 @@ -#! /usr/bin/env zsh - # https://zhuanlan.zhihu.com/p/51008087 -function _fish_collapsed_pwd() { +() { local pwd="$1" # fix end slash local home="${HOME%/}" @@ -42,3 +40,5 @@ function _fish_collapsed_pwd() { local IFS="/" echo "${elements[*]}" } + +# vim:set filetype=zsh: diff --git a/.config/zsh/hostrc.d/funcs.zsh b/.config/zsh/hostrc.d/funcs.zsh new file mode 100644 index 0000000..b44d8f8 --- /dev/null +++ b/.config/zsh/hostrc.d/funcs.zsh @@ -0,0 +1,8 @@ +# Arch Linux +alias pmq='pacman -Qs' +alias pms='pacman -Ss' +pmi() { pacman -Qi $1 2>/dev/null || pacman -Sii $1 } +pmo() { pacman -Qoq $1 2>/dev/null || pkgfile -i $1 } +pml() { (pacman -Qlq $1 2>/dev/null || pkgfile -lq $1) | sed '/\/$/d' } +pmb() { (pacman -Qlq $1 2>/dev/null || pkgfile -lq $1) | awk -F/ '/\/usr\/bin\/.+[^/]$/{print $NF}' } +pmd() { (pacman -Qlq $1 2>/dev/null || pkgfile -lq $1) | grep -e '\.service$' -e '\.socket$' } From 0d26934e5a9a1d0bb1cdeed604c13c01e62a549f Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 4 Feb 2021 23:20:23 +0800 Subject: [PATCH 51/79] Update zsh config: completion --- .config/zsh/.zshrc | 2 +- .config/zsh/{functions/_pm => Completion/_package} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename .config/zsh/{functions/_pm => Completion/_package} (100%) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index e5f0fd9..f8e42e3 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -3,7 +3,7 @@ setopt no_beep # 不响铃 setopt correct # 修正命令 setopt interactive_comments # 交互模式支持注释 -fpath=(${ZDOTDIR}/functions $fpath) +fpath=(${ZDOTDIR}/functions ${ZDOTDIR}/Completion $fpath) # 插件 <<<------------------------------ command -v antibody &>/dev/null && source <(antibody init) && \ diff --git a/.config/zsh/functions/_pm b/.config/zsh/Completion/_package similarity index 100% rename from .config/zsh/functions/_pm rename to .config/zsh/Completion/_package From 4ba4c6470578e1b0dd3e70b10ed330749c6b0cd5 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 5 Feb 2021 16:50:04 +0800 Subject: [PATCH 52/79] Fix fontconfig: generic font order for firefox --- .config/fontconfig/fonts.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index b7cc257..97d6944 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -54,8 +54,8 @@ emoji - Blobmoji Symbols Nerd Font + Blobmoji From fb0d570b95c48c774975a38641a4930642ce7766 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 5 Feb 2021 22:57:00 +0800 Subject: [PATCH 53/79] Update zsh config: new path --- .config/zsh/.zprofile | 5 +- .config/zsh/.zshrc | 217 +----------------------------------------- .config/zsh/zprofile | 4 + .config/zsh/zshrc | 212 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 218 insertions(+), 220 deletions(-) create mode 100644 .config/zsh/zprofile create mode 100644 .config/zsh/zshrc diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 42f2280..1d6fc5d 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -1,4 +1 @@ -# Autostart X -if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then - xinit qtile -fi +source ${ZDOTDIR}/zprofile diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index f8e42e3..c1012d1 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,216 +1 @@ -# 基础配置 -setopt no_beep # 不响铃 -setopt correct # 修正命令 -setopt interactive_comments # 交互模式支持注释 - -fpath=(${ZDOTDIR}/functions ${ZDOTDIR}/Completion $fpath) - -# 插件 <<<------------------------------ -command -v antibody &>/dev/null && source <(antibody init) && \ -antibody bundle <>>----------------------------------- -# zsh-autosuggestions <<<--------------- -# 建议策略: history, completion, match_prev_cmd -ZSH_AUTOSUGGEST_STRATEGY=(history completion) -# 开启异步模式 -ZSH_AUTOSUGGEST_USE_ASYNC=1 -# >>>----------------------------------- -# pkgfile: 命令找不到时提示安装包 -if [[ -f /usr/share/doc/pkgfile/command-not-found.zsh ]]; then - source /usr/share/doc/pkgfile/command-not-found.zsh -fi -# function: 模仿fish折叠路径 -autoload -Uz fish_collapsed_pwd -# >>>----------------------------------- - -# 历史记录 <<<-------------------------- -HISTSIZE=10000 -SAVEHIST=100000 -setopt share_history -# 去掉重复和空白 -setopt hist_ignore_dups hist_reduce_blanks hist_find_no_dups -# >>>----------------------------------- - -# 命令补全 <<<-------------------------- -autoload -Uz compinit -# 指定缓存文件所在目录必须先确保该目录存在 -if [[ ! -d ${XDG_CACHE_HOME}/zsh/ ]]; then - mkdir -p ${XDG_CACHE_HOME}/zsh/ -fi -compinit -d ${XDG_CACHE_HOME}/zsh/zcompdump-${ZSH_VERSION} - -# 补全失败时的提示 -zstyle ':completion:*:warnings' format $'\e[31m -- No Matches Found --\e[0m' -setopt complete_aliases # 补全别名 -setopt list_packed # 补全列表压缩列宽 -zstyle :compinstall filename ${XDG_CONFIG_HOME}/zsh/.zshrc -zstyle ':completion:*' menu select -# 模糊修正 -zstyle ':completion:*' matcher-list '' 'm:{-a-zA-Z}={_A-Za-z}' -# fzf -if [[ -f /usr/share/fzf/completion.zsh ]]; then - source /usr/share/fzf/completion.zsh -fi -export FZF_COMPLETION_TRIGGER='~~' -export FZF_DEFAULT_COMMAND='fd -uu -E .git -E .node_modules' -export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" - -compdef proxychains=command - -# 当前环境的配置 -_ZSH_HOSTRC_COMMAND=${XDG_CONFIG_HOME}/zsh/hostrc.d/funcs.zsh -if [[ -e $_ZSH_HOSTRC_COMMAND ]]; then - source $_ZSH_HOSTRC_COMMAND -fi -# >>>----------------------------------- - -# 按键绑定 <<<-------------------------- -# 默认Emacs -bindkey -e -# 用$EDITOR编辑命令 -autoload -Uz edit-command-line -zle -N edit-command-line -bindkey '^X^E' edit-command-line -# fzf -if [[ -f /usr/share/fzf/key-bindings.zsh ]]; then - source /usr/share/fzf/key-bindings.zsh -fi -# 默认 WORDCHARS='*?_-.[]~=/&;!#$%^(){}<>' -export WORDCHARS='*?_-.[]~=&;!#$%^(){}<>' -# >>>----------------------------------- - -# 提示符 <<<---------------------------- -setopt prompt_subst -autoload -Uz promptinit -promptinit -autoload -Uz colors -colors -setopt transient_rprompt # 右提示符只出现一次 - -_ZSH_HOSTRC_PROMPT=${XDG_CONFIG_HOME}/zsh/hostrc.d/colors.zsh -if [[ -e $_ZSH_HOSTRC_PROMPT ]]; then - source $_ZSH_HOSTRC_PROMPT -fi - -if [[ -n ${_SPEC_color_host} ]]; then - _color_host=${_SPEC_color_host} -else - _color_host=$'%{\e[38;2;199;146;234m%}' -fi -_color_invert=$'%{\e[7m%}' -_color_reset=$'%{\e[0m%}' -if [[ -z ${_SPEC_PROMPT_disable_icon} ]]; then - _icon_error="😈" - _icon_gitdir="  " -fi - -ZLE_RPROMPT_INDENT=-1 # 去掉右提示符右侧多余空白 -precmd() { - # 上一条命令的运行结果 - if [ $? -ne 0 ]; then - PROMPT_err="%{$bg[red]$fg[black]%} ${_icon_error:-E} %{$reset_color%}" - else - PROMPT_err="" - fi - - if command -v fish_collapsed_pwd &>/dev/null; then - _collapsed_pwd=$(fish_collapsed_pwd) - fi - PROMPT_host="${_color_host}${_color_invert} %n@%m ${_color_reset}" - # ssh标志 - if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then - PROMPT_ssh="%{$bg[yellow]$fg[black]%} ssh %{$reset_color%}" - else - PROMPT_ssh="" - fi - # tmux标志 - if [ -n "$TMUX" ]; then - PROMPT_tmux="%{$bg[green]$fg[black]%} tmux %{$reset_color%}" - else - PROMPT_tmux="" - fi - # python virtualenv标志 - if [ -n "$VIRTUAL_ENV" ]; then - PROMPT_pyvenv="%{$bg[cyan]$fg[white]%} pyvenv %{$reset_color%}" - else - PROMPT_pyvenv="" - fi - # nvm标志 - if [ -n "$NVM_BIN" ]; then - PROMPT_nvm="%{$bg[cyan]$fg[white]%} nvm %{$reset_color%}" - else - PROMPT_nvm="" - fi - if command -v __git_ps1 &>/dev/null; then - PROMPT_git=$(__git_ps1 " %s${_icon_gitdir:-)}") - fi - PROMPT_cwd=${_collapsed_pwd} - if [[ $UID == 0 || $EUID == 0 ]]; then - PROMPT_tail=" # " - else - PROMPT_tail=" $ " - fi - - PROMPT="${_color_host}▒${PROMPT_git} ${PROMPT_cwd}${PROMPT_tail}${_color_reset}" - RPROMPT="${PROMPT_err}${PROMPT_pyvenv}${PROMPT_nvm}${PROMPT_tmux}${PROMPT_ssh}${PROMPT_host}" - - # 设置终端标题 - print -n "\e]0;zsh ( ${_collapsed_pwd} )\a" -} -# git <<<------------------------------- -if [[ -f /usr/share/git/completion/git-prompt.sh ]]; then - source /usr/share/git/completion/git-prompt.sh -fi -GIT_PS1_SHOWDIRTYSTATE=1 -GIT_PS1_SHOWSTASHSTATE=1 -GIT_PS1_SHOWUNTRACKEDFILES=1 -GIT_PS1_STATESEPARATOR= -GIT_PS1_SHOWUPSTREAM="auto" -GIT_PS1_DESCRIBE_STYLE="default" -# >>>----------------------------------- -# >>>----------------------------------- - -# 命令别名 <<<----------------------------- -# sudo后面的命令可以是别名 -alias sudo='sudo ' -# 设置命令默认行为 -alias ls='ls --color=auto --time-style=iso --human-readable' -alias grep='grep --color=auto' -alias diff='diff --color=auto' -alias mv='mv -i' - -alias sl='ls' -alias l='ls -l' -alias la='ls -Al' -mcd() { mkdir -p $1 && cd $1 } - -alias x='xdg-open' -alias v='nvim -R -c "nnoremap q :exit"' && compdef v=nvim # 使用neovim作为pager -if [[ -e $VIMRUNTIME ]]; then - alias e='nvr' -else - alias e='nvim' && compdef e=nvim -fi -alias g='git' && compdef g=git -alias py='python' && compdef py=python -alias config='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME' && compdef config=git -alias config.edit='GIT_DIR=$HOME/.myconf GIT_WORK_TREE=$HOME nvim' && compdef config.edit=nvim -alias ssh='TERM=xterm-256color ssh' -alias mountdisk="mount | grep -E '^(/dev/sd|/dev/nvme|/dev/mmcblk|gvfsd-fuse)' | awk '{print \$1 \"\t\" \$5 \"\t\" \$3 \"\n\t\t\" \$6}'" -# >>>----------------------------------- - -# vim: foldmethod=marker:foldmarker=<<<---,>>>--- +source ${ZDOTDIR}/zshrc diff --git a/.config/zsh/zprofile b/.config/zsh/zprofile new file mode 100644 index 0000000..42f2280 --- /dev/null +++ b/.config/zsh/zprofile @@ -0,0 +1,4 @@ +# Autostart X +if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then + xinit qtile +fi diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc new file mode 100644 index 0000000..9b630ed --- /dev/null +++ b/.config/zsh/zshrc @@ -0,0 +1,212 @@ +# 基础配置 +setopt no_beep # 不响铃 +setopt correct # 修正命令 +setopt interactive_comments # 交互模式支持注释 + +fpath=(${ZDOTDIR}/functions ${ZDOTDIR}/Completion $fpath) + +# 插件 <<<------------------------------ +command -v antibody &>/dev/null && source <(antibody init) && \ +antibody bundle <>>----------------------------------- +# zsh-autosuggestions <<<--------------- +# 建议策略: history, completion, match_prev_cmd +ZSH_AUTOSUGGEST_STRATEGY=(history completion) +# 开启异步模式 +ZSH_AUTOSUGGEST_USE_ASYNC=1 +# >>>----------------------------------- +# pkgfile: 命令找不到时提示安装包 +if [[ -f /usr/share/doc/pkgfile/command-not-found.zsh ]]; then + source /usr/share/doc/pkgfile/command-not-found.zsh +fi +# function: 模仿fish折叠路径 +autoload -Uz fish_collapsed_pwd +# >>>----------------------------------- + +# 历史记录 <<<-------------------------- +HISTSIZE=10000 +SAVEHIST=100000 +setopt share_history +# 去掉重复和空白 +setopt hist_ignore_dups hist_reduce_blanks hist_find_no_dups +# >>>----------------------------------- + +# 命令补全 <<<-------------------------- +autoload -Uz compinit +# 指定缓存文件所在目录必须先确保该目录存在 +if [[ ! -d ${XDG_CACHE_HOME}/zsh/ ]]; then + mkdir -p ${XDG_CACHE_HOME}/zsh/ +fi +compinit -d ${XDG_CACHE_HOME}/zsh/zcompdump-${ZSH_VERSION} + +# 补全失败时的提示 +zstyle ':completion:*:warnings' format $'\e[31m -- No Matches Found --\e[0m' +setopt complete_aliases # 补全别名 +setopt list_packed # 补全列表压缩列宽 +zstyle :compinstall filename ${ZDOTDIR}/zshrc +zstyle ':completion:*' menu select +# 模糊修正 +zstyle ':completion:*' matcher-list '' 'm:{-a-zA-Z}={_A-Za-z}' +# fzf +if [[ -f /usr/share/fzf/completion.zsh ]]; then + source /usr/share/fzf/completion.zsh +fi +export FZF_COMPLETION_TRIGGER='~~' +export FZF_DEFAULT_COMMAND='fd -uu -E .git -E .node_modules' +export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" + +compdef proxychains=command + +# 当前环境的配置 +for i in ${ZDOTDIR}/hostrc.d/*.zsh; do +if [[ -f $i ]]; then + source $i +fi +done; unset i +# >>>----------------------------------- + +# 按键绑定 <<<-------------------------- +# 默认Emacs +bindkey -e +# 用$EDITOR编辑命令 +autoload -Uz edit-command-line +zle -N edit-command-line +bindkey '^X^E' edit-command-line +# fzf +if [[ -f /usr/share/fzf/key-bindings.zsh ]]; then + source /usr/share/fzf/key-bindings.zsh +fi +# 默认 WORDCHARS='*?_-.[]~=/&;!#$%^(){}<>' +export WORDCHARS='*?_-.[]~=&;!#$%^(){}<>' +# >>>----------------------------------- + +# 提示符 <<<---------------------------- +setopt prompt_subst +autoload -Uz promptinit +promptinit +autoload -Uz colors +colors +setopt transient_rprompt # 右提示符只出现一次 + +if [[ -n ${_SPEC_color_host} ]]; then + _color_host=${_SPEC_color_host} +else + _color_host=$'%{\e[38;2;199;146;234m%}' +fi +_color_invert=$'%{\e[7m%}' +_color_reset=$'%{\e[0m%}' +if [[ -z ${_SPEC_PROMPT_disable_icon} ]]; then + _icon_error="😈" + _icon_gitdir="  " +fi + +ZLE_RPROMPT_INDENT=-1 # 去掉右提示符右侧多余空白 +precmd() { + # 上一条命令的运行结果 + if [ $? -ne 0 ]; then + PROMPT_err="%{$bg[red]$fg[black]%} ${_icon_error:-E} %{$reset_color%}" + else + PROMPT_err="" + fi + + if command -v fish_collapsed_pwd &>/dev/null; then + _collapsed_pwd=$(fish_collapsed_pwd) + fi + PROMPT_host="${_color_host}${_color_invert} %n@%m ${_color_reset}" + # ssh标志 + if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then + PROMPT_ssh="%{$bg[yellow]$fg[black]%} ssh %{$reset_color%}" + else + PROMPT_ssh="" + fi + # tmux标志 + if [ -n "$TMUX" ]; then + PROMPT_tmux="%{$bg[green]$fg[black]%} tmux %{$reset_color%}" + else + PROMPT_tmux="" + fi + # python virtualenv标志 + if [ -n "$VIRTUAL_ENV" ]; then + PROMPT_pyvenv="%{$bg[cyan]$fg[white]%} pyvenv %{$reset_color%}" + else + PROMPT_pyvenv="" + fi + # nvm标志 + if [ -n "$NVM_BIN" ]; then + PROMPT_nvm="%{$bg[cyan]$fg[white]%} nvm %{$reset_color%}" + else + PROMPT_nvm="" + fi + if command -v __git_ps1 &>/dev/null; then + PROMPT_git=$(__git_ps1 " %s${_icon_gitdir:-)}") + fi + PROMPT_cwd=${_collapsed_pwd} + if [[ $UID == 0 || $EUID == 0 ]]; then + PROMPT_tail=" # " + else + PROMPT_tail=" $ " + fi + + PROMPT="${_color_host}▒${PROMPT_git} ${PROMPT_cwd}${PROMPT_tail}${_color_reset}" + RPROMPT="${PROMPT_err}${PROMPT_pyvenv}${PROMPT_nvm}${PROMPT_tmux}${PROMPT_ssh}${PROMPT_host}" + + # 设置终端标题 + print -n "\e]0;zsh ( ${_collapsed_pwd} )\a" +} +# git <<<------------------------------- +if [[ -f /usr/share/git/completion/git-prompt.sh ]]; then + source /usr/share/git/completion/git-prompt.sh +fi +GIT_PS1_SHOWDIRTYSTATE=1 +GIT_PS1_SHOWSTASHSTATE=1 +GIT_PS1_SHOWUNTRACKEDFILES=1 +GIT_PS1_STATESEPARATOR= +GIT_PS1_SHOWUPSTREAM="auto" +GIT_PS1_DESCRIBE_STYLE="default" +# >>>----------------------------------- +# >>>----------------------------------- + +# 命令别名 <<<----------------------------- +# sudo后面的命令可以是别名 +alias sudo='sudo ' +# 设置命令默认行为 +alias ls='ls --color=auto --time-style=iso --human-readable' +alias grep='grep --color=auto' +alias diff='diff --color=auto' +alias mv='mv -i' + +alias sl='ls' +alias l='ls -l' +alias la='ls -Al' +mcd() { mkdir -p $1 && cd $1 } + +alias x='xdg-open' +alias v='nvim -R -c "nnoremap q :exit"' && compdef v=nvim # 使用neovim作为pager +if [[ -e $VIMRUNTIME ]]; then + alias e='nvr' +else + alias e='nvim' && compdef e=nvim +fi +alias g='git' && compdef g=git +alias py='python' && compdef py=python +alias config='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME' && compdef config=git +alias config.edit='GIT_DIR=$HOME/.myconf GIT_WORK_TREE=$HOME nvim' && compdef config.edit=nvim +alias ssh='TERM=xterm-256color ssh' +alias mountdisk="mount | grep -E '^(/dev/sd|/dev/nvme|/dev/mmcblk|gvfsd-fuse)' | awk '{print \$1 \"\t\" \$5 \"\t\" \$3 \"\n\t\t\" \$6}'" +# >>>----------------------------------- + +# vim: foldmethod=marker:foldmarker=<<<---,>>>--- From 6f7692cd1d95a0243d9f0de1d8716b2cd4e591fc Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 5 Feb 2021 23:02:14 +0800 Subject: [PATCH 54/79] Fix glitch of X11 keymap --- .config/X11/profile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.config/X11/profile b/.config/X11/profile index af132d4..e8a8e24 100644 --- a/.config/X11/profile +++ b/.config/X11/profile @@ -1,7 +1,10 @@ export LANG=zh_CN.UTF-8 -# swap Caps_Lock and Escape -setxkbmap -option caps:swapescape -# swap Ctrl_R and Alt_R -setxkbmap -option ctrl:rctrl_ralt -setxkbmap -option ctrl:ralt_rctrl +( + sleep 2 + # swap Caps_Lock and Escape + setxkbmap -option caps:swapescape + # swap Ctrl_R and Alt_R + setxkbmap -option ctrl:rctrl_ralt + setxkbmap -option ctrl:ralt_rctrl +) & From 292daf9769dde4da2dfcbcd1ab3a2028042c5474 Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 9 Feb 2021 22:09:04 +0800 Subject: [PATCH 55/79] Update fontconfig --- .config/fontconfig/conf.d/50-generic.conf | 46 ++ .../conf.d/51-language-noto-cjk.conf | 149 +++++++ .../conf.d/51-language-sarasa-gothic.conf | 101 +++++ .../conf.d/51-language-source-han-serif.conf | 51 +++ .config/fontconfig/conf.d/52-replace.conf | 147 +++++++ .../conf.d/53-override-noto-cjk.conf | 41 ++ .../conf.d/53-override-sarasa-gothic.conf | 29 ++ .../conf.d/53-override-source-han-serif.conf | 17 + .config/fontconfig/fonts.conf | 397 ------------------ 9 files changed, 581 insertions(+), 397 deletions(-) create mode 100644 .config/fontconfig/conf.d/50-generic.conf create mode 100644 .config/fontconfig/conf.d/51-language-noto-cjk.conf create mode 100644 .config/fontconfig/conf.d/51-language-sarasa-gothic.conf create mode 100644 .config/fontconfig/conf.d/51-language-source-han-serif.conf create mode 100644 .config/fontconfig/conf.d/52-replace.conf create mode 100644 .config/fontconfig/conf.d/53-override-noto-cjk.conf create mode 100644 .config/fontconfig/conf.d/53-override-sarasa-gothic.conf create mode 100644 .config/fontconfig/conf.d/53-override-source-han-serif.conf delete mode 100644 .config/fontconfig/fonts.conf diff --git a/.config/fontconfig/conf.d/50-generic.conf b/.config/fontconfig/conf.d/50-generic.conf new file mode 100644 index 0000000..18da31a --- /dev/null +++ b/.config/fontconfig/conf.d/50-generic.conf @@ -0,0 +1,46 @@ + + + + + + + + system-ui + + + sans-serif + + + + + + + sans-serif + + + Sarasa Gothic SC + + + + + + + serif + + + Source Han Serif SC + + + + + + + monospace + + + Iosevka Custom + Sarasa Mono SC + + + + diff --git a/.config/fontconfig/conf.d/51-language-noto-cjk.conf b/.config/fontconfig/conf.d/51-language-noto-cjk.conf new file mode 100644 index 0000000..44a487e --- /dev/null +++ b/.config/fontconfig/conf.d/51-language-noto-cjk.conf @@ -0,0 +1,149 @@ + + + + + + + zh-HK + + + Noto Sans CJK SC + + + Noto Sans CJK HK + + + + + + zh-HK + + + Noto Serif CJK SC + + + Noto Serif CJK HK + + + + + + zh-HK + + + Noto Sans Mono CJK SC + + + Noto Sans Mono CJK HK + + + + + + zh-TW + + + Noto Sans CJK SC + + + Noto Sans CJK TC + + + + + + zh-TW + + + Noto Serif CJK SC + + + Noto Serif CJK TC + + + + + + zh-TW + + + Noto Sans Mono CJK SC + + + Noto Sans Mono CJK TC + + + + + + ja + + + Noto Sans CJK SC + + + Noto Sans CJK JP + + + + + + ja + + + Noto Serif CJK SC + + + Noto Serif CJK JP + + + + + + ja + + + Noto Sans Mono CJK SC + + + Noto Sans Mono CJK JP + + + + + + ko + + + Noto Sans CJK SC + + + Noto Sans CJK KR + + + + + + ko + + + Noto Serif CJK SC + + + Noto Serif CJK KR + + + + + + ko + + + Noto Sans Mono CJK SC + + + Noto Sans Mono CJK KR + + + + diff --git a/.config/fontconfig/conf.d/51-language-sarasa-gothic.conf b/.config/fontconfig/conf.d/51-language-sarasa-gothic.conf new file mode 100644 index 0000000..56d05e4 --- /dev/null +++ b/.config/fontconfig/conf.d/51-language-sarasa-gothic.conf @@ -0,0 +1,101 @@ + + + + + + + zh-HK + + + Sarasa Gothic SC + + + Sarasa Gothic HC + + + + + + zh-HK + + + Sarasa Mono SC + + + Sarasa Mono HC + + + + + + zh-TW + + + Sarasa Gothic SC + + + Sarasa Gothic TC + + + + + + zh-TW + + + Sarasa Mono SC + + + Sarasa Mono TC + + + + + + ja + + + Sarasa Gothic SC + + + Sarasa Gothic J + + + + + + ja + + + Sarasa Mono SC + + + Sarasa Mono J + + + + + + ko + + + Sarasa Gothic SC + + + Sarasa Gothic K + + + + + + ko + + + Sarasa Mono SC + + + Sarasa Mono K + + + + diff --git a/.config/fontconfig/conf.d/51-language-source-han-serif.conf b/.config/fontconfig/conf.d/51-language-source-han-serif.conf new file mode 100644 index 0000000..28990cb --- /dev/null +++ b/.config/fontconfig/conf.d/51-language-source-han-serif.conf @@ -0,0 +1,51 @@ + + + + + + zh-HK + + + Source Han Serif SC + + + Source Han Serif TC + + + + + zh-TW + + + Source Han Serif SC + + + Source Han Serif TC + + + + + + ja + + + Source Han Serif SC + + + Source Han Serif + + + + + + ko + + + Source Han Serif SC + + + Source Han Serif K + + + + diff --git a/.config/fontconfig/conf.d/52-replace.conf b/.config/fontconfig/conf.d/52-replace.conf new file mode 100644 index 0000000..0e2e1b5 --- /dev/null +++ b/.config/fontconfig/conf.d/52-replace.conf @@ -0,0 +1,147 @@ + + + + + + + + Cantarell + + + Noto Sans + + + + + + Arial + + + Noto Sans + + + + + + Tahoma + + + Noto Sans + + + + + + Calibri + + + Noto Sans + + + + + + Microsoft YaHei + + + Sarasa Gothic SC + + + + + + 微软雅黑 + + + Sarasa Gothic SC + + + + + + SimHei + + + Sarasa Gothic SC + + + + + + 黑体 + + + Sarasa Gothic SC + + + + + + + Times New Roman + + + Noto Serif + + + + + + SimSun + + + Source Han Serif SC + + + + + + 宋体 + + + Source Han Serif SC + + + + + + FangSong + + + Source Han Serif SC + + + + + + 仿宋 + + + Source Han Serif SC + + + + + + + Source Code + + + Iosevka Custom + + + + + + + Noto Color Emoji + + + firefox + + + Blobmoji + + + + diff --git a/.config/fontconfig/conf.d/53-override-noto-cjk.conf b/.config/fontconfig/conf.d/53-override-noto-cjk.conf new file mode 100644 index 0000000..212a3c3 --- /dev/null +++ b/.config/fontconfig/conf.d/53-override-noto-cjk.conf @@ -0,0 +1,41 @@ + + + + + + + chrome + + + Noto Sans CJK + + + Noto Sans + + + + + + chrome + + + Noto Serif CJK + + + Noto Serif + + + + + + chrome + + + Noto Sans Mono CJK + + + Iosevka Custom + + + + diff --git a/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf b/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf new file mode 100644 index 0000000..38906b0 --- /dev/null +++ b/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf @@ -0,0 +1,29 @@ + + + + + + + chrome + + + Sarasa Gothic + + + Noto Sans + + + + + + chrome + + + Sarasa Mono + + + Iosevka Custom + + + + diff --git a/.config/fontconfig/conf.d/53-override-source-han-serif.conf b/.config/fontconfig/conf.d/53-override-source-han-serif.conf new file mode 100644 index 0000000..e0b2634 --- /dev/null +++ b/.config/fontconfig/conf.d/53-override-source-han-serif.conf @@ -0,0 +1,17 @@ + + + + + + + chrome + + + Source Han Serif + + + Noto Serif + + + + diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf deleted file mode 100644 index 97d6944..0000000 --- a/.config/fontconfig/fonts.conf +++ /dev/null @@ -1,397 +0,0 @@ - - - - - - - - system-ui - - - sans-serif - - - - - - - sans-serif - - - Noto Sans - Noto Sans CJK SC - emoji - - - - - - - serif - - - Noto Serif - Noto Serif CJK SC - emoji - - - - - - - monospace - - - Iosevka Custom - Noto Sans Mono CJK SC - emoji - - - - - - - emoji - - - Symbols Nerd Font - Blobmoji - - - - - - - zh-HK - - - Noto Sans CJK SC - - - Noto Sans CJK HK - - - - - zh-HK - - - Noto Serif CJK SC - - - Noto Serif CJK HK - - - - - zh-HK - - - Noto Sans Mono CJK SC - - - Noto Sans Mono CJK HK - - - - - - zh-TW - - - Noto Sans CJK SC - - - Noto Sans CJK TC - - - - - zh-TW - - - Noto Serif CJK SC - - - Noto Serif CJK TC - - - - - zh-TW - - - Noto Sans Mono CJK SC - - - Noto Sans Mono CJK TC - - - - - - ja - - - Noto Sans CJK SC - - - Noto Sans CJK JP - - - - - ja - - - Noto Serif CJK SC - - - Noto Serif CJK JP - - - - - ja - - - Noto Sans Mono CJK SC - - - Noto Sans Mono CJK JP - - - - - - ko - - - Noto Sans CJK SC - - - Noto Sans CJK KR - - - - - ko - - - Noto Serif CJK SC - - - Noto Serif CJK KR - - - - - ko - - - Noto Sans Mono CJK SC - - - Noto Sans Mono CJK KR - - - - - - - Cantarell - - - Noto Sans - - - - - Arial - - - Noto Sans - - - - - Tahoma - - - Noto Sans - - - - - Calibri - - - Noto Sans - - - - - Microsoft YaHei - - - Noto Sans CJK SC - - - - - 微软雅黑 - - - Noto Sans CJK SC - - - - - SimHei - - - Noto Sans CJK SC - - - - - 黑体 - - - Noto Sans CJK SC - - - - - - - Times New Roman - - - Noto Serif - - - - - SimSun - - - Noto Serif CJK SC - - - - - 宋体 - - - Noto Serif CJK SC - - - - - FangSong - - - Noto Serif CJK SC - - - - - 仿宋 - - - Noto Serif CJK SC - - - - - - - Source Code - - - Iosevka Custom - - - - - - - KaiTi - - - AR PL UKai CN - Noto Serif CJK SC - - - - - 楷体 - - - AR PL UKai CN - Noto Serif CJK SC - - - - - - AR PL UKai - - - Noto Serif CJK SC - - - - - - - Noto Sans CJK - - - chrome - - - Noto Sans - - - - - Noto Serif CJK - - - chrome - - - Noto Serif - - - - - Noto Sans Mono CJK - - - chrome - - - Iosevka Custom - - - - - - - Noto Color Emoji - - - firefox - - - Blobmoji - - - - - - From 875efd5a92116679f434958115a4093d6efe0dc8 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 10 Feb 2021 00:48:30 +0800 Subject: [PATCH 56/79] Update fontconfig: only use noto cjk --- .config/fontconfig/conf.d/50-generic.conf | 6 +++--- .config/fontconfig/conf.d/52-replace.conf | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.config/fontconfig/conf.d/50-generic.conf b/.config/fontconfig/conf.d/50-generic.conf index 18da31a..1d34ae2 100644 --- a/.config/fontconfig/conf.d/50-generic.conf +++ b/.config/fontconfig/conf.d/50-generic.conf @@ -18,7 +18,7 @@ sans-serif - Sarasa Gothic SC + Noto Sans CJK SC @@ -28,7 +28,7 @@ serif - Source Han Serif SC + Noto Serif CJK SC @@ -39,7 +39,7 @@ Iosevka Custom - Sarasa Mono SC + Noto Sans Mono CJK SC diff --git a/.config/fontconfig/conf.d/52-replace.conf b/.config/fontconfig/conf.d/52-replace.conf index 0e2e1b5..b53c757 100644 --- a/.config/fontconfig/conf.d/52-replace.conf +++ b/.config/fontconfig/conf.d/52-replace.conf @@ -44,7 +44,7 @@ Microsoft YaHei - Sarasa Gothic SC + Noto Sans CJK SC @@ -53,7 +53,7 @@ 微软雅黑 - Sarasa Gothic SC + Noto Sans CJK SC @@ -62,7 +62,7 @@ SimHei - Sarasa Gothic SC + Noto Sans CJK SC @@ -71,7 +71,7 @@ 黑体 - Sarasa Gothic SC + Noto Sans CJK SC @@ -90,7 +90,7 @@ SimSun - Source Han Serif SC + Noto Serif CJK SC @@ -99,7 +99,7 @@ 宋体 - Source Han Serif SC + Noto Serif CJK SC @@ -108,7 +108,7 @@ FangSong - Source Han Serif SC + Noto Serif CJK SC @@ -117,7 +117,7 @@ 仿宋 - Source Han Serif SC + Noto Serif CJK SC From ed698ddbb1215b797c5983f9028a4055e2611cd0 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 10 Feb 2021 00:59:44 +0800 Subject: [PATCH 57/79] Fix fontconfig: add missing nerd font --- .config/fontconfig/conf.d/50-generic.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/fontconfig/conf.d/50-generic.conf b/.config/fontconfig/conf.d/50-generic.conf index 1d34ae2..d44bbdd 100644 --- a/.config/fontconfig/conf.d/50-generic.conf +++ b/.config/fontconfig/conf.d/50-generic.conf @@ -40,6 +40,7 @@ Iosevka Custom Noto Sans Mono CJK SC + Symbols Nerd Font From 730ec119131431693ea7d6a927211f36ceb4f9c9 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 10 Feb 2021 12:37:05 +0800 Subject: [PATCH 58/79] Fix fontconfig: fix emoji --- .config/fontconfig/conf.d/50-generic.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/fontconfig/conf.d/50-generic.conf b/.config/fontconfig/conf.d/50-generic.conf index d44bbdd..5da36dc 100644 --- a/.config/fontconfig/conf.d/50-generic.conf +++ b/.config/fontconfig/conf.d/50-generic.conf @@ -19,6 +19,7 @@ Noto Sans CJK SC + Twemoji @@ -29,6 +30,7 @@ Noto Serif CJK SC + Twemoji @@ -41,6 +43,7 @@ Iosevka Custom Noto Sans Mono CJK SC Symbols Nerd Font + Twemoji From 2c65496cd2fdc772a86e9d8a3ac19684de49b09c Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 10 Feb 2021 19:05:32 +0800 Subject: [PATCH 59/79] Fix fontconfig --- .../conf.d/51-language-noto-cjk.conf | 3 +- .../51-language-source-han-sans-hw.conf | 53 ++++++++++++++++++ .../conf.d/51-language-source-han-sans.conf | 54 +++++++++++++++++++ .../conf.d/51-language-source-han-serif.conf | 4 ++ .../53-override-source-han-sans-hw.conf | 17 ++++++ .../conf.d/53-override-source-han-sans.conf | 20 +++++++ 6 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 .config/fontconfig/conf.d/51-language-source-han-sans-hw.conf create mode 100644 .config/fontconfig/conf.d/51-language-source-han-sans.conf create mode 100644 .config/fontconfig/conf.d/53-override-source-han-sans-hw.conf create mode 100644 .config/fontconfig/conf.d/53-override-source-han-sans.conf diff --git a/.config/fontconfig/conf.d/51-language-noto-cjk.conf b/.config/fontconfig/conf.d/51-language-noto-cjk.conf index 44a487e..bac95d8 100644 --- a/.config/fontconfig/conf.d/51-language-noto-cjk.conf +++ b/.config/fontconfig/conf.d/51-language-noto-cjk.conf @@ -22,7 +22,8 @@ Noto Serif CJK SC - Noto Serif CJK HK + + Noto Serif CJK TC diff --git a/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf b/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf new file mode 100644 index 0000000..d76c320 --- /dev/null +++ b/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf @@ -0,0 +1,53 @@ + + + + + + + zh-HK + + + Source Han Sans HW SC + + + Source Han Sans HW HC + + + + + + zh-TW + + + Source Han Sans HW SC + + + Source Han Sans HW TC + + + + + + ja + + + Source Han Sans HW SC + + + Source Han Sans HW + + + + + + ko + + + Source Han Sans HW SC + + + Source Han Sans HW K + + + + diff --git a/.config/fontconfig/conf.d/51-language-source-han-sans.conf b/.config/fontconfig/conf.d/51-language-source-han-sans.conf new file mode 100644 index 0000000..aa023de --- /dev/null +++ b/.config/fontconfig/conf.d/51-language-source-han-sans.conf @@ -0,0 +1,54 @@ + + + + + + + zh-HK + + + Source Han Sans SC + + + Source Han Sans HC + + + + + + zh-TW + + + Source Han Sans SC + + + Source Han Sans TC + + + + + + ja + + + Source Han Sans SC + + + + Source Han Sans + + + + + + ko + + + Source Han Sans SC + + + Source Han Sans K + + + + diff --git a/.config/fontconfig/conf.d/51-language-source-han-serif.conf b/.config/fontconfig/conf.d/51-language-source-han-serif.conf index 28990cb..84a5da6 100644 --- a/.config/fontconfig/conf.d/51-language-source-han-serif.conf +++ b/.config/fontconfig/conf.d/51-language-source-han-serif.conf @@ -1,6 +1,7 @@ + zh-HK @@ -9,9 +10,11 @@ Source Han Serif SC + Source Han Serif TC + zh-TW @@ -32,6 +35,7 @@ Source Han Serif SC + Source Han Serif diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf b/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf new file mode 100644 index 0000000..103e213 --- /dev/null +++ b/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf @@ -0,0 +1,17 @@ + + + + + + + chrome + + + Source Han Sans HW + + + Iosevka Custom + + + + diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans.conf b/.config/fontconfig/conf.d/53-override-source-han-sans.conf new file mode 100644 index 0000000..10fcce1 --- /dev/null +++ b/.config/fontconfig/conf.d/53-override-source-han-sans.conf @@ -0,0 +1,20 @@ + + + + + + + chrome + + + HW + + + Source Han Sans + + + Noto Sans + + + + From 523c04bc9fd09b71ca7a3abbeeee1b9470c27e00 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 10 Feb 2021 19:09:00 +0800 Subject: [PATCH 60/79] Update fontconfig: merge config for source han sans --- .../51-language-source-han-sans-hw.conf | 53 ------------------- .../conf.d/51-language-source-han-sans.conf | 48 +++++++++++++++++ .../53-override-source-han-sans-hw.conf | 17 ------ .../conf.d/53-override-source-han-sans.conf | 12 +++++ 4 files changed, 60 insertions(+), 70 deletions(-) delete mode 100644 .config/fontconfig/conf.d/51-language-source-han-sans-hw.conf delete mode 100644 .config/fontconfig/conf.d/53-override-source-han-sans-hw.conf diff --git a/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf b/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf deleted file mode 100644 index d76c320..0000000 --- a/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - zh-HK - - - Source Han Sans HW SC - - - Source Han Sans HW HC - - - - - - zh-TW - - - Source Han Sans HW SC - - - Source Han Sans HW TC - - - - - - ja - - - Source Han Sans HW SC - - - Source Han Sans HW - - - - - - ko - - - Source Han Sans HW SC - - - Source Han Sans HW K - - - - diff --git a/.config/fontconfig/conf.d/51-language-source-han-sans.conf b/.config/fontconfig/conf.d/51-language-source-han-sans.conf index aa023de..b82fb4e 100644 --- a/.config/fontconfig/conf.d/51-language-source-han-sans.conf +++ b/.config/fontconfig/conf.d/51-language-source-han-sans.conf @@ -51,4 +51,52 @@ + + + zh-HK + + + Source Han Sans HW SC + + + Source Han Sans HW HC + + + + + + zh-TW + + + Source Han Sans HW SC + + + Source Han Sans HW TC + + + + + + ja + + + Source Han Sans HW SC + + + Source Han Sans HW + + + + + + ko + + + Source Han Sans HW SC + + + Source Han Sans HW K + + + diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf b/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf deleted file mode 100644 index 103e213..0000000 --- a/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - chrome - - - Source Han Sans HW - - - Iosevka Custom - - - - diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans.conf b/.config/fontconfig/conf.d/53-override-source-han-sans.conf index 10fcce1..7776116 100644 --- a/.config/fontconfig/conf.d/53-override-source-han-sans.conf +++ b/.config/fontconfig/conf.d/53-override-source-han-sans.conf @@ -17,4 +17,16 @@ + + + chrome + + + Source Han Sans HW + + + Iosevka Custom + + + From c9eea7b317bea664babe41d4722e3e29ee617d14 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 15 Feb 2021 15:03:23 +0800 Subject: [PATCH 61/79] Fix fontconfig: weird fonts in chrome and steam --- .config/fontconfig/conf.d/50-generic.conf | 13 +++++++++++- .../conf.d/53-override-noto-cjk.conf | 20 +++++++------------ .../conf.d/53-override-sarasa-gothic.conf | 6 ++++++ .../conf.d/53-override-source-han-sans.conf | 6 ++++++ .../conf.d/53-override-source-han-serif.conf | 3 +++ 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.config/fontconfig/conf.d/50-generic.conf b/.config/fontconfig/conf.d/50-generic.conf index 5da36dc..07af4e0 100644 --- a/.config/fontconfig/conf.d/50-generic.conf +++ b/.config/fontconfig/conf.d/50-generic.conf @@ -40,11 +40,22 @@ monospace - Iosevka Custom Noto Sans Mono CJK SC Symbols Nerd Font Twemoji + + + chrome + + + Noto Sans Mono CJK + + + Iosevka Custom + + + diff --git a/.config/fontconfig/conf.d/53-override-noto-cjk.conf b/.config/fontconfig/conf.d/53-override-noto-cjk.conf index 212a3c3..900a72f 100644 --- a/.config/fontconfig/conf.d/53-override-noto-cjk.conf +++ b/.config/fontconfig/conf.d/53-override-noto-cjk.conf @@ -6,6 +6,9 @@ chrome + + steam + Noto Sans CJK @@ -18,24 +21,15 @@ chrome + + steam + - Noto Serif CJK + Noto Serif CJK Noto Serif - - - chrome - - - Noto Sans Mono CJK - - - Iosevka Custom - - - diff --git a/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf b/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf index 38906b0..526d3b1 100644 --- a/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf +++ b/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf @@ -6,6 +6,9 @@ chrome + + steam + Sarasa Gothic @@ -18,6 +21,9 @@ chrome + + steam + Sarasa Mono diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans.conf b/.config/fontconfig/conf.d/53-override-source-han-sans.conf index 7776116..0f53517 100644 --- a/.config/fontconfig/conf.d/53-override-source-han-sans.conf +++ b/.config/fontconfig/conf.d/53-override-source-han-sans.conf @@ -6,6 +6,9 @@ chrome + + steam + HW @@ -21,6 +24,9 @@ chrome + + steam + Source Han Sans HW diff --git a/.config/fontconfig/conf.d/53-override-source-han-serif.conf b/.config/fontconfig/conf.d/53-override-source-han-serif.conf index e0b2634..276e1da 100644 --- a/.config/fontconfig/conf.d/53-override-source-han-serif.conf +++ b/.config/fontconfig/conf.d/53-override-source-han-serif.conf @@ -6,6 +6,9 @@ chrome + + steam + Source Han Serif From 5f1d74cadcc021a2d0e4c3d63cf978c7ef69c10b Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 15 Feb 2021 16:15:03 +0800 Subject: [PATCH 62/79] Update fontconfig: remove unused config --- .config/fontconfig/conf.d/52-replace.conf | 13 ------------- .../conf.d/53-override-sarasa-gothic.conf | 15 --------------- .../conf.d/53-override-source-han-sans.conf | 15 --------------- 3 files changed, 43 deletions(-) diff --git a/.config/fontconfig/conf.d/52-replace.conf b/.config/fontconfig/conf.d/52-replace.conf index b53c757..373bf95 100644 --- a/.config/fontconfig/conf.d/52-replace.conf +++ b/.config/fontconfig/conf.d/52-replace.conf @@ -131,17 +131,4 @@ - - - - Noto Color Emoji - - - firefox - - - Blobmoji - - - diff --git a/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf b/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf index 526d3b1..263a703 100644 --- a/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf +++ b/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf @@ -17,19 +17,4 @@ - - - chrome - - - steam - - - Sarasa Mono - - - Iosevka Custom - - - diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans.conf b/.config/fontconfig/conf.d/53-override-source-han-sans.conf index 0f53517..31b6568 100644 --- a/.config/fontconfig/conf.d/53-override-source-han-sans.conf +++ b/.config/fontconfig/conf.d/53-override-source-han-sans.conf @@ -20,19 +20,4 @@ - - - chrome - - - steam - - - Source Han Sans HW - - - Iosevka Custom - - - From b36be7fc37389cdedf776c87d5e6d635afd2d8ab Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 16 Feb 2021 13:47:59 +0800 Subject: [PATCH 63/79] Update fontconfig: font order --- .config/fontconfig/conf.d/50-generic.conf | 2 ++ .../fontconfig/conf.d/53-override-noto-cjk.conf | 14 ++++---------- .../conf.d/53-override-sarasa-gothic.conf | 7 ++----- .../conf.d/53-override-source-han-sans.conf | 7 ++----- .../conf.d/53-override-source-han-serif.conf | 7 ++----- 5 files changed, 12 insertions(+), 25 deletions(-) diff --git a/.config/fontconfig/conf.d/50-generic.conf b/.config/fontconfig/conf.d/50-generic.conf index 07af4e0..2916cf0 100644 --- a/.config/fontconfig/conf.d/50-generic.conf +++ b/.config/fontconfig/conf.d/50-generic.conf @@ -19,6 +19,7 @@ Noto Sans CJK SC + Noto Sans Twemoji @@ -30,6 +31,7 @@ Noto Serif CJK SC + Noto Serif Twemoji diff --git a/.config/fontconfig/conf.d/53-override-noto-cjk.conf b/.config/fontconfig/conf.d/53-override-noto-cjk.conf index 900a72f..87f9461 100644 --- a/.config/fontconfig/conf.d/53-override-noto-cjk.conf +++ b/.config/fontconfig/conf.d/53-override-noto-cjk.conf @@ -3,11 +3,8 @@ - - chrome - - - steam + + en Noto Sans CJK @@ -18,11 +15,8 @@ - - chrome - - - steam + + en Noto Serif CJK diff --git a/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf b/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf index 263a703..7dcee7a 100644 --- a/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf +++ b/.config/fontconfig/conf.d/53-override-sarasa-gothic.conf @@ -3,11 +3,8 @@ - - chrome - - - steam + + en Sarasa Gothic diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans.conf b/.config/fontconfig/conf.d/53-override-source-han-sans.conf index 31b6568..4317c32 100644 --- a/.config/fontconfig/conf.d/53-override-source-han-sans.conf +++ b/.config/fontconfig/conf.d/53-override-source-han-sans.conf @@ -3,11 +3,8 @@ - - chrome - - - steam + + en HW diff --git a/.config/fontconfig/conf.d/53-override-source-han-serif.conf b/.config/fontconfig/conf.d/53-override-source-han-serif.conf index 276e1da..af17183 100644 --- a/.config/fontconfig/conf.d/53-override-source-han-serif.conf +++ b/.config/fontconfig/conf.d/53-override-source-han-serif.conf @@ -3,11 +3,8 @@ - - chrome - - - steam + + en Source Han Serif From f5d9b2b5fd9fc6aa06a37e9d1c0c3c55398fc8bb Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 17 Feb 2021 22:31:24 +0800 Subject: [PATCH 64/79] Add systemd user unit: kdeconnect --- .config/systemd/user/kdeconnect.service | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .config/systemd/user/kdeconnect.service diff --git a/.config/systemd/user/kdeconnect.service b/.config/systemd/user/kdeconnect.service new file mode 100644 index 0000000..e4df087 --- /dev/null +++ b/.config/systemd/user/kdeconnect.service @@ -0,0 +1,11 @@ +[Unit] +Description=Adds communication between KDE and your smartphone + +[Service] +Type=idle +Environment="LANG=zh_CN.UTF-8" +ExecStartPre=/usr/bin/sleep 5 +ExecStart=/usr/bin/kdeconnect-indicator + +[Install] +WantedBy=Xorg.target From d78b11b04e46e27ee71c52154dfd89ee92b331b3 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 17 Feb 2021 22:51:56 +0800 Subject: [PATCH 65/79] Update systemd user units --- .config/systemd/user/copyq.service | 1 + .config/systemd/user/kdeconnect.service | 2 +- .config/systemd/user/nm-applet.service | 1 + .config/systemd/user/picom.service | 1 + .config/systemd/user/policykit-agent.service | 3 ++- .config/systemd/user/qv2ray.service | 1 + .config/systemd/user/v2ray.service | 2 +- .config/systemd/user/xsettingsd.service | 1 + 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.config/systemd/user/copyq.service b/.config/systemd/user/copyq.service index 2b0a04e..9b8a8b0 100644 --- a/.config/systemd/user/copyq.service +++ b/.config/systemd/user/copyq.service @@ -2,6 +2,7 @@ Description=Clipboard manager with searchable and editable history [Service] +Type=idle Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/copyq diff --git a/.config/systemd/user/kdeconnect.service b/.config/systemd/user/kdeconnect.service index e4df087..d153160 100644 --- a/.config/systemd/user/kdeconnect.service +++ b/.config/systemd/user/kdeconnect.service @@ -1,5 +1,5 @@ [Unit] -Description=Adds communication between KDE and your smartphone +Description=Communication Daemon between desktop and smartphone [Service] Type=idle diff --git a/.config/systemd/user/nm-applet.service b/.config/systemd/user/nm-applet.service index 2c73ea2..6fa923b 100644 --- a/.config/systemd/user/nm-applet.service +++ b/.config/systemd/user/nm-applet.service @@ -2,6 +2,7 @@ Description=Applet for managing network connections [Service] +Type=idle Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/nm-applet diff --git a/.config/systemd/user/picom.service b/.config/systemd/user/picom.service index 290c4d1..a4d8cf4 100644 --- a/.config/systemd/user/picom.service +++ b/.config/systemd/user/picom.service @@ -2,6 +2,7 @@ Description=X compositor [Service] +Type=idle Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/picom diff --git a/.config/systemd/user/policykit-agent.service b/.config/systemd/user/policykit-agent.service index 9a65846..3dd074d 100644 --- a/.config/systemd/user/policykit-agent.service +++ b/.config/systemd/user/policykit-agent.service @@ -1,7 +1,8 @@ [Unit] -Description=The LXQt policykit authentication agent +Description=LXQt policykit authentication agent [Service] +Type=idle Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/lxqt-policykit-agent diff --git a/.config/systemd/user/qv2ray.service b/.config/systemd/user/qv2ray.service index 0f902f0..cff4d67 100644 --- a/.config/systemd/user/qv2ray.service +++ b/.config/systemd/user/qv2ray.service @@ -2,6 +2,7 @@ Description=Cross-platform V2ray Client written in Qt [Service] +Type=idle Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/qv2ray diff --git a/.config/systemd/user/v2ray.service b/.config/systemd/user/v2ray.service index 0a41b53..85bc045 100644 --- a/.config/systemd/user/v2ray.service +++ b/.config/systemd/user/v2ray.service @@ -1,5 +1,5 @@ [Unit] -Description=A platform for building proxies to bypass network restrictions Service +Description=Platform for building proxies to bypass network restrictions Service After=default.target [Service] diff --git a/.config/systemd/user/xsettingsd.service b/.config/systemd/user/xsettingsd.service index 7e8e77d..722efb3 100644 --- a/.config/systemd/user/xsettingsd.service +++ b/.config/systemd/user/xsettingsd.service @@ -2,6 +2,7 @@ Description=Provides settings to X11 applications via the XSETTINGS specification [Service] +Type=idle Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/xsettingsd From aad8d4d7cd07b6627f32c938dcb98fa0c9fe5747 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 25 Feb 2021 18:52:52 +0800 Subject: [PATCH 66/79] Add picom config --- .config/picom/picom.conf | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .config/picom/picom.conf diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf new file mode 100644 index 0000000..6cae47f --- /dev/null +++ b/.config/picom/picom.conf @@ -0,0 +1,43 @@ +################################# +# Shadows # +################################# + +shadow = true +shadow-radius = 32 +shadow-offset-x = -32 +shadow-offset-y = -32 +shadow-opacity = 0.24 + +shadow-exclude = [ + "class_g = 'Thunderbird' && argb" +] + +################################# +# Fading # +################################# + +fading = true + +################################# +# Transparency / Opacity # +################################# + +opacity-rule = [ + "90:class_i = 'Terminal Emulator'" +]; + +################################# +# General Settings # +################################# + +vsync = true +mark-wmwin-focused = true +mark-ovredir-focused = true +detect-rounded-corners = true +detect-client-opacity = true +refresh-rate = 0 +use-ewmh-active-win = true +detect-transient = true +detect-client-leader = true +use-damage = true + From c761e0e9391ca78078757fb3da4bbac319e7eae4 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 25 Feb 2021 19:11:54 +0800 Subject: [PATCH 67/79] Update zsh prompt --- .config/zsh/.gitignore | 2 +- .config/zsh/zshrc | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.config/zsh/.gitignore b/.config/zsh/.gitignore index 8535af7..7006e11 100644 --- a/.config/zsh/.gitignore +++ b/.config/zsh/.gitignore @@ -1 +1 @@ -/hostrc.d/colors.zsh +/hostrc.d/env.zsh diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc index 9b630ed..4750b9c 100644 --- a/.config/zsh/zshrc +++ b/.config/zsh/zshrc @@ -110,7 +110,7 @@ fi _color_invert=$'%{\e[7m%}' _color_reset=$'%{\e[0m%}' if [[ -z ${_SPEC_PROMPT_disable_icon} ]]; then - _icon_error="😈" + _icon_error=" 😈" _icon_gitdir="  " fi @@ -118,7 +118,7 @@ ZLE_RPROMPT_INDENT=-1 # 去掉右提示符右侧多余空白 precmd() { # 上一条命令的运行结果 if [ $? -ne 0 ]; then - PROMPT_err="%{$bg[red]$fg[black]%} ${_icon_error:-E} %{$reset_color%}" + PROMPT_err=${_icon_error:-E} else PROMPT_err="" fi @@ -126,7 +126,9 @@ precmd() { if command -v fish_collapsed_pwd &>/dev/null; then _collapsed_pwd=$(fish_collapsed_pwd) fi - PROMPT_host="${_color_host}${_color_invert} %n@%m ${_color_reset}" + if ! (($DISABLE_RPROMPT_host)); then + PROMPT_host="${_color_host}${_color_invert} %n@%m ${_color_reset}" + fi # ssh标志 if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then PROMPT_ssh="%{$bg[yellow]$fg[black]%} ssh %{$reset_color%}" @@ -161,8 +163,8 @@ precmd() { PROMPT_tail=" $ " fi - PROMPT="${_color_host}▒${PROMPT_git} ${PROMPT_cwd}${PROMPT_tail}${_color_reset}" - RPROMPT="${PROMPT_err}${PROMPT_pyvenv}${PROMPT_nvm}${PROMPT_tmux}${PROMPT_ssh}${PROMPT_host}" + PROMPT="${_color_host}${PROMPT_sign}${PROMPT_err}${PROMPT_git} ${PROMPT_cwd}${PROMPT_tail}${_color_reset}" + RPROMPT="${PROMPT_pyvenv}${PROMPT_nvm}${PROMPT_tmux}${PROMPT_ssh}${PROMPT_host}" # 设置终端标题 print -n "\e]0;zsh ( ${_collapsed_pwd} )\a" From 3959b803ff1f3870fb8008acc27545b960d242c3 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 25 Feb 2021 19:17:24 +0800 Subject: [PATCH 68/79] Update README --- README.md | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/README.md b/README.md index d9cbee9..8840bc6 100644 --- a/README.md +++ b/README.md @@ -7,32 +7,6 @@ 另见 [如何使用 Git 管理 Linux 配置？](https://2cat.cc/post/diyo4/) -## 已添加软件 - -- [x] `alacritty` -- [x] `aria2` - - > FIXME: 包含硬编码目录 - -- [x] `firefox` -- [x] `git` - - > 注意: 包含 ID 和邮箱 - -- [x] `pikaur` -- [x] `zsh` - -### 以及配置 - -- [x] `cargo` -- [x] `fontconfig` -- [x] `npm` -- [x] `python` - - > 让 REPL 历史记录保存在 XDG 目录 - -- [x] `X11` - ## 更多 Neovim 配置移步至 From ea00f9978641fb9754c065e3a838d6edc3ebdf98 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 26 Feb 2021 19:43:28 +0800 Subject: [PATCH 69/79] Add keybindings --- .config/X11/profile | 1 + .config/xbindkeys/config | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 .config/xbindkeys/config diff --git a/.config/X11/profile b/.config/X11/profile index e8a8e24..beac2d6 100644 --- a/.config/X11/profile +++ b/.config/X11/profile @@ -7,4 +7,5 @@ export LANG=zh_CN.UTF-8 # swap Ctrl_R and Alt_R setxkbmap -option ctrl:rctrl_ralt setxkbmap -option ctrl:ralt_rctrl + xbindkeys -f ${XDG_CONFIG_HOME}/xbindkeys/config ) & diff --git a/.config/xbindkeys/config b/.config/xbindkeys/config new file mode 100644 index 0000000..cb64167 --- /dev/null +++ b/.config/xbindkeys/config @@ -0,0 +1,5 @@ +"xdotool keydown super && notify-send -t 5000 xdotool 正在持续按住Super键..." + b:9 + +"xdotool keyup super; notify-send -t 5000 xdotool 松开Super键。" + Mod4 + b:8 + Release From 07840a5393b0ae50c0acff045138b56aa9902944 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 1 Mar 2021 18:51:31 +0800 Subject: [PATCH 70/79] Update firefox: auto popup sidebar --- .../firefox/profile/chrome/userChrome.css | 28 ++++++++++++---- .../firefox/profile/chrome/userContent.css | 33 +++++++++++-------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index e0aa5c9..661a4e0 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -25,8 +25,27 @@ background-color: unset !important; } -#sidebar { - min-width: 10em !important; +/* 自动弹出式侧边栏 */ +#sidebar-box { + z-index: 1000 !important; + position: relative !important; + min-width: 32px !important; + max-width: 32px !important; +} +#sidebar-box #sidebar { + position: absolute !important; + width: 32px !important; + min-width: 32px !important; + max-width: 32px !important; + transition: all 0.1s; +} +#sidebar-box #sidebar:hover { + min-width: 200px !important; + max-width: 200px !important; + box-shadow: 2px 0 13px 0px #333333; +} +#sidebar-splitter { + display: none !important; } /* 暗色侧边栏 */ @@ -44,11 +63,6 @@ treechildren::-moz-tree-separator { border-color: #333 !important } -#sidebar-splitter { - width: 4px !important; - border: 0px !important; - background-color: var(--frame-background-color) !important; -} /* 隐藏扩展侧边栏的头部 */ /* Visual Tabs */ diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index 7860773..5a8c5be 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -33,40 +33,45 @@ height: 2px !important; } - #tabbox #tabList[mode="compact"] .tab { + #tabbox #tabList .tab { padding-top: 0 !important; padding-left: 0 !important; padding-bottom: 0 !important; margin-bottom: 15px !important; + margin-right: 4px !important; border-bottom: none !important; } - #tabbox #tabList[mode="compact"] .tab .bar { + #tabbox #tabList .tab .bar { height: 28px !important; } - #tabbox #tabList[mode="compact"] .tab .bar .title { + #tabbox #tabList .tab .bar .title { color: #333 !important; } - #tabbox #tabList[mode="compact"] .tab[selected="true"] .bar .title { + #tabbox #tabList .tab[selected="true"] .bar .title { font-weight: unset !important; } - #tabbox #tabList[mode="compact"] .tab .line1 { + #tabbox #tabList .tab .line1 { display: none !important; } - #tabbox #tabList[mode="compact"] .tab .thumbnail { - width: 90% !important; - margin-top: 5px !important; - margin-left: auto !important; - margin-right: 0 !important; + #tabbox #tabList .tab .thumbnail { + width: 100% !important; + margin: 0 !important; + box-shadow: inset 0px 1px 2px 0px #606060 !important; } - #tabbox #tabList[mode="compact"] .tab[discarded="true"] { + #tabbox #tabList .tab[discarded="true"] { padding-bottom: 0 !important; } - #tabbox #tabList[mode="compact"] .tab[url="about:blank"] .thumbnail, - #tabbox #tabList[mode="compact"] .tab[discarded="true"] .thumbnail { + #tabbox #tabList .tab[url^="about:"] .thumbnail, + #tabbox #tabList .tab[discarded="true"] .thumbnail { display: none !important; } + #tabbox #tabList .tab[url^="moz-extension:"] .line2, + #tabbox #tabList .tab[url^="https://addons.mozilla.org/"] .line2, + #tabbox #tabList .tab[url^="about:"] .line2 { + background-color: #ee9090; + } /* 自动隐藏关闭按钮 */ - #tabbox #tabList[mode="compact"] .tab:not(:hover) button.close { + #tabbox #tabList .tab:not(:hover) button.close { display: none !important; } From e031071a40b06d54c0a473ae8d9d29cf7a32b945 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 1 Mar 2021 18:52:24 +0800 Subject: [PATCH 71/79] Update firefox: remove fingerprint indicator --- .mozilla/firefox/profile/chrome/userChrome.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index 661a4e0..515ae0e 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -18,6 +18,10 @@ #urlbar:not(.megabar), #urlbar.megabar > #urlbar-background, #searchbar { box-shadow: none !important; } +/* 隐藏地址栏的容器图标 */ +#urlbar .identity-icon-fingerprint { + display: none !important; +} /* 简化后退图标 */ #back-button > .toolbarbutton-icon { From 2284aa0926d8c02d4e0493180ec4b26d9d976a8a Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 2 Mar 2021 15:44:13 +0800 Subject: [PATCH 72/79] Update firefox sidebar --- .mozilla/firefox/profile/chrome/userContent.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index 5a8c5be..bfe104b 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -66,6 +66,7 @@ display: none !important; } #tabbox #tabList .tab[url^="moz-extension:"] .line2, + #tabbox #tabList .tab[url^="file:///"] .line2, #tabbox #tabList .tab[url^="https://addons.mozilla.org/"] .line2, #tabbox #tabList .tab[url^="about:"] .line2 { background-color: #ee9090; @@ -74,6 +75,10 @@ #tabbox #tabList .tab:not(:hover) button.close { display: none !important; } + /* 自动隐藏音量图标 */ + body:not(:hover) div.audio { + display: none !important; + } /* 隐藏新标签按钮 */ #newTab { From 5c27db0306b0dfcfde2b9d9371712132824fe30a Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 8 Mar 2021 20:41:07 +0800 Subject: [PATCH 73/79] Update zsh: use zinit --- .config/zsh/tools/install.sh | 12 ++++++++++++ .config/zsh/tools/update.sh | 11 +++++++++++ .config/zsh/update.sh | 11 ----------- .config/zsh/zshrc | 18 +++++++++++------- 4 files changed, 34 insertions(+), 18 deletions(-) create mode 100755 .config/zsh/tools/install.sh create mode 100755 .config/zsh/tools/update.sh delete mode 100755 .config/zsh/update.sh diff --git a/.config/zsh/tools/install.sh b/.config/zsh/tools/install.sh new file mode 100755 index 0000000..eb67d61 --- /dev/null +++ b/.config/zsh/tools/install.sh @@ -0,0 +1,12 @@ +#!/bin/zsh -e + +zinit_bin_dir=${XDG_DATA_HOME:-~/.data}/zinit/bin + +if [[ -e $zinit_bin_dir ]]; then + echo Clean up old zinit bin dir. + rm -rf $zinit_bin_dir +fi + +echo Installing zinit... +git clone --depth 1 --single-branch \ + https://github.com/zdharma/zinit.git $zinit_bin_dir diff --git a/.config/zsh/tools/update.sh b/.config/zsh/tools/update.sh new file mode 100755 index 0000000..1d5c8a4 --- /dev/null +++ b/.config/zsh/tools/update.sh @@ -0,0 +1,11 @@ +#!/bin/zsh -ie + +if command -v zinit &>/dev/null; then + echo Updating plugins... + zinit update --all --parallel +else + echo zinit is missing >&2 +fi + +echo +echo Done. diff --git a/.config/zsh/update.sh b/.config/zsh/update.sh deleted file mode 100755 index 448cfca..0000000 --- a/.config/zsh/update.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/zsh -e - -if command -v antibody &>/dev/null; then - echo Updating plugins... - antibody update -else - echo antibody is missing >&2 -fi - -echo -echo Done. diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc index 4750b9c..2b0fd90 100644 --- a/.config/zsh/zshrc +++ b/.config/zsh/zshrc @@ -6,13 +6,17 @@ setopt interactive_comments # 交互模式支持注释 fpath=(${ZDOTDIR}/functions ${ZDOTDIR}/Completion $fpath) # 插件 <<<------------------------------ -command -v antibody &>/dev/null && source <(antibody init) && \ -antibody bundle < Date: Mon, 8 Mar 2021 21:04:20 +0800 Subject: [PATCH 74/79] Add zsh plugin: autopair --- .config/zsh/zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc index 2b0fd90..0145319 100644 --- a/.config/zsh/zshrc +++ b/.config/zsh/zshrc @@ -14,6 +14,8 @@ source ${ZINIT[BIN_DIR]}/zinit.zsh zinit light zdharma/fast-syntax-highlighting # 语法高亮 zinit ice lucid wait atload='_zsh_autosuggest_start' zinit light zsh-users/zsh-autosuggestions # 提示建议 +zinit ice lucid wait +zinit light 'hlissner/zsh-autopair' # 自动闭合符号 zinit light zsh-users/zsh-completions # 更多命令补全 zinit light skywind3000/z.lua # 快速跳转目录 From 995cb2b3d7f27a8df2d978dcc60bb862b461831a Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 9 Mar 2021 21:01:09 +0800 Subject: [PATCH 75/79] painful chores --- .config/alacritty/alacritty.yml | 2 -- .mozilla/firefox/profile/chrome/userChrome.css | 7 ------- 2 files changed, 9 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index a7d27b5..e53d4f0 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -3,8 +3,6 @@ window: instance: Terminal Emulator font: size: 9 - offset: - y: 4 # colorscheme: Material colors: # Default colors diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index 515ae0e..4d3b784 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -2,13 +2,6 @@ --frame-background-color: #445; } -*|*:root:-moz-lwtheme { - --toolbar-bgcolor: #e4e5e7 !important; - --tab-line-color: #f0b0ff !important; - --lwt-toolbar-field-background-color: #e4e5e7 !important; - --lwt-toolbar-field-border-color: #e4e5e7 !important; -} - /* 隐藏标签栏 */ #main-window:not([tabsintitlebar="true"]) #TabsToolbar { visibility: collapse !important; From 97eeb1c7fd660bda78c3b349aa07cbe6236b9afa Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 5 Apr 2021 23:40:24 +0800 Subject: [PATCH 76/79] Untrack npm config --- .config/npm/npmrc | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .config/npm/npmrc diff --git a/.config/npm/npmrc b/.config/npm/npmrc deleted file mode 100644 index b340cfc..0000000 --- a/.config/npm/npmrc +++ /dev/null @@ -1,5 +0,0 @@ -prefix=${XDG_DATA_HOME}/npm -cache=${XDG_CACHE_HOME}/npm -tmp=${XDG_RUNTIME_DIR}/npm -init-module=${XDG_CONFIG_HOME}/npm/config/npm-init.js -registry=https://registry.npm.taobao.org/ From ea6f82879aef8de29b75316dd086ab2d8fb6e8b0 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 5 Apr 2021 23:40:48 +0800 Subject: [PATCH 77/79] Update fontconfig --- .config/fontconfig/conf.d/50-generic.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/fontconfig/conf.d/50-generic.conf b/.config/fontconfig/conf.d/50-generic.conf index 2916cf0..75b7530 100644 --- a/.config/fontconfig/conf.d/50-generic.conf +++ b/.config/fontconfig/conf.d/50-generic.conf @@ -20,6 +20,7 @@ Noto Sans CJK SC Noto Sans + Symbols Nerd Font Twemoji @@ -32,6 +33,7 @@ Noto Serif CJK SC Noto Serif + Symbols Nerd Font Twemoji From 5f041160d5b8cb500bf831a1b56e4d2cd82df252 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 27 May 2021 16:54:41 +0800 Subject: [PATCH 78/79] Add user service: udiskie --- .config/systemd/user/udiskie.service | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .config/systemd/user/udiskie.service diff --git a/.config/systemd/user/udiskie.service b/.config/systemd/user/udiskie.service new file mode 100644 index 0000000..767231c --- /dev/null +++ b/.config/systemd/user/udiskie.service @@ -0,0 +1,10 @@ +[Unit] +Description=Removable disk automounter using udisks + +[Service] +Type=idle +Environment="LANG=zh_CN.UTF-8" +ExecStart=/usr/bin/udiskie --smart-tray + +[Install] +WantedBy=Xorg.target From 84400b5f4873bb1501977810ad78a4df1eccdd5a Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 2 Jun 2021 16:47:31 +0800 Subject: [PATCH 79/79] Update firefox css --- .../firefox/profile/chrome/userChrome.css | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index 4d3b784..dd6d1b1 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -23,25 +23,26 @@ } /* 自动弹出式侧边栏 */ -#sidebar-box { - z-index: 1000 !important; - position: relative !important; - min-width: 32px !important; - max-width: 32px !important; +/* 强制在 VisualTab 扩展下有效 */ +#sidebar-box[sidebarcommand="visualtab_xuldev_org-sidebar-action"] { + z-index: 1000 !important; + position: relative !important; + min-width: 28px !important; + max-width: 28px !important; } -#sidebar-box #sidebar { - position: absolute !important; - width: 32px !important; - min-width: 32px !important; - max-width: 32px !important; - transition: all 0.1s; +#sidebar-box[sidebarcommand="visualtab_xuldev_org-sidebar-action"] #sidebar { + position: absolute !important; + transition: all 0.1s; } -#sidebar-box #sidebar:hover { - min-width: 200px !important; - max-width: 200px !important; - box-shadow: 2px 0 13px 0px #333333; +#sidebar-box[sidebarcommand="visualtab_xuldev_org-sidebar-action"] #sidebar:not(:hover) { + width: 28px !important; + min-width: 28px !important; + max-width: 28px !important; } -#sidebar-splitter { +#sidebar-box[sidebarcommand="visualtab_xuldev_org-sidebar-action"] #sidebar:hover { + box-shadow: 2px 0 13px 0px #333333; +} +#sidebar-box[sidebarcommand="visualtab_xuldev_org-sidebar-action"] + #sidebar-splitter { display: none !important; } @@ -84,7 +85,7 @@ panelview#widget-overflow-mainView vbox#widget-overflow-fixed-list { flex-wrap: wrap !important; } panelview#widget-overflow-mainView vbox#widget-overflow-fixed-list toolbarbutton { - width: calc(100% / 6) !important; + width: calc(100% / 8) !important; height: 40px !important; } panelview#widget-overflow-mainView vbox#widget-overflow-fixed-list label.toolbarbutton-text {