projects
/
~bandali
/
configs
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sxhkd|rofi: fancier prompts for program launcher and window switcher
[~bandali/configs]
/
vim
/
.vimrc
diff --git
a/vim/.vimrc
b/vim/.vimrc
index
5573306
..
d3784f9
100644
(file)
--- a/
vim/.vimrc
+++ b/
vim/.vimrc
@@
-20,18
+20,20
@@
Plug 'terryma/vim-multiple-cursors'
Plug 'tpope/vim-surround'
Plug 'rust-lang/rust.vim'
Plug 'phildawes/racer'
Plug 'tpope/vim-surround'
Plug 'rust-lang/rust.vim'
Plug 'phildawes/racer'
+Plug 'whatyouhide/vim-gotham'
+"Plug 'tpope/vim-repeat' | Plug 'svermeulen/vim-easyclip'
call plug#end()
" Use the Solarized Dark theme
set background=dark
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`)
" Make Vim more useful
set nocompatible
" Use the OS clipboard by default (on versions compiled with `+clipboard`)
-set clipboard=unnamed
+set clipboard=unnamed
plus
" Enhance command-line completion
set wildmenu
" Allow cursor keys in insert mode
" Enhance command-line completion
set wildmenu
" Allow cursor keys in insert mode
@@
-103,10
+105,10
@@
set title
" Show the (partial) command as it’s being typed
set showcmd
" Use relative line numbers
" 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
" Start scrolling three lines before the horizontal window border
set scrolloff=3
@@
-119,8
+121,8
@@
function! StripWhitespace()
call setreg('/', old_query)
endfunction
noremap <leader>ss :call StripWhitespace()<CR>
call setreg('/', old_query)
endfunction
noremap <leader>ss :call StripWhitespace()<CR>
-" Save a file as root (,
W
)
-noremap <leader>
W
:w !sudo tee % > /dev/null<CR>
+" Save a file as root (,
w
)
+noremap <leader>
w
:w !sudo tee % > /dev/null<CR>
" Automatic commands
if has("autocmd")
" Automatic commands
if has("autocmd")
@@
-139,20
+141,11
@@
endif
vnoremap ; :
vnoremap : ;
vnoremap ; :
vnoremap : ;
-" relative line number stuff
-function! NumberToggle()
- if(&relativenumber == 1)
- set number
- else
- set relativenumber
- endif
-endfunc
-nnoremap <leader>n :call NumberToggle()<cr>
":au FocusLost * :set number
":au FocusGained * :set relativenumber
":au FocusLost * :set number
":au FocusGained * :set relativenumber
-autocmd InsertEnter * :set number
-autocmd InsertEnter * :set norelativenumber
-autocmd InsertLeave * :set relativenumber
+
"
autocmd InsertEnter * :set number
+
"
autocmd InsertEnter * :set norelativenumber
+
"
autocmd InsertLeave * :set relativenumber
"autocmd InsertLeave * :set nonumber
" Rainbow Parantheses
"autocmd InsertLeave * :set nonumber
" Rainbow Parantheses
@@
-176,8
+169,8
@@
let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
set shiftwidth=4
set expandtab
set shiftwidth=4
set expandtab
-
"
let g:ctrlp_map = '<space>'
-let g:ctrlp_map = '<leader>p'
+let g:ctrlp_map = '<space>'
+
"
let g:ctrlp_map = '<leader>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'
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'
@@
-232,10
+225,16
@@
let g:indentLine_char = '¦'
"
" change cursor shape based on mode
"
" change cursor shape based on mode
-let &t_SI = "\<Esc>]50;CursorShape=1\x7"
-let &t_EI = "\<Esc>]50;CursorShape=0\x7"
+if &term =~ "xterm\\|rxvt"
+ " use a solid vertical bar in insert mode
+ let &t_SI .= "\<Esc>[6 q"
+ " use a solid block otherwise
+ let &t_EI .= "\<Esc>[2 q"
+endif
+" eliminite the delay when switching modes
+set ttimeoutlen=0
-set pastetoggle=<leader>
t
+set pastetoggle=<leader>
p
"set conceallevel=0
"let g:vim_json_syntax_conceal = 0
"set conceallevel=0
"let g:vim_json_syntax_conceal = 0
@@
-246,3
+245,6
@@
let g:Tex_DefaultTargetFormat = "pdf"
set hidden
let g:racer_cmd = "racer"
let $RUST_SRC_PATH=expand('~/misc/rs/rust/src/')
set hidden
let g:racer_cmd = "racer"
let $RUST_SRC_PATH=expand('~/misc/rs/rust/src/')
+
+noremap \ :q<CR>
+