update nvim

1 files changed, 50 insertions, 49 deletions

diff --git a/zsh/zshrc b/zsh/zshrc
index 28124d8..ad5e7c5 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -28,7 +28,7 @@ export PATH=$HOME/.local/bin:/usr/local/bin:$HOME/go/bin:$PATH
 # export GOROOT=$HOME/work/go
 export GOPATH=$HOME/go
 export GOPROXY=https://proxy.neonxp.ru
-export EDITOR="micro"
+export EDITOR="nvim"
 #export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
 
 # Aliases
@@ -36,14 +36,15 @@ alias ls="ls -F"
 alias l="ls"
 alias ll="ls -AFhl"
 alias cp="cp -i"                                                # Confirm before overwriting something
-alias gitpush='git add . && git commit --amend --no-edit && git push -f'
-alias k='kubectl'
+alias gitpush="git add . && git commit --amend --no-edit && git push -f"
+alias k="kubectl"
 alias yu="ssh-add -e /usr/lib/x86_64-linux-gnu/libykcs11.so; ssh-add -s /usr/lib/x86_64-linux-gnu/libykcs11.so"
-alias m='micro'
+alias m="micro"
+alias n="nvim"
 alias cp="cp -i"                          # confirm before overwriting something
-alias df='df -h'                          # human-readable sizes
-alias free='free -m'                      # show sizes in MB
-alias np='nano -w PKGBUILD'
+alias df="df -h"                          # human-readable sizes
+alias free="free -m"                      # show sizes in MB
+alias np="nano -w PKGBUILD"
 alias more=less
 
 
@@ -61,38 +62,38 @@ setopt correct                                                  # Auto correct m
 setopt extendedglob                                             # Extended globbing. Allows using regular expressions with *
 setopt nocaseglob                                               # Case insensitive globbing
 setopt rcexpandparam                                            # Array expension with parameters
-setopt nocheckjobs                                              # Don't warn about running processes when exiting
+setopt nocheckjobs                                              # Don"t warn about running processes when exiting
 setopt numericglobsort                                          # Sort filenames numerically when it makes sense
 setopt nobeep                                                   # No beep
 setopt appendhistory                                            # Immediately append history instead of overwriting
 setopt histignorealldups                                        # If a new command is a duplicate, remove the older one
 setopt autocd                                                   # if only directory path is entered, cd there.
 setopt inc_append_history                                       # save commands are added to the history immediately, otherwise only when shell exits.
-setopt histignorespace                                          # Don't save commands that start with space
+setopt histignorespace                                          # Don"t save commands that start with space
 
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'       # Case insensitive tab completion
-zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"         # Colored completion (different colors for dirs/files/etc)
-zstyle ':completion:*' rehash true                              # automatically find new executables in path
+zstyle ":completion:*" matcher-list "m:{a-zA-Z}={A-Za-z}"       # Case insensitive tab completion
+zstyle ":completion:*" list-colors "${(s.:.)LS_COLORS}"         # Colored completion (different colors for dirs/files/etc)
+zstyle ":completion:*" rehash true                              # automatically find new executables in path
 # Speed up completions
-zstyle ':completion:*' accept-exact '*(N)'
-zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path ~/.zsh/cache
+zstyle ":completion:*" accept-exact "*(N)"
+zstyle ":completion:*" use-cache on
+zstyle ":completion:*" cache-path ~/.zsh/cache
 
-zstyle ':completion:*:processes' command 'ps -ax'
-zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;32'
-zstyle ':completion:*:*:kill:*' menu yes select
-zstyle ':completion:*:kill:*'   force-list always
+zstyle ":completion:*:processes" command "ps -ax"
+zstyle ":completion:*:*:kill:*:processes" list-colors "=(#b) #([0-9]#)*=0=01;32"
+zstyle ":completion:*:*:kill:*" menu yes select
+zstyle ":completion:*:kill:*"   force-list always
 
-zstyle ':completion:*:processes-names' command 'ps -e -o comm='
-zstyle ':completion:*:*:killall:*' menu yes select
-zstyle ':completion:*:killall:*'   force-list always
+zstyle ":completion:*:processes-names" command "ps -e -o comm="
+zstyle ":completion:*:*:killall:*" menu yes select
+zstyle ":completion:*:killall:*"   force-list always
 
 HISTFILE=~/.zsh_history
 HISTSIZE=100000
 SAVEHIST=100000
 #export EDITOR=/usr/bin/nano
 #export VISUAL=/usr/bin/nano
