From 7d96c892beab376eb3ca8d22675c86fcf5c4b97a Mon Sep 17 00:00:00 2001
From: rydesun <rydesun@gmail.com>
Date: Fri, 27 Jan 2023 21:55:45 +0800
Subject: [PATCH] Update zsh config

---
 .zprofile | 25 ++++++++++++++++++++-----
 .zshrc    |  9 +++++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.zprofile b/.zprofile
index 70e3231..3536523 100644
--- a/.zprofile
+++ b/.zprofile
@@ -17,21 +17,31 @@ export XDG_STATE_HOME=~/.state
 # 需要手动添加至 $XDG_DATA_DIRS 和 $PATH
 FLATPAK_DATA_DIR="$XDG_DATA_HOME"/flatpak/exports/share
 FLATPAK_BIN_DIR="$XDG_DATA_HOME"/flatpak/exports/bin
-[[ -d "$FLATPAK_DATA_DIR" ]] &&
+[[ -d "$FLATPAK_DATA_DIR" ]] && \
     XDG_DATA_DIRS="$FLATPAK_DATA_DIR":"$XDG_DATA_DIRS"
 [[ -d "$FLATPAK_BIN_DIR" ]] && path=("$FLATPAK_BIN_DIR" $path)
 
 ### Flatpak中的Steam安装的程序
 STEAM_DESKTOP=~/.var/app/com.valvesoftware.Steam/.local/share/
-[[ -d "$STEAM_DESKTOP" ]] &&
+[[ -d "$STEAM_DESKTOP" ]] && \
     XDG_DATA_DIRS="$STEAM_DESKTOP":"$XDG_DATA_DIRS"
+# 修复steam程序名
+if [[ -f "$FLATPAK_BIN_DIR"/com.valvesoftware.Steam ]]; then
+    [[ ! -f "$FLATPAK_BIN_DIR"/steam ]] && \
+        ln -s com.valvesoftware.Steam "$FLATPAK_BIN_DIR"/steam
+else
+    [[ -f "$FLATPAK_BIN_DIR"/steam ]] && rm "$FLATPAK_BIN_DIR"/steam
+fi
+
+### 默认程序
+export EDITOR=nvim
+export BROWSER=firefox
 
 ### Zsh
 export HISTFILE="$XDG_DATA_HOME"/zsh/history
 
 ### 终端
 export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
-export EDITOR=nvim
 export MANPAGER="nvim +Man! --cmd 'let paging=1'"
 
 ### GnuPG
@@ -57,13 +67,18 @@ export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 ### SQLite
 export SQLITE_HISTORY="$XDG_DATA_HOME"/sqlite_history
 
-# 环境变量 (桌面) {{{
+# {{{ 图形环境
 ### Qt
-# 用qt5ct配置Qt主题
+# 无桌面环境用qt5ct配置Qt主题
 export QT_QPA_PLATFORMTHEME=qt5ct
+
 # 禁止Qt自动缩放。用xrdb手动设置DPI
 export QT_AUTO_SCREEN_SCALE_FACTOR=0
 
+### GTK
+# 配合xdg-desktop-portal-kde使用
+export GTK_USE_PORTAL=1
+
 ### Fcitx
 export GTK_IM_MODULE=fcitx
 export QT_IM_MODULE=fcitx
diff --git a/.zshrc b/.zshrc
index f1780a2..c117ad1 100644
--- a/.zshrc
+++ b/.zshrc
@@ -52,6 +52,7 @@ setopt share_history		# 多个实例共享历史记录
 setopt hist_ignore_dups		# 不记录多条连续重复的历史
 setopt hist_reduce_blanks	# 删除历史记录中的空行
 setopt hist_find_no_dups	# 查找历史记录时忽略重复项
+setopt hist_ignore_space    # 不记录空格开头的命令
 # }}}
 
 # {{{ 插件
@@ -230,6 +231,7 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 
 # {{{ 按键绑定
 bindkey -e	# emacs风格
+bindkey '^U' backward-kill-line
 
 # 补全菜单
 zmodload zsh/complist
@@ -247,7 +249,7 @@ bindkey -M menuselect '/' accept-and-infer-next-history
 # 当前命令行在编辑器中打开
 autoload -Uz edit-command-line
 zle -N edit-command-line
-bindkey "^X^E" edit-command-line
+bindkey '^X^E' edit-command-line
 
 # 修改清屏方式
 # 将内容挤出屏幕而不是直接清空
@@ -255,11 +257,12 @@ scroll-and-clear-screen() {
     printf '\n%.0s' {1..$LINES}
     zle clear-screen
 } && zle -N scroll-and-clear-screen
-bindkey '^l' scroll-and-clear-screen
+bindkey '^L' scroll-and-clear-screen
 
 # fzf
 [[ -f "$Z_SRC_FZF_KEYBIND" ]] && source "$Z_SRC_FZF_KEYBIND"
 
+# 空行按Tab时，展示当前目录
 first-tab() {
     if [[ $#BUFFER == 0 ]]; then
         BUFFER="ls "
@@ -300,6 +303,8 @@ alias ll='ls -Al'
 alias g='git'
 alias x='xdg-open'
 alias e='nvim'
+alias f='ranger'
+d() { diff -u "$1" "$2" | delta }
 
 # 需要搭配我的neovim配置
 # https://github.com/rydesun/neovim-config/blob/master/init.lua#L3