kevin/darkcloud-nvimconfig
1
0
Fork 0
mirror of https://github.com/prurigro/darkcloud-nvimconfig.git synced 2024-11-23 20:14:11 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: kevin:a816ebe15cfa10d6b60ac5084f0a1a32ba60938b
Branches Tags
kevin:master
...
compare: kevin:a8abf099112ef3122cf2588aba7e7f2744586b33
Branches Tags
kevin:master

7 commits
a816ebe15c ... a8abf09911

Author SHA1 Message Date
Kevin MacMartin
a8abf09911 Adjust treesitter scss a bit more 2024-03-28 18:26:08 -04:00
Kevin MacMartin
ca8553d777 Remove the split 33% and 66% stuff as it's really not that useful, remove the binding that had ~ run :TCommand as this is no longer included, and rather than having <space><space> toggle folding and fold the current point, use ~ to toggle folds without closing any of them (at which point normal bindings or the mouse can be used) 2024-03-28 17:44:30 -04:00
Kevin MacMartin
23f3293b9b Disable the treesitter parser for markdown 2024-03-28 17:42:55 -04:00
Kevin MacMartin
5ad59fcb54 Use cGray4 instead of cBlue for non-characters so tabs don't stand out quite so much 2024-03-28 16:35:46 -04:00
Kevin MacMartin
e64b390560 Update submodules 2024-03-28 16:32:08 -04:00
Kevin MacMartin
07f017f257 Remove a few more treesitter styles that were causing weird issues (partial matches of placeholder names) from scss 2024-03-28 16:30:23 -04:00
Kevin MacMartin
5f9424bbd4 Blacklist treesitter parsers rather than whitelist them (though keep the ensure_installed list), add go to the ensure_installed list, disable the gitcommit parser, combine the semi-broken scss parser with its regex, update the scss colors they basically match with and without treesitter but look a bit better with treesitter (thanks to some granularity it offers), and sort colors in their respective lists alphabetically 2024-03-28 16:25:45 -04:00
12 changed files with 76 additions and 109 deletions
Show stats Expand all files Collapse all files

7
readme.md
View file

