init.vim

@@ -18,10 +18,12 @@
 let &runtimepath = printf("%s,%s/vim,%s/vim/after,%s/local", &runtimepath, g:darkcloudpath, g:darkcloudpath, g:darkcloudpath)
 
 "load colours
-runtime colors/palette.vim
+if &term != "linux"
+    runtime colors/palette.vim
 
-"load colour scheme:
+    "load colour scheme:
-colorscheme darkcloud
+    colorscheme darkcloud
+endif
 
 "load user config:
 runtime user.vim

vim/bundle/nvim-treesitter

@@ -1 +1 @@
-Subproject commit c09932bd2de01dc9c01e870fe83060693c67de13
+Subproject commit 212b7a504cf56f85d1acc5be237261b42d7560c5

vim/bundle/vim-polyglot-darkcloud

@@ -1 +1 @@
-Subproject commit f363d911ed2c865b8883a42613ca529cf7a6d006
+Subproject commit 25afe7ebbc7c34f711685f5d29308a82ed5350ac

vim/colors/darkcloud.vim

@@ -61,18 +61,9 @@ endfun
 
     "cursor
     call s:C("Cursor","",g:cDarkBg,"standout")
-
+    call s:C("CursorColumn","",g:cLightBg,"")
-    if &term != "linux"
+    call s:C("CursorLine","",g:cLightBg,"")
-        call s:C("CursorLineNr",g:cBlue,g:cLightBg,"bold")
+    call s:C("CursorLineNr",g:cBlue,g:cLightBg,"bold")
-        call s:C("CursorColumn","",g:cLightBg,"")
-        call s:C("CursorLine","",g:cLightBg,"")
-    else
-        call s:C("CursorLineNr",g:cBlue,"","bold")
-        call s:C("CursorColumn","","","")
-        call s:C("CursorLine","","","")
-    end
-
-    "line number
     call s:C("LineNr",g:cGray4,"","bold")
 
     "selected text
@@ -92,12 +83,12 @@ endfun
     call s:C("PmenuSel",g:cBlue,g:cLightBg,"bold")
 
     "search
-    call s:C("Search",g:cRed,g:cWhite,"bold")
+    call s:C("Search","",g:cDarkBg,"standout")
-    hi! link IncSearch Search
     hi! link IncSearchMatch Search
     hi! link IncSearchMatchReverse Search
+    call s:C("IncSearch","",g:cDarkBg,"standout")
     hi! link IncSearchOnCursor IncSearch
-    hi! link IncSearchCursor IncSearch
+    hi! link IncSearchCursor IncSearchOnCursor
 
     "status line
     call s:C("StatusLine","",g:cLightBg,"")
@@ -281,18 +272,12 @@ endfun
     hi! link SignifyLineChange DiffChange
     hi! link SignifyLineDelete DiffDelete
 
-    "diagnostics
+    "ale
-    call s:C("ALEError",g:cDarkRed,"","")
+    call s:C("ALEErrorSign",g:cRed,"","standout")
-    call s:C("ALEWarning",g:cDarkYellow,"","")
+    call s:C("ALEWarningSign",g:cYellow,"","standout")
-    call s:C("ALEInfo",g:cDarkBlue,"","")
 
-    call s:C("DiagnosticError",g:cDarkRed,"","italic")
+    "taglist
-    call s:C("DiagnosticWarn",g:cDarkYellow,"","italic")
+    hi! link TagListFileName Directory
-    call s:C("DiagnosticInfo",g:cDarkBlue,"","italic")
-    call s:C("DiagnosticHint",g:cGray3,"","italic")
-    call s:C("DiagnosticOk",g:cWhite,"","italic")
-    call s:C("DiagnosticDeprecated",g:cGray1,"","italic")
-    call s:C("DiagnosticUnnecessary",g:cGray1,"","italic")
 "}}}
 
 "TREESITTER: {{{

vim/colors/palette.vim

@@ -1,4 +1,4 @@
-if has("gui_running") || &term != "linux" && &termguicolors
+if has("gui_running") || &termguicolors
     let g:cBlack = '#000000'
     let g:cWhite = '#ffffff'
 
@@ -11,13 +11,13 @@ if has("gui_running") || &term != "linux" && &termguicolors
     let g:cRed = '#d75f5f'
     let g:cYellow = '#ffd787'
 
-    let g:cDarkBlue = '#518199'
+    let g:cDarkBlue = '#5fafd7'
-    let g:cDarkRed = '#994444'
+    let g:cDarkRed = '#af5f5f'
-    let g:cDarkYellow = '#998151'
+    let g:cDarkYellow = '#d7af5f'
 
     let g:cLightBg = '#303030'
     let g:cDarkBg = '#262626'
