From 31b6233360341c461c334c11c655fa0859c57067 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Fri, 4 Oct 2024 11:12:22 +0000 Subject: [PATCH] small fixes --- nvim/.config/nvim/init.vim | 7 ++++++- zsh/.zprofile | 5 +++++ zsh/.zshrc | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 158bc89..5c9ae45 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -27,14 +27,19 @@ Plug 'jeffkreeftmeijer/vim-dim' " complete Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +Plug 'tpope/vim-fugitive' +Plug 'tpope/vim-surround' + call plug#end() " filetype magic autocmd BufRead,BufNewFile *.nasm set filetype=nasm +set notermguicolors colorscheme dim +set background=dark " bug in neovim 0.8.0 -hi NormalFloat ctermfg=LightGrey +"hi NormalFloat ctermfg=LightGrey " langmap russian set langmap=ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNOPQRSTUVWXYZ,фисвуапршолдьтщзйкыегмцчня;abcdefghijklmnopqrstuvwxyz diff --git a/zsh/.zprofile b/zsh/.zprofile index 44b69c7..d03540c 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -6,6 +6,11 @@ export PATH=$HOME/.local/bin:$PATH export EDITOR="vi" export VISUAL="nvim" +alias vvi=vi +alias vvim=vim +alias vi=nvim +alias vim=nvim + # platform-specific config unamestr=$(uname 2> /dev/null) case "$unamestr" in diff --git a/zsh/.zshrc b/zsh/.zshrc index 0706fbd..bbae840 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -75,4 +75,8 @@ if type "direnv" > /dev/null; then eval "$(direnv hook zsh)" fi -export PS1="%n@%m:%F{green}%~%F{reset}%# " +if [[ -v SSH_CLIENT ]] || [[ -v SSH_TTY ]]; then; + export PS1="%B>>> %F{cyan}%n%F{magenta}@%m%F{reset}:%F{green}%~%F{reset}%#%b " +else + export PS1="%B>>> %F{cyan}%n@%m%F{reset}:%F{green}%~%F{reset}%#%b " +fi