diff --git a/.vim/.vimrc b/.vim/.vimrc index 51e9608..e484e9a 100644 --- a/.vim/.vimrc +++ b/.vim/.vimrc @@ -28,6 +28,7 @@ set softtabstop=4 set shiftwidth=4 set autoindent set smartindent +set nowrap set noerrorbells set novisualbell @@ -43,6 +44,11 @@ set mouse=a set colorcolumn=120 set scrolloff=7 +set virtualedit=onemore " allow for cursor beyond last character + +" f4 toggle hlsearch +nnoremap :set invhlsearch + " navigation on russian nmap о j nmap л k @@ -95,7 +101,8 @@ nnoremap :NERDTreeToggle if &filetype ==# 'nerdtre let NERDTreeShowBookmarks = 1 let NERDTreeIgnore = ['\.pyc$', '\.swp', '\.swo', '\.vscode', '__pycache__'] -let NERDTreeHidden = 1 " show hidden files .* +let NERDTreeChDirMode=2 +let NERDTreeKeepTreeInNewTab=1 set laststatus=2 let g:lightline = { diff --git a/Makefile b/Makefile index 8451f39..129be46 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,15 @@ backup: mv ~/.bashrc ~/.bashrc.bak || true mv ~/.zshrc ~/.zshrc.bak || true mv ~/.vimrc ~/.vimrc.bak || true + mv ~/.vim ~/.vim.bak || true mv ~/.subbash ~/.subbash.bak || true + mv ~/.tmux.conf ~/.tmux.conf.bak || true install: ln -s $(PWD)/.subbash ~ || true ln -s $(PWD)/.bashrc ~ || true ln -s $(PWD)/.zshrc ~ || true + ln -s $(PWD)/.tmux.conf ~ || true vim: ln -s $(PWD)/.vim ~