nvim: install iceberg

4 files changed, 10 insertions, 288 deletions

diff --git a/.config/nvim/colors/ocean.lua b/.config/nvim/colors/ocean.lua
deleted file mode 100644
index e4b157c..0000000
--- a/.config/nvim/colors/ocean.lua
+++ /dev/null
@@ -1,279 +0,0 @@
-vim.cmd('hi clear')
-vim.g.colors_name = 'ocean'
-
-
-
--- Color palette {{{1
-
-local palette
-if vim.o.background == 'dark' then
-   palette = {
-      NONE        = 'NONE',
-      fg          = '#b1b1c8',
-      bg          = '#101020',
-      gray        = '#353535',
-      dark_gray   = '#202020',
-      comment     = '#8686bf',
-      selection   = '#303060',
-      blue        = '#6e6eff',
-      cyan        = '#70b0ff',
-      green       = '#bdd792',
-      orange      = '#deab52',
-      red         = '#a65f49',
-      magenta     = '#bd91e6',
-      yellow      = '#a68f49',
-      diff_add    = '#202050',
-      diff_change = '#204020',
-      diff_delete = '#402020',
-   }
-else
-   palette = {
-      NONE        = 'NONE',
-      fg          = '#203050',
-      bg          = '#f5f5ff',
-      gray        = '#bebebe',
-      dark_gray   = '#171717',
-      comment     = '#a0a0e0',
-      selection   = '#f0f0d0',
-      blue        = '#6e6eff',
-      cyan        = '#6f8fff',
-      green       = '#6f9226',
-      orange      = '#e79230',
-      red         = '#d77253',
-      magenta     = '#8967a8',
-      yellow      = '#cba224',
-      diff_add    = '#202050',
-      diff_change = '#204020',
-      diff_delete = '#402020',
-   }
-end
-
-
--- Set colors for `Normal` group. {{{1
-
--- Why do I highlight `Normal` first?
---   Because setting colors for it may change `background` option, which causes
---   the highlight groups that depend on `background` to change.
---
--- Why do I set `ctermfg` and `ctermbg` here?
---   Because Vim doesn't notify background/foreground colors to a terminal
---   unless `ctermfg` or `ctermbg` is explicitly configured to `Normal`
---   highlight group.
---
--- See also `:h :hi-normal-cterm`.
-vim.cmd(('hi! Normal ctermfg=15 ctermbg=0 guifg=%s guibg=%s'):format(palette.fg, palette.bg))
-
-
--- Semantic highlight group {{{1
-
-local function hl(group_name, guifg, guibg, attr)
-   vim.cmd(('hi! ocean%s guifg=%s guibg=%s gui=%s cterm=%s'):format(
-      group_name,
-      palette[guifg],
-      palette[guibg],
-      attr,
-      attr)
-   )
-end
-
-
-
-hl('AnalysisError',            'red',     'NONE',        'underline')
-hl('AnalysisWarning',          'yellow',  'NONE',        'underline')
-hl('Cursor',                   'fg',      'bg',          'NONE')
-hl('DecorationBold',           'NONE',    'NONE',        'bold')
-hl('DecorationUnderlined',     'NONE',    'NONE',        'underline')
-hl('DiffAdd',                  'NONE',    'diff_add',    'NONE')
-hl('DiffChange',               'NONE',    'diff_change', 'NONE')
-hl('DiffDelete',               'NONE',    'diff_delete', 'NONE')
-hl('DiffText',                 'NONE',    'diff_change', 'underline')
-hl('Error',                    'red',     'NONE',        'NONE')
-hl('Hidden',                   'bg',      'bg',          'NONE')
-hl('Normal',                   'fg',      'bg',          'NONE')
-hl('Prompt',                   'comment', 'NONE',        'bold')
-hl('Search',                   'bg',      'comment',     'NONE')
-hl('Special',                  'red',     'NONE',        'NONE')
-hl('SpecialKey',               'gray',    'NONE',        'NONE')
-hl('SyntaxComment',            'comment', 'NONE',        'NONE')
-hl('SyntaxCommentSpecial',     'fg',      'NONE',        'bold')
-hl('SyntaxConstant',           'magenta', 'NONE',        'NONE')
-hl('SyntaxIdentifier',         'green',   'NONE',        'NONE')
-hl('SyntaxKeyword',            'blue',    'NONE',        'NONE')
-hl('SyntaxMacro',              'orange',  'NONE',        'NONE')
-hl('SyntaxOperator',           'blue',    'NONE',        'NONE')
-hl('SyntaxStatement',          'blue',    'NONE',        'bold')
-hl('SyntaxString',             'yellow',  'NONE',        'NONE')
-hl('SyntaxType',               'cyan',    'NONE',        'NONE')
-hl('Title',                    'orange',  'NONE',        'NONE')
-hl('UiCompletion',             'fg',      'gray',        'NONE')
-hl('UiSelection',              'NONE',    'selection',   'NONE')
-hl('UiStatusLine',             'fg',      'gray',        'NONE')
-hl('UiStatusLineModeCommand',  'bg',      'blue',        'bold')
-hl('UiStatusLineModeInsert',   'bg',      'green',       'bold')
-hl('UiStatusLineModeNormal',   'bg',      'blue',        'bold')
-hl('UiStatusLineModeOperator', 'bg',      'blue',        'bold')
-hl('UiStatusLineModeOther',    'bg',      'blue',        'bold')
-hl('UiStatusLineModeReplace',  'bg',      'red',         'bold')
-hl('UiStatusLineModeTerminal', 'bg',      'blue',        'bold')
-hl('UiStatusLineModeVisual',   'bg',      'orange',      'bold')
-hl('UiStatusLineNC',           'comment', 'dark_gray',   'NONE')
-hl('UiTabLine',                'fg',      'gray',        'NONE')
-hl('UiTabLineNC',              'comment', 'bg',          'NONE')
-hl('UiTarget',                 'orange',  'NONE',        'underline')
-hl('Warning',                  'yellow',  'NONE',        'NONE')
-
-
-
--- Highlight link {{{1
-
-local function link(from, to)
-   vim.cmd(('hi! link %s ocean%s'):format(from, to))
-end
-
-
-
--- :sort /, \+/
-
--- Vim builtins {{{2
-
-link('SpellBad',       'AnalysisError')
-link('SpellCap',       'AnalysisError')
-link('SpellLocal',     'AnalysisWarning')
-link('SpellRare',      'AnalysisWarning')
-link('Cursor',         'Cursor')
-link('CursorIM',       'Cursor')
-link('Underlined',     'DecorationUnderlined')
-link('DiffAdd',        'DiffAdd')
-link('DiffChange',     'DiffChange')
-link('DiffDelete',     'DiffDelete')
-link('DiffText',       'DiffText')
-link('Error',          'Error')
-link('ErrorMsg',       'Error')
-link('EndOfBuffer',    'Hidden')
-link('MatchParen',     'Hidden')
-link('CursorLineNr',   'Normal')
-link('Delimiter',      'Normal')
-link('MoreMsg',        'Prompt')
-link('Question',       'Prompt')
-link('IncSearch',      'Search')
-link('Search',         'Search')
-link('Special',        'Special')
-link('NonText',        'SpecialKey')
-link('SpecialKey',     'SpecialKey')
-link('Comment',        'SyntaxComment')
-link('Folded',         'SyntaxComment')
-link('ModeMsg',        'SyntaxComment')
-link('SpecialComment', 'SyntaxCommentSpecial')
-link('Todo',           'SyntaxCommentSpecial')
-link('Constant',       'SyntaxConstant')
-link('Identifier',     'SyntaxIdentifier')
-link('PreProc',        'SyntaxMacro')
-link('Operator',       'SyntaxOperator')
-link('Statement',      'SyntaxStatement')
-link('Character',      'SyntaxString')
-link('String',         'SyntaxString')
-link('Directory',      'SyntaxType')
-link('Type',           'SyntaxType')
-link('Title',          'Title')
-link('WildMenu',       'Title')
-link('PMenu',          'UiCompletion')
-link('PMenuSbar',      'UiCompletion')
-link('PMenuThumb',     'UiCompletion')
-link('CursorColumn',   'UiSelection')
-link('CursorLine',     'UiSelection')
-link('FoldColumn',     'UiSelection')
-link('LineNr',         'UiSelection')
-link('PMenuSel',       'UiSelection')
-link('SignColumn',     'UiSelection')
-link('Visual',         'UiSelection')
-link('ColorColumn',    'UiSelection')
-link('VertSplit',      'UiStatusLine')
-link('WarningMsg',     'Warning')
-
-
--- Tree-sitter {{{2
-
-link('@attribute',        'SyntaxKeyword')
-link('@function.builtin', 'SyntaxKeyword')
-link('@string.escape',    'Special')
-
-
--- 'statusline' and 'tabline' {{{2
-
--- Cited from ':h hl-StatusLineNC':
--- > Note: if this is equal to "StatusLine" Vim will use "^^^" in
--- > the status line of the current window.
-link('StatusLine',             'UiStatusLine')
-link('StatusLineNC',           'UiStatusLineNC')
-link('statusLineModeNormal',   'UiStatusLineModeNormal')
-link('statusLineModeInsert',   'UiStatusLineModeInsert')
-link('statusLineModeVisual',   'UiStatusLineModeVisual')
-link('statusLineModeOperator', 'UiStatusLineModeOperator')
-link('statusLineModeReplace',  'UiStatusLineModeReplace')
-link('statusLineModeCommand',  'UiStatusLineModeCommand')
-link('statusLineModeTerminal', 'UiStatusLineModeTerminal')
-link('statusLineModeOther',    'UiStatusLineModeOther')
-
-
-link('TabLineSel',  'UiTabLine')
-link('TabLine',     'UiTabLineNC')
-link('TabLineFill', 'Hidden')
-
-
--- Third-party plugins {{{2
-
-link('YankRoundRegion', 'UiSelection')
-
-link('OperatorSandwichAdd',    'UiSelection')
-link('OperatorSandwichBuns',   'UiSelection')
-link('OperatorSandwichChange', 'UiSelection')
-link('OperatorSandwichDelete', 'UiSelection')
-
-link('HopNextKey', 'UiTarget')
-link('HopNextKey1', 'UiTarget')
-link('HopNextKey2', 'UiTarget')
-
-
--- File types {{{2
-
--- c {{{3
-
-link('cOctalZero', 'Constant')
-
--- cpp {{{3
-
-link('cppRawStringDelimiter', 'SyntaxString')
-
--- html {{{3
-
-link('htmlEndTag',  'SyntaxKeyword')
-link('htmlTag',     'SyntaxKeyword')
-link('htmlTagName', 'SyntaxKeyword')
-
--- php {{{3
-
-link('phpParent',          'Normal')
-link('phpOperator',        'Normal')
-link('phpRelation',        'Normal')
-link('phpDocTags',         'SyntaxCommentSpecial')
-link('phpSpecialFunction', 'SyntaxIdentifier')
-
--- ruby {{{3
-
-link('rubyDataDirective',   'SyntaxKeyword')
-link('rubyStringDelimiter', 'SyntaxString')
-
--- sh {{{3
-
-link('shQuote',       'SyntaxString')
-link('shDerefSimple', 'SyntaxIdentifier')
-link('shDerefVar',    'SyntaxIdentifier')
-
--- sql {{{3
-
-link('sqlKeyword', 'SyntaxKeyword')
-
-
-
-
-
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 4c80fa1..5ee765e 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -7,6 +7,7 @@
   "denops.vim": { "branch": "main", "commit": "4ff8f353ee54ee67288c1099242444ccb0ab5b69" },
   "foldCC.vim": { "branch": "master", "commit": "344335d27349b837d33dc7757de0cb7930ac33ae" },
   "hop.nvim": { "branch": "master", "commit": "9c6a1dd9afb53a112b128877ccd583a1faa0b8b6" },
+  "iceberg.vim": { "branch": "master", "commit": "23835d5ed696436f716cbfdb56a93a7850fe3b18" },
   "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "nvim-lspconfig": { "branch": "master", "commit": "fd26f8626c03b424f7140d454031d1dcb8d23513" },
diff --git a/.config/nvim/lua/init/05-appearance.lua b/.config/nvim/lua/init/05-appearance.lua
index ec5366f..9a5f97b 100644
--- a/.config/nvim/lua/init/05-appearance.lua
+++ b/.config/nvim/lua/init/05-appearance.lua
@@ -5,15 +5,6 @@ local uniquify = require('uniquify')
 local vimrc = require('vimrc')
 
 
--- Color scheme {{{1
-
--- if not pcall(function() vim.cmd('colorscheme ocean') end) then
---    -- Load "desert", one of the built-in colorschemes, instead of mine
---    -- when nvim failed to load it.
---    vim.cmd('colorscheme desert')
--- end
-
-
 -- Statusline {{{1
 
 O.statusline = '%!v:lua.vimrc.statusline.build()'
diff --git a/.config/nvim/lua/vimrc/plugins.lua b/.config/nvim/lua/vimrc/plugins.lua
index ed76bce..5a3ae50 100644
--- a/.config/nvim/lua/vimrc/plugins.lua
+++ b/.config/nvim/lua/vimrc/plugins.lua
@@ -258,6 +258,15 @@ return {
       'justinmk/vim-dirvish',
    },
    -- Appearance {{{1
+   -- Colorscheme
+   {
+      'cocopon/iceberg.vim',
+      lazy = false,
+      priority = 999,
+      config = function()
+         vim.cmd('colorscheme iceberg')
+      end,
+   },
    -- Show highlight.
    {
       'cocopon/colorswatch.vim',