neovim/vim: move highlight settings to my colorscheme file

3 files changed, 40 insertions, 77 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 56e74d3..395a4d9 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1105,34 +1105,18 @@ command! -nargs=+
 
 -- Color scheme {{{2
 
--- A command which changes color scheme with fall back.
 vim.cmd([[
-function My_colorscheme(bang, name)
-   try
-      if get(g:, 'colors_name') isnot# a:name || a:bang
-         execute 'colorscheme' a:name
-      end
-   catch
-      " Loading colorscheme failed.
-      " The color scheme, "desert", is one of the built-in ones. Probably, it
-      " will be loaded without any errors.
-      colorscheme desert
-   endtry
-endfunction
-]])
-
-
-vim.cmd([[
-command! -bang -nargs=?
-   \ ColorScheme
-   \ call My_colorscheme(<bang>0, <q-args>)
+try
+    colorscheme ocean
+catch
+    " Loading colorscheme failed.
+    " The color scheme, "desert", is one of the built-in ones. Probably, it
+    " will be loaded without any errors.
+    colorscheme desert
+endtry
 ]])
 
 
-vim.cmd('ColorScheme! ocean')
-
-
-
 
 -- Statusline {{{2
 
diff --git a/.config/vim/my/colors/ocean.vim b/.config/vim/my/colors/ocean.vim
index f220740..c7f2bda 100644
--- a/.config/vim/my/colors/ocean.vim
+++ b/.config/vim/my/colors/ocean.vim
@@ -139,6 +139,30 @@ hi! link WildMenu     Title
 
 
 
+hi! link YankRoundRegion DiffChange
+
+hi! link OperatorSandwichBuns   DiffChange
+hi! link OperatorSandwichStuff  DiffChange
+hi! link OperatorSandwichDelete DiffChange
+hi! link OperatorSandwichAdd    OperatorSandwichBuns
+
+hi EasyMotionShade guifg=#4d4d4d guibg=NONE gui=NONE cterm=NONE
+hi EasyMotionTarget guifg=#ff7100 guibg=NONE gui=underline cterm=underline
+hi! link EasyMotionMoveHL IncSearch
+
+hi statusLineModeNormal   guifg=NONE    guibg=NONE    gui=bold cterm=bold
+hi statusLineModeInsert   guifg=NONE    guibg=NONE    gui=bold cterm=bold
+hi statusLineModeVisual   guifg=NONE    guibg=NONE    gui=bold cterm=bold
+hi statusLineModeOperator guifg=NONE    guibg=NONE    gui=bold cterm=bold
+hi statusLineModeReplace  guifg=NONE    guibg=NONE    gui=bold cterm=bold
+hi statusLineModeCommand  guifg=NONE    guibg=NONE    gui=bold cterm=bold
+hi statusLineModeTerminal guifg=NONE    guibg=NONE    gui=bold cterm=bold
+hi statusLineModeOther    guifg=NONE    guibg=NONE    gui=bold cterm=bold
+hi statusLineLeft         guifg=#b7b7b7 guibg=#606060 gui=NONE cterm=NONE
+hi statusLineRight        guifg=#b7b7b7 guibg=#606060 gui=NONE cterm=NONE
+
+
+
 unlet s:pallete
 unlet s:dark
 unlet s:light
diff --git a/.vimrc b/.vimrc
index 884dd7e..521e79c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1178,59 +1178,14 @@ endfunction
 
 " Color scheme {{{2
 
-" A command which changes color scheme with fall back.
-command! -bang -nargs=?
-    \ ColorScheme
-    \ call s:colorscheme(<bang>0, <q-args>)
-
-
-function! s:colorscheme(bang, name) abort
-    try
-        if get(g:, 'colors_name') isnot# a:name || a:bang
-            execute 'colorscheme' a:name
-        endif
-    catch
-        " Loading colorscheme failed.
-        " The color scheme, "desert", is one of the built-in ones. Probably, it
-        " will be loaded without any errors.
-        colorscheme desert
-    endtry
-endfunction
-
-
-function! s:extra_highlight() abort
-    if &background != 'dark'
-        return
-    endif
-
-    hi! link YankRoundRegion DiffChange
-
-    hi! link OperatorSandwichBuns   DiffChange
-    hi! link OperatorSandwichStuff  DiffChange
-    hi! link OperatorSandwichDelete DiffChange
-    hi! link OperatorSandwichAdd    OperatorSandwichBuns
-
-    hi EasyMotionShade guifg=#4d4d4d guibg=NONE gui=NONE cterm=NONE
-    hi EasyMotionTarget guifg=#ff7100 guibg=NONE gui=underline cterm=underline
-    hi! link EasyMotionMoveHL IncSearch
-
-    hi statusLineModeNormal   guifg=NONE    guibg=NONE    gui=bold cterm=bold
-    hi statusLineModeInsert   guifg=NONE    guibg=NONE    gui=bold cterm=bold
-    hi statusLineModeVisual   guifg=NONE    guibg=NONE    gui=bold cterm=bold
-    hi statusLineModeOperator guifg=NONE    guibg=NONE    gui=bold cterm=bold
-    hi statusLineModeReplace  guifg=NONE    guibg=NONE    gui=bold cterm=bold
-    hi statusLineModeCommand  guifg=NONE    guibg=NONE    gui=bold cterm=bold
-    hi statusLineModeTerminal guifg=NONE    guibg=NONE    gui=bold cterm=bold
-    hi statusLineModeOther    guifg=NONE    guibg=NONE    gui=bold cterm=bold
-    hi statusLineLeft         guifg=#b7b7b7 guibg=#606060 gui=NONE cterm=NONE
-    hi statusLineRight        guifg=#b7b7b7 guibg=#606060 gui=NONE cterm=NONE
-endfunction
-
-
-Autocmd ColorScheme ocean call s:extra_highlight()
-
-
-ColorScheme! ocean
+try
+    colorscheme ocean
+catch
+    " Loading colorscheme failed.
+    " The color scheme, "desert", is one of the built-in ones. Probably, it
+    " will be loaded without any errors.
+    colorscheme desert
+endtry