support for nvim and legacy for vim
This commit is contained in:
parent
e87c3a04c9
commit
ac76077ea7
@ -4,7 +4,7 @@
|
|||||||
rm -rf ~/.dotfiles ~/.oh-my-zsh ~/.zshrc ~/.vim ~/.vimrc ~/.gvimrc ~/.gitignore ~/.tmux.conf
|
rm -rf ~/.dotfiles ~/.oh-my-zsh ~/.zshrc ~/.vim ~/.vimrc ~/.gvimrc ~/.gitignore ~/.tmux.conf
|
||||||
|
|
||||||
# repos
|
# repos
|
||||||
if [ `whoami` = "f" ] || [ `whoami` = "ftpd" ] || [ `whoami` = "bartek.stalewski" ]; then
|
if [ `whoami` = "f" ]; then
|
||||||
path="git@bitbucket.org:ftpd/dotfiles.git"
|
path="git@bitbucket.org:ftpd/dotfiles.git"
|
||||||
else
|
else
|
||||||
path="https://bitbucket.org/ftpd/dotfiles.git"
|
path="https://bitbucket.org/ftpd/dotfiles.git"
|
||||||
@ -26,9 +26,10 @@ touch ~/.zshrc.local
|
|||||||
source ~/.zshrc
|
source ~/.zshrc
|
||||||
|
|
||||||
# vim
|
# vim
|
||||||
#ln -sf ~/.dotfiles/vim ~/.vim
|
mkdir -p ~/.config
|
||||||
#ln -sf ~/.vim/rcfiles/vimrc ~/.vimrc
|
ln -sf ~/.dotfiles/vim ~/.vim
|
||||||
#ln -sf ~/.vim/rcfiles/gvimrc ~/.gvimrc
|
ln -sf ~/.dotfiles/vim ~/.config/nvim
|
||||||
|
ln -sf ~/.dotfiles/vim/init.vim ~/.vimrc
|
||||||
|
|
||||||
# .gitignore
|
# .gitignore
|
||||||
ln -sf ~/.dotfiles/gitignore ~/.gitignore
|
ln -sf ~/.dotfiles/gitignore ~/.gitignore
|
||||||
|
|||||||
2263
vim/autoload/plug.vim
Normal file
2263
vim/autoload/plug.vim
Normal file
File diff suppressed because it is too large
Load Diff
95
vim/colors/smyck.vim
Normal file
95
vim/colors/smyck.vim
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" Vim color file
|
||||||
|
" Maintainer: John-Paul Bader <contact@smyck.org>
|
||||||
|
" Last Change: 2012 April
|
||||||
|
" License: Beer Ware
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
" Reset Highlighting
|
||||||
|
hi clear
|
||||||
|
if exists("syntax_on")
|
||||||
|
syntax reset
|
||||||
|
endif
|
||||||
|
|
||||||
|
set background=dark
|
||||||
|
set linespace=3
|
||||||
|
|
||||||
|
let g:colors_name = "smyck"
|
||||||
|
|
||||||
|
hi Normal cterm=none ctermbg=none ctermfg=15 gui=none guibg=#282828 guifg=#F7F7F7
|
||||||
|
hi LineNr cterm=none ctermbg=none ctermfg=8 gui=none guibg=#282828 guifg=#8F8F8F
|
||||||
|
hi StatusLine cterm=none ctermbg=8 ctermfg=15 gui=none guibg=#5D5D5D guifg=#FBFBFB
|
||||||
|
hi StatusLineNC cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#5D5D5D guifg=#FBFBFB
|
||||||
|
hi Search cterm=none ctermbg=6 ctermfg=15 gui=none guibg=#2EB5C1 guifg=#F7F7F7
|
||||||
|
hi IncSearch cterm=none ctermbg=3 ctermfg=8 gui=none guibg=#F6DC69 guifg=#8F8F8F
|
||||||
|
hi ColumnMargin cterm=none ctermbg=0 gui=none guibg=#000000
|
||||||
|
hi Error cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7
|
||||||
|
hi ErrorMsg cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7
|
||||||
|
hi Folded cterm=none ctermbg=8 ctermfg=2 gui=none guibg=#3B3B3B guifg=#90AB41
|
||||||
|
hi FoldColumn cterm=none ctermbg=8 ctermfg=2 gui=none guibg=#3B3B3B guifg=#90AB41
|
||||||
|
hi NonText cterm=bold ctermbg=none ctermfg=8 gui=bold guifg=#8F8F8F
|
||||||
|
hi ModeMsg cterm=bold ctermbg=none ctermfg=10 gui=none
|
||||||
|
hi Pmenu cterm=none ctermbg=8 ctermfg=15 gui=none guibg=#8F8F8F guifg=#F7F7F7
|
||||||
|
hi PmenuSel cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F
|
||||||
|
hi PmenuSbar cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F
|
||||||
|
hi SpellBad cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7
|
||||||
|
hi SpellCap cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7
|
||||||
|
hi SpellRare cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7
|
||||||
|
hi SpellLocal cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7
|
||||||
|
hi Visual cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F
|
||||||
|
hi Directory cterm=none ctermbg=none ctermfg=4 gui=none guibg=#242424 guifg=#88CCE7
|
||||||
|
hi SpecialKey cterm=none ctermbg=none ctermfg=8 gui=none guifg=#8F8F8F
|
||||||
|
hi DiffAdd cterm=bold ctermbg=2 ctermfg=15
|
||||||
|
hi DiffChange cterm=bold ctermbg=4 ctermfg=15
|
||||||
|
hi DiffDelete cterm=bold ctermbg=1 ctermfg=15
|
||||||
|
hi DiffText cterm=bold ctermbg=3 ctermfg=8
|
||||||
|
hi MatchParen cterm=none ctermbg=6 ctermfg=15 gui=none guibg=#2EB5C1 guifg=#F7F7F7
|
||||||
|
hi CursorLine cterm=none ctermbg=238 ctermfg=none gui=none guibg=#424242
|
||||||
|
hi CursorColumn cterm=none ctermbg=238 ctermfg=none gui=none guibg=#424242
|
||||||
|
hi Title cterm=none ctermbg=none ctermfg=4 gui=none guifg=#88CCE7
|
||||||
|
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
" Syntax Highlighting
|
||||||
|
" ----------------------------------------------------------------------------
|
||||||
|
hi Keyword cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71
|
||||||
|
hi Comment cterm=none ctermbg=none ctermfg=8 gui=none guifg=#8F8F8F
|
||||||
|
hi Delimiter cterm=none ctermbg=none ctermfg=15 gui=none guifg=#F7F7F7
|
||||||
|
hi Identifier cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1
|
||||||
|
hi Structure cterm=none ctermbg=none ctermfg=12 gui=none guifg=#9DEEF2
|
||||||
|
hi Ignore cterm=none ctermbg=none ctermfg=8 gui=none guifg=bg
|
||||||
|
hi Constant cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1
|
||||||
|
hi PreProc cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71
|
||||||
|
hi Type cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1
|
||||||
|
hi Statement cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71
|
||||||
|
hi Special cterm=none ctermbg=none ctermfg=6 gui=none guifg=#d7d7d7
|
||||||
|
hi String cterm=none ctermbg=none ctermfg=3 gui=none guifg=#F6DC69
|
||||||
|
hi Number cterm=none ctermbg=none ctermfg=3 gui=none guifg=#F6DC69
|
||||||
|
hi Underlined cterm=none ctermbg=none ctermfg=magenta gui=underline guibg=#272727
|
||||||
|
hi Symbol cterm=none ctermbg=none ctermfg=9 gui=none guifg=#FAB1AB
|
||||||
|
hi Method cterm=none ctermbg=none ctermfg=15 gui=none guifg=#F7F7F7
|
||||||
|
hi Interpolation cterm=none ctermbg=none ctermfg=6 gui=none guifg=#2EB5C1
|
||||||
|
|
||||||
|
" Erlang
|
||||||
|
hi link erlangAtom Keyword
|
||||||
|
hi link erlangBitType Keyword
|
||||||
|
|
||||||
|
hi link rubyBeginend Keyword
|
||||||
|
hi link rubyClass Keyword
|
||||||
|
hi link rubyModule Keyword
|
||||||
|
hi link rubyKeyword Keyword
|
||||||
|
hi link rubyOperator Method
|
||||||
|
hi link rubyIdentifier Keyword
|
||||||
|
hi link rubyClassVariable Symbol
|
||||||
|
hi link rubyInstanceVariable Constant
|
||||||
|
hi link rubyGlobalVariable Constant
|
||||||
|
hi link rubyClassVariable Method
|
||||||
|
hi link rubyConstant Constant
|
||||||
|
hi link rubySymbol Symbol
|
||||||
|
hi link rubyFunction Constant
|
||||||
|
hi link rubyControl Keyword
|
||||||
|
hi link rubyConditional Keyword
|
||||||
|
hi link rubyInterpolation Interpolation
|
||||||
|
hi link rubyInterpolationDelimiter Interpolation
|
||||||
|
hi link rubyRailsMethod Method
|
||||||
|
|
||||||
|
|
||||||
76
vim/indent/puppet.vim
Normal file
76
vim/indent/puppet.vim
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
" Vim indent file
|
||||||
|
" Language: Puppet
|
||||||
|
" Maintainer: Todd Zullinger <tmz@pobox.com>
|
||||||
|
" Last Change: 2009 Aug 19
|
||||||
|
" vim: set sw=4 sts=4:
|
||||||
|
|
||||||
|
if exists("b:did_indent")
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
let b:did_indent = 1
|
||||||
|
|
||||||
|
setlocal autoindent smartindent
|
||||||
|
setlocal indentexpr=GetPuppetIndent()
|
||||||
|
setlocal indentkeys+=0],0)
|
||||||
|
|
||||||
|
if exists("*GetPuppetIndent")
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Check if a line is part of an include 'block', e.g.:
|
||||||
|
" include foo,
|
||||||
|
" bar,
|
||||||
|
" baz
|
||||||
|
function! s:PartOfInclude(lnum)
|
||||||
|
let lnum = a:lnum
|
||||||
|
while lnum
|
||||||
|
let lnum = lnum - 1
|
||||||
|
let line = getline(lnum)
|
||||||
|
if line !~ ',$'
|
||||||
|
break
|
||||||
|
endif
|
||||||
|
if line =~ '^\s*include\s\+[^,]\+,$'
|
||||||
|
return 1
|
||||||
|
endif
|
||||||
|
endwhile
|
||||||
|
return 0
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! s:OpenBrace(lnum)
|
||||||
|
call cursor(a:lnum, 1)
|
||||||
|
return searchpair('{\|\[\|(', '', '}\|\]\|)', 'nbW')
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! GetPuppetIndent()
|
||||||
|
let pnum = prevnonblank(v:lnum - 1)
|
||||||
|
if pnum == 0
|
||||||
|
return 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
let line = getline(v:lnum)
|
||||||
|
let pline = getline(pnum)
|
||||||
|
let ind = indent(pnum)
|
||||||
|
|
||||||
|
if pline =~ '^\s*#'
|
||||||
|
return ind
|
||||||
|
endif
|
||||||
|
|
||||||
|
if pline =~ '\({\|\[\|(\|:\)$'
|
||||||
|
let ind += &sw
|
||||||
|
elseif pline =~ ';$' && pline !~ '[^:]\+:.*[=+]>.*'
|
||||||
|
let ind -= &sw
|
||||||
|
elseif pline =~ '^\s*include\s\+.*,$'
|
||||||
|
let ind += &sw
|
||||||
|
endif
|
||||||
|
|
||||||
|
if pline !~ ',$' && s:PartOfInclude(pnum)
|
||||||
|
let ind -= &sw
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Match } }, }; ] ]: )
|
||||||
|
if line =~ '^\s*\(}\(,\|;\)\?$\|]:\?$\|)\)'
|
||||||
|
let ind = indent(s:OpenBrace(v:lnum))
|
||||||
|
endif
|
||||||
|
|
||||||
|
return ind
|
||||||
|
endfunction
|
||||||
70
vim/init.vim
Normal file
70
vim/init.vim
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
syntax on
|
||||||
|
set encoding=utf-8
|
||||||
|
set background=dark
|
||||||
|
colorscheme smyck
|
||||||
|
set guifont=MesloLGS\ Nerd\ Font:h11
|
||||||
|
hi BadWhitespace ctermbg=red guibg=red
|
||||||
|
|
||||||
|
set gdefault
|
||||||
|
set nobackup
|
||||||
|
set nodigraph
|
||||||
|
set incsearch
|
||||||
|
set nohlsearch
|
||||||
|
set nojoinspaces
|
||||||
|
set nowritebackup
|
||||||
|
|
||||||
|
set title
|
||||||
|
set number
|
||||||
|
set noshowmode
|
||||||
|
set ruler
|
||||||
|
set laststatus=2
|
||||||
|
set clipboard+=unnamed
|
||||||
|
set ignorecase
|
||||||
|
set smartcase
|
||||||
|
set backspace=eol,start,indent
|
||||||
|
set winminheight=0
|
||||||
|
set scrolloff=5
|
||||||
|
set cursorline
|
||||||
|
set cursorcolumn
|
||||||
|
|
||||||
|
set shiftwidth=2 tabstop=2 softtabstop=2 expandtab
|
||||||
|
set shiftround
|
||||||
|
set autoindent
|
||||||
|
set matchpairs+=(:),{:},[:],<:>,':',":"
|
||||||
|
set bs=2
|
||||||
|
|
||||||
|
nmap <tab> w
|
||||||
|
nmap
:wq!
|
||||||
|
|
||||||
|
map <leader>b <Esc>:set cc=79<CR>
|
||||||
|
map <leader>nb <Esc>:set cc=0<CR>
|
||||||
|
map <leader>n <Esc>:set nonumber!<CR>
|
||||||
|
map <leader>\ <Esc>:setlocal nospell<CR>
|
||||||
|
map <leader>pl <Esc>:setlocal spell spelllang=pl<CR>
|
||||||
|
map <leader>en <Esc>:setlocal spell spelllang=en_gb<CR>
|
||||||
|
map <leader>p <Esc>:set paste!<CR>
|
||||||
|
|
||||||
|
"nnoremap n nzzzv
|
||||||
|
"nnoremap N Nzzzv¬
|
||||||
|
|
||||||
|
au BufRead,BufNewFile *.pp
|
||||||
|
\ set filetype=puppet
|
||||||
|
filetype plugin indent on
|
||||||
|
|
||||||
|
call plug#begin('~/.config/nvim/plugins')
|
||||||
|
Plug 'ctrlpvim/ctrlp.vim'
|
||||||
|
Plug 'rodjek/vim-puppet'
|
||||||
|
Plug 'godlygeek/tabular'
|
||||||
|
Plug 'edkolev/tmuxline.vim'
|
||||||
|
Plug 'ryanoasis/vim-devicons'
|
||||||
|
Plug 'vim-airline/vim-airline'
|
||||||
|
Plug 'vim-airline/vim-airline-themes'
|
||||||
|
call plug#end()
|
||||||
|
|
||||||
|
let g:airline_theme = 'powerlineish'
|
||||||
|
let g:airline#extensions#tabline#enabled = 1
|
||||||
|
let g:airline_powerline_fonts = 1
|
||||||
|
let g:airline#extensions#tabline#left_sep = ''
|
||||||
|
let g:airline#extensions#tabline#left_alt_sep = ''
|
||||||
|
let g:airline#extensions#tabline#right_sep = ''
|
||||||
|
let g:airline#extensions#tabline#right_alt_sep = ''
|
||||||
Loading…
Reference in New Issue
Block a user