-WORDCHARS=${WORDCHARS//\/[&.;]}                                 # Don't consider certain characters part of the word
+WORDCHARS=${WORDCHARS//\/[&.;]}                                 # Don"t consider certain characters part of the word
 
 autoload -U compinit colors zcalc
 compinit -d
@@ -102,13 +103,13 @@ source ~/.config/zsh/conf.d/*.zsh
 colors
 
 # Color man pages
-export LESS_TERMCAP_mb=$'\E[01;32m'
-export LESS_TERMCAP_md=$'\E[01;32m'
-export LESS_TERMCAP_me=$'\E[0m'
-export LESS_TERMCAP_se=$'\E[0m'
-export LESS_TERMCAP_so=$'\E[01;47;34m'
-export LESS_TERMCAP_ue=$'\E[0m'
-export LESS_TERMCAP_us=$'\E[01;36m'
+export LESS_TERMCAP_mb=$"\E[01;32m"
+export LESS_TERMCAP_md=$"\E[01;32m"
+export LESS_TERMCAP_me=$"\E[0m"
+export LESS_TERMCAP_se=$"\E[0m"
+export LESS_TERMCAP_so=$"\E[01;47;34m"
+export LESS_TERMCAP_ue=$"\E[0m"
+export LESS_TERMCAP_us=$"\E[01;36m"
 export LESS=-R
 
 
@@ -121,34 +122,34 @@ export LESS=-R
 zmodload zsh/terminfo
 bindkey "$terminfo[kcuu1]" history-substring-search-up
 bindkey "$terminfo[kcud1]" history-substring-search-down
-bindkey '^[[A' history-substring-search-up
-bindkey '^[[B' history-substring-search-down
+bindkey "^[[A" history-substring-search-up
+bindkey "^[[B" history-substring-search-down
 
 bindkey -e
-bindkey '^[[7~' beginning-of-line                               # Home key
-bindkey '^[[H' beginning-of-line                                # Home key
+bindkey "^[[7~" beginning-of-line                               # Home key
+bindkey "^[[H" beginning-of-line                                # Home key
 if [[ "${terminfo[khome]}" != "" ]]; then
   bindkey "${terminfo[khome]}" beginning-of-line                # [Home] - Go to beginning of line
 fi
-bindkey '^[[8~' end-of-line                                     # End key
-bindkey '^[[F' end-of-line                                     # End key
+bindkey "^[[8~" end-of-line                                     # End key
+bindkey "^[[F" end-of-line                                     # End key
 if [[ "${terminfo[kend]}" != "" ]]; then
   bindkey "${terminfo[kend]}" end-of-line                       # [End] - Go to end of line
 fi
-bindkey '^[[2~' overwrite-mode                                  # Insert key
-bindkey '^[[3~' delete-char                                     # Delete key
-bindkey '^[[C'  forward-char                                    # Right key
-bindkey '^[[D'  backward-char                                   # Left key
-bindkey '^[[5~' history-beginning-search-backward               # Page up key
-bindkey '^[[6~' history-beginning-search-forward                # Page down key
+bindkey "^[[2~" overwrite-mode                                  # Insert key
+bindkey "^[[3~" delete-char                                     # Delete key
+bindkey "^[[C"  forward-char                                    # Right key
+bindkey "^[[D"  backward-char                                   # Left key
+bindkey "^[[5~" history-beginning-search-backward               # Page up key
+bindkey "^[[6~" history-beginning-search-forward                # Page down key
 
 # Navigate words with ctrl+arrow keys
-bindkey '^[Oc' forward-word                                     #
-bindkey '^[Od' backward-word                                    #
-bindkey '^[[1;5D' backward-word                                 #
-bindkey '^[[1;5C' forward-word                                  #
-bindkey '^H' backward-kill-word                                 # delete previous word with ctrl+backspace
-bindkey '^[[Z' undo                                             # Shift+tab undo last action
+bindkey "^[Oc" forward-word                                     #
+bindkey "^[Od" backward-word                                    #
+bindkey "^[[1;5D" backward-word                                 #
+bindkey "^[[1;5C" forward-word                                  #
+bindkey "^H" backward-kill-word                                 # delete previous word with ctrl+backspace
+bindkey "^[[Z" undo                                             # Shift+tab undo last action
 
 # ctrl + space accept suggestion
-bindkey '^ ' autosuggest-accept
+bindkey "^ " autosuggest-accept