diff --git a/init.vim b/init.vim index 26c67d5..1bf2c47 100644 --- a/init.vim +++ b/init.vim @@ -18,12 +18,10 @@ let &runtimepath = printf("%s,%s/vim,%s/vim/after,%s/local", &runtimepath, g:darkcloudpath, g:darkcloudpath, g:darkcloudpath) "load colours -if &term != "linux" - runtime colors/palette.vim +runtime colors/palette.vim - "load colour scheme: - colorscheme darkcloud -endif +"load colour scheme: +colorscheme darkcloud "load user config: runtime user.vim diff --git a/vim/colors/darkcloud.vim b/vim/colors/darkcloud.vim index 4e5f802..3a90c0d 100644 --- a/vim/colors/darkcloud.vim +++ b/vim/colors/darkcloud.vim @@ -61,9 +61,18 @@ endfun "cursor call s:C("Cursor","",g:cDarkBg,"standout") - call s:C("CursorColumn","",g:cLightBg,"") - call s:C("CursorLine","",g:cLightBg,"") - call s:C("CursorLineNr",g:cBlue,g:cLightBg,"bold") + + if &term != "linux" + 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 diff --git a/vim/colors/palette.vim b/vim/colors/palette.vim index d659c88..941b992 100644 --- a/vim/colors/palette.vim +++ b/vim/colors/palette.vim @@ -1,4 +1,4 @@ -if has("gui_running") || &termguicolors +if has("gui_running") || &term != "linux" && &termguicolors let g:cBlack = '#000000' let g:cWhite = '#ffffff' @@ -17,7 +17,7 @@ if has("gui_running") || &termguicolors let g:cLightBg = '#303030' let g:cDarkBg = '#262626' -elseif &t_Co >= 256 +elseif &term != "linux" && &t_Co >= 256 let g:cBlack = '0' "#000000 let g:cWhite = '15' "#ffffff diff --git a/vim/config/plugins/lightline.vim b/vim/config/plugins/lightline.vim index ded2086..d0a7fdb 100644 --- a/vim/config/plugins/lightline.vim +++ b/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 (g:enablepowerline == 1) +if &term != "linux" && g:enablepowerline == 1 let g:lightline.separator = { "left": "", "right": "" } let g:lightline.subseparator = { "left": "", "right": "" } else @@ -99,27 +99,25 @@ endif "ligtline theme {{{ let s:p = { "normal": {}, "inactive": {}, "insert": {}, "replace": {}, "visual": {}, "tabline": {} } - if &term != "linux" - let g:lightline.colorscheme = "darkcloud" + let g:lightline.colorscheme = "darkcloud" - 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.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.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.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.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.visual.left = [[ g:cYellow, 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.visual.left = [[ g:cYellow, g:cLightBg ], [ g:cWhite, g:cDarkBg ]] - let s:p.normal.middle = [[ g:cWhite, g:cLightBg ]] - let s:p.normal.error = [[ g:cRed, g:cLightBg ]] - let s:p.normal.warning = [[ g:cYellow, g:cLightBg ]] + let s:p.normal.middle = [[ g:cWhite, g:cLightBg ]] + let s:p.normal.error = [[ g:cRed, g:cLightBg ]] + let s:p.normal.warning = [[ g:cYellow, g:cLightBg ]] - let s:p.tabline.left = [[ g:cGray2, g:cLightBg ]] - let s:p.tabline.tabsel = [[ g:cWhite, g:cDarkBg ]] - let s:p.tabline.middle = [[ g:cGray2, g:cLightBg ]] - let s:p.tabline.right = [[ g:cWhite, g:cDarkBg ]] + let s:p.tabline.left = [[ g:cGray2, g:cLightBg ]] + let s:p.tabline.tabsel = [[ g:cWhite, g:cDarkBg ]] + let s:p.tabline.middle = [[ g:cGray2, g:cLightBg ]] + let s:p.tabline.right = [[ g:cWhite, g:cDarkBg ]] - let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p) - endif + let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p) "}}}