diff --git a/README.md b/README.md index d6bb976..1bd4da8 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,12 @@ chmod +x install.sh vim +source~/.vimrc +PlugInstall ~~~ -### Screenshot +### Screen-shot -![](https://i.imgur.com/D47eTO9.png) +![](https://i.imgur.com/yHVgYZ7.png) + +--- + +[Oh my ZSH](https://github.com/ohmyzsh/ohmyzsh) + +[Oh my Tmux](https://github.com/gpakosz/.tmux) diff --git a/install.sh b/install.sh index 5908856..de75c44 100644 --- a/install.sh +++ b/install.sh @@ -1,12 +1,12 @@ #!/bin/bash -read -p "All your git, vim, bash, tmux, zsh settings will be deleted [y/n]" CONTINUE +read -p "All your git, vim, bash, tmux, zsh settings will be deleted [y/n]: " CONTINUE if [[ "$CONTINUE" = "y" ]] || [[ "$CONTINUE" = "Y" ]]; then rm -rf ~/.vimrc ~/.vim rm -rf ~/.gitconfig ~/.git rm -rf ~/.bashrc ~/.bash rm -rf ~/.tmux ~/.tmux - rm -rf ~/.zshrci + rm -rf ~/.zshrc fi read -p "Install vim config [y/n]: " VIM_CONF @@ -41,3 +41,9 @@ if [[ "$ZSH_CONF" = "y" ]] || [[ "$ZSH_CONF" = "Y" ]]; then sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" mv zshrc ~/.zshrc fi + +if [[ "$VIM_CONF" = "y" ]] || [[ "$VIM_CONF" = "Y" ]]; then + clear + echo "vim +source~/.vimrc +PlugInstall" + echo "For install plugins in vim" +fi diff --git a/tmux.conf.local b/tmux.conf.local index aa63bcf..79186e4 100644 --- a/tmux.conf.local +++ b/tmux.conf.local @@ -248,7 +248,7 @@ tmux_conf_copy_to_os_clipboard=false #set -g history-limit 10000 # start with mouse mode enabled -#set -g mouse on +set -g mouse on # force Vi mode # really you should export VISUAL or EDITOR environment variable, see manual @@ -263,4 +263,4 @@ tmux_conf_copy_to_os_clipboard=false # bind C-a send-prefix # move status line to top -#set -g status-position top \ No newline at end of file +#set -g status-position top diff --git a/vimrc b/vimrc index 40cc3a7..f257cc5 100644 --- a/vimrc +++ b/vimrc @@ -1,29 +1,32 @@ call plug#begin('~/.vim/plugged') Plug 'jiangmiao/auto-pairs' " Automapic closing of quotes Plug 'flazz/vim-colorschemes' " ColorChemes pack -Plug 'airblade/vim-gitgutter' " Git indecator + "Plug 'airblade/vim-gitgutter' " Git indecator + "Plug 'pangloss/vim-javascript' " JS syntax support call plug#end() set nocompatible " be iMproved -set number " Number line -set relativenumber " Number line +"set number " Number line +"set relativenumber " Number line syntax on " Support syntax -set mouse=a " Mousr support set ruler " Cursor position set t_Co=256 " Enable 265 colors +set mouse=a " Mouse support +set mousehide " Mouse hide + set encoding=utf-8 " Use utf-8 encoding set fileencodings=utf8,cp1251 -set cursorline " The line with the cursor will be highlighted +"set cursorline " The line with the cursor will be highlighted set wrap " Line wrappingv set linebreak " Line wrappingv set nobackup " Disable backup files set noswapfile " Disable *.swp files -set history=1000 " History size 1000 edits +set history=50 " History size 1000 edits set autoread " Auto reade file for edit set showmode @@ -37,11 +40,10 @@ set expandtab " Tab consist of space set smarttab set autoindent - " Search set incsearch " Highlighted set ignorecase " Highlighted -set smartcase " Smart Rigger +set smartcase " Smart Rigger " Buffers set hidden @@ -55,7 +57,11 @@ colorscheme OceanicNext " Color cheme list " Dark: adventurs, Atelier_DuneLight, colorsbox-material, colorsbox-faff, OceanicNext, gruvbox, Monokai, material " Light: newspaper, wikipedia, Atelier_CaveLight, mac_classic -" Outher: off + +" Python +let python_highlight_all = 1 +autocmd BufWritePre *.py normal m`:%s/\s\+$//e ` +autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class """""""""" " MAPING " @@ -70,7 +76,6 @@ map l " Tabs map tn :tabnew " Create new tab -map to :tabonly " Kill all tab map tc :tabclose " Tab kill map 1 :tabn 1 " Change tab map 2 :tabn 2 " Change tab @@ -81,41 +86,18 @@ map 6 :tabn 6 " Change tab map 7 :tabn 7 " Change tab map 8 :tabn 8 " Change tab map 9 :tabn 9 " Change tab -map 0 :tablast " Change tab - -" Russian letters -map ш i -map м v -map ч x -map в d -map р h -map п g -map о j -map л k -map д l " Bufer nnoremap :bnext nnoremap :bprev -" Unmap arrows -noremap -noremap -noremap -noremap - """""""" " GVIM " """""""" if has("gui_running") set guioptions -=m set guioptions -=T - map p "+gP " Past test in buffer + map p "+gP " Past text in buffer map :tabnext " Change tab map :tabprev " Change tab endif - -" Python -let python_highlight_all = 1 -autocmd BufWritePre *.py normal m`:%s/\s\+$//e ` -autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class