9 files changed, 35 insertions, 25 deletions
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
deleted file mode 160000
-Subproject 9a38216a1c0c597f978d73547d37681fc689c90
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
deleted file mode 160000
-Subproject fa92f40d0209469a037196fdc3d949ae29d0c30
diff --git a/.vim/bundle/swift.vim b/.vim/bundle/swift.vim
deleted file mode 160000
-Subproject 5e330f026d4184c917cc156410634551dbd9a94
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
deleted file mode 160000
-Subproject 881ad1ed0bd88acc7568c07e35daa4b81c4aa1c
diff --git a/.vim/bundle/indentpy.vim b/vim/.vim/bundle/indentpy.vim
index 32c773c..32c773c 100755
--- a/.vim/bundle/indentpy.vim
+++ b/vim/.vim/bundle/indentpy.vim
diff --git a/.vim/colors/gruvbox-hard.vim b/vim/.vim/colors/gruvbox-hard.vim
index fe10560..fe10560 100644
--- a/.vim/colors/gruvbox-hard.vim
+++ b/vim/.vim/colors/gruvbox-hard.vim
diff --git a/.vim/colors/horizon.vim b/vim/.vim/colors/horizon.vim
index 45f6cd0..45f6cd0 100755
--- a/.vim/colors/horizon.vim
+++ b/vim/.vim/colors/horizon.vim
diff --git a/.vim/colors/miramare.vim b/vim/.vim/colors/miramare.vim
index d1a1725..d1a1725 100644
--- a/.vim/colors/miramare.vim
+++ b/vim/.vim/colors/miramare.vim
diff --git a/.vimrc b/vim/.vimrc
index 957cd2b..a44daae 100755
--- a/.vimrc
+++ b/vim/.vimrc
@@ -1,46 +1,50 @@
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-Plugin 'VundleVim/Vundle.vim'
+autocmd! bufwritepost .vimrc source %
 
-Plugin 'rust-lang/rust.vim' 
-Plugin 'airblade/vim-gitgutter' " display git status of the file
-Plugin 'vim-airline/vim-airline' " airline at bottom with insert, name, line etc.
-Plugin 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} | Plugin 'junegunn/fzf.vim' " fuzzy finder
-Plugin 'luochen1990/rainbow' " color parentheses
-Plugin 'dense-analysis/ale' " checker syntax
-
-augroup remember_folds
-  autocmd!
-  autocmd BufWinLeave * mkview
-  autocmd BufWinEnter * silent! loadview
-augroup END
+set clipboard=unnamed
+set mouse=a " click with mouse
 
 set number " number of the current line
 set relativenumber " relative number, ..-2 -1 x 1 2, where x is current line
-set mouse=a " click with mouse
+set textwidth=80
+set colorcolumn=80
+set nowrap
+set fo-=t
+
 set tabstop=4
 set shiftwidth=4
 set expandtab " convert tabs in spaces
+
 set ai " auto indent
 set autoread
 set encoding=utf-8
 set history=1000
 set wildignore+=*.pyc
-set wrap
+
 set hlsearch " highlight search
 set incsearch " highlight search while type
+
 set nowritebackup
 set laststatus=2
 set cursorline
 set list " spaces as characters
 set listchars=eol:⏎,tab:»·,trail:ˑ,nbsp:⎵
-set textwidth=80
-set colorcolumn=80
+
+set foldmethod=indent
+
+syntax on
+
+colorscheme miramare
+"colorscheme gruvbox-hard
+
+augroup remember_folds
+  autocmd!
+  autocmd BufWinLeave * mkview
+  autocmd BufWinEnter * silent! loadview
+augroup END
 
 nnoremap tn :tabnew<CR>
 nnoremap ve :Vexplore<CR>
-nnoremap di ciw
-nnoremap rt :RainbowToggle<CR>
+nnoremap :rt :RainbowToggle<CR>
 
 " mapping fzf commands
 " ff = open files explorer
@@ -54,14 +58,20 @@ nnoremap gs :GFiles?<CR>
 let g:fzf_preview_window = 'right:70%'
 let g:ale_fix_on_save = 1
 
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+Plugin 'VundleVim/Vundle.vim'
+
+Plugin 'rust-lang/rust.vim' 
+Plugin 'airblade/vim-gitgutter' " display git status of the file
+Plugin 'vim-airline/vim-airline' " airline at bottom with insert, name, line etc.
+Plugin 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} | Plugin 'junegunn/fzf.vim' " fuzzy finder
+Plugin 'luochen1990/rainbow' " color parentheses
+Plugin 'dense-analysis/ale' " checker syntax
 
 call vundle#end()            " required
 filetype plugin indent on    " required
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
-syntax on
-
-colorscheme miramare
-"colorscheme gruvbox-hard
 set showcmd " show commands at bottom