mirror of
https://github.com/prurigro/darkcloud-nvimconfig.git
synced 2024-11-24 04:21:26 -05:00
Compare commits
No commits in common. "0c8b46b80392ec4aebe45d8440521375bfa2fafc" and "7fa989a986e8e564039a81fed298b55166a0d88d" have entirely different histories.
0c8b46b803
...
7fa989a986
11 changed files with 14 additions and 60 deletions
6
.gitmodules
vendored
6
.gitmodules
vendored
|
@ -7,6 +7,9 @@
|
||||||
[submodule "vim/bundle/lightline.vim"]
|
[submodule "vim/bundle/lightline.vim"]
|
||||||
path = vim/bundle/lightline.vim
|
path = vim/bundle/lightline.vim
|
||||||
url = https://github.com/itchyny/lightline.vim
|
url = https://github.com/itchyny/lightline.vim
|
||||||
|
[submodule "vim/bundle/vim-togglelist"]
|
||||||
|
path = vim/bundle/vim-togglelist
|
||||||
|
url = https://github.com/milkypostman/vim-togglelist.git
|
||||||
[submodule "vim/bundle/vim-fugitive"]
|
[submodule "vim/bundle/vim-fugitive"]
|
||||||
path = vim/bundle/vim-fugitive
|
path = vim/bundle/vim-fugitive
|
||||||
url = https://github.com/tpope/vim-fugitive.git
|
url = https://github.com/tpope/vim-fugitive.git
|
||||||
|
@ -85,6 +88,3 @@
|
||||||
[submodule "vim/bundle/vista.vim"]
|
[submodule "vim/bundle/vista.vim"]
|
||||||
path = vim/bundle/vista.vim
|
path = vim/bundle/vista.vim
|
||||||
url = https://github.com/liuchengxu/vista.vim
|
url = https://github.com/liuchengxu/vista.vim
|
||||||
[submodule "vim/bundle/qf.nvim"]
|
|
||||||
path = vim/bundle/qf.nvim
|
|
||||||
url = https://github.com/ten3roberts/qf.nvim
|
|
||||||
|
|
|
@ -130,7 +130,6 @@ For a complete list of mappings specific to **darkcloud-nvimconfig**, check the
|
||||||
* [nvim-surround](https://github.com/kylechui/nvim-surround): Add/change/delete surrounding delimiter pairs with ease
|
* [nvim-surround](https://github.com/kylechui/nvim-surround): Add/change/delete surrounding delimiter pairs with ease
|
||||||
* [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter): Treesitter configurations and abstraction layer for Neovim
|
* [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter): Treesitter configurations and abstraction layer for Neovim
|
||||||
* [nvim-treesitter-textobjects](https://github.com/nvim-treesitter/nvim-treesitter-textobjects): Syntax aware text-objects, select, move, swap, and peek support
|
* [nvim-treesitter-textobjects](https://github.com/nvim-treesitter/nvim-treesitter-textobjects): Syntax aware text-objects, select, move, swap, and peek support
|
||||||
* [qf.nvim](https://github.com/ten3roberts/qf.nvim): Extends the default quickfix and location lists for neovim
|
|
||||||
* [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWithRegister): Replace text with the contents of a register (for paste+replace without writing over the buffer)
|
* [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWithRegister): Replace text with the contents of a register (for paste+replace without writing over the buffer)
|
||||||
* [splitjoin.vim](https://github.com/AndrewRadev/splitjoin.vim): Simplifies the transition between multiline and single-line code
|
* [splitjoin.vim](https://github.com/AndrewRadev/splitjoin.vim): Simplifies the transition between multiline and single-line code
|
||||||
* [tabular](https://github.com/godlygeek/tabular): Vim script for text filtering and alignment
|
* [tabular](https://github.com/godlygeek/tabular): Vim script for text filtering and alignment
|
||||||
|
@ -140,6 +139,7 @@ For a complete list of mappings specific to **darkcloud-nvimconfig**, check the
|
||||||
* [vim-pathogen](https://github.com/tpope/vim-pathogen): A plugin to load other plugins while keeping them isolated in their own directory structure rather than all dumped together
|
* [vim-pathogen](https://github.com/tpope/vim-pathogen): A plugin to load other plugins while keeping them isolated in their own directory structure rather than all dumped together
|
||||||
* [vim-polyglot-darkcloud](https://github.com/prurigro/vim-polyglot-darkcloud): The darkcloud-nvimconfig fork of a meta-package that attempts to provide the best syntax plugins for each file type
|
* [vim-polyglot-darkcloud](https://github.com/prurigro/vim-polyglot-darkcloud): The darkcloud-nvimconfig fork of a meta-package that attempts to provide the best syntax plugins for each file type
|
||||||
* [vim-signify](https://github.com/mhinz/vim-signify): When a version controlled file is changed, this displays a column showing where and how, and allows for navigation to and between differences
|
* [vim-signify](https://github.com/mhinz/vim-signify): When a version controlled file is changed, this displays a column showing where and how, and allows for navigation to and between differences
|
||||||
|
* [vim-togglelist](https://github.com/milkypostman/vim-togglelist): A simple plugin for vim that allows you to bind a key to toggle the Location List and the Quickfix List
|
||||||
* [vim-trailing-whitespace](https://github.com/bronson/vim-trailing-whitespace): Highlights and allows for the easy removal of trailing whitespace in documents
|
* [vim-trailing-whitespace](https://github.com/bronson/vim-trailing-whitespace): Highlights and allows for the easy removal of trailing whitespace in documents
|
||||||
* [vista.vim](https://github.com/liuchengxu/vista.vim): Viewer & Finder for LSP symbols and tags
|
* [vista.vim](https://github.com/liuchengxu/vista.vim): Viewer & Finder for LSP symbols and tags
|
||||||
|
|
||||||
|
|
6
update
6
update
|
@ -272,16 +272,16 @@ fi
|
||||||
# GENERATE PLUGIN HELP
|
# GENERATE PLUGIN HELP
|
||||||
#
|
#
|
||||||
|
|
||||||
type -P nvim >/dev/null && {
|
type -P vim >/dev/null && {
|
||||||
printf '%s' "$cbg_blue >> Generating plugin help:$c_reset"
|
printf '%s' "$cbg_blue >> Generating plugin help:$c_reset"
|
||||||
$timeout_command --preserve-status --foreground 1m nvim -c 'helptags ALL|qa!'
|
$timeout_command --preserve-status --foreground 1m nvim -c 'Helptags|qa!'
|
||||||
|
|
||||||
if (( ! $? )); then
|
if (( ! $? )); then
|
||||||
printf '%s\n' "$cfg_green_bold SUCCESS! $c_reset"
|
printf '%s\n' "$cfg_green_bold SUCCESS! $c_reset"
|
||||||
else
|
else
|
||||||
reset -I
|
reset -I
|
||||||
printf '%s\n' "$cfg_red_bold FAIL! $c_reset"
|
printf '%s\n' "$cfg_red_bold FAIL! $c_reset"
|
||||||
error "nvim -c 'helptags ALL|qa!'" 'Generating helpdocs for the submodules failed'
|
error "nvim -c 'Helptags|qa!'" 'Generating helpdocs for the submodules failed'
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 831f7393400935fadb1e762009ff3bd11d9fbe3b
|
Subproject commit 4d132b3ffa5c42c882fccdf970ddb3f0063ee599
|
|
@ -1 +1 @@
|
||||||
Subproject commit 35c1a32b267c969a024ef651c8a25d7ff9018d22
|
Subproject commit 488bec03254207b1dd071be8cb1fb78434b6e777
|
|
@ -1 +1 @@
|
||||||
Subproject commit d2a4ffc22d9d38d44edb73da007b3cf43451e9b4
|
Subproject commit b7a0bfa3e93697ca5b61b15df633404bf8f45883
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit e7db62a4ec814c12585c0c8262d3304000a1af2e
|
|
1
vim/bundle/vim-togglelist
Submodule
1
vim/bundle/vim-togglelist
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 48f0d30292efdf20edc883e61b121e6123e03df7
|
|
@ -154,9 +154,6 @@
|
||||||
" >> | (N) -> next difference (vimdiff/signify)
|
" >> | (N) -> next difference (vimdiff/signify)
|
||||||
" << | (N) -> previous difference (vimdiff/signify)
|
" << | (N) -> previous difference (vimdiff/signify)
|
||||||
"
|
"
|
||||||
" [[ | (N) -> jump to previous issue in the location list (qf.nvim)
|
|
||||||
" ]] | (N) -> jump to the next issue in the location list (qf.nvim)
|
|
||||||
"
|
|
||||||
" (selection)
|
" (selection)
|
||||||
" <Ctrl-a> | (N) -> select all text
|
" <Ctrl-a> | (N) -> select all text
|
||||||
" <Ctrl-a> | (V) -> select all text
|
" <Ctrl-a> | (V) -> select all text
|
||||||
|
@ -418,7 +415,7 @@
|
||||||
nnoremap <silent><expr> <Leader>] ':Vista!!<CR>'
|
nnoremap <silent><expr> <Leader>] ':Vista!!<CR>'
|
||||||
|
|
||||||
"toggle the location list
|
"toggle the location list
|
||||||
nnoremap <Leader><Leader> <cmd>lua require('qf').toggle('l', false)<CR>
|
nnoremap <silent><expr> <Leader><Leader> ':call ToggleLocationList()<CR>'
|
||||||
"}
|
"}
|
||||||
|
|
||||||
"SPELLCHECK:{
|
"SPELLCHECK:{
|
||||||
|
@ -545,10 +542,6 @@
|
||||||
nmap [g <plug>(signify-prev-hunk)
|
nmap [g <plug>(signify-prev-hunk)
|
||||||
nmap >> ]g
|
nmap >> ]g
|
||||||
nmap << [g
|
nmap << [g
|
||||||
|
|
||||||
"jump to the previous and next issues in the location list
|
|
||||||
nnoremap [[ <cmd>lua require('qf').above('l')<CR>
|
|
||||||
nnoremap ]] <cmd>lua require('qf').below('l')<CR>
|
|
||||||
"}
|
"}
|
||||||
|
|
||||||
"SELECTION:{
|
"SELECTION:{
|
||||||
|
@ -583,7 +576,7 @@
|
||||||
autocmd FileType qf map <buffer> h k
|
autocmd FileType qf map <buffer> h k
|
||||||
autocmd FileType qf map <buffer> <2-LeftMouse> <CR>
|
autocmd FileType qf map <buffer> <2-LeftMouse> <CR>
|
||||||
autocmd FileType qf map <buffer> <Space> <CR><C-w>p
|
autocmd FileType qf map <buffer> <Space> <CR><C-w>p
|
||||||
autocmd FileType qf map <buffer> <silent><expr> q ':q<CR>'
|
autocmd FileType qf if getwininfo(win_getid())[0]['loclist'] == 0|map <buffer> <silent><expr> q ':call ToggleQuickfixList()<CR>'|else|map <buffer> <silent><expr> q ':call ToggleLocationList()<CR>'|endif
|
||||||
|
|
||||||
"vimdiff
|
"vimdiff
|
||||||
autocmd FilterWritePre * if &diff|nmap <buffer> <silent><expr> <Leader><> ':diffu<CR>'|endif
|
autocmd FilterWritePre * if &diff|nmap <buffer> <silent><expr> <Leader><> ':diffu<CR>'|endif
|
||||||
|
|
|
@ -1,39 +0,0 @@
|
||||||
require("qf").setup {
|
|
||||||
-- Location list configuration
|
|
||||||
l = {
|
|
||||||
auto_close = true, -- Automatically close location/quickfix list if empty
|
|
||||||
auto_follow = 'prev', -- Follow current entry, possible values: prev,next,nearest, or false to disable
|
|
||||||
auto_follow_limit = 8, -- Do not follow if entry is further away than x lines
|
|
||||||
follow_slow = true, -- Only follow on CursorHold
|
|
||||||
auto_open = false, -- Automatically open list on QuickFixCmdPost
|
|
||||||
auto_resize = true, -- Auto resize and shrink location list if less than `max_height`
|
|
||||||
max_height = 12, -- Maximum height of location/quickfix list
|
|
||||||
min_height = 5, -- Minimum height of location/quickfix list
|
|
||||||
wide = true, -- Open list at the very bottom of the screen, stretching the whole width.
|
|
||||||
number = false, -- Show line numbers in list
|
|
||||||
relativenumber = false, -- Show relative line numbers in list
|
|
||||||
unfocus_close = false, -- Close list when window loses focus
|
|
||||||
focus_open = false, -- Auto open list on window focus if it contains items
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Quickfix list configuration
|
|
||||||
c = {
|
|
||||||
auto_close = true, -- Automatically close location/quickfix list if empty
|
|
||||||
auto_follow = 'prev', -- Follow current entry, possible values: prev,next,nearest, or false to disable
|
|
||||||
auto_follow_limit = 8, -- Do not follow if entry is further away than x lines
|
|
||||||
follow_slow = true, -- Only follow on CursorHold
|
|
||||||
auto_open = false, -- Automatically open list on QuickFixCmdPost
|
|
||||||
auto_resize = true, -- Auto resize and shrink location list if less than `max_height`
|
|
||||||
max_height = 12, -- Maximum height of location/quickfix list
|
|
||||||
min_height = 5, -- Minimum height of location/quickfix list
|
|
||||||
wide = true, -- Open list at the very bottom of the screen, stretching the whole width.
|
|
||||||
number = false, -- Show line numbers in list
|
|
||||||
relativenumber = false, -- Show relative line numbers in list
|
|
||||||
unfocus_close = false, -- Close list when window loses focus
|
|
||||||
focus_open = false, -- Auto open list on window focus if it contains items
|
|
||||||
},
|
|
||||||
|
|
||||||
close_other = false, -- Close location list when quickfix list opens
|
|
||||||
pretty = false, -- Pretty print quickfix lists
|
|
||||||
silent = true, -- Suppress messages like "(1 of 3): *line content*" on jump
|
|
||||||
}
|
|
|
@ -99,7 +99,7 @@
|
||||||
set history=250 "size of the undo history
|
set history=250 "size of the undo history
|
||||||
set whichwrap=b,s,<,>,[,] "scrolling left/right off current line wraps to the next/previous
|
set whichwrap=b,s,<,>,[,] "scrolling left/right off current line wraps to the next/previous
|
||||||
set smarttab expandtab autoindent tabstop=4 shiftwidth=4 "configure tabs
|
set smarttab expandtab autoindent tabstop=4 shiftwidth=4 "configure tabs
|
||||||
set hlsearch incsearch smartcase "configure how search behaves
|
set hlsearch incsearch ignorecase smartcase "configure how search behaves
|
||||||
set timeout timeoutlen=500 "how long before timing out for mappings
|
set timeout timeoutlen=500 "how long before timing out for mappings
|
||||||
set ttimeout ttimeoutlen=100 "how long before timing out for terminal key codes
|
set ttimeout ttimeoutlen=100 "how long before timing out for terminal key codes
|
||||||
set nomodeline "disable the use of file-based modelines as these are insecure
|
set nomodeline "disable the use of file-based modelines as these are insecure
|
||||||
|
|
Loading…
Reference in a new issue