Browse Source

Switched from Vundle to VIM8 package system

master
Julio Biason 5 years ago
parent
commit
4f5f8f9dcf
  1. 2
      .gitignore
  2. 30
      .gitmodules
  3. 1
      starship/starship.toml
  4. 1
      vim/pack/colors/start/mustang-vim
  5. 1
      vim/pack/colors/start/nord-vim
  6. 1
      vim/pack/colors/start/vim-monokai
  7. 1
      vim/pack/default/start/ale
  8. 1
      vim/pack/default/start/commentary
  9. 1
      vim/pack/default/start/editorconfig-vim
  10. 1
      vim/pack/default/start/fugitive
  11. 1
      vim/pack/default/start/lightline.vim
  12. 1
      vim/pack/default/start/vim-polyglot
  13. 1
      vim/pack/default/start/vim-vinegar
  14. 232
      vim/vimrc

2
.gitignore vendored

@ -1 +1,3 @@
.DS_Store .DS_Store
*.sw?
vim/.netrwhist

30
.gitmodules vendored

@ -0,0 +1,30 @@
[submodule "vim/pack/default/vim-polyglot"]
path = vim/pack/default/start/vim-polyglot
url = https://github.com/sheerun/vim-polyglot.git
[submodule "vim/pack/default/start/ale"]
path = vim/pack/default/start/ale
url = https://github.com/dense-analysis/ale.git
[submodule "vim/pack/default/start/lightline.vim"]
path = vim/pack/default/start/lightline.vim
url = https://github.com/itchyny/lightline.vim
[submodule "vim/pack/default/start/fugitive"]
path = vim/pack/default/start/fugitive
url = https://tpope.io/vim/fugitive.git
[submodule "vim/pack/default/start/commentary"]
path = vim/pack/default/start/commentary
url = https://tpope.io/vim/commentary.git
[submodule "vim/pack/colors/start/mustang-vim"]
path = vim/pack/colors/start/mustang-vim
url = https://github.com/croaker/mustang-vim.git
[submodule "vim/pack/colors/start/nord-vim"]
path = vim/pack/colors/start/nord-vim
url = https://github.com/arcticicestudio/nord-vim.git
[submodule "vim/pack/colors/start/vim-monokai"]
path = vim/pack/colors/start/vim-monokai
url = https://github.com/sickill/vim-monokai.git
[submodule "vim/pack/default/start/vim-vinegar"]
path = vim/pack/default/start/vim-vinegar
url = https://github.com/tpope/vim-vinegar.git
[submodule "vim/pack/default/start/editorconfig-vim"]
path = vim/pack/default/start/editorconfig-vim
url = https://github.com/editorconfig/editorconfig-vim.git

1
starship/starship.toml

@ -6,6 +6,7 @@ prompt_order = [
# "git_status", # "git_status",
"python", "python",
"jobs", "jobs",
"cmd_duration",
"character", "character",
] ]

1
vim/pack/colors/start/mustang-vim

@ -0,0 +1 @@
Subproject commit 6533d7d21bf27cae94d9c2caa575f627f003dfd5

1
vim/pack/colors/start/nord-vim

@ -0,0 +1 @@
Subproject commit 0ccf70b6b06fbe022109d98812657aaf54dbf65a

1
vim/pack/colors/start/vim-monokai

@ -0,0 +1 @@
Subproject commit ae7753878f8740fbdb2cef5617911ef83255349b

1
vim/pack/default/start/ale

@ -0,0 +1 @@
Subproject commit 82f734a7c286d8705c9a6e2879b4173fe18a6356

1
vim/pack/default/start/commentary

@ -0,0 +1 @@
Subproject commit f8238d70f873969fb41bf6a6b07ca63a4c0b82b1

1
vim/pack/default/start/editorconfig-vim

@ -0,0 +1 @@
Subproject commit 8aff78a03357bf573abcec407a543762f281b7d3

1
vim/pack/default/start/fugitive

@ -0,0 +1 @@
Subproject commit 85e2c73830b6bb01ce7fc3a926d2b25836a253eb

1
vim/pack/default/start/lightline.vim

@ -0,0 +1 @@
Subproject commit b8976d2e549b417e5d1c1594fb9034b749976cc0

1
vim/pack/default/start/vim-polyglot

@ -0,0 +1 @@
Subproject commit 14dc82fc4e6c0c08078f97a24a6c1639c1cc5113

1
vim/pack/default/start/vim-vinegar

@ -0,0 +1 @@
Subproject commit fcce70f1403ba4101668a4c960c577bddbd00f06

232
vim/configs/vimrc → vim/vimrc

