Update submodules

readme.md

@@ -18,9 +18,9 @@ A theme, config and collection of plugins for Neovim
 ## Distribution Features
 
 * **Default Configuration**: A complete set of defaults, focusing on the most modern settings that still provide a compatible experience
-* **Custom theme**: An original colour scheme with explicit values set to optimize the look of individual filetypes
+* **Custom theme**: An original colour scheme with explicit values set to optimize the look of individual file types
 * **Key Bindings/Aliases**: A set of bindings and aliases defined to group similar features and provide numerous (and sometimes more familiar) ways to access options
-* **Plugins**: A set of plugins have been included and configured to provide support for most normally-unsupported filetypes, and a set of features useful when using Vim as an editor
+* **Plugins**: A set of plugins have been included and configured to provide support for most normally-unsupported file types, and a set of features useful when using Vim as an editor
 * **Custom Configuration**: A second vimrc and bundle folder are included that aren't maintained as part of the repo, making custom plugins and configuration easy to add
 
 ## Installation
@@ -36,7 +36,7 @@ A theme, config and collection of plugins for Neovim
   * `g:enabletreesitter`: **1** = Use treesitter for compatible files | **0** = Keep treesitter disabled (default: **0**)
   * `g:enablecompletion`: **1** = Enable autocompletion | **0** = Disable autocompletion (default: **0**)
   * `g:enableautotags`: **1** = Automatically generate tags files | **0** = Disable tag generation (default: **0**)
-  * `g:enablepowerline`: **1** = Render the statusline using characters that require powerline-patched fonts | **0** = Render the statusbar with characters that work with all fonts (default: **0**)
+  * `g:enablepowerline`: **1** = Render the status line using characters that require powerline-patched fonts | **0** = Render the status line with characters that work with all fonts (default: **0**)
 * **Custom Plugins**: Pathogen compatible plugins can be cloned or extracted to `local/bundle/`, or a folder named `bundle` in any of the folders in the runtimepath
 * **Update Script**: (requires: bash+git) Use the `update` script to update the project and submodules, as well as handle any required maintenance
 
