From f97caa57d556d94d1a5ec467efdd394301e4157b Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Thu, 17 Aug 2023 16:17:46 -0400 Subject: [PATCH] Don't apply the colorscheme in a vterm --- vim/config/plugins/lightline.vim | 32 +++++++++++++++++--------------- vimrc | 10 ++++++---- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/vim/config/plugins/lightline.vim b/vim/config/plugins/lightline.vim index 0451534..46588f0 100644 --- a/vim/config/plugins/lightline.vim +++ b/vim/config/plugins/lightline.vim @@ -117,22 +117,24 @@ endif "ligtline theme {{{ let s:p = { 'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {} } - let s:p.normal.left = [[ g:cBlue, g:cDarkGrayBg ], [ g:cLightText, g:cLightGrayBg ]] - let s:p.inactive.left = [[ g:cLightGrayFg, g:cDarkGrayBg ], [ g:cLightGrayFg, g:cLightGrayBg ]] - let s:p.normal.right = [[ g:cLightText, g:cDarkGrayBg ], [ g:cLightText, g:cLightGrayBg ], [ g:cLightText, g:cDarkGrayBg ]] - let s:p.inactive.right = [[ g:cLightGrayFg, g:cDarkGrayBg ], [ g:cLightGrayFg, g:cLightGrayBg ], [ g:cLightGrayFg, g:cDarkGrayBg ]] + if &term != "linux" + let s:p.normal.left = [[ g:cBlue, g:cDarkGrayBg ], [ g:cLightText, g:cLightGrayBg ]] + let s:p.inactive.left = [[ g:cLightGrayFg, g:cDarkGrayBg ], [ g:cLightGrayFg, g:cLightGrayBg ]] + let s:p.normal.right = [[ g:cLightText, g:cDarkGrayBg ], [ g:cLightText, g:cLightGrayBg ], [ g:cLightText, g:cDarkGrayBg ]] + let s:p.inactive.right = [[ g:cLightGrayFg, g:cDarkGrayBg ], [ g:cLightGrayFg, g:cLightGrayBg ], [ g:cLightGrayFg, g:cDarkGrayBg ]] - let s:p.insert.left = [[ g:cRed, g:cLightGrayBg ], [ g:cLightText, g:cDarkGrayBg ]] - let s:p.replace.left = [[ g:cLightGrayBg, g:cRed ], [ g:cLightText, g:cDarkGrayBg ]] - let s:p.visual.left = [[ g:cYellow, g:cLightGrayBg ], [ g:cLightText, g:cDarkGrayBg ]] + let s:p.insert.left = [[ g:cRed, g:cLightGrayBg ], [ g:cLightText, g:cDarkGrayBg ]] + let s:p.replace.left = [[ g:cLightGrayBg, g:cRed ], [ g:cLightText, g:cDarkGrayBg ]] + let s:p.visual.left = [[ g:cYellow, g:cLightGrayBg ], [ g:cLightText, g:cDarkGrayBg ]] - let s:p.normal.middle = [[ g:cLightText, g:cLightGrayBg ]] - let s:p.tabline.left = [[ g:cLightText, g:cDarkGrayBg ]] - let s:p.tabline.tabsel = [[ g:cLightText, g:cLightGrayBg ]] - let s:p.tabline.middle = [[ g:cDarkGrayBg, g:cGray ]] - let s:p.tabline.right = copy(s:p.normal.right) - let s:p.normal.error = [[ g:cRed, g:cLightGrayBg ]] - let s:p.normal.warning = [[ g:cYellow, g:cLightGrayBg ]] + let s:p.normal.middle = [[ g:cLightText, g:cLightGrayBg ]] + let s:p.tabline.left = [[ g:cLightText, g:cDarkGrayBg ]] + let s:p.tabline.tabsel = [[ g:cLightText, g:cLightGrayBg ]] + let s:p.tabline.middle = [[ g:cDarkGrayBg, g:cGray ]] + let s:p.tabline.right = copy(s:p.normal.right) + let s:p.normal.error = [[ g:cRed, g:cLightGrayBg ]] + let s:p.normal.warning = [[ g:cYellow, g:cLightGrayBg ]] - let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p) + let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p) + endif "}}} diff --git a/vimrc b/vimrc index e2c571e..9eaec74 100644 --- a/vimrc +++ b/vimrc @@ -29,11 +29,13 @@ let &runtimepath = printf('%s,%s/vim,%s/vim/after',&runtimepath,g:darkcloudpath,g:darkcloudpath) "Load Colours - runtime colors/palette.vim + if &term != "linux" + runtime colors/palette.vim - "Load Colour Scheme: - colorscheme default "hack to fix vimrc colorschemes in some versions of vim - colorscheme darkcloud + "Load Colour Scheme: + colorscheme default "hack to fix vimrc colorschemes in some versions of vim + colorscheme darkcloud + endif "Load Settings: runtime config/settings.vim