1
0
raylu 2 долоо хоног өмнө
parent
commit
dcf65c08d5
2 өөрчлөгдсөн 9 нэмэгдсэн , 7 устгасан
  1. 1 1
      gitconfig
  2. 8 6
      zshrc

+ 1 - 1
gitconfig

@@ -40,7 +40,7 @@
 	color = true
 	color = true
 
 
 [core]
 [core]
-	editor = vi
+	editor = nvim
 	pager = delta
 	pager = delta
 	precomposeUnicode = true
 	precomposeUnicode = true
 
 

+ 8 - 6
zshrc

@@ -48,8 +48,8 @@ zle -N self-insert url-quote-magic
 
 
 source $HOME/.zsh_fast_syntax_highlighting/fast-syntax-highlighting.plugin.zsh
 source $HOME/.zsh_fast_syntax_highlighting/fast-syntax-highlighting.plugin.zsh
 
 
-if builtin which batcat > /dev/null; then
-	export MANPAGER='sh -c "col -bx | batcat --language man --paging always --style plain"'
+if builtin which bat > /dev/null; then
+	export MANPAGER='sh -c "col -bx | bat --language man --paging always --style plain"'
 	export MANROFFOPT='-c'
 	export MANROFFOPT='-c'
 elif builtin which nvim > /dev/null; then
 elif builtin which nvim > /dev/null; then
 	export MANPAGER='vim +Man!'
 	export MANPAGER='vim +Man!'
@@ -58,6 +58,10 @@ else
 fi
 fi
 export GREP_COLORS='ms=01;36:mc=01;31:sl=:cx=:fn=35:ln=33:bn=33:se=01;34'
 export GREP_COLORS='ms=01;36:mc=01;31:sl=:cx=:fn=35:ln=33:bn=33:se=01;34'
 
 
+for coreutil in `find /usr/bin -maxdepth 1 -name 'uu_*'`; do
+	[[ ${coreutil#/usr/bin/} = 'uu_[' ]] && continue
+	alias ${coreutil#/usr/bin/uu_}=${coreutil#/usr/bin/}
+done
 if [ -x ~/bin/eza ]; then
 if [ -x ~/bin/eza ]; then
 	export EZA_COLORS=bu=0:cr=0
 	export EZA_COLORS=bu=0:cr=0
 	alias ls='eza --group-directories-first --mounts --group --hyperlink --icons=auto'
 	alias ls='eza --group-directories-first --mounts --group --hyperlink --icons=auto'
@@ -71,11 +75,9 @@ alias ll='ls -l'
 alias l.='ls -Ad .*'
 alias l.='ls -Ad .*'
 alias la='ls -A'
 alias la='ls -A'
 alias llr='lr -1AGl -ov'
 alias llr='lr -1AGl -ov'
-alias bat=batcat
 alias grep='grep --color -s'
 alias grep='grep --color -s'
 alias df='df -hx tmpfs'
 alias df='df -hx tmpfs'
 alias du='du --max-depth=1'
 alias du='du --max-depth=1'
-alias fd='fdfind'
 alias sr='screen -r'
 alias sr='screen -r'
 alias gil='git log --graph --abbrev-commit --stat --summary -C --decorate --date=local'
 alias gil='git log --graph --abbrev-commit --stat --summary -C --decorate --date=local'
 alias gime='git short --author raylu'
 alias gime='git short --author raylu'
@@ -90,7 +92,7 @@ alias hgw='hg diff --change .'
 alias class='xprop -notype WM_CLASS'
 alias class='xprop -notype WM_CLASS'
 alias fx='FX_NO_MOUSE=1 FX_COLLAPSED=1 FX_SHOW_SIZE=1 fx'
 alias fx='FX_NO_MOUSE=1 FX_COLLAPSED=1 FX_SHOW_SIZE=1 fx'
 alias tree='tree -AvL 10'
 alias tree='tree -AvL 10'
-alias vi='vi -p'
+alias vi='nvim -p'
 alias vil='vi *(.om[1])'
 alias vil='vi *(.om[1])'
 alias sudovi="sudo vi -N -u $HOME/.vimrc"
 alias sudovi="sudo vi -N -u $HOME/.vimrc"
 alias shrug="echo -n '¯\\(°_o)/¯' | xclip -selection clipboard"
 alias shrug="echo -n '¯\\(°_o)/¯' | xclip -selection clipboard"
@@ -174,7 +176,7 @@ fi
 
 
 if builtin which fzf > /dev/null; then
 if builtin which fzf > /dev/null; then
 	FZF_DEFAULT_OPTS='--no-mouse'
 	FZF_DEFAULT_OPTS='--no-mouse'
-	source "/usr/share/doc/fzf/examples/key-bindings.zsh"
+	source "/usr/share/fzf/shell/key-bindings.zsh"
 
 
 	__fzf_git_commit_sha() {
 	__fzf_git_commit_sha() {
 		setopt localoptions pipefail no_aliases 2> /dev/null
 		setopt localoptions pipefail no_aliases 2> /dev/null