@@ -115,10 +115,10 @@ For a complete list of mappings specific to **darkcloud-nvimconfig**, check the
 * [ale](https://github.com/w0rp/ale): Asynchronous Lint Engine
 * [Comment.nvim](https://github.com/numToStr/Comment.nvim): Smart and Powerful commenting plugin for neovim
   * [nvim-ts-context-commentstring](https://github.com/JoosepAlviste/nvim-ts-context-commentstring): A Neovim plugin for setting the commentstring option based on the cursor location in the file. The location is checked via treesitter queries
-* [lightline.vim](https://github.com/itchyny/lightline.vim): A light and configurable statusline/tabline for Vim
+* [lightline.vim](https://github.com/itchyny/lightline.vim): A light and configurable statusline/tabline plugin for Vim
   * [lightline-ale](https://github.com/maximbaz/lightline-ale): Provides ALE indicator for the lightline vim plugin
 * [nvim-cmp](https://github.com/hrsh7th/nvim-cmp): A completion engine plugin for neovim written in Lua
-  * [cmp-async-path](https://codeberg.org/FelipeLema/cmp-async-path): Async filesystem path source for nvim-cmp
+  * [cmp-async-path](https://codeberg.org/FelipeLema/cmp-async-path): Async file system path source for nvim-cmp
   * [cmp-buffer](https://github.com/hrsh7th/cmp-buffer): Buffer words source for nvim-cmp
   * [cmp-nvim-tags](https://github.com/quangnguyen30192/cmp-nvim-tags): Tags source for nvim-cmp
   * [cmp-omni](https://github.com/hrsh7th/cmp-omni): Omnifunc source for cmp-nvim
@@ -130,7 +130,7 @@ For a complete list of mappings specific to **darkcloud-nvimconfig**, check the
 * [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
 * [qf.nvim](https://github.com/ten3roberts/qf.nvim):  Extends the default quickfix and location lists for neovim
-* [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 multi-line and single-line code
 * [tabular](https://github.com/godlygeek/tabular): Vim script for text filtering and alignment
 * [vim-fugitive](https://github.com/tpope/vim-fugitive): A wrapper integrating git into vim in such a way as to provide features neither of them could offer on their own
 * [vim-gutentags](https://github.com/xolox/vim-easytags): A plugin that takes care of the much needed management of tags files in Vim

vim/bundle/nvim-treesitter

@@ -1 +1 @@
-Subproject commit bb3dd60ebcf6f75f73f39c44724b4a426ece6b7b
+Subproject commit 03f650705c0c10f97b214ca4ecca3c25ff9bee7d

vim/bundle/splitjoin.vim

@@ -1 +1 @@
-Subproject commit 1aa617d15a9904107a68f95ebf5036b7d4abf64d
+Subproject commit 9b0c30f61f13ba4800a11107648bdd748ad511ba

vim/bundle/vim-polyglot-darkcloud

@@ -1 +1 @@
-Subproject commit 635ad3d1a29619036014a8feca226356767e5fca
+Subproject commit d54a9087879ed813801041d3d51d70987c502796

vim/colors/darkcloud.vim

@@ -49,8 +49,8 @@ endfun
 "SYNTAX COLORS:
 
 "SPELL CHECKING UNDERLINE: {{{
-    call s:C("SpellBad","","","italic,underline")
-    call s:C("SpellCap","","","italic,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","","","")
 "}}}

vim/config/after.vim

@@ -14,7 +14,7 @@ if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
     runtime! macros/matchit.vim
 endif
 
-"enable omnicompletion for any filetype without that has syntax highlighting
+"enable omni-completion for any file type without that has syntax highlighting
 if exists("+omnifunc")
     autocmd VimEnter,Filetype * if &omnifunc == ""|setlocal omnifunc=syntaxcomplete#Complete|endif
 endif
@@ -22,14 +22,14 @@ endif
 "prevent warnings when changing read-only files
 autocmd FileChangedRO * nested set noreadonly
 
-"FILETPE AND SYNTAX: {{{
+"FILE TYPE AND SYNTAX: {{{
     "enable more accurate syntax synchronization
     autocmd BufEnter * :syntax sync fromstart
 
     "disable automatic line breaks
     set textwidth=0
 
-    "set filetypes for various file extensions
+    "set file types for various file extensions
     autocmd BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setlocal ft=aspnet
     autocmd BufNewFile,BufRead *.gradle setlocal ft=groovy
     autocmd BufNewFile,BufRead *eslintrc setlocal ft=json

vim/config/keyboard.vim

@@ -32,8 +32,6 @@
 "    <Ctrl-Alt-RightClick>    | (A) -> paste at the cursor (not mouse)
 "    <Ctrl-Alt-MiddleClick>   | (A) -> paste at the cursor (not mouse)
 "
-"    <Shift-MiddleClick>      | (A) -> paste from xorg paste buffer
-"
 "  (terminal)
 "    <Esc>                    | (T) -> leave edit mode
 "
@@ -66,7 +64,7 @@
 "    ik                       | (N) -> add cursor character as a keyword
 "    iK                       | (N) -> remove cursor character as a keyword
 "
-"    ~                        | (N) -> popup a command reference
+"    ~                        | (N) -> pop-up a command reference
 "    <Leader><F1>             | (N) -> toggle the vim reference manual
 "    `                        | (A) -> toggle the gutter(numbers+folds+signify)
 "
@@ -116,8 +114,8 @@
 "    <Leader>w                | (N) -> remove whitespace
 "    <Tab>                    | (V) -> indent all the lines currently selected
 "    <Tab>                    | (N) -> indent the current line
-"    <Shift-Tab>              | (V) -> un-indent all the lines currently selected
-"    <Shift-Tab>              | (N) -> un-indent the current line
+"    <Shift-Tab>              | (V) -> unindent all the lines currently selected
+"    <Shift-Tab>              | (N) -> unindent the current line
 "    [<Space>                 | (N) -> insert a blank line above the current one
 "    ]<Space>                 | (N) -> insert a blank line below the current one
 "
@@ -170,7 +168,7 @@
 "    <Ctrl-Right>             | (V) -> select one word right
 "    <Ctrl-Left>              | (V) -> select one word left
 "
-"Filetype Specific Mappings:
+"File type Specific Mappings:
 "  (help)
 "    q                        | (A) -> close the dialog
 "
@@ -214,7 +212,7 @@
     nnoremap <S-k> <Nop>
 "}}}
 
-"MAPPINGS: GENERAL KEYBINDINGS AND REBINDINGS {{{
+"MAPPINGS: GENERAL KEYBINDINGS AND REBINDING {{{
     "MOUSE:{
         "hold ctrl to scroll left/right instead of up/down
         noremap <C-ScrollWheelUp> 4zh
@@ -324,10 +322,6 @@
         snoremap <C-A-MiddleMouse> p
         vnoremap <C-A-MiddleMouse> p
         inoremap <C-A-MiddleMouse> <C-O>p
-
-        "configure middle click to paste from X
-        noremap <S-Insert> <MiddleMouse>
-        noremap! <S-Insert> <MiddleMouse>
     "}
 
     "TERMINAL:{
@@ -377,7 +371,7 @@
         "toggle the display of the left 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 foldpoints
+        "toggle folded code at fold-points
         nnoremap <Space><Space> za
 
         "toggle line wrapping (and bottom bar if using the gui)
@@ -421,16 +415,16 @@
     "}
 
     "SPELLCHECK:{
-        "add the selected mispelled word to the local dictionary
+        "add the selected misspelled word to the local dictionary
         nnoremap ?+ zg
 
-        "display a list of suggestions for the selected mispelled word
+        "display a list of suggestions for the selected misspelled word
         nnoremap ?? hea<C-X>s
 
-        "go to the next mispelled word
+        "go to the next misspelled word
         nnoremap ?N ]s
 
-        "go to the previous mispelled word
+        "go to the previous misspelled word
         nnoremap ?P [s
     "}
 
@@ -473,7 +467,7 @@
         "remove trailing whitespace
         nnoremap <silent><expr> <Leader>w ':FixWhitespace<CR>:echo "Trailing whitespace has been removed"<CR>'
 
-        "tab and untab the currently selected lines
+        "indent and unindent the currently selected lines
         vnoremap <Tab> >gv
         nnoremap <Tab> v>gv<Esc>
         vnoremap <S-Tab> <gv
@@ -593,7 +587,7 @@
     autocmd FilterWritePre * if &diff|cabbrev q! qall!|endif
 "}}}
 
-"MAPPINGS DISABLED FOR GIVEN FILETYPES: {{{
+"MAPPINGS DISABLED FOR GIVEN FILE TYPES: {{{
     "remove incompatible toggles from specific file types
     autocmd Filetype help,qf,diff,vista noremap <buffer> <F11> <Nop>
     autocmd Filetype help,qf,diff,vista noremap <buffer> <Leader>[ <Nop>

vim/config/settings.vim

@@ -13,7 +13,7 @@
     set nocompatible "disable vi-compatibility settings
     set backspace=indent,eol,start "enables/configures standard backspace behaviour
 
-    "use the '*' register as well as the the '+' register if it's available too
+    "use the '*' register as well as the '+' register if it's available too
     set clipboard=unnamed
 
     if has('unnamedplus')
@@ -42,7 +42,7 @@
     if $TERM =~ '^linux$'|set t_Co=8|elseif !has("gui_running")|set t_Co=256|endif
     set ttyfast "assume a fast connection to the terminal for better rendering
 
-    "configure to primarily use utf8
+    "configure to primarily use utf-8
     if has("multi_byte")
         if &termencoding == ""
             let &termencoding = &encoding
@@ -57,7 +57,7 @@
 
 "GENERAL SETTINGS: {{{
     "FILE: {{{
-        filetype plugin indent on "enable filetype-based auto-indentation
+        filetype plugin indent on "enable file type-based auto-indentation
         syntax on "enable syntax highlighting
         set formatoptions=roqnl12 "how automatic formatting is to be done
         set diffopt=foldcolumn:0,filler "vimdiff default settings
@@ -69,7 +69,7 @@
 
     "USER INTERFACE: {{{
         set updatetime=100 "set updates to occur every 100ms
-        set laststatus=2 showcmd statusline=%F%m%r%h%w[%L][%{&ff}]%y[%p%%][%04l,%04v] "statusline init and config
+        set laststatus=2 showcmd statusline=%F%m%r%h%w[%L][%{&ff}]%y[%p%%][%04l,%04v] "status line init and config
         set winheight=1 winminheight=1 "set the minimum window height to 1 lines
         set winwidth=1 winminwidth=1 "set the minimum window width to 1 columns
         set noshowmode "don't display mode information handled by lightline
@@ -85,7 +85,7 @@
         set list listchars=tab:>-,trail:- "display tabs as: >--- and trailing spaces as: -
         set showmatch "show matching open bracket when closed bracket is inserted
         set matchtime=5 "the amount of time before the matching bracket will highlight
-        let &showbreak = "" "character to prepend to wrapped lines when linewrapping is enabled
+        let &showbreak = "" "character to prepend to wrapped lines when line wrapping is enabled
 
         "enable tab completion in command mode and configure how it handles extensions
         set completeopt=longest,menuone
@@ -123,7 +123,7 @@
                 augroup END
             endif
 
-            "update the current filetype when a file is renamed
+            "update the current file type when a file is renamed
             augroup RenameCheckFiletype
                 autocmd!
                 autocmd BufFilePost * filetype detect