diff --git a/chezmoi/dot_zshenv b/chezmoi/dot_zshenv
index 85cb333..fc50d11 100644
--- a/chezmoi/dot_zshenv
+++ b/chezmoi/dot_zshenv
@@ -1,5 +1,6 @@
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:${PATH}"
 export LANG='en_US.UTF-8'
+export PAGER='less -RF'
 
 for editor in nvim vim nano; do
     if command -v "$editor" &> /dev/null; then
diff --git a/chezmoi/dot_zshrc b/chezmoi/dot_zshrc
index 6c4fcc1..9bb26ff 100644
--- a/chezmoi/dot_zshrc
+++ b/chezmoi/dot_zshrc
@@ -29,8 +29,8 @@ setopt \
 	HIST_VERIFY \
 	INTERACTIVE_COMMENTS \
 	LONG_LIST_JOBS \
-	NOMATCH \
 	NOTIFY \
+	NULL_GLOB \
 	PROMPT_SUBST \
 	PUSHD_IGNORE_DUPS \
 	PUSHD_MINUS \
diff --git a/chezmoi/dot_zshrc.d/executable_fzf.zsh b/chezmoi/dot_zshrc.d/executable_fzf.zsh
index 44991b0..ff04be9 100644
--- a/chezmoi/dot_zshrc.d/executable_fzf.zsh
+++ b/chezmoi/dot_zshrc.d/executable_fzf.zsh
@@ -1,3 +1,7 @@
 2>/dev/null for FZF_FILE in /usr/share/doc/fzf/examples/*.zsh; do
 	source "$FZF_FILE"
 done
+
+2>/dev/null for FZF_FILE in /usr/share/fzf/shell/*.zsh; do
+	source "$FZF_FILE"
+done