@ -64,6 +64,8 @@ A theme, config and collection of plugins for Neovim
### Keyboard
A more complete list of key bindings exists at the top of `vim/config/keyboard.vim`
#### Sidebars
| Binding | Mode | Action |
@ -76,14 +78,13 @@ A theme, config and collection of plugins for Neovim
| Binding | Mode | Action |
|-----------------|------|-------------------------------------------------|
| ~ | N | Popup a command list dialog |
| \` | N | Toggle gutter (left bar with line numbers, etc) |
| ~ | N | Toggle code the code folding sidebar |
| | | |
| F1 | ALL | Toggle line wrapping |
| F2 | ALL | Toggle highlighting of spelling mistakes |
| F3 | ALL | Toggle external-paste mode |
| F4 | ALL | Toggle source code syntax checking |
| | | |
| \` | N | Toggle gutter (left bar with line numbers etc.) |
#### Spell Check

2
vim/bundle/ale

@ -1 +1 @@
Subproject commit 712b4b3a9714ff58a5c0798c7b6e0ecf7c59857d
Subproject commit 6c10a519f1460179cf8f8e329d8eb3186247be2b

2
vim/bundle/cmp-async-path

@ -1 +1 @@
Subproject commit 46714d1bed484be0d5ac7d1b078ad4be0f1a7efa
Subproject commit 7df7f3721c45aac26b6e0474087538f4681c9c7a

2
vim/bundle/nvim-cmp

@ -1 +1 @@
Subproject commit 04e0ca376d6abdbfc8b52180f8ea236cbfddf782
Subproject commit 97dc716fc914c46577a4f254035ebef1aa72558a

2
vim/bundle/nvim-treesitter

@ -1 +1 @@
Subproject commit 03f650705c0c10f97b214ca4ecca3c25ff9bee7d
Subproject commit 23ba63028c6acca29be6462c0a291fc4a1b9eae8

2
vim/bundle/nvim-ts-context-commentstring

@ -1 +1 @@
Subproject commit 7ab799a9792f7cf3883cf28c6a00ad431f3d382a
Subproject commit 734ebad31c81c6198dfe102aa23280937c937c42

2
vim/bundle/vim-fugitive

@ -1 +1 @@
Subproject commit 8d4e8d45385c63a0bf735fe1164772116bf0da0d
Subproject commit 2377e16e6641418565b934990cf49068855987c6

2
vim/bundle/vim-polyglot-darkcloud

@ -1 +1 @@
Subproject commit d54a9087879ed813801041d3d51d70987c502796
Subproject commit 73c7b32a01f8add4ca28b22ec696d931703c7ddb

83
vim/colors/darkcloud.vim
View file

@ -51,8 +51,8 @@ endfun
"SPELL CHECKING UNDERLINE: {{{
call s:C("SpellBad",g:cRed,"","italic,undercurl")
call s:C("SpellCap",g:cYellow,"","italic,undercurl")
call s:C("SpellRare","","","")
call s:C("SpellLocal","","","")
call s:C("SpellRare","","","")
"}}}
"CORE: {{{
@ -63,13 +63,13 @@ endfun
call s:C("Cursor","",g:cDarkBg,"standout")
if &term != "linux"
call s:C("CursorLineNr",g:cBlue,g:cLightBg,"bold")
call s:C("CursorColumn","",g:cLightBg,"")
call s:C("CursorLine","",g:cLightBg,"")
call s:C("CursorLineNr",g:cBlue,g:cLightBg,"bold")
else
call s:C("CursorLineNr",g:cBlue,"","bold")
call s:C("CursorColumn","","","")
call s:C("CursorLine","","","")
call s:C("CursorLineNr",g:cBlue,"","bold")
end
"line number
@ -94,10 +94,10 @@ endfun
"search
call s:C("Search","","","standout")
hi! link IncSearch Search
hi! link IncSearchCursor IncSearch
hi! link IncSearchMatch Search
hi! link IncSearchMatchReverse Search
hi! link IncSearchOnCursor IncSearch
hi! link IncSearchCursor IncSearch
"quickfix
call s:C("QuickFixLine","","","bold,underline")
@ -105,12 +105,12 @@ endfun
"status line
call s:C("StatusLine","",g:cLightBg,"")
hi! link StatusLineNC StatusLine
call s:C("WildMenu",g:cGray1,g:cLightBg,"")
hi! link StatusLineNC StatusLine
"folding
call s:C("Folded",g:cBlue,g:cLightBg,"bold")
call s:C("FoldColumn",g:cWhite,"","bold")
call s:C("Folded",g:cBlue,g:cLightBg,"bold")
call s:C("SignColumn",g:cRed,"","bold")
hi! link ColorColumn SignColumn
@ -125,7 +125,7 @@ endfun
call s:C("Identifier",g:cBlue,"","bold")
call s:C("Keyword",g:cBlue,"","bold")
call s:C("Label",g:cRed,"","")
call s:C("NonText",g:cBlue,"","")
call s:C("NonText",g:cGray4,"","")
call s:C("Number",g:cRed,"","bold")
call s:C("Operator",g:cRed,"","")
call s:C("PreProc",g:cYellow,"","")
@ -150,8 +150,8 @@ endfun
"errors
call s:C("Error",g:cRed,g:cBlack,"standout")
hi! link WarningMsg Error
hi! link ErrorMsg Error
hi! link WarningMsg Error
"vimdiff
call s:C("DiffAdd",g:cYellow,"","standout")
@ -172,22 +172,24 @@ endfun
"css/sass
call s:C("cssBraces",g:cBlue,"","")
call s:C("sassDefinition",g:cGray2,"","bold")
call s:C("cssValueNumber",g:cYellow,"","bold")
call s:C("sassAmpersand",g:cBlue,"","bold")
call s:C("sassClassChar",g:cYellow,"","bold")
call s:C("sassClass",g:cGray1,"","bold")
call s:C("sassClassChar",g:cBlue,"","bold")
call s:C("sassDefinition",g:cGray2,"","bold")
"diff
call s:C("diffIndexLine",g:cGray2,"","italic")
call s:C("diffOldFile",g:cYellow,"","italic")
call s:C("diffNewFile",g:cBlue,"","italic")
call s:C("diffOldFile",g:cYellow,"","italic")
"dosini
hi! link dosiniLabel Function
"gitcommit
call s:C("gitcommitFile",g:cRed,"","")
call s:C("gitcommitSummary",g:cWhite,"","")
call s:C("gitcommitType",g:cBlue,"","")
call s:C("gitcommitFile",g:cRed,"","")
"html
call s:C("htmlArg",g:cRed,"","bold")
@ -203,20 +205,20 @@ endfun
call s:C("htmlTagName",g:cYellow,"","bold")
"javaScript
call s:C("jsBracket",g:cYellow,"","bold")
call s:C("jsExport",g:cRed,"","bold")
call s:C("jsFrom",g:cRed,"","bold")
call s:C("jsFuncBlock",g:cBlue,"","")
call s:C("jsImport",g:cRed,"","bold")
call s:C("jsModuleKeyword",g:cYellow,"","bold")
call s:C("jsFrom",g:cRed,"","bold")
call s:C("jsExport",g:cRed,"","bold")
call s:C("jsFuncBlock",g:cBlue,"","")
call s:C("jsObjectKey",g:cBlue,"","")
call s:C("jsObjectProp",g:cBlue,"","")
call s:C("jsBracket",g:cYellow,"","bold")
call s:C("jsReturn",g:cRed,"","bold")
hi! link jsBraces Delimiter
hi! link jsParens Delimiter
hi! link jsDomElemAttrs jsSpecial
hi! link jsDomElemFuncs jsFunction
hi! link jsHtmlEvents jsSpecial
hi! link jsParens Delimiter
"json
autocmd BufEnter,FileType json hi! link Label Constant
@ -256,8 +258,8 @@ endfun
hi! link rubySharpBang Comment
"sh
call s:C("shVariable",g:cBlue,"","bold")
call s:C("shAlias",g:cBlue,"","bold")
call s:C("shVariable",g:cBlue,"","bold")
"systemd unit files
hi! link sdBindIPv6 sdValue
@ -320,18 +322,18 @@ endfun
call s:C("@danger",g:cRed,"","bold")
call s:C("@error",g:cRed,"","bold")
call s:C("@exception",g:cRed,"","")
call s:C("@field",g:cBlue,"","italic")
call s:C("@float",g:cYellow,"","bold")
call s:C("@function",g:cGray2,"","bold")
call s:C("@function.call",g:cGray2,"","bold")
call s:C("@function.method",g:cGray2,"","bold")
call s:C("@function.builtin",g:cYellow,"","")
call s:C("@function.call",g:cGray2,"","bold")
call s:C("@function.macro",g:cGray2,"","italic")
call s:C("@field",g:cBlue,"","italic")
call s:C("@function.method",g:cGray2,"","bold")
call s:C("@include",g:cBlue,"","bold")
call s:C("@keyword",g:cRed,"","bold")
call s:C("@keyword.directive",g:cGray3,"","italic")
call s:C("@keyword.function",g:cBlue,"","bold")
call s:C("@keyword.import",g:cYellow,"","bold")
call s:C("@keyword.directive",g:cGray3,"","italic")
call s:C("@label",g:cWhite,"","")
call s:C("@namespace",g:cGray2,"","")
call s:C("@none",g:cWhite,"","")
@ -366,8 +368,8 @@ endfun
call s:C("@type",g:cBlue,"","bold")
call s:C("@type.qualifier",g:cYellow,"","bold")
call s:C("@variable",g:cBlue,"","")
call s:C("@variable.member",g:cBlue,"","bold")
call s:C("@variable.builtin",g:cYellow,"","bold")
call s:C("@variable.member",g:cBlue,"","bold")
call s:C("@variable.parameter",g:cYellow,"","")
call s:C("@warning",g:cRed,"","")
hi! link @annotation @comment
@ -377,29 +379,36 @@ endfun
hi! link @note @comment
"css
call s:C("@function.css",g:cWhite,"","")
call s:C("@keyword.directive.css",g:cYellow,"","")
call s:C("@function.css",g:cGray1,"","")
call s:C("@tag.css",g:cYellow,"","")
call s:C("@number.css",g:cYellow,"","bold")
call s:C("@number.float.css",g:cYellow,"","bold")
call s:C("@property.css",g:cRed,"","bold")
call s:C("@variable.css",g:cBlue,"","bold")
call s:C("@number.css",g:cWhite,"","bold")
call s:C("@number.float.css",g:cWhite,"","bold")
call s:C("@type.css",g:cRed,"","bold")
call s:C("@punctuation.delimiter.css",g:cGray2,"","")
call s:C("@tag.css",g:cYellow,"","")
call s:C("@type.css",g:cRed,"","bold")
call s:C("@variable.css",g:cBlue,"","")
hi! link @punctuation.bracket.css @punctuation.delimiter.css
"scss
hi! link @keyword.directive.scss @keyword.directive.css
call s:C("@attribute.scss","","","")
call s:C("@character.special.scss",g:cBlue,"","bold")
call s:C("@keyword.import.scss","","","")
call s:C("@keyword.operator.scss","","","")
call s:C("@keyword.scss","","","")
call s:C("@operator.scss","","","")
call s:C("@punctuation.bracket.scss","","","")
call s:C("@punctuation.delimiter.scss","","","")
call s:C("@string.scss","","","")
call s:C("@tag.scss","","","")
call s:C("@type.scss",g:cGray1,"","bold")
call s:C("@variable.parameter.scss","","","")
hi! link @function.scss @function.css
hi! link @tag.scss @tag.css
hi! link @keyword.directive.scss @keyword.directive.css
hi! link @number.float.scss @number.float.css
hi! link @number.scss @number.css
hi! link @property.scss @property.css
hi! link @variable.scss @variable.css
hi! link @variable.parameter.scss @variable.css
hi! link @number.scss @number.css
hi! link @number.float.scss @number.float.css
hi! link @type.scss @type.css
hi! link @punctuation.delimiter.scss @punctuation.delimiter.css
hi! link @punctuation.bracket.scss @punctuation.delimiter.css
endif
"}}}

37
vim/config/keyboard.vim
View file

@ -41,14 +41,12 @@
" <Ctrl-t> | (N) -> open a new tab
"
" (split)
" <Ctrl-w>] | (N) -> split vertically
" <Ctrl-w>[ | (N) -> split horizontally
"
" (rotate)
" <Ctrl-w>{ | (N) -> rotate counter-clockwise
" <Ctrl-w>} | (N) -> rotate clockwise
" <Ctrl-w>] | (N) -> split vertically
" <Ctrl-w>0 | (N) -> create a vertical split 33% of the window
" <Ctrl-w>) | (N) -> create a vertical split 66% of the window
" <Ctrl-w>[ | (N) -> split horizontally
" <Ctrl-w>9 | (N) -> create a horizontal split 33% of the window
" <Ctrl-w>( | (N) -> create a horizontal split 66% of the window
"
" (display)
" <Backspace> | (N) -> reset window and clear search
@ -64,11 +62,8 @@
" ik | (N) -> add cursor character as a keyword
" iK | (N) -> remove cursor character as a keyword
"
" ~ | (N) -> pop-up a command reference
" <Leader><F1> | (N) -> toggle the vim reference manual
" ` | (A) -> toggle the gutter(numbers+folds+signify)
"
" <Space><Space> | (N) -> toggle selected fold
" ` | (N) -> toggle the gutter
" ~ | (N) -> toggle folds
"
" <F1> | (A) -> toggle line wrapping
" <F2> | (A) -> toggle spell check
@ -335,14 +330,13 @@
"}
"SPLIT:{
nmap <expr><silent> <C-w>] ':vs<CR>'
nmap <expr><silent> <C-w>[ ':sp<CR>:wincmd j<CR>'
"}
"ROTATE:{
nmap <expr><silent> <C-w>{ ':wincmd R<CR>'
nmap <expr><silent> <C-w>} ':wincmd r<CR>'
nmap <expr><silent> <C-w>] ':vs<CR>'
nmap <expr><silent> <C-w>0 ':VS33<CR>'
nmap <expr><silent> <C-w>) ':VS66<CR>'
nmap <expr><silent> <C-w>[ ':sp<CR>:wincmd j<CR>'
nmap <expr><silent> <C-w>9 ':SP33<CR>'
nmap <expr><silent> <C-w>( ':SP66<CR>'
"}
"DISPLAY:{
@ -365,14 +359,11 @@
nmap <expr><silent> <Leader>k ':execute "setlocal iskeyword+=".getline(".")[col(".")-1]<CR>:echo "The character ".getline(".")[col(".")-1]." has been added to iskeyword"<CR>'
nmap <expr><silent> <Leader>K ':execute "setlocal iskeyword-=".getline(".")[col(".")-1]<CR>:echo "The character ".getline(".")[col(".")-1]." has been removed from iskeyword"<CR>'
"toggle the command reference box
nnoremap <silent><expr> ~ ':TCommand<CR>'
"toggle the display of the left gutter
"toggle the gutter
nnoremap <silent><expr> ` ':if (&number)<Bar>set nonumber<Bar>if exists("b:sy")<Bar>SignifyDisable<Bar>endif<Bar>else<Bar>set number<Bar>if exists("b:sy")<Bar>SignifyEnable<Bar>endif<Bar>endif<CR>:echo "gutter visibility toggled"<CR>'
"toggle folded code at fold-points
nnoremap <Space><Space> za
"toggle the fold sidebar
nnoremap ~ zRzi
"toggle line wrapping (and bottom bar if using the gui)
nnoremap <silent><expr> <F1> ':set wrap!<CR>:echo "line wrapping toggled"<CR>'

10
vim/config/plugins/nvim-treesitter.lua
View file

@ -10,15 +10,15 @@ if (vim.g.enabletreesitter == 1) then
vim.opt.runtimepath:append(parser_dir)
require("nvim-treesitter.configs").setup({
ensure_installed = { "bash", "c", "cpp", "css", "git_config", "html", "java", "javascript", "json", "lua", "php", "python", "query", "rust", "toml", "typescript", "vim", "vue" },
sync_install = false,
auto_install = false,
ensure_installed = { "bash", "c", "cpp", "css", "git_config", "go", "html", "java", "javascript", "json", "lua", "php", "python", "query", "rust", "toml", "typescript", "vim", "vimdoc", "vue" },
sync_install = true,
auto_install = true,
parser_install_dir = parser_dir,
highlight = {
enable = true,
disable = {},
additional_vim_regex_highlighting = false,
disable = { "gitcommit", "markdown" },
additional_vim_regex_highlighting = { "scss" },
},
textobjects = {

34
vim/config/settings.vim
View file

@ -128,40 +128,6 @@
autocmd!
autocmd BufFilePost * filetype detect
augroup END
"functions to create a split using 33% and 66% of the height
function s:SPResize33()
sp|wincmd =|q
endfunction
function s:sp33()
sp|call s:SPResize33()|wincmd j
endfunction
command! -buffer SP33 call s:sp33()
function s:sp66()
sp|wincmd j|call s:SPResize33()
endfunction
command! -buffer SP66 call s:sp66()
"functions to create a vertical split using 33% and 66% width
function s:VSResize66()
vs|wincmd =|q
endfunction
function s:vs66()
vs|call s:VSResize66()
endfunction
command! -buffer VS66 call s:vs66()
function s:vs33()
vs|wincmd h|call s:VSResize66()|wincmd l
endfunction
command! -buffer VS33 call s:vs33()
"}}}
"}}}
"}}}