X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/c6be1079d6a56978efb98164061c7b72b178f368..75905dbc2071e161e42f0240a4fc7a9e996b5d43:/vim/.vimrc
diff --git a/vim/.vimrc b/vim/.vimrc
index f459549..f0c6919 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,40 +1,38 @@
-" ==== ====
-set nocompatible " be iMproved, required
-filetype off " required
-
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-
-" let Vundle manage Vundle, required
-Plugin 'gmarik/Vundle.vim'
-Plugin 'kien/rainbow_parentheses.vim'
-"Plugin 'hsanson/vim-android'
-Plugin 'scrooloose/nerdcommenter'
-Plugin 'SirVer/ultisnips'
-Plugin 'honza/vim-snippets'
-"Plugin 'kien/ctrlp.vim'
-"Plugin 'tacahiroy/ctrlp-funky'
-Plugin 'Raimondi/delimitMate'
-Plugin 'Yggdroot/indentLine'
-"Plugin 'tpope/vim-fugitive'
-Plugin 'airblade/vim-gitgutter'
-"Plugin 'altercation/vim-colors-solarized'
-Plugin 'terryma/vim-multiple-cursors'
-"Plugin 'elzr/vim-json'
-"Plugin 'lervag/vim-latex'
-Plugin 'tpope/vim-surround'
-call vundle#end() " required
-" ==== ====
+"set nocompatible " be iMproved, required
+"filetype off " required
+
+call plug#begin('~/.vim/plugged')
+
+Plug 'kien/rainbow_parentheses.vim'
+"Plug 'hsanson/vim-android'
+Plug 'scrooloose/nerdcommenter'
+Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
+"Plug 'kien/ctrlp.vim'
+"Plug 'tacahiroy/ctrlp-funky'
+Plug 'Raimondi/delimitMate'
+Plug 'Yggdroot/indentLine'
+"Plug 'tpope/vim-fugitive'
+Plug 'airblade/vim-gitgutter'
+"Plug 'altercation/vim-colors-solarized'
+Plug 'terryma/vim-multiple-cursors'
+"Plug 'elzr/vim-json'
+"Plug 'lervag/vim-latex'
+Plug 'tpope/vim-surround'
+Plug 'rust-lang/rust.vim'
+Plug 'phildawes/racer'
+Plug 'whatyouhide/vim-gotham'
+
+call plug#end()
+
" Use the Solarized Dark theme
set background=dark
-"colorscheme solarized
+colorscheme gotham
" Make Vim more useful
set nocompatible
" Use the OS clipboard by default (on versions compiled with `+clipboard`)
-set clipboard=unnamed
+set clipboard=unnamedplus
" Enhance command-line completion
set wildmenu
" Allow cursor keys in insert mode
@@ -106,10 +104,10 @@ set title
" Show the (partial) command as itâs being typed
set showcmd
" Use relative line numbers
-if exists("&relativenumber")
- set relativenumber
- au BufReadPost * set relativenumber
-endif
+"if exists("&relativenumber")
+ "set relativenumber
+ "au BufReadPost * set relativenumber
+"endif
" Start scrolling three lines before the horizontal window border
set scrolloff=3
@@ -142,15 +140,6 @@ endif
vnoremap ; :
vnoremap : ;
-" relative line number stuff
-function! NumberToggle()
- if(&relativenumber == 1)
- set number
- else
- set relativenumber
- endif
-endfunc
-nnoremap n :call NumberToggle()
":au FocusLost * :set number
":au FocusGained * :set relativenumber
autocmd InsertEnter * :set number
@@ -179,8 +168,8 @@ let g:UltiSnipsJumpBackwardTrigger=""
set shiftwidth=4
set expandtab
-"let g:ctrlp_map = ''
-let g:ctrlp_map = 'p'
+let g:ctrlp_map = ''
+"let g:ctrlp_map = 'p'
set wildignore+=*/build/**
let g:android_sdk_path= '/Applications/Android\ Studio.app/sdk/'
let g:android_adb_tool= '/Applications/Android\ Studio.app/sdk/platform-tools/adb'
@@ -238,8 +227,14 @@ let g:indentLine_char = '¦'
let &t_SI = "\]50;CursorShape=1\x7"
let &t_EI = "\]50;CursorShape=0\x7"
-set pastetoggle=t
+set pastetoggle=p
"set conceallevel=0
"let g:vim_json_syntax_conceal = 0
"let g:indentLine_noConcealCursor=""
+" latex mode settings
+let g:Tex_DefaultTargetFormat = "pdf"
+
+set hidden
+let g:racer_cmd = "racer"
+let $RUST_SRC_PATH=expand('~/misc/rs/rust/src/')