jordan
/
.dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replacing vundle with vim-plug

Browse Source
master
Jordan Orelli 6 months ago
parent 03bc022339
commit 0c8da86a51
4 changed files with 2881 additions and 73 deletions
Show Stats Download Patch File Download Diff File

12
config.ini
Unescape Escape View File

@ -24,9 +24,9 @@ files:
[home vim]
when: host.has('vim') or host.has('nvim')
files:
Vundle.vim > .vim/bundle/Vundle.vim
vim/ftplugin > .vim/ftplugin
vim/pack > .vim/pack
vim/plug.vim > .vim/autoload/plug.vim
vimrc > .vimrc
[home kitty]
@ -67,7 +67,6 @@ target_root: ~/AppData/Local
files:
nvim/lua
nvim/init.vim
Vundle.vim > nvim/bundle/Vundle.vim
[link-files neovim:linux]
when: host.is_linux and host.has('nvim')
@ -77,11 +76,6 @@ files:
nvim/lua
nvim/init.vim
[git vundle]
when: host.has('vim') or host.has('nvim')
repo: https://github.com/VundleVim/Vundle.vim.git
target: ~/.vim/bundle/Vundle.vim
[git packer-posix]
when: not host.is_windows
repo: https://github.com/wbthomason/packer.nvim
@ -92,10 +86,6 @@ when: host.is_windows
repo: https://github.com/wbthomason/packer.nvim
target: ~/AppData/Local/nvim-data/site/pack/packer/start/packer.nvim
# [run nvim-plugins]
# when: host.has('nvim')
# cmd: nvim +PluginInstall +qall
[home cargo]
when: host.has('cargo')
files: cargo-config.toml > .cargo/config.toml

4
vim/ftplugin/python.vim
Unescape Escape View File

@ -0,0 +1,4 @@
set expandtab
set shiftwidth=2
set tabstop=2
set omnifunc=ale#completion#OmniFunc

2827
vim/plug.vim
View File

File diff suppressed because it is too large Load Diff

109
vimrc
Unescape Escape View File

@ -1,69 +1,43 @@
if &compatible
set nocompatible
endif
map <F12> :source $MYVIMRC<CR>
" Plugins -------------------------------------------------------------------{{{
" set the runtime path to include Vundle and initialize
if has('nvim') && has('win32')
lua require('plugins')
set rtp+=~/AppData/Local/nvim/bundle/Vundle.vim
else
set rtp+=~/.vim/bundle/Vundle.vim
endif
" allegedly this needs to be off to load Vundle
filetype off
call vundle#begin()
" let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim'
if !has('nvim')
Plugin 'dense-analysis/ale' " asynchronous linting engine
endif
Plugin 'tpope/vim-fugitive' " integration with the git cli
Plugin 'tpope/vim-surround' " edits surrounding quotes and parens and the like
Plugin 'tpope/vim-rails' " rails project management stuff
Plugin 'tpope/vim-repeat' " fixes the . key for ...something
Plugin 'scrooloose/nerdtree' " better file navigation
" Plugin 'airblade/vim-gitgutter' " in-file git integration
Plugin 'mhinz/vim-signify'
Plugin 'slim-template/vim-slim' " what in the 2008 is this
Plugin 'kchmck/vim-coffee-script' " lol coffee script
Plugin 'fatih/vim-go' " all-in-one Go tools
Plugin 'fatih/vim-hclfmt' " nicely formats hcl files
Plugin 'nanotech/jellybeans.vim' " the best colorscheme
Plugin 'ervandew/supertab' " makes tab better apparently
Plugin 'scrooloose/nerdcommenter' " no idea if I'm even using this
Plugin 'Align' " aligns things on demand
Plugin 'ctrlpvim/ctrlp.vim' " don't actually know how to use this honestly
Plugin 'itchyny/lightline.vim' " fancy status line
Plugin 'heavenshell/vim-jsdoc' " js docs?
Plugin 'hashivim/vim-terraform' " hclfmt but for terraform
Plugin 'b4b4r07/vim-hcl' " hcl syntax stuff?
Plugin 'Glench/Vim-Jinja2-Syntax' " jinja2 syntax stuff
Plugin 'rust-lang/rust.vim' " bare minimum rust syntax stuff
Plugin 'elubow/cql-vim'
Plugin 'tikhomirov/vim-glsl'
" Past plugins
"
" Seems to break NERDTree. I dunno why. Kinda problematic since it's
" intended to improve NERDTree.
" Plugin 'Xuyuanp/nerdtree-git-plugin'
"
" Still figuring this one out. I think I hate it?
" Plugin 'neoclide/coc.nvim'
"
" this repo is gone
" Plugin 'calviken/vim-gdscript3'
"
" I'm trying ALE instead
" Plugin 'ycm-core/YouCompleteMe'
" Plugin 'prabirshrestha/vim-lsp'
" Plugin 'mattn/vim-lsp-settings'
call vundle#end() " required
call plug#begin()
" if !has('nvim')
" Plug 'dense-analysis/ale' " asynchronous linting engine
" endif
Plug 'yegappan/lsp'
Plug 'tpope/vim-fugitive' " integration with the git cli
Plug 'tpope/vim-surround' " edits surrounding quotes and parens and the like
Plug 'tpope/vim-rails' " rails project management stuff
Plug 'tpope/vim-repeat' " fixes the . key for ...something
Plug 'scrooloose/nerdtree' " better file navigation
Plug 'mhinz/vim-signify'
Plug 'slim-template/vim-slim' " what in the 2008 is this
Plug 'kchmck/vim-coffee-script' " lol coffee script
Plug 'fatih/vim-go' " all-in-one Go tools
Plug 'fatih/vim-hclfmt' " nicely formats hcl files
Plug 'nanotech/jellybeans.vim' " the best colorscheme
Plug 'ervandew/supertab' " makes tab better apparently
Plug 'scrooloose/nerdcommenter' " no idea if I'm even using this
Plug 'ctrlpvim/ctrlp.vim' " don't actually know how to use this honestly
Plug 'itchyny/lightline.vim' " fancy status line
Plug 'heavenshell/vim-jsdoc' " js docs?
Plug 'hashivim/vim-terraform' " hclfmt but for terraform
Plug 'b4b4r07/vim-hcl' " hcl syntax stuff?
Plug 'Glench/Vim-Jinja2-Syntax' " jinja2 syntax stuff
Plug 'rust-lang/rust.vim' " bare minimum rust syntax stuff
Plug 'elubow/cql-vim'
Plug 'tikhomirov/vim-glsl'
Plug 'jparise/vim-graphql'
call plug#end()
" enable the filetype plugin
filetype plugin indent on
@ -192,6 +166,7 @@ if &t_Co > 2 || has("gui_running")
" this should not do anything but it does.
set termguicolors
" jellybeans disables italics by default for some reason
let g:jellybeans_use_term_italics = 1
let g:jellybeans_overrides = {
\ 'background': { 'ctermbg': 'none', '256ctermbg': 'none' },
@ -215,15 +190,13 @@ if has("autocmd")
augroup vimrcEx
autocmd!
" Add filetype recognition for some lesser-known file types
autocmd BufNewFile,BufRead *.zig set filetype=zig
autocmd BufNewFile,BufRead *.txt set filetype=text
autocmd BufNewFile,BufRead *.gd set filetype=gdscript3
" on some machines md files are thought to be modula2
autocmd BufNewFile,BufRead *.md set filetype=markdown
autocmd BufNewFile,BufRead *.tf set filetype=terraform
" add Coloring for ChucK source
autocmd BufNewFile,BufRead *.ck set filetype=ck
@ -242,7 +215,7 @@ if has("autocmd")
autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
autocmd FileType php set omnifunc=phpcomplete#CompletePHP
autocmd FileType python set omnifunc=pythoncomplete#Complete
autocmd FileType python set omnifunc=ale#completion#OmniFunc
autocmd FileType css set omnifunc=csscomplete#CompleteCSS
autocmd FileType rust set omnifunc=ale#completion#OmniFunc
endif
@ -499,6 +472,20 @@ let g:SuperTabClosePreviewOnPopupClose = 1
" \ ]
" ---------------------------------------------------------------------------}}}
" lsp -----------------------------------------------------------------------{{{
" this is not portable at all and I hate it and dunno how to fix it yet
" call LspAddServer([#{name: 'pyright',
" \ filetype: 'python',
" \ path: '/Users/jordan.orelli/.nix-profile/bin/pyright-langserver',
" \ args: ['--stdio'],
" \ workspaceConfig: #{
" \ python: #{
" \ pythonPath: '/usr/local/bin/python3'
" \ }}
" \ }])
" ---------------------------------------------------------------------------}}}
" ALE -----------------------------------------------------------------------{{{
if !has('nvim')
let g:ale_linters = {'rust': ['analyzer']}

Write Preview
Loading…
Cancel
Save