zshrc: update options and history

[dotfiles.git] / etc / zsh / .zshrc

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index d1d10ddb528e0bbcef30e58dfc3dffc92a30b2cb..4a5a2522c9fbdbbffab9fba7f122bd0fa410efcc 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -1,11 +1,27 @@
 ### options
-setopt NO_BEEP NO_CLOBBER \
-       AUTO_CD CDABLE_VARS \
-       EXTENDED_GLOB GLOB_DOTS GLOB_STAR_SHORT MARK_DIRS NUMERIC_GLOB_SORT \
-       CORRECT_ALL INTERACTIVE_COMMENTS \
-       GLOB_COMPLETE \
-       AUTO_CONTINUE LONG_LIST_JOBS \
-       NO_HIST_SAVE_BY_COPY HIST_IGNORE_DUPS SHARE_HISTORY HIST_REDUCE_BLANKS
+setopts=(
+  ## 16.2.1  Changing Directories
+  AUTO_CD CDABLE_VARS
+  ## 16.2.2  Completion
+  COMPLETE_IN_WORD GLOB_COMPLETE REC_EXACT
+  ## 16.2.3  Expansion and Globbing
+  EXTENDED_GLOB GLOB_DOTS GLOB_STAR_SHORT MAGIC_EQUAL_SUBST MARK_DIRS
+  NUMERIC_GLOB_SORT
+  ## 16.2.4  History
+  # NOTE: NO_HIST_SAVE_BY_COPY to allow saving histfile if updating another
+  #       user's histfile. this is for compatibility with zsu.
+  HIST_FCNTL_LOCK HIST_IGNORE_DUPS HIST_IGNORE_SPACE HIST_LEX_WORDS
+  HIST_NO_STORE HIST_REDUCE_BLANKS NO_HIST_SAVE_BY_COPY SHARE_HISTORY
+  ## 16.2.6  Input/Output
+  NO_CLOBBER CLOBBER_EMPTY CORRECT_ALL INTERACTIVE_COMMENTS
+  HASH_EXECUTABLES_ONLY
+  ## 16.2.7  Job Control
+  AUTO_CONTINUE LONG_LIST_JOBS
+  ## 16.2.12 Zle
+  NO_BEEP
+)
+setopt $setopts
+unset setopts
 
 ### exports
 ## common
@@ -16,8 +32,8 @@ export PAGER=${$(whence -p less micro nano more)[(f)1]:s/micro/& -readonly true
 export GREP_OPTIONS=--color=auto
 ## histfile
 export HISTFILE=~/.histfile
-export HISTSIZE=1000
-export SAVEHIST=1000
+export HISTSIZE=10000
+export SAVEHIST=$HISTSIZE
 ## python
 export PYTHONSTARTUP=${XDG_CONFIG_HOME:-~/.config}/pythonrc
 ## vim
@@ -248,6 +264,7 @@ alias pa=$ps
 alias spa="sudo $ps"
 unset ps
 ## git
+alias g=git
 alias gd='git diff'
 alias gdh='git diff HEAD'
 alias ga='git add'
@@ -256,6 +273,8 @@ alias gc='git commit'
 alias gca='git commit --amend'
 alias gp='git push'
 alias gu='git pull'
+alias gl='git log'
+alias gt='git tree' # from gitconfig
 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})