diff --git a/config/misc/.config/code-flags.conf b/config/misc/.config/code-flags.conf index c9c1cf9..3b547f9 100644 --- a/config/misc/.config/code-flags.conf +++ b/config/misc/.config/code-flags.conf @@ -1,5 +1,5 @@ --password-store=gnome-libsecret ---enable-features=UseOzonePlatform +# --enable-features=UseOzonePlatform --ozone-platform=wayland ---use-gl=desktop ---enable-wayland-ime +# --use-gl=desktop +# --enable-wayland-ime diff --git a/config/misc/.config/qq-electron-flags.conf b/config/misc/.config/qq-electron-flags.conf index 5629f6a..72a9e5c 100644 --- a/config/misc/.config/qq-electron-flags.conf +++ b/config/misc/.config/qq-electron-flags.conf @@ -1,2 +1,2 @@ ---ozone-platform-hint=auto +--ozone-platform=wayland --enable-wayland-ime diff --git a/config/misc/.config/qq-flags.conf b/config/misc/.config/qq-flags.conf index 5629f6a..72a9e5c 100644 --- a/config/misc/.config/qq-flags.conf +++ b/config/misc/.config/qq-flags.conf @@ -1,2 +1,2 @@ ---ozone-platform-hint=auto +--ozone-platform=wayland --enable-wayland-ime diff --git a/config/shell/.bash_profile b/config/shell/.bash_profile index 07a6703..b048dfb 100644 --- a/config/shell/.bash_profile +++ b/config/shell/.bash_profile @@ -1,21 +1,21 @@ #!/bin/bash # From archlinux's /etc/profile -append_path () { - case ":$PATH:" in - *:"$1":*) - ;; - *) - PATH="${PATH:+$PATH:}$1" - esac +append_path() { + case ":$PATH:" in + *:"$1":*) ;; + *) + PATH="${PATH:+$PATH:}$1" + ;; + esac } -prepend_path () { - case ":$PATH:" in - *:"$1":*) - ;; - *) - PATH="$1${PATH:+:$PATH}" - esac +prepend_path() { + case ":$PATH:" in + *:"$1":*) ;; + *) + PATH="$1${PATH:+:$PATH}" + ;; + esac } # Better than nothing @@ -26,8 +26,9 @@ export XDG_CACHE_HOME="$HOME/.cache" # Better than nothing if [[ -z "$LANG" ]]; then - export LANG="en_US.UTF-8" - export LC_ALL="en_US.UTF-8" + LANG="en_US.UTF-8" + LC_ALL="en_US.UTF-8" + export LANG LC_ALL fi # Paths @@ -38,48 +39,48 @@ fi export PATH # fnm -if command -v fnm; then - eval (fnm env --shell bash) +if command -v fnm &>/dev/null; then + eval $(fnm env --shell bash) fi # SSH with cross-session ssh-agent if [ -x "$HOME/.local/scripts/ssh-init" ]; then - eval "$($HOME/.local/scripts/ssh-init 2>/dev/null)" >/dev/null 2>&1 + eval "$($HOME/.local/scripts/ssh-init 2>/dev/null)" >/dev/null 2>&1 fi # .profile is not included in the repo [ -f "$HOME/.profile" ] && . "$HOME/.profile" -# Triggered when SSH into the machine +# Triggered in SSH sessions if [[ $- == *i* ]]; then - # Set EDITOR and VISUAL, mainly for sudoedit - for app in nvim helix vim vi nano; do - if command -v "$app" >/dev/null 2>&1; then - EDITOR="$app" - VISUAL="$app" - break - fi - done - export EDITOR VISUAL + # Set EDITOR and VISUAL, mainly for sudoedit + for app in nvim helix vim vi nano; do + if command -v "$app" &>/dev/null; then + EDITOR="$app" + VISUAL="$app" + break + fi + done + export EDITOR VISUAL - # For gpg - GPG_TTY=$(tty) - export GPG_TTY + # For gpg + GPG_TTY=$(tty) + export GPG_TTY - # Shortcut alias for launching fish - command -v f >/dev/null 2>&1 || { - alias f="exec fish" - } - # Better do this manually since the automatic approach is kinda buggy. - # Add this to .bashrc to enable it anyway: - # - # if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then - # shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' - # exec fish $LOGIN_OPTION - # fi + # Shortcut alias for launching fish + command -v f &>/dev/null || { + alias f="exec fish" + } + # Better do this manually since the automatic approach is kinda buggy. + # Add this to .bashrc to enable it anyway: + # + # if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then + # shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' + # exec fish $LOGIN_OPTION + # fi - # .bashrc is not included in the repo - [ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" + # .bashrc is not included in the repo + [ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" fi unset append_path diff --git a/config/shell/.config/fish/conf.d/50-prompt.fish b/config/shell/.config/fish/conf.d/50-prompt.fish index f9c4ff8..d35f874 100644 --- a/config/shell/.config/fish/conf.d/50-prompt.fish +++ b/config/shell/.config/fish/conf.d/50-prompt.fish @@ -8,5 +8,5 @@ end # oh-my-posh if test -f $HOME/.config/posh_theme.omp.json; and type -q oh-my-posh - oh-my-posh init fish --config $HOME/.config/posh_theme.omp.json | source + eval (oh-my-posh init fish --config $HOME/.config/posh_theme.omp.json) end diff --git a/memo/kmscon.md b/memo/kmscon.md index 8a72886..e5187d0 100644 --- a/memo/kmscon.md +++ b/memo/kmscon.md @@ -101,9 +101,13 @@ login=/usr/bin/su - kolkas -s /usr/bin/fish --login kmscon 中 `$TERM` 将会是 `xterm-256color`,不具区分度,需要另寻他路。 +> [!NOTE] +> +> 不建议在缺少对应 terminfo 的情况下直接在 `kmscon.conf` 中配置 `term=kmscon`,但确实也是一种可行的做法。 + > [!IMPORTANT] > -> 以下代码片段适用于 fish shell +> 以下代码片段适用于 fish shell。 检测所有祖先进程中是否有 kmscon: