andrew/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix changes for vim-plug installation

Browse Source
This commit is contained in:
Andrew Lee
2022-01-25 19:59:40 -07:00
parent c9113d3425
commit 7406739b4a
7 changed files with 110 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
dot_config/nvim/cmp_init.vim
View File

@@ -1,38 +1,39 @@
call plug#begin()
source $HOME/.config/nvim/templates/general_plugs.vim
" LSP resources
Plug 'neovim/nvim-lspconfig'
Plug 'williamboman/nvim-lsp-installer'
Plug 'hrsh7th/cmp-nvim-lsp'
Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/cmp-path'
Plug 'hrsh7th/cmp-cmdline'
Plug 'hrsh7th/nvim-cmp'
" For vsnip users.
Plug 'hrsh7th/cmp-vsnip'
Plug 'hrsh7th/vim-vsnip'
" For luasnip users.
" Plug 'L3MON4D3/LuaSnip'
" Plug 'saadparwaiz1/cmp_luasnip'
" For ultisnips users.
" Plug 'SirVer/ultisnips'
" Plug 'quangnguyen30192/cmp-nvim-ultisnips'
" For snippy users.
" Plug 'dcampos/nvim-snippy'
" Plug 'dcampos/cmp-snippy'
call plug#end()
source $HOME/.config/nvim/templates/general.vim
source $HOME/.config/nvim/templates/treesitter.vim
source $HOME/.config/nvim/templates/lsp_keymap.vim
" Theme
colorscheme OceanicNext
call plug#begin()
" LSP resources
Plug 'neovim/nvim-lspconfig'
Plug 'williamboman/nvim-lsp-installer'
Plug 'hrsh7th/cmp-nvim-lsp'
Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/cmp-path'
Plug 'hrsh7th/cmp-cmdline'
Plug 'hrsh7th/nvim-cmp'
" For vsnip users.
Plug 'hrsh7th/cmp-vsnip'
Plug 'hrsh7th/vim-vsnip'
" For luasnip users.
" Plug 'L3MON4D3/LuaSnip'
" Plug 'saadparwaiz1/cmp_luasnip'
" For ultisnips users.
" Plug 'SirVer/ultisnips'
" Plug 'quangnguyen30192/cmp-nvim-ultisnips'
" For snippy users.
" Plug 'dcampos/nvim-snippy'
" Plug 'dcampos/cmp-snippy'
call plug#end()
lua <<EOF
-- Setup nvim-cmp.
local cmp = require'cmp'

10
dot_config/nvim/coc_init.vim
View File

@@ -1,8 +1,12 @@
call plug#begin()
source $HOME/.config/nvim/templates/general_plugs.vim
Plug 'neoclide/coc.nvim', {'branch': 'release'}
call plug#end()
source $HOME/.config/nvim/templates/general.vim
call plug#begin()
Plug 'neoclide/coc.nvim', {'branch': 'release'}
call plug#end()
" Theme
colorscheme gruvbox
" Use tab for trigger completion with characters ahead and navigate.
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by

22
dot_config/nvim/coq_init.vim
View File

@@ -1,21 +1,21 @@
call plug#begin()
source $HOME/.config/nvim/templates/general_plugs.vim
" LSP resources
Plug 'neovim/nvim-lspconfig'
Plug 'williamboman/nvim-lsp-installer'
Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
call plug#end()
source $HOME/.config/nvim/templates/general.vim
source $HOME/.config/nvim/templates/treesitter.vim
source $HOME/.config/nvim/templates/lsp_keymap.vim
set omnifunc=v:lua.vim.lsp.omnifunc
" Theme
set background=dark
colorscheme onedark
call plug#begin()
" LSP resources
Plug 'neovim/nvim-lspconfig'
Plug 'williamboman/nvim-lsp-installer'
Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
call plug#end()
set omnifunc=v:lua.vim.lsp.omnifunc
lua << EOF
vim.g.coq_settings = {
auto_start = 'shut-up',

4
dot_config/nvim/init.vim
View File

@@ -1,4 +1,6 @@
source $HOME/.config/nvim/templates/general.vim
call plug#begin()
source $HOME/.config/nvim/templates/general.vim
call plug#end()
"Theme
colorscheme gruvbox

64
dot_config/nvim/templates/general.vim
View File

@@ -11,41 +11,15 @@ set completeopt=menu,menuone,noselect
" Set leader to comma
let mapleader=","
call plug#begin()
" Color Schemes
Plug 'rafi/awesome-vim-colorschemes'
Plug 'mhartington/oceanic-next'
Plug 'morhetz/gruvbox'
Plug 'joshdick/onedark.vim'
" Navigation
Plug 'tpope/vim-commentary'
Plug 'tpope/vim-surround'
" Commands
Plug 'vim-test/vim-test'
Plug 'skywind3000/asyncrun.vim'
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
" Extra Appearance Features
Plug 'airblade/vim-gitgutter'
Plug 'tpope/vim-fugitive'
Plug 'mhinz/vim-signify'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
" File Navigation
Plug 'ms-jpq/chadtree', {'branch': 'chad', 'do': 'python3 -m chadtree deps'}
" Vista Sidebar
Plug 'liuchengxu/vista.vim'
" Syntax Highlighting
Plug 'sheerun/vim-polyglot'
call plug#end()
" Set to open tree
nnoremap <leader><space> <cmd>CHADopen<cr>
nnoremap <leader><space> <cmd>NERDTreeToggle<cr>
" Start NERDTree when Vim is started without file arguments.
autocmd StdinReadPre * let s:std_in=1
autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif
" Close the tab if NERDTree is the only window remaining in it.
autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
" Exit Vim if NERDTree is the only window remaining in the only tab.
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
" Set to open Vista Sidebar
nnoremap ;<space> <cmd>Vista!!<cr>
@@ -151,5 +125,25 @@ endif
" Set termdebug
let g:termdebug_wide=1
lua << EOF
require'nvim-treesitter.configs'.setup {
ensure_installed = { "zig", "python", "c", "bash", "json" }, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
ignore_install = { "javascript" }, -- List of parsers to ignore installing
highlight = {
enable = true, -- false will disable the whole extension
-- disable = { "c", "rust" }, -- list of language that will be disabled
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-- Using this option may slow down your editor, and you may see some duplicate highlights.
-- Instead of true it can also be a list of languages
additional_vim_regex_highlighting = false,
},
}
nnoremap <D-v> "+p
EOF
" Specific Local config
if filereadable($HOME . "/.config/nvim/templates/general.vim.local")
source ~/.config/nvim/templates/general.vim.local
endif

30
dot_config/nvim/templates/general_plugs.vim Normal file
View File

@@ -0,0 +1,30 @@
" Color Schemes
Plug 'rafi/awesome-vim-colorschemes'
Plug 'mhartington/oceanic-next'
Plug 'morhetz/gruvbox'
Plug 'joshdick/onedark.vim'
" Navigation
Plug 'tpope/vim-commentary'
Plug 'tpope/vim-surround'
" Commands
Plug 'vim-test/vim-test'
Plug 'skywind3000/asyncrun.vim'
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
" Extra Appearance Features
Plug 'airblade/vim-gitgutter'
Plug 'tpope/vim-fugitive'
Plug 'mhinz/vim-signify'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
" File Navigation
Plug 'preservim/nerdtree'
" Vista Sidebar
Plug 'liuchengxu/vista.vim'
" Syntax Highlighting
Plug 'sheerun/vim-polyglot'
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " We recommend updating the parsers on update

23
dot_config/nvim/templates/treesitter.vim
View File

@@ -1,23 +0,0 @@
call plug#begin()
" Highlighting
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " We recommend updating the parsers on update
call plug#end()
lua << EOF
require'nvim-treesitter.configs'.setup {
ensure_installed = { "zig", "python", "c", "bash", "json" }, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
ignore_install = { "javascript" }, -- List of parsers to ignore installing
highlight = {
enable = true, -- false will disable the whole extension
-- disable = { "c", "rust" }, -- list of language that will be disabled
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-- Using this option may slow down your editor, and you may see some duplicate highlights.
-- Instead of true it can also be a list of languages
additional_vim_regex_highlighting = false,
},
}
EOF