@ -67,92 +67,7 @@ let mapleader=" " " use space to start user-defined (in plugins) functions
syntax sync minlines=1500 " increases the number of lines to find the proper syntax syntax sync minlines=1500 " increases the number of lines to find the proper syntax
" ---------------------------------------------------------------------- " Color scheme
" Vundle stuff starts here
" ----------------------------------------------------------------------
filetype off
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
" ----------------------------------------------------------------------
" Bundles
" ----------------------------------------------------------------------
" Vundle itself!
Plugin 'VundleVim/Vundle.vim'
" Magic "every updated syntax" plugin
Plugin 'sheerun/vim-polyglot'
" Lint files on save
" Plugin 'scrooloose/syntastic'
Plugin 'w0rp/ale'
" status line
Plugin 'itchyny/lightline.vim'
" git support
Plugin 'tpope/vim-fugitive'
" comment code with keys
Plugin 'tpope/vim-commentary'
" align things
Plugin 'godlygeek/tabular'
" close pairs
" Plugin 'jiangmiao/auto-pairs'
" snippets
Plugin 'SirVer/ultisnips'
Plugin 'honza/vim-snippets'
" fuzzy file open
" Plugin 'kien/ctrlp.vim'
" Plugin 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
" Plugin 'junegunn/fzf.vim'
Plugin 'Yggdroot/LeaderF'
" select multiple strings at the same time
Plugin 'terryma/vim-multiple-cursors'
" colorschemes
Plugin 'croaker/mustang-vim'
Plugin 'crusoexia/vim-monokai'
Plugin 'arcticicestudio/nord-vim'
" Improved syntax files
Plugin 'Glench/Vim-Jinja2-Syntax'
Plugin 'fmoralesc/vim-pinpoint'
Plugin 'kchmck/vim-coffee-script'
Plugin 'mattn/emmet-vim'
" Automatically detect and change the display of CSS colors
Plugin 'gorodinskiy/vim-coloresque'
" Project tree
" Plugin 'scrooloose/nerdtree'
" Plugin 'jistr/vim-nerdtree-tabs'
Plugin 'tpope/vim-vinegar'
" Editor configuration
Plugin 'editorconfig/editorconfig-vim'
" Selection
Plugin 'terryma/vim-expand-region'
" Unhighlight stuff when moving
Plugin 'romainl/vim-cool'
" Better "around stuff"
Plugin 'tpope/vim-surround'
" Tiling split manager
Plugin 'zhamlin/tiler.vim'
call vundle#end() " done with plugins
" color mustang " looks awesome on gvim, looks alright in vim if you have 256 color support
" color monokai
color nord color nord
" Enable file type detection. " Enable file type detection.
@ -333,24 +248,6 @@ nnoremap <C-H> <C-W><C-H>
" Use ';' as ':' " Use ';' as ':'
nnoremap ; : nnoremap ; :
" ----------------------------------------------------------------------
" Autopair settings
" ----------------------------------------------------------------------
let g:AutoPairsMapCR = 1
" ----------------------------------------------------------------------
" Airline configuration
" ----------------------------------------------------------------------
let g:airline_powerline_fonts = 1
let g:airline_theme = 'understated'
let g:airline#extensions#branch#enabled = 1
let g:airline#extensions#syntastic#enabled = 1
let g:airline#extensions#tabline#enabled = 1
let g:airline#extensions#tabline#show_buffers = 0
let g:airline#extensions#tabline#show_tab_type = 0
let g:airline#extensions#tabline#tab_nr_type = 1
let g:airline#extensions#whitespace#enabled = 0 "disabled
" ---------------------------------------------------------------------- " ----------------------------------------------------------------------
" Lightline configuration " Lightline configuration
" ---------------------------------------------------------------------- " ----------------------------------------------------------------------
@ -358,133 +255,11 @@ let g:lightline = {
\ 'colorscheme': 'wombat', \ 'colorscheme': 'wombat',
\ } \ }
" ----------------------------------------------------------------------
" CtrlP and extensions configuration
" ----------------------------------------------------------------------
" let g:ctrlp_extensions = ['funky']
" nnoremap <C-O> :CtrlPFunky<CR>
" ----------------------------------------------------------------------
" Indent guides
" ----------------------------------------------------------------------
let g:indent_guides_start_level=2
let g:indent_guides_guide_size=1
" ----------------------------------------------------------------------
" Jedi-VIM
" ----------------------------------------------------------------------
" this disables the documentation/preview split
autocmd FileType python setlocal completeopt-=preview
let g:jedi#show_call_signatures = "0"
" ----------------------------------------------------------------------
" UltiSnips
" ----------------------------------------------------------------------
let g:UltiSnipsEditSplit = "horizontal"
let g:UltiSnipsExpandTrigger = "<tab>"
let g:UltiSnipsJumpForwardTrigger = "<tab>"
let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
let g:ultisnips_python_style = "sphinx"
let g:UltiSnipsSnippetDirectories=[$HOME.'/.vim/UltiSnips']
" ----------------------------------------------------------------------
" Nerdtree and Nerdtree tabs
" ----------------------------------------------------------------------
let NERDTreeChDirMode=2
let NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__']
let NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$']
let NERDTreeShowBookmarks=1
let g:nerdtree_tabs_focus_on_files=1
let g:NERDTreeMapOpenInTabSilent = '<RightMouse>'
let g:NERDTreeWinSize = 40
"noremap <F3> :NERDTreeToggle<CR>
"nnoremap <silent> <F2> :NERDTreeFind<CR>
" map <Leader>\ <plug>NERDTreeTabsToggle<CR>
" ----------------------------------------------------------------------
" Syntastic
" ----------------------------------------------------------------------
" * Global options
let g:syntastic_aggregate_errors = 1
let g:syntastic_always_populate_loc_list = 1
let g:syntastic_auto_loc_list = 2
let g:syntastic_loc_list_height = 4
" * Checker options
" ** C:
let g:syntastic_c_check_header = 1
let g:syntastic_c_cflags = '-Wall -Werror -W -Wno-unused-parameter -Werror=unused-variable'
let g:syntastic_cpp_compiler_options = '-std=c++11'
" ---------------------------------------------------------------------- " ----------------------------------------------------------------------
" ALE " ALE
" ---------------------------------------------------------------------- " ----------------------------------------------------------------------
let g:ale_sign_column_always=1 let g:ale_sign_column_always=1
" ----------------------------------------------------------------------
" Clang formatter
" ----------------------------------------------------------------------
let g:clang_format#style_options = {
\ "Language": "Cpp",
\ "AccessModifierOffset": -1,
\ "ConstructorInitializerIndentWidth": 4,
\ "AlignEscapedNewlinesLeft": "true",
\ "AlignTrailingComments": "true",
\ "AllowAllParametersOfDeclarationOnNextLine": "true",
\ "AllowShortBlocksOnASingleLine": "false",
\ "AllowShortIfStatementsOnASingleLine": "false",
\ "AllowShortLoopsOnASingleLine": "false",
\ "AllowShortFunctionsOnASingleLine": "None",
\ "AlwaysBreakTemplateDeclarations": "true",
\ "AlwaysBreakBeforeMultilineStrings": "true",
\ "BreakBeforeBinaryOperators": "true",
\ "BreakBeforeTernaryOperators": "true",
\ "BreakConstructorInitializersBeforeComma": "false",
\ "BinPackParameters": "true",
\ "ColumnLimit": 100,
\ "ConstructorInitializerAllOnOneLineOrOnePerLine": "true",
\ "DerivePointerAlignment": "true",
\ "ExperimentalAutoDetectBinPacking": "false",
\ "IndentCaseLabels": "true",
\ "IndentWrappedFunctionNames": "true",
\ "IndentFunctionDeclarationAfterType": "true",
\ "MaxEmptyLinesToKeep": 1,
\ "KeepEmptyLinesAtTheStartOfBlocks": "true",
\ "NamespaceIndentation": "None",
\ "ObjCSpaceAfterProperty": "false",
\ "ObjCSpaceBeforeProtocolList": "false",
\ "PenaltyBreakBeforeFirstCallParameter": 1,
\ "PenaltyBreakComment": 300,
\ "PenaltyBreakString": 1000,
\ "PenaltyBreakFirstLessLess": 120,
\ "PenaltyExcessCharacter": 1000000,
\ "PenaltyReturnTypeOnItsOwnLine": 200,
\ "PointerAlignment": "Left",
\ "SpacesBeforeTrailingComments": 2,
\ "Cpp11BracedListStyle": "false",
\ "Standard": "Auto",
\ "IndentWidth": 4,
\ "TabWidth": 8,
\ "UseTab": "Never",
\ "BreakBeforeBraces": "Stroustrup",
\ "SpacesInParentheses": "false",
\ "SpacesInAngles": "false",
\ "SpaceInEmptyParentheses": "false",
\ "SpacesInCStyleCastParentheses": "false",
\ "SpacesInContainerLiterals": "true",
\ "SpaceBeforeAssignmentOperators": "true",
\ "ContinuationIndentWidth": 4,
\ "CommentPragmas": "^ IWYU pragma:",
\ "SpaceBeforeParens": "ControlStatements",
\ "DisableFormat": "false" }
" ----------------------------------------------------------------------
" Vim Expand Region
" ----------------------------------------------------------------------
vmap v <Plug>(expand_region_expand)
vmap <C-v> <Plug>(expand_region_shrink)
" ---------------------------------------------------------------------- " ----------------------------------------------------------------------
" Special options for Python syntax " Special options for Python syntax
" ---------------------------------------------------------------------- " ----------------------------------------------------------------------
@ -499,11 +274,6 @@ nmap <Leader><space> :TilerReorder<CR>
let g:tiler#master#size = 55 let g:tiler#master#size = 55
" ----------------------------------------------------------------------
" fzf keybinds
" ----------------------------------------------------------------------
nmap <C-p> :FZF<CR>
" ---------------------------------------------------------------------- " ----------------------------------------------------------------------
" Lastly, load configurations available only to this computer " Lastly, load configurations available only to this computer
" ---------------------------------------------------------------------- " ----------------------------------------------------------------------
Loading…
Cancel
Save