-elseif &term != "linux" && &t_Co >= 256
+elseif &t_Co >= 256
     let g:cBlack = '0' "#000000
     let g:cWhite = '15' "#ffffff
 

vim/config/after.vim

@@ -26,10 +26,13 @@ autocmd FileChangedRO * nested set noreadonly
     "enable more accurate syntax synchronization
     autocmd BufEnter * :syntax sync fromstart
 
+    "don't conceal json syntax
+    let g:vim_json_syntax_conceal = 0
+
     "disable automatic line breaks
     autocmd VimEnter * set textwidth=0
 
-    "set filetypes for various file extensions
+    "set given filenames to various filetypes
     autocmd BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setlocal ft=aspnet
     autocmd BufNewFile,BufRead *.gradle setlocal ft=groovy
     autocmd BufNewFile,BufRead *eslintrc setlocal ft=json
@@ -55,6 +58,7 @@ autocmd FileChangedRO * nested set noreadonly
 
     "settings for buffers in diff mode
     autocmd VimEnter,FilterWritePre * if &diff|setlocal nofoldenable|endif
+    autocmd VimEnter * if &diff|wincmd H|endif
 
     "disable the whitespace plugin for mail
     autocmd BufEnter,FileType mail hi ExtraWhitespace ctermbg=NONE guibg=NONE

vim/config/keyboard.vim

@@ -9,6 +9,22 @@
 "                                                             "
 "============================================================="
 "
+"Aliases:
+"  :GitLog & :gitlog          | (C) -> show a navigatable log of commit history
+"  :GitDiff & :gitdiff        | (C) -> current file and last commit in vimdiff
+"  :GitStatus & :gitstatus    | (C) -> shows the output of git status
+"  :GitCommit & :gitcommit    | (C) -> commits changes to the current file
+"  :git <file>                | (C) -> open a vert split with the file in diff mode
+"
+"  :vs33                      | (C) -> create a vertical split using 33% width
+"  :vs66                      | (C) -> create a vertical split using 66% width
+"  :sp33                      | (C) -> create a split using 33% of the height
+"  :sp66                      | (C) -> create a split using 66% of the height
+"  :diff                      | (C) -> open a new file in diff mode
+"
+"  :ik                        | (C) -> add following character to keywords
+"  :iK                        | (C) -> remove following character from keywords
+"
 "Mappings:
 "  (mouse)
 "    <Ctrl-ScrollUp>          | (A) -> scroll left
@@ -188,8 +204,8 @@
 "    <Leader>.,               | (N) -> update differences
 "    <Leader>>                | (N) -> replace diff in other pane with current pane
 "    <Leader>.                | (N) -> replace diff in other pane with current pane
-"    <Leader><                | (N) -> replace diff in current pane with other pane
+"    <Leader<<                | (N) -> replace diff in current pane with other pane
-"    <Leader>,                | (N) -> replace diff in current pane with other pane
+"    <Leader<,                | (N) -> replace diff in current pane with other pane
 
 "DISABLED DEFAULT MAPPING: UNSET SHORTCUTS {{{
     "-unmapping tabbing from < and > for use with diff
@@ -212,6 +228,27 @@
     nnoremap <S-k> <Nop>
 "}}}
 
+"ALIASES: COMMAND SHORTCUTS {{{
+    "shortcuts to git commands
+    cabbrev <expr><silent> GitDiff ':Gdiff<CR>'
+    cabbrev <expr><silent> gitdiff ':Gdiff<CR>'
+    cabbrev <expr><silent> GitStatus ':Gstatus<CR>'
+    cabbrev <expr><silent> gitstatus ':Gstatus<CR>'
+    cabbrev <expr><silent> GitCommit ':Gcommit<CR>'
+    cabbrev <expr><silent> gitcommit ':Gcommit<CR>'
+
+    "create various sizes of splits
+    cabbrev <expr><silent> vs33 ':VS33<CR>'
+    cabbrev <expr><silent> vs66 ':VS66<CR>'
+    cabbrev <expr><silent> sp33 ':SP33<CR>'
+    cabbrev <expr><silent> sp66 ':SP66<CR>'
+    cabbrev diff vertical diffsplit
+
+    "add/remove character as keyword
+    cabbrev ik setlocal iskeyword+=
+    cabbrev iK setlocal iskeyword-=
+"}}}
+
 "MAPPINGS: GENERAL KEYBINDINGS AND REBINDINGS {{{
     "MOUSE:{
         "hold ctrl to scroll left/right instead of up/down

vim/config/plugins/lightline.vim

@@ -87,7 +87,7 @@ let g:lightline#ale#indicator_errors = "E:"
 let g:lightline#ale#indicator_ok = "OK"
 
 "status bar config with and without powerline fonts (default: 0)
-if &term != "linux" && g:enablepowerline == 1
+if (g:enablepowerline == 1)
     let g:lightline.separator = { "left": "", "right": "" }
     let g:lightline.subseparator = { "left": "", "right": "" }
 else
@@ -99,25 +99,27 @@ endif
 "ligtline theme {{{
     let s:p = { "normal": {}, "inactive": {}, "insert": {}, "replace": {}, "visual": {}, "tabline": {} }
 
-    let g:lightline.colorscheme = "darkcloud"
+    if &term != "linux"
+        let g:lightline.colorscheme = "darkcloud"
 
-    let s:p.normal.left = [[ g:cBlue, g:cDarkBg ], [ g:cWhite, g:cLightBg ]]
+        let s:p.normal.left = [[ g:cBlue, g:cDarkBg ], [ g:cWhite, g:cLightBg ]]
-    let s:p.inactive.left = [[ g:cGray3, g:cDarkBg ], [ g:cGray3, g:cLightBg ]]
+        let s:p.inactive.left = [[ g:cGray3, g:cDarkBg ], [ g:cGray3, g:cLightBg ]]
-    let s:p.normal.right = [[ g:cWhite, g:cDarkBg ], [ g:cWhite, g:cLightBg ], [ g:cWhite, g:cDarkBg ]]
+        let s:p.normal.right = [[ g:cWhite, g:cDarkBg ], [ g:cWhite, g:cLightBg ], [ g:cWhite, g:cDarkBg ]]
-    let s:p.inactive.right = [[ g:cGray3, g:cDarkBg ], [ g:cGray3, g:cLightBg ], [ g:cGray3, g:cDarkBg ]]
+        let s:p.inactive.right = [[ g:cGray3, g:cDarkBg ], [ g:cGray3, g:cLightBg ], [ g:cGray3, g:cDarkBg ]]
 
-    let s:p.insert.left = [[ g:cRed, g:cLightBg ], [ g:cWhite, g:cDarkBg ]]
+        let s:p.insert.left = [[ g:cRed, g:cLightBg ], [ g:cWhite, g:cDarkBg ]]
-    let s:p.replace.left = [[ g:cLightBg, g:cRed ], [ g:cWhite, g:cDarkBg ]]
+        let s:p.replace.left = [[ g:cLightBg, g:cRed ], [ g:cWhite, g:cDarkBg ]]
-    let s:p.visual.left = [[ g:cYellow, g:cLightBg ], [ g:cWhite, g:cDarkBg ]]
+        let s:p.visual.left = [[ g:cYellow, g:cLightBg ], [ g:cWhite, g:cDarkBg ]]
 
-    let s:p.normal.middle = [[ g:cWhite, g:cLightBg ]]
+        let s:p.normal.middle = [[ g:cWhite, g:cLightBg ]]
-    let s:p.normal.error = [[ g:cRed, g:cLightBg ]]
+        let s:p.normal.error = [[ g:cRed, g:cLightBg ]]
-    let s:p.normal.warning = [[ g:cYellow, g:cLightBg ]]
+        let s:p.normal.warning = [[ g:cYellow, g:cLightBg ]]
 
-    let s:p.tabline.left = [[ g:cGray2, g:cLightBg ]]
+        let s:p.tabline.left = [[ g:cGray2, g:cLightBg ]]
-    let s:p.tabline.tabsel = [[ g:cWhite, g:cDarkBg ]]
+        let s:p.tabline.tabsel = [[ g:cWhite, g:cDarkBg ]]
-    let s:p.tabline.middle = [[ g:cGray2, g:cLightBg ]]
+        let s:p.tabline.middle = [[ g:cGray2, g:cLightBg ]]
-    let s:p.tabline.right = [[ g:cWhite, g:cDarkBg ]]
+        let s:p.tabline.right = [[ g:cWhite, g:cDarkBg ]]
 
-    let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p)
+        let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p)
+    endif
 "}}}

vim/config/plugins/vim-polyglot-darkcloud.vim

@@ -1,2 +0,0 @@
-"don't conceal json syntax
-let g:vim_json_syntax_conceal = 0