From 67ddadd31ec859930b944572d3e4630aff3acd58 Mon Sep 17 00:00:00 2001 From: Blallo Date: Mon, 13 May 2019 12:29:19 +0200 Subject: [PATCH] Ignore bundle/* --- .gitignore | 1 + vimrc.backup | 303 --------------------------------------------------- 2 files changed, 1 insertion(+), 303 deletions(-) delete mode 100644 vimrc.backup diff --git a/.gitignore b/.gitignore index 5789f99..1f2f71c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /black __pycache__/* +/bundle/* diff --git a/vimrc.backup b/vimrc.backup deleted file mode 100644 index ee5790e..0000000 --- a/vimrc.backup +++ /dev/null @@ -1,303 +0,0 @@ -let $VIMHOME = expand('~/.vim') -" check if in tty -let g:is_tty = system('case $(tty) in (/dev/tty[0-9]) echo 1;; (*) echo 0;; esac') - -" vim-plug init -if empty(glob('~/.vim/autoload/plug.vim')) - system('curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim') - autocmd VimEnter * PlugInstall --sync | source $MYVIMRC -endif - -call plug#begin('~/.vim/bundle') - -""" Install Plugs - -" Deoplete.vim -Plug 'Shougo/deoplete.nvim' -Plug 'roxma/nvim-yarp' -Plug 'roxma/vim-hug-neovim-rpc' -let g:deoplete#enable_at_startup = 1 - -" fzf -Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -Plug 'junegunn/fzf.vim' - -" NERDTree -Plug 'scrooloose/nerdtree' -Plug 'Xuyuanp/nerdtree-git-plugin' - -" tagbar -Plug 'majutsushi/tagbar' - -" vim-fugitive -Plug 'tpope/vim-fugitive' - -" ALE -Plug 'w0rp/ale' - -" vim-airline -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' - -" Colorschemes -Plug 'junegunn/seoul256.vim' -Plug 'scwood/vim-hybrid' -Plug 'kristijanhusak/vim-hybrid-material' -Plug 'srcery-colors/srcery-vim' -Plug 'nightsense/cosmic_latte' -Plug 'rafi/awesome-vim-colorschemes' - -" Dockerfile.vim -Plug 'ekalinin/Dockerfile.vim' - -" YAML -Plug 'mrk21/yaml-vim' - -" Python -Plug 'ambv/black' - -" TOML -Plug 'cespare/vim-toml' - -" Autoclose -Plug 'jiangmiao/auto-pairs' - -" vim-go -Plug 'fatih/vim-go' - -" vim-multiple-cursor -Plug 'terryma/vim-multiple-cursors' - -" rust.vim -Plug 'rust-lang/rust.vim' - -call plug#end() - -""" - -""" ALE configuration - -let g:ale_sign_error = '->' -let g:ale_sign_warning = '~>' - -let g:deoplete#sources = {'_': ['ale']} -let g:ale_completion_enabled = 1 - -let g:ale_linters = { -\ 'javascript': ['eslint'], -\ 'golang': ['gopls', 'gofmt'], -\ 'python': ['flake8', 'python-language-server'], -\ 'rust': ['cargo'], -\} - -let g:ale_fixers = { -\ 'javascript': ['prettier'], -\ 'golang': ['gopls', 'gofmt', 'goimports'], -\ 'python': ['black', 'python-language-server'], -\ 'rust': ['cargo', 'rustfmt'], -\} - -let g:ale_echo_msg_error_str = 'Err' -let g:ale_echo_msg_warning_str = 'Warn' -let g:ale_echo_msg_format = '[%linter%] %s [%severity%]' - -let g:ale_go_langserver_executable = 'gopls' - -""" Themes and colors - -set term=linux -set t_Co=256 -set background=dark -colorscheme hybrid_reverse -let g:airline_theme='hybrid' -set number -let g:enable_bold_font = 1 -let g:enable_italic_font = 1 - -" air-line -let g:airline_powerline_fonts = 1 - -if !exists('g:airline_symbols') && !g:is_tty - let g:airline_symbols = {} - endif - - " unicode symbols - let g:airline_left_sep = '' - let g:airline_left_alt_sep = '' - let g:airline_right_sep = '' - let g:airline_right_alt_sep = '' - let g:airline_symbols.branch = '' - let g:airline_symbols.readonly = '' - let g:airline_symbols.linenr = ''" - " let g:airline_symbols.branch = '⎇' - let g:airline_symbols.paste = 'ρ' - " let g:airline_symbols.paste = 'Þ' - " let g:airline_symbols.paste = '∥' - let g:airline_symbols.whitespace = 'Ξ' - - -""" FZF - -let g:fzf_commits_log_options = '--graph --color=always --format="%C(auto)%h%d %s %C(black)%C(bold)%cr"' - -let g:fzf_action = { -\ 'ctrl-t': 'tabedit', -\ 'ctrl-v': 'vsplit', -\ 'ctrl-x': 'split' } -let g:fzf_buffers_jump = 1 - -let g:fzf_commands_expect = 'alt-enter,ctrl-x' - -""" NERDTree - -" Close NERDTree automatically after opening a file with it. -let g:NERDTreeQuitOnOpen = 1 -" Use a single click for opening things in NERDTree -let g:NERDTreeMouseMode = 3 -let g:NERDTreeMapActivateNode = '' -let g:NERDTreeIgnore = [ -\ '\.pyc$', -\ '^__pycache__$', -\] - -" ripgrep -if executable('rg') - let $FZF_DEFAULT_COMMAND = 'rg --files --hidden --follow --glob "!.git/*"' - set grepprg=rg\ --vimgrep - command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --glob "!.git/*" --color "always" '.shellescape().'| tr -d "\017"', 1, 0) -endif - -" Search in files with ripgrep + preview with bat -function! Fzf_dev() - let l:fzf_files_options = '--preview "bat --style=numbers,changes --color always {2..-1} | head -'.&lines.'"' - - function! s:files() - let l:files = split(system($FZF_DEFAULT_COMMAND), '\n') - return s:format_list(l:files) - endfunction - - function! s:format_list(candidates) - let l:result = [] - for l:candidate in a:candidates - let l:filename = fnamemodify(l:candidate, ':p:t') - let l:icon = ">-" - call add(l:result, printf('%s %s', l:icon, l:candidate)) - endfor - - return l:result - endfunction - - function! s:edit_file(item) - let l:pos = stridx(a:item, ' ') - let l:file_path = a:item[pos+1:-1] - execute 'silent e' l:file_path - endfunction - - call fzf#run({ - \ 'source': files(), - \ 'sink': function('s:edit_file'), - \ 'options': '-m ' . l:fzf_files_options, - \ 'down': '40%' }) -endfunction - -""" general - -set nospell -" restore screen after quitting -au VimLeave * :!clear - -packloadall - -silent! helptags ALL - -" Enable persistent undo -set undodir=$VIMHOME/.undo// -set undofile -set undolevels=1000 "maximum number of changes that can be undone -set undoreload=10000 "maximum number lines to save for undo on a buffer reload - -" Automatically re-open files after they have changed without prompting. -" This can be a little more destructive, but a lot less annoying. -set autoread - -set autochdir -set autoindent -set showmatch - -" Put all special files in the right place -set backupdir=$VIMHOME/.backup// -set directory=$VIMHOME/.swp// - -" Draw tabs and trailing spaces. -" set listchars=tab:<-> -set listchars=tab:›\ ,trail:•,extends:#,nbsp:. -set list - -" Set the right margin. -set colorcolumn=89 -" Automatically split words at the margin. -set wrap - -" Default to spaces instead of tabs -set expandtab - -" Set tab width to 4. -set tabstop=4 -set shiftwidth=4 -" Setting this will make backspace delete space indents -set softtabstop=4 - -" Disable automatic wrapping. -set textwidth=0 - -" Make :Q and :W work like :q and :w -command! W w -command! Q q - -" Make completion smarter. -set ignorecase -set smartcase - -" viminfo settings -" '100 : Remember marks for 100 previously edited files. -" <50 : ??? -" s10 : ??? -" h : ??? -" "100 : Save 100 lines for each register -" :50 : Remember 50 lines of command history -set viminfo='100,<50,s10,h,\"100,:50 - -" Jump at last opened cursor position position, if valid -if has("autocmd") - au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") - \| exe "normal! g'\"" | endif -endif - -" Warn about not being able to write to .viminfo, which messes up restoring -" the cursor position when editing. -let s:info_filename = expand('~/.viminfo') - -if !empty(glob(s:info_filename)) && !filewritable(s:info_filename) - echoerr 'The .viminfo file cannot be written to!' -endif - - -""" keybindings - -let mapleader = ',' -nnoremap :bd -nnoremap :NERDTree -nnoremap -nnoremap -nnoremap -nnoremap -nnoremap :Tagbar -nnoremap b :Gblame -nnoremap :FZF -nnoremap :Buffers -nnoremap :Files -nnoremap :Rg -nnoremap \ :call Fzf_dev() -nnoremap c :Commits -map :bnext -map :bprev