diff --git a/.vim/.vimrc b/.vim/.vimrc index 69d36dd..6f6f908 100644 --- a/.vim/.vimrc +++ b/.vim/.vimrc @@ -19,7 +19,7 @@ let &t_EI.="\e[1 q" "EI = нормальный режим set encoding=utf-8 "Ставит кодировку UTF-8 set nocompatible "Отключает обратную совместимость с Vi -syntax enable "Включает подсветку синтаксиса +syntax on "Включает подсветку синтаксиса set expandtab set smarttab @@ -37,8 +37,12 @@ set smartcase set hlsearch set incsearch +set mousehide +set mouse=a + set colorcolumn=120 +" navigation on russian nmap о j nmap л k nmap р h @@ -48,18 +52,31 @@ nmap ф a nmap в d -set rtp+=~/.vim/bundle/Vundle.vim -nmap :NERDTreeToggle - - set ffs=unix,dos,mac set encoding=utf8 +" tabs nnoremap :tabprevious nnoremap :tabnext nnoremap :tabprevious nnoremap :tabnext + +" Plugins +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + Plugin 'VundleVim/Vundle.vim' + Plugin 'preservim/nerdtree' +call vundle#end() +filetype plugin indent on + +" Python +let python_highlight_all = 1 +set t_Co=256 + +autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class,match,case +" nerdtree +nmap :NERDTreeToggle let NERDTreeShowBookmarks = 1 let NERDTreeIgnore = ['\.pyc$', '\.swp', '\.swo', '\.vscode', '__pycache__'] @@ -74,12 +91,3 @@ let g:lightline = { \ 'gitbranch': 'fugitive#head' \ }, \ } - - -call vundle#begin() - Plugin 'VundleVim/Vundle.vim' - Plugin 'preservim/nerdtree' -call vundle#end() -filetype plugin indent on - - diff --git a/Makefile b/Makefile index f3e0c34..6bfd9ed 100644 --- a/Makefile +++ b/Makefile @@ -5,13 +5,15 @@ install: ln -s $(PWD)/.subbash ~ ln -s $(PWD)/.bashrc ~ ln -s $(PWD)/.zshrc ~ + +vim: ln -s $(PWD)/.vim ~ ln -s $(PWD)/.vim/.vimrc ~ git clone https://github.com/VundleVim/Vundle.vim.git $(PWD)/.vim/bundle/Vundle.vim vim +PluginInstall +qall clean: - rm -rf .ssh doc etc functions img .gitignore README.md setup.sh ssh_setup.sh git_setup.sh .git + rm -rf .ssh doc etc scripts img .gitignore README.md .git ssh: cat .ssh/config >> ~/.ssh/config