Merge development
This commit is contained in:
parent
b8ed14cf46
commit
b8f89f17ac
19 changed files with 107 additions and 376 deletions
128
vim/.vimrc
128
vim/.vimrc
|
|
@ -1,128 +0,0 @@
|
|||
" vim:set ts=2 sw=2 et:
|
||||
" indent, load plugin and detect filetype depending on filetype
|
||||
filetype indent plugin on
|
||||
set autoindent
|
||||
|
||||
" fix different locale settings when ssh'ing
|
||||
set encoding=utf-8
|
||||
|
||||
" replace vertical split pipe character with space
|
||||
set fillchars="vert:\ |,fold:\ "
|
||||
|
||||
set splitright
|
||||
set splitbelow
|
||||
|
||||
" colorscheme
|
||||
if exists('+termguicolors')
|
||||
" enable termguicolors correctly for terminals other than
|
||||
" xterm-256color see https://github.com/vim/vim/issues/993
|
||||
" also see :h xterm-true-color
|
||||
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
|
||||
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
|
||||
set termguicolors
|
||||
|
||||
set background=dark
|
||||
colorscheme space_vim_theme
|
||||
endif
|
||||
|
||||
" syntax on
|
||||
syntax on
|
||||
|
||||
" switch buffers without writing to file
|
||||
set hidden
|
||||
|
||||
" file specific formatting
|
||||
autocmd Filetype python,bash,sh,java,php,json setlocal tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix
|
||||
autocmd Filetype css,scss,html,htmldjango,javascript,yaml setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent
|
||||
|
||||
" open folds by default
|
||||
autocmd Syntax * normal zR
|
||||
|
||||
" fold indents
|
||||
set foldmethod=indent
|
||||
|
||||
" search down into subfolders
|
||||
" provides tab-completion for all file-related tasks
|
||||
set path+=**
|
||||
|
||||
" display all matching files when we tab complete
|
||||
set wildmenu
|
||||
|
||||
" use normal backspace behavior
|
||||
set backspace=2
|
||||
|
||||
" allow arrow keys to be used
|
||||
set nocompatible
|
||||
|
||||
" Color trailing spaces with red color
|
||||
highlight ExtraWhitespace ctermbg=green guibg=green
|
||||
match ExtraWhitespace /\s\+$/
|
||||
autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
|
||||
autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
|
||||
autocmd InsertLeave * match ExtraWhitespace /\s\+$/
|
||||
autocmd BufWinLeave * call clearmatches()
|
||||
|
||||
" line numbers
|
||||
set number
|
||||
|
||||
" changes to current directory when creating new files
|
||||
set autochdir
|
||||
|
||||
" higlhight search
|
||||
set hls
|
||||
|
||||
" search as characters are entered
|
||||
set incsearch
|
||||
|
||||
" line for linewrapping
|
||||
set colorcolumn=80
|
||||
|
||||
" remove temporary swap file
|
||||
set nobackup
|
||||
set noswapfile
|
||||
|
||||
" wrap text instead of being on one line
|
||||
set lbr
|
||||
|
||||
" default Colors for CursorLine
|
||||
set cursorline
|
||||
highlight CursorLine cterm=NONE
|
||||
|
||||
" activate statusbar
|
||||
set laststatus=2
|
||||
set statusline=\ %F\ %m%r%w\ %=\ %{hostname()}\ \ \ %{strlen(&ft)?&ft:'none'}\ %{(&bomb?\",BOM\":\"\")}\ %{&ff}\ \ %l/%L\ \ %c\ %P
|
||||
|
||||
" netrw settings
|
||||
let g:netrw_banner = 0
|
||||
let g:netrw_winsize = -30
|
||||
let g:netrw_browse_split = 4
|
||||
let g:netrw_liststyle = 3
|
||||
|
||||
" tab autocompletion
|
||||
function! Tab_Or_Complete()
|
||||
if col('.')>1 && strpart( getline('.'), col('.')-2, 3 ) =~ '^\w'
|
||||
return "\<C-N>"
|
||||
else
|
||||
return "\<Tab>"
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" persistent undo history
|
||||
if !isdirectory("/tmp/vim-undo")
|
||||
call mkdir("/tmp/vim-undo", "", 0700)
|
||||
endif
|
||||
set undodir=/tmp/vim-undo
|
||||
set undofile
|
||||
|
||||
" ------------ Keybindings ----------------
|
||||
" paste mode toggle
|
||||
set pastetoggle=<F4>
|
||||
|
||||
" reload file
|
||||
map <F5> :e <CR>
|
||||
|
||||
" open netrw browser
|
||||
map <silent> <C-E> :Lexplore <CR>
|
||||
|
||||
" tab for completion
|
||||
inoremap <Tab> <C-R>=Tab_Or_Complete()<CR>
|
||||
Loading…
Add table
Add a link
Reference in a new issue