From 5cf28d635bd903b23c9a34830f4346a99a1e159b Mon Sep 17 00:00:00 2001 From: Smirnov Alexander Date: Sun, 16 May 2021 12:13:21 +0300 Subject: [PATCH] Add repl plug in vim, update zsh, starship --- bin/gpe | 20 +++++++++++--------- config/nvim/init.vim | 19 ++++++++++++------- config/starship.toml | 7 ++----- gitconfig | 3 ++- zshrc | 10 ++++------ 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/bin/gpe b/bin/gpe index 5ed9ebf..766c450 100755 --- a/bin/gpe +++ b/bin/gpe @@ -1,18 +1,20 @@ #!/usr/bin/env bash -# For working this script set in $GPG_KEY you gpg key +# For working this script set $GPG_KEY with gpg key + ## Functions -function encrypt() { +encrypt() { gpg -ea -r $GPG_KEY $@ } -function decrypt() { - local fn="$1" - if [ ${fn: -4} == ".asc" ] - then gpg -d -o ${fn%%.asc} $@ - elif [ ${fn: -4} == ".gpg" ] - then gpg -d -o ${fn%%.gpg} $@ - fi +decrypt() { + local f="$1" + if [ ${f: -4} == ".asc" ] + then gpg -d -o ${f%%.asc} $@ + elif [ ${f: -4} == ".gpg" ] + then gpg -d -o ${f%%.gpg} $@ + fi } +## Case's case "$1" in enc|e) shift; encrypt $@ ;; dec|d) shift; decrypt $@ ;; diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 9b7a44c..8f58d87 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -2,13 +2,13 @@ call plug#begin('~/.vim/plugged') Plug 'Smirnov-O/nten.vim' Plug 'jiangmiao/auto-pairs' Plug 'sheerun/vim-polyglot' + Plug 'axvr/zepl.vim' call plug#end() "== General colo nten-light " Color scheme -set nu rnu " Line numbers -set cursorline " Highlight line by cursor -set linebreak wrap " Line wrap +set nu rnu cul " Line numbers & cursor highlight +set lbr wrap " Line wrap set mouse=a mousehide " Mouse set ruler laststatus=0 " Status line set history=500 " Set history size @@ -31,7 +31,7 @@ set smarttab set expandtab set autoindent -"== Netrw file manager +"== Netrw file tree let g:netrw_liststyle=3 let g:netrw_banner=0 let g:netrw_dirhistmax=0 @@ -49,16 +49,21 @@ com! GoFmt :silent !gofmt -w % "== Mapping let mapleader=";" -nn :w -nn t :Term +nn :w nn :noh + +tno +nn t :Term nn j :bn nn k :bp nn w :bd + nn :wincmd h nn :wincmd j nn :wincmd k nn :wincmd l -tno + +nn cpp :ReplSend +vn cpp :ReplSend nn spv :vs nn sph :sp diff --git a/config/starship.toml b/config/starship.toml index e0d1683..70cce3d 100644 --- a/config/starship.toml +++ b/config/starship.toml @@ -1,17 +1,14 @@ add_newline = false [nodejs] -symbol = "N.JS " +symbol = "Node " [python] -symbol = "PY " +symbol = "Py " [elm] symbol = "Elm " -[java] -disabled = true - [package] symbol = "PKG " diff --git a/gitconfig b/gitconfig index 1a82e54..2efecb8 100644 --- a/gitconfig +++ b/gitconfig @@ -14,4 +14,5 @@ br = branch df = diff dh = diff HEAD - l = log --oneline --decorate + l = log --oneline --decorate + st = status --porcelain diff --git a/zshrc b/zshrc index 976aad3..32a55c1 100644 --- a/zshrc +++ b/zshrc @@ -10,22 +10,20 @@ export FZF_DEFAULT_COMMAND="rg --files --ignore-vcs" ### Oh my zsh export OMH="$HOME/.oh-my-zsh" -#ZSH_THEME="simple" +# ZSH_THEME="simple" DISABLE_AUTO_TITLE="true" plugins=(docker npm) source $OMH/oh-my-zsh.sh ### Aliases source ~/.aliases.sh - - alias cls="clear" alias mkdir="mkdir -p" alias cp="cp -r" -alias vim="nvim" vi="vim" +alias vim="nvim" +alias vi="vim" +alias vimfzf='vim $(fzf)' alias e="$EDITOR" alias tmux="tmux -2" alias :q="exit" alias ...="cd ../.." - -