From b16989a251eed5a2bb3477a3eb5c5a6ede619499 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 4 Mar 2020 14:50:55 +0800 Subject: [PATCH 01/21] Update Xresource --- .config/X11/Xresources | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.config/X11/Xresources b/.config/X11/Xresources index eb657b5..c785b5d 100644 --- a/.config/X11/Xresources +++ b/.config/X11/Xresources @@ -1 +1,41 @@ Xft.dpi: 115 + +!--- font ---! +Xft.autohint: 0 +Xft.lcdfilter: lcddefault +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 + +!--- colorscheme: material ---! +! special +*.foreground: #eceff1 +*.background: #263238 +*.cursorColor: #eceff1 +! black +*.color0: #263238 +*.color8: #37474f +! red +*.color1: #ff9800 +*.color9: #ffa74d +! green +*.color2: #8bc34a +*.color10: #9ccc65 +! yellow +*.color3: #ffc107 +*.color11: #ffa000 +! blue +*.color4: #03a9f4 +*.color12: #81d4fa +! magenta +*.color5: #e91e63 +*.color13: #ad1457 +! cyan +*.color6: #009688 +*.color14: #26a69a +! white +*.color7: #cfd8dc +*.color15: #eceff1 From 59b965fe9bba3d6d0f27511cdfeeb888d94d3d44 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 9 Mar 2020 13:58:19 +0800 Subject: [PATCH 02/21] Update pam_environment: add path slash --- .pam_environment | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.pam_environment b/.pam_environment index 865caeb..711766c 100644 --- a/.pam_environment +++ b/.pam_environment @@ -4,9 +4,9 @@ BROWSER DEFAULT=firefox MANPAGER DEFAULT="nvim -c 'set ft=man' -" # xdg base directory -XDG_CONFIG_HOME DEFAULT=@{HOME}.config -XDG_CACHE_HOME DEFAULT=@{HOME}.cache -XDG_DATA_HOME DEFAULT=@{HOME}.data +XDG_CONFIG_HOME DEFAULT=@{HOME}/.config +XDG_CACHE_HOME DEFAULT=@{HOME}/.cache +XDG_DATA_HOME DEFAULT=@{HOME}/.data # gtk2 GTK2_RC_FILES DEFAULT=${XDG_CONFIG_HOME}/gtk-2.0/gtkrc @@ -43,12 +43,12 @@ GO111MODULE DEFAULT=on GOPROXY DEFAULT=https://goproxy.cn,direct GOCACHE DEFAULT=${XDG_CACHE_HOME}/go GOPATH DEFAULT=${GOCACHE} -GOBIN DEFAULT=@{HOME}bin/go +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 +PYTHONPYCACHEPREFIX DEFAULT=@{HOME}/.cache/python +PYTHONUSERBASE DEFAULT=@{HOME}/.packages/python # ipython IPYTHONDIR DEFAULT=${XDG_CONFIG_HOME}/jupyter JUPYTER_CONFIG_DIR DEFAULT=${XDG_CONFIG_HOME}/jupyter @@ -69,5 +69,5 @@ 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\ +PATH DEFAULT=@{HOME}/bin:${GOBIN}:${PYTHONUSERBASE}/bin:@{HOME}/.packages/node_modules/.bin\ :/usr/bin:/usr/local/bin From 8869792211a3f4776b5042321ee7ba9c9670cccf Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 9 Mar 2020 16:48:26 +0800 Subject: [PATCH 03/21] Fix zsh in ssh session --- .config/zsh/.zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 5d637e8..8ae73e2 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -103,7 +103,7 @@ if [[ -z ${_SPEC_PROMPT_disable_icon} ]]; then _icon_gitdir="  " fi -ZLE_RPROMPT_INDENT=0 # 去掉右提示符右侧多余空白 +ZLE_RPROMPT_INDENT=-1 # 去掉右提示符右侧多余空白 precmd() { # 上一条命令的运行结果 if [ $? -ne 0 ]; then @@ -183,6 +183,7 @@ 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 ssh='TERM=xterm-256color ssh' # >>>----------------------------------- # vim: foldmethod=marker:foldmarker=<<<---,>>>--- From 725d5f44a9bdbf6cc96633c465902a6eaa897902 Mon Sep 17 00:00:00 2001 From: rydesun Date: Thu, 9 Apr 2020 13:50:38 +0800 Subject: [PATCH 04/21] Update firefox ui --- .mozilla/firefox/profile/chrome/userChrome.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index f958525..3f1e952 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -18,6 +18,17 @@ visibility: collapse !important; } +/* 去除地址栏、搜索栏的阴影边框 */ +#urlbar:not(.megabar), #urlbar.megabar > #urlbar-background, #searchbar { + box-shadow: none !important; +} + +/* 简化后退图标 */ +#back-button > .toolbarbutton-icon { + border: none !important; + background-color: unset !important; +} + /* 暗色侧边栏 */ #sidebar-header { -moz-appearance: none !important; From 5d32297f4d3109a8bfc127d7e6158b48b66153c1 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sat, 11 Apr 2020 15:01:58 +0800 Subject: [PATCH 05/21] Add firefox user prefs --- .mozilla/firefox/profile/user.js | 48 ++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .mozilla/firefox/profile/user.js diff --git a/.mozilla/firefox/profile/user.js b/.mozilla/firefox/profile/user.js new file mode 100644 index 0000000..68e74f2 --- /dev/null +++ b/.mozilla/firefox/profile/user.js @@ -0,0 +1,48 @@ +/* 启动后恢复上次会话 */ +user_pref("browser.startup.page", 3); +/* 主页使用空白页 */ +user_pref("browser.startup.homepage", "about:blank"); +/* 新标签页使用空白页 */ +user_pref("browser.newtabpage.enabled", false); +/* 所有情况下都启用跟踪保护 */ +user_pref("privacy.trackingprotection.enabled", true); + +/*==== 隐藏设置 ====*/ +/* 打开about:config页面不警告 */ +user_pref("browser.aboutConfig.showWarning", false); +/* 去除about:addons页面中的推荐页 */ +user_pref("extensions.getAddons.showPane", false); +/* 去除about:addons页面中底部的推荐列表 */ +user_pref("extensions.htmlaboutaddons.recommendations.enabled", false); +/* 去除Pocket */ +user_pref("extensions.pocket.enabled", false); + +/* 禁止预连接(地址栏) */ +user_pref("browser.urlbar.speculativeConnect.enabled", false); +/* 禁止预连接(鼠标指针停留在链接上) */ +user_pref("network.http.speculative-parallel-limit", 0); +/* 禁止链接预读取 */ +user_pref("network.prefetch-next", false); +/* 禁止DNS预读取 */ +user_pref("network.dns.disablePrefetch", true); +/* 禁止超链接审计 + * 无需设置: 默认设置已禁止, 而且uBlock Origin也提供禁止选项 */ +// user_pref("browser.send_pings", false); +/* 禁止sendBeacon API + * 无需设置: 使用uBlock Origin过滤 + * https://bugzilla.mozilla.org/show_bug.cgi?id=1454252#c6 + * https://github.com/gorhill/uBlock/issues/1884#issuecomment-253813062 */ +// user_pref("beacon.enabled", false); + +/*==== 可能破坏网页 ====*/ +/* RFP: 阻止多种收集浏览器指纹的行为 */ +user_pref("privacy.resistFingerprinting", true); +/* 禁止WebGL */ +user_pref("webgl.disabled", true); +/* 禁止Web Audio API */ +user_pref("dom.webaudio.enabled", false); +/* 禁止WebRTC */ +user_pref("media.peerconnection.enabled", false); +/* 禁止获取媒体设备列表API + * 注意: 需要同时禁止WebRTC */ +user_pref("media.navigator.enabled", false); From be0cd60e1190518337bf9bdf507e71d63b6120e3 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 20 Apr 2020 15:55:10 +0800 Subject: [PATCH 06/21] Update firefox user prefs: enable webgl --- .mozilla/firefox/profile/user.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.mozilla/firefox/profile/user.js b/.mozilla/firefox/profile/user.js index 68e74f2..261276d 100644 --- a/.mozilla/firefox/profile/user.js +++ b/.mozilla/firefox/profile/user.js @@ -37,8 +37,9 @@ user_pref("network.dns.disablePrefetch", true); /*==== 可能破坏网页 ====*/ /* RFP: 阻止多种收集浏览器指纹的行为 */ user_pref("privacy.resistFingerprinting", true); -/* 禁止WebGL */ -user_pref("webgl.disabled", true); +/* 禁止WebGL + * 开启RFP后无需设置: RFP伪装了WebGL指纹 */ +// user_pref("webgl.disabled", true); /* 禁止Web Audio API */ user_pref("dom.webaudio.enabled", false); /* 禁止WebRTC */ From 64f405898066d19eb4e62b665c4e2726283064c8 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 20 Apr 2020 15:58:07 +0800 Subject: [PATCH 07/21] Update firefox user prefs: update comments --- .mozilla/firefox/profile/user.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.mozilla/firefox/profile/user.js b/.mozilla/firefox/profile/user.js index 261276d..8c9cc5f 100644 --- a/.mozilla/firefox/profile/user.js +++ b/.mozilla/firefox/profile/user.js @@ -1,3 +1,4 @@ +/*==== 显式设置 ====*/ /* 启动后恢复上次会话 */ user_pref("browser.startup.page", 3); /* 主页使用空白页 */ @@ -7,14 +8,14 @@ user_pref("browser.newtabpage.enabled", false); /* 所有情况下都启用跟踪保护 */ user_pref("privacy.trackingprotection.enabled", true); -/*==== 隐藏设置 ====*/ +/*==== 隐式设置 ====*/ /* 打开about:config页面不警告 */ user_pref("browser.aboutConfig.showWarning", false); /* 去除about:addons页面中的推荐页 */ user_pref("extensions.getAddons.showPane", false); /* 去除about:addons页面中底部的推荐列表 */ user_pref("extensions.htmlaboutaddons.recommendations.enabled", false); -/* 去除Pocket */ +/* 去除Pocket服务 */ user_pref("extensions.pocket.enabled", false); /* 禁止预连接(地址栏) */ From c44205363980dfef1d2263d14d8bb01806270f08 Mon Sep 17 00:00:00 2001 From: rydesun Date: Tue, 21 Apr 2020 22:04:37 +0800 Subject: [PATCH 08/21] Update firefox user prefs: update comments --- .mozilla/firefox/profile/user.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.mozilla/firefox/profile/user.js b/.mozilla/firefox/profile/user.js index 8c9cc5f..bd5bbc9 100644 --- a/.mozilla/firefox/profile/user.js +++ b/.mozilla/firefox/profile/user.js @@ -1,4 +1,3 @@ -/*==== 显式设置 ====*/ /* 启动后恢复上次会话 */ user_pref("browser.startup.page", 3); /* 主页使用空白页 */ @@ -8,7 +7,6 @@ user_pref("browser.newtabpage.enabled", false); /* 所有情况下都启用跟踪保护 */ user_pref("privacy.trackingprotection.enabled", true); -/*==== 隐式设置 ====*/ /* 打开about:config页面不警告 */ user_pref("browser.aboutConfig.showWarning", false); /* 去除about:addons页面中的推荐页 */ @@ -39,7 +37,7 @@ user_pref("network.dns.disablePrefetch", true); /* RFP: 阻止多种收集浏览器指纹的行为 */ user_pref("privacy.resistFingerprinting", true); /* 禁止WebGL - * 开启RFP后无需设置: RFP伪装了WebGL指纹 */ + * 开启RFP即可减少WebGL信息熵 */ // user_pref("webgl.disabled", true); /* 禁止Web Audio API */ user_pref("dom.webaudio.enabled", false); From ca2225216a854083dfc865a14ef583be20b1be2d Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 24 Apr 2020 23:26:33 +0800 Subject: [PATCH 09/21] Update firefox user prefs: change speculativeConnect --- .mozilla/firefox/profile/user.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.mozilla/firefox/profile/user.js b/.mozilla/firefox/profile/user.js index bd5bbc9..23f25bd 100644 --- a/.mozilla/firefox/profile/user.js +++ b/.mozilla/firefox/profile/user.js @@ -16,9 +16,7 @@ user_pref("extensions.htmlaboutaddons.recommendations.enabled", false); /* 去除Pocket服务 */ user_pref("extensions.pocket.enabled", false); -/* 禁止预连接(地址栏) */ -user_pref("browser.urlbar.speculativeConnect.enabled", false); -/* 禁止预连接(鼠标指针停留在链接上) */ +/* 禁止投机性预连接 */ user_pref("network.http.speculative-parallel-limit", 0); /* 禁止链接预读取 */ user_pref("network.prefetch-next", false); From dbd1b10c2e0e3c7b56fdc81211e51dd7c20f0fcc Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 15 Jun 2020 14:23:30 +0800 Subject: [PATCH 10/21] Update firefox userChrome.js --- .../firefox/profile/chrome/userChrome.css | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index 3f1e952..35b5505 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -10,10 +10,6 @@ } /* 隐藏标签栏 */ -#main-window[tabsintitlebar="true"]:not([extradragspace="true"]) #TabsToolbar > .toolbar-items { - opacity: 0; - pointer-events: none; -} #main-window:not([tabsintitlebar="true"]) #TabsToolbar { visibility: collapse !important; } @@ -49,17 +45,12 @@ treechildren::-moz-tree-separator { background-color: var(--frame-background-color) !important; } -/* 全屏时自动隐藏侧边栏 */ -#main-window[inFullscreen] #sidebar-box, -#main-window[inFullscreen] #sidebar-splitter { +/* 隐藏扩展侧边栏的头部 */ +/* Tree Style Tab */ +#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header, +/* Bitwarden */ +#sidebar-box[sidebarcommand="_446900e4-71c2-419f-a6a7-df9c091e268b_-sidebar-action"] #sidebar-header { display: none !important; - width: 0px !important; -} - -/**** 树状标签栏 ****/ -/* 隐藏头部 */ -#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header { - display: none; } /* 弹出的工具栏去除半透明阴影, 防止与picom阴影效果重复 */ From 299a26b026a0517fafaa6ef0bfce30026146a662 Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 15 Jun 2020 16:36:06 +0800 Subject: [PATCH 11/21] Add firefox userContent.css --- .../firefox/profile/chrome/userContent.css | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .mozilla/firefox/profile/chrome/userContent.css diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css new file mode 100644 index 0000000..9231414 --- /dev/null +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -0,0 +1,60 @@ +/* Tree Style Tab */ +@-moz-document regexp("^moz-extension://[a-zA-Z0-9-]+/sidebar/sidebar\.html.*") { + #tabbar { + background: #445 !important; + } + #all-tabs { + margin-top: 6px !important; + background: #aab !important; + } + + /* 隐藏新标签按钮 */ + .newtab-button-box { + display: none !important; + } + + /* 自动隐藏关闭按钮 */ + tab-item:not(:hover) tab-closebox { + display: none !important; + } + + /* 去除当前选中标签的蓝条 */ + span.highlighter { + display: none !important; + } + + /* 容器颜色 */ + tab-item:not(.faviconized) .contextual-identity-marker { + width: 5px !important; + left: 0 !important; + right: unset !important; + } + + tab-item { + height: 34px !important; + box-shadow: 1px 1px 1px #333 !important; + } + tab-item:not(.pinned) { + border-left-width: 0 !important; + } + tab-item[data-level][data-level="0"] { + margin-top: 6px !important; + box-shadow: 1px 1px 1px #333 !important; + } + + tab-item[data-level]:first-child { + margin-top: 0 !important; + } + tab-item[data-level][data-level="1"] { + margin-left: 0 !important; + } + tab-item[data-level][data-level="2"] { + margin-left: 0 !important; + } + tab-item[data-level][data-level="3"] { + margin-left: 10% !important; + } + tab-item[data-level][data-level="4"] { + margin-left: 15% !important; + } +} From d808350034ba491ea790eba6e1bb0b1ff2234dfa Mon Sep 17 00:00:00 2001 From: rydesun Date: Mon, 15 Jun 2020 17:45:05 +0800 Subject: [PATCH 12/21] Update firefox userContent.css : Add sidebar background image --- .mozilla/firefox/profile/chrome/userContent.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index 9231414..7205593 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -2,6 +2,10 @@ @-moz-document regexp("^moz-extension://[a-zA-Z0-9-]+/sidebar/sidebar\.html.*") { #tabbar { background: #445 !important; + background-image: url("images/sidebar.svg") !important; + background-size: 100px !important; + background-position: bottom 20px right 50% !important; + background-repeat: no-repeat !important; } #all-tabs { margin-top: 6px !important; From 2f0d8c61e308d1d440853838e4e01ee24382e9ae Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 24 Jun 2020 11:55:57 +0800 Subject: [PATCH 13/21] Update firefox ui: toolbar panel --- .../firefox/profile/chrome/userChrome.css | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index 35b5505..45ffb8e 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -57,3 +57,23 @@ treechildren::-moz-tree-separator { box.panel-arrowcontent { margin: 0px !important; } + +/* 弹出工具栏 */ +panelview#widget-overflow-mainView vbox.panel-subview-body { + display: block !important; + overflow: auto !important; +} +panelview#widget-overflow-mainView vbox#widget-overflow-fixed-list { + display: flex !important; + flex-wrap: wrap !important; +} +panelview#widget-overflow-mainView vbox#widget-overflow-fixed-list toolbarbutton { + width: calc(100% / 6) !important; + height: 40px !important; +} +panelview#widget-overflow-mainView vbox#widget-overflow-fixed-list label.toolbarbutton-text { + display: none !important; +} +panelview#widget-overflow-mainView .subviewbutton.panel-subview-footer { + min-height: unset !important; +} From f7a47187f35b8f680cf2087c20391ac95b0683cc Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 24 Jun 2020 21:36:15 +0800 Subject: [PATCH 14/21] Update fontconfig --- .config/fontconfig/fonts.conf | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 1e0365a..4e5564a 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -218,7 +218,7 @@ Emoji - + Noto Sans Font Awesome 5 Brands Font Awesome 5 Free @@ -254,4 +254,16 @@ 400 + + alacritty + Emoji + + Noto Sans + Symbols Nerd Font + Font Awesome 5 Brands + Font Awesome 5 Free + Twitter Color Emoji + + + From dff99c73f6df414e336acd1fc1a58a3276187094 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 24 Jun 2020 21:37:14 +0800 Subject: [PATCH 15/21] Update pikaur config --- .config/pikaur.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/pikaur.conf b/.config/pikaur.conf index e65aebf..235c7d6 100644 --- a/.config/pikaur.conf +++ b/.config/pikaur.conf @@ -38,4 +38,5 @@ noedit = no nodiff = no gitdiffargs = --ignore-space-change,--ignore-all-space diffpager = auto +hidedifffiles = .SRCINFO From 56de2fdd8d86200a7538b624b82fd1ba59ce5f44 Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 1 Jul 2020 17:13:53 +0800 Subject: [PATCH 16/21] Update firefox ui: tree style tab --- .../firefox/profile/chrome/userContent.css | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index 7205593..1b0b2d0 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -36,29 +36,25 @@ tab-item { height: 34px !important; - box-shadow: 1px 1px 1px #333 !important; } tab-item:not(.pinned) { + box-shadow: 0px 1px 0px #669 !important; border-left-width: 0 !important; } - tab-item[data-level][data-level="0"] { + /* 排除第一个标签 */ + tab-item[data-level="0"]:not(.pinned) ~ tab-item[data-level="0"]:not(.pinned) { margin-top: 6px !important; - box-shadow: 1px 1px 1px #333 !important; } - - tab-item[data-level]:first-child { - margin-top: 0 !important; - } - tab-item[data-level][data-level="1"] { + tab-item[data-level="1"] { margin-left: 0 !important; } - tab-item[data-level][data-level="2"] { + tab-item[data-level="2"] { margin-left: 0 !important; } - tab-item[data-level][data-level="3"] { + tab-item[data-level="3"] { margin-left: 10% !important; } - tab-item[data-level][data-level="4"] { + tab-item[data-level="4"] { margin-left: 15% !important; } } From c32b25d35c455cfbd7d8c7cd90db3dd6b004c45f Mon Sep 17 00:00:00 2001 From: rydesun Date: Sat, 4 Jul 2020 00:22:03 +0800 Subject: [PATCH 17/21] Remove efm lsp config --- .config/efm-langserver/config.yaml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .config/efm-langserver/config.yaml diff --git a/.config/efm-langserver/config.yaml b/.config/efm-langserver/config.yaml deleted file mode 100644 index 5166167..0000000 --- a/.config/efm-langserver/config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -languages: - vim: - lint-command: 'vint -' - lint-stdin: true - - markdown: - lint-command: 'markdownlint -s' - lint-stdin: true - lint-formats: - - '%f: %l: %m' From 3a0d3bb4c3856c0cd605b66ba9ea610453e30c72 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sun, 5 Jul 2020 14:55:06 +0800 Subject: [PATCH 18/21] Add README.md --- README.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..cb7b398 --- /dev/null +++ b/README.md @@ -0,0 +1,41 @@ +# Linux 配置 + +- 使用 `pam_environment` 管理环境变量 +- 使用 `alacritty` 虚拟终端 +- 使用 `material` 配色主题 +- 不使用 `Powerline` 和 `Oh My Zsh` + +另见 [如何使用 Git 管理 Linux 配置？](https://2cat.cc/post/diyo4/) + +## 已添加软件 + +- [x] `alacritty` +- [x] `aria2` + +> FIXME: 包含硬编码目录 + +- [x] `firefox` +- [x] `git` + +> 注意: 包含 ID 和邮箱 + +- [x] `pikaur` +- [x] `zsh` + +### 以及配置 + +- [x] `fontconfig` +- [x] `npm` +- [x] `python` + +> 让 REPL 历史记录保存在 XDG 目录 + +- [x] `X11` + +## 更多 + +Neovim 配置移步至 +[rydesun/neovim-config](https://github.com/rydesun/neovim-config) + +Qtile WM 配置移步至 +[rydesun/qtile-config](https://github.com/rydesun/qtile-config) From b26db2d549e031b46e2119a2a0fd7ebd1f214ccd Mon Sep 17 00:00:00 2001 From: rydesun Date: Sun, 5 Jul 2020 06:57:01 +0000 Subject: [PATCH 19/21] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cb7b398..76ca7a2 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ - [x] `alacritty` - [x] `aria2` -> FIXME: 包含硬编码目录 + > FIXME: 包含硬编码目录 - [x] `firefox` - [x] `git` -> 注意: 包含 ID 和邮箱 + > 注意: 包含 ID 和邮箱 - [x] `pikaur` - [x] `zsh` @@ -28,7 +28,7 @@ - [x] `npm` - [x] `python` -> 让 REPL 历史记录保存在 XDG 目录 + > 让 REPL 历史记录保存在 XDG 目录 - [x] `X11` From 1d490f27dac6f53ac0c811c6caf6cae004e88994 Mon Sep 17 00:00:00 2001 From: rydesun Date: Sun, 5 Jul 2020 21:25:09 +0800 Subject: [PATCH 20/21] Update firefox config: use addon Visual Tab --- .../firefox/profile/chrome/userChrome.css | 4 +- .../firefox/profile/chrome/userContent.css | 104 +++++++++--------- 2 files changed, 53 insertions(+), 55 deletions(-) diff --git a/.mozilla/firefox/profile/chrome/userChrome.css b/.mozilla/firefox/profile/chrome/userChrome.css index 45ffb8e..58f016d 100644 --- a/.mozilla/firefox/profile/chrome/userChrome.css +++ b/.mozilla/firefox/profile/chrome/userChrome.css @@ -46,8 +46,8 @@ treechildren::-moz-tree-separator { } /* 隐藏扩展侧边栏的头部 */ -/* Tree Style Tab */ -#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header, +/* Visual Tabs */ +#sidebar-box[sidebarcommand="visualtab_xuldev_org-sidebar-action"] #sidebar-header, /* Bitwarden */ #sidebar-box[sidebarcommand="_446900e4-71c2-419f-a6a7-df9c091e268b_-sidebar-action"] #sidebar-header { display: none !important; diff --git a/.mozilla/firefox/profile/chrome/userContent.css b/.mozilla/firefox/profile/chrome/userContent.css index 1b0b2d0..5219570 100644 --- a/.mozilla/firefox/profile/chrome/userContent.css +++ b/.mozilla/firefox/profile/chrome/userContent.css @@ -1,60 +1,58 @@ -/* Tree Style Tab */ -@-moz-document regexp("^moz-extension://[a-zA-Z0-9-]+/sidebar/sidebar\.html.*") { - #tabbar { - background: #445 !important; - background-image: url("images/sidebar.svg") !important; - background-size: 100px !important; - background-position: bottom 20px right 50% !important; - background-repeat: no-repeat !important; +/* Visual Tabs */ +@-moz-document regexp("^moz-extension://[a-zA-Z0-9-]+/sidebar/view\.html.*") { + :root[theme="light"] { + --background-color: #445 !important; + --separator-color: black !important; } - #all-tabs { - margin-top: 6px !important; - background: #aab !important; + #tabbox #tabList .tab { + background: #445 !important; + } + #tabbox #tabList .tab .bar { + background: white !important; + } + #tabbox #tabList .tab[selected="true"] .bar { + background: #d0d0ff !important; + } + + /* 固定标签栏 */ + #tabbox #pinList:not(:empty) { + border-bottom: unset !important; + } + #tabbox #pinList:not(:empty) .tab { + margin-bottom: 15px !important; + } + + #tabbox #tabList[mode="compact"] .tab { + padding-top: 0 !important; + padding-left: 0 !important; + margin-bottom: 15px !important; + border-bottom: none !important; + } + #tabbox #tabList[mode="compact"] .tab .bar { + height: 28px !important; + } + #tabbox #tabList[mode="compact"] .tab .bar .title { + color: #333 !important; + } + #tabbox #tabList[mode="compact"] .tab[selected="true"] .bar .title { + font-weight: unset !important; + } + #tabbox #tabList[mode="compact"] .tab .line1 { + display: none !important; + } + #tabbox #tabList[mode="compact"] .tab .thumbnail { + width: 80% !important; + margin-top: 5px !important; + margin-left: auto !important; + margin-right: auto !important; + } + /* 自动隐藏关闭按钮 */ + #tabbox #tabList[mode="compact"] .tab:not(:hover) button.close { + display: none !important; } /* 隐藏新标签按钮 */ - .newtab-button-box { + #newTab { display: none !important; } - - /* 自动隐藏关闭按钮 */ - tab-item:not(:hover) tab-closebox { - display: none !important; - } - - /* 去除当前选中标签的蓝条 */ - span.highlighter { - display: none !important; - } - - /* 容器颜色 */ - tab-item:not(.faviconized) .contextual-identity-marker { - width: 5px !important; - left: 0 !important; - right: unset !important; - } - - tab-item { - height: 34px !important; - } - tab-item:not(.pinned) { - box-shadow: 0px 1px 0px #669 !important; - border-left-width: 0 !important; - } - /* 排除第一个标签 */ - tab-item[data-level="0"]:not(.pinned) ~ tab-item[data-level="0"]:not(.pinned) { - margin-top: 6px !important; - } - tab-item[data-level="1"] { - margin-left: 0 !important; - } - tab-item[data-level="2"] { - margin-left: 0 !important; - } - tab-item[data-level="3"] { - margin-left: 10% !important; - } - tab-item[data-level="4"] { - margin-left: 15% !important; - } } From 0cab8f1f3cbf1ed62008c73ba043dc9bddc6b6ad Mon Sep 17 00:00:00 2001 From: rydesun Date: Wed, 8 Jul 2020 12:41:14 +0800 Subject: [PATCH 21/21] Update terminal colorscheme --- .config/alacritty/alacritty.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 086a26e..bc30635 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -13,23 +13,23 @@ colors: foreground: '0xeceff1' # Normal colors normal: - black: '0x263238' - red: '0xff9800' - green: '0x8bc34a' - yellow: '0xffc107' - blue: '0x03a9f4' - magenta: '0xe91e63' - cyan: '0x009688' - white: '0xcfd8dc' + black: '#505070' + red: '#ff9800' + green: '#8bc34a' + yellow: '#ffc107' + blue: '#03a9f4' + magenta: '#e91e63' + cyan: '#009688' + white: '#cfd8dc' # Bright colors bright: - black: '0x37474f' - red: '0xffa74d' - green: '0x9ccc65' - yellow: '0xffa000' - blue: '0x81d4fa' - magenta: '0xad1457' - cyan: '0x26a69a' - white: '0xeceff1' + black: '#507070' + red: '#ffa74d' + green: '#9ccc65' + yellow: '#ffa000' + blue: '#81d4fa' + magenta: '#ad1457' + cyan: '#26a69a' + white: '#eceff1' selection: save_to_clipboard: false