Move fully to nvim config (test)
Remove vim plugins and configuration, move to using nvim init and vim-plug to manage plugins
This commit is contained in:
Edward Litherland-Smith
parent
436484809c
commit
c288e11ac6
73
.gitmodules
vendored
73
.gitmodules
vendored
|
|
@ -1,73 +0,0 @@
|
|||
[submodule "pack/plugins/start/lightline"]
|
||||
path = pack/plugins/start/lightline
|
||||
url = https://github.com/itchyny/lightline.vim
|
||||
[submodule "pack/plugins/opt/onedark.vim"]
|
||||
path = extras/onedark
|
||||
url = https://github.com/joshdick/onedark.vim.git
|
||||
[submodule "pack/plugins/start/auto-pairs"]
|
||||
path = pack/plugins/start/auto-pairs
|
||||
url = https://github.com/jiangmiao/auto-pairs.git
|
||||
[submodule "pack/plugins/start/ale"]
|
||||
path = pack/plugins/start/ale
|
||||
url = https://github.com/dense-analysis/ale.git
|
||||
[submodule "pack/plugins/start/lightline-ale"]
|
||||
path = pack/plugins/start/lightline-ale
|
||||
url = https://github.com/maximbaz/lightline-ale.git
|
||||
[submodule "pack/plugins/start/vim-fugitive"]
|
||||
path = pack/plugins/start/vim-fugitive
|
||||
url = https://github.com/tpope/vim-fugitive.git
|
||||
[submodule "pack/plugins/start/unimpaired"]
|
||||
path = pack/plugins/start/unimpaired
|
||||
url = https://github.com/tpope/vim-unimpaired.git
|
||||
[submodule "pack/plugins/start/tabular"]
|
||||
path = pack/plugins/start/tabular
|
||||
url = https://github.com/godlygeek/tabular.git
|
||||
[submodule "pack/plugins/start/vim-markdown"]
|
||||
path = pack/plugins/start/vim-markdown
|
||||
url = https://github.com/gabrielelana/vim-markdown.git
|
||||
[submodule "pack/plugins/start/python-syntax"]
|
||||
path = pack/plugins/start/python-syntax
|
||||
url = https://github.com/vim-python/python-syntax.git
|
||||
[submodule "pack/plugins/start/vim-tmux-navigator"]
|
||||
path = pack/plugins/start/vim-tmux-navigator
|
||||
url = https://github.com/christoomey/vim-tmux-navigator.git
|
||||
[submodule "pack/plugins/start/jedi-vim"]
|
||||
path = pack/plugins/opt/jedi-vim
|
||||
url = https://github.com/davidhalter/jedi-vim.git
|
||||
[submodule "extras/vim-monokai-pro"]
|
||||
path = extras/vim-monokai-pro
|
||||
url = https://github.com/phanviet/vim-monokai-pro.git
|
||||
[submodule "extras/onehalf"]
|
||||
path = extras/onehalf
|
||||
url = https://github.com/sonph/onehalf.git
|
||||
[submodule "pack/plugins/start/vim-gitgutter"]
|
||||
path = pack/plugins/start/vim-gitgutter
|
||||
url = https://github.com/airblade/vim-gitgutter.git
|
||||
[submodule "pack/plugins/start/indentLine"]
|
||||
path = pack/plugins/start/indentLine
|
||||
url = https://github.com/Yggdroot/indentLine.git
|
||||
[submodule "pack/plugins/start/vim-python-docstring"]
|
||||
path = pack/plugins/start/vim-python-docstring
|
||||
url = https://github.com/pixelneo/vim-python-docstring.git
|
||||
[submodule "pack/plugins/start/rainbow_csv"]
|
||||
path = pack/plugins/start/rainbow_csv
|
||||
url = https://github.com/mechatroner/rainbow_csv.git
|
||||
[submodule "pack/plugins/start/vim-toml"]
|
||||
path = pack/plugins/start/vim-toml
|
||||
url = https://github.com/cespare/vim-toml.git
|
||||
[submodule "pack/plugins/start/fzf"]
|
||||
path = pack/plugins/start/fzf
|
||||
url = git@github.com:junegunn/fzf.vim.git
|
||||
branch = master
|
||||
[submodule "pack/plugins/start/nerdtree"]
|
||||
path = pack/plugins/start/nerdtree
|
||||
url = https://github.com/preservim/nerdtree.git
|
||||
[submodule "pack/plugins/start/ack"]
|
||||
path = pack/plugins/start/ack
|
||||
url = git@github.com:mileszs/ack.vim.git
|
||||
[submodule "pack/plugins/start/vim-surround"]
|
||||
path = pack/plugins/start/vim-surround
|
||||
url = git@github.com:tpope/vim-surround.git
|
||||
[submodule "pack/plugins/start/vim-slime"]
|
||||
path = pack/plugins/start/vim-slime
|
||||
url = git@github.com:jpalardy/vim-slime.git
|
||||
26
README.md
26
README.md
|
|
@ -9,6 +9,25 @@ mv nvim.appimage "$HOME/bin/."
|
|||
# ./nvim.appimage
|
||||
```
|
||||
|
||||
### Installing `vim-plug` plugin manager
|
||||
```bash
|
||||
sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
|
||||
```
|
||||
Plugin definitions are in `init.vim`, inside `vim` run `:PlugInstall` to install plugins
|
||||
|
||||
## Enabling python support
|
||||
Install `pynvim` package for python
|
||||
|
||||
## Installing language servers for LSP
|
||||
```bash
|
||||
pip install -U "python-lsp-server[all]" fortls
|
||||
```
|
||||
Installs `pylsp` and `fortls` servers
|
||||
|
||||
## Miscellaneous settings
|
||||
- Modifications in `pack/plugins/start/python-syntax`
|
||||
- Edit `.git/modules/pack/plugins/start/python-syntax/info/exclude` to exclude `doc`
|
||||
|
||||
### To use with existing `~/.vimrc`
|
||||
Add the following lines to neovim init file:
|
||||
> set runtimepath^=~/.vim runtimepath+=~/.vim/after
|
||||
|
|
@ -21,10 +40,3 @@ Using the following commands:
|
|||
|
||||
From [vim documentation](https://neovim.io/doc/user/nvim.html#nvim-from-vim)
|
||||
|
||||
### Enabling python support
|
||||
Install `pynvim` package for python
|
||||
|
||||
## Miscellaneous settings
|
||||
- Modifications in `pack/plugins/start/python-syntax`
|
||||
- Edit `.git/modules/pack/plugins/start/python-syntax/info/exclude` to exclude `doc`
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
setlocal shiftwidth=4
|
||||
setlocal softtabstop=4
|
||||
setlocal textwidth=88
|
||||
|
||||
let b:ale_linters = ['mypy', 'flake8']
|
||||
let b:ale_fixers = ['black']
|
||||
|
||||
" Fix multi-line past for slime
|
||||
let b:slime_bracketed_paste = 1
|
||||
|
||||
let g:python_style = 'rest'
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
setlocal tabstop=2
|
||||
setlocal softtabstop=2
|
||||
setlocal shiftwidth=2
|
||||
setlocal expandtab
|
||||
|
||||
let b:ale_linters = ['yamllint']
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
let s:shade0 = "#2c292d"
|
||||
let s:shade1 = "#4a474a"
|
||||
let s:shade2 = "#676568"
|
||||
let s:shade3 = "#858385"
|
||||
let s:shade4 = "#a3a2a2"
|
||||
let s:shade5 = "#c1c0bf"
|
||||
let s:shade6 = "#dededd"
|
||||
let s:shade7 = "#fcfcfa"
|
||||
let s:accent0 = "#a9dc76" "green
|
||||
let s:accent1 = "#ffd866" "yellow
|
||||
let s:accent2 = "#ab9df2" "magenta
|
||||
let s:accent3 = "#ff6188" "red
|
||||
let s:accent4 = "#78dce8" "cyan
|
||||
let s:accent5 = "#fc9867" "orange
|
||||
|
||||
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
|
||||
let s:p.normal.left = [ [ s:shade1, s:accent4 ], [ s:shade7, s:shade2 ] ]
|
||||
let s:p.normal.right = [ [ s:shade1, s:shade4 ], [ s:shade5, s:shade2 ] ]
|
||||
let s:p.normal.error = [ [ s:shade1, s:accent3 ] ]
|
||||
let s:p.normal.warning = [ [ s:shade1, s:accent5 ] ]
|
||||
let s:p.normal.middle = [ [ s:shade5, s:shade1 ] ]
|
||||
|
||||
let s:p.insert.left = [ [ s:shade1, s:accent0 ], [ s:shade7, s:shade2 ] ]
|
||||
let s:p.replace.left = [ [ s:shade1, s:accent2 ], [ s:shade7, s:shade2 ] ]
|
||||
let s:p.visual.left = [ [ s:shade1, s:accent2 ], [ s:shade7, s:shade2 ] ]
|
||||
|
||||
let s:p.inactive.right = [ [ s:shade1, s:shade3 ], [ s:shade3, s:shade1 ] ]
|
||||
let s:p.inactive.left = [ [ s:shade4, s:shade1 ], [ s:shade3, s:shade0 ] ]
|
||||
let s:p.inactive.middle = [ [ s:shade4, s:shade1 ] ]
|
||||
|
||||
let s:p.tabline.left = [ [ s:shade6, s:shade2 ] ]
|
||||
let s:p.tabline.tabsel = [ [ s:shade1, s:accent1 ] ]
|
||||
let s:p.tabline.middle = copy(s:p.normal.middle)
|
||||
let s:p.tabline.right = copy(s:p.normal.middle)
|
||||
|
||||
let g:lightline#colorscheme#monokai_pro#palette = lightline#colorscheme#fill(s:p)
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
" [onedark.vim](https://github.com/joshdick/onedark.vim/)
|
||||
|
||||
" This is a [lightline.vim](https://github.com/itchyny/lightline.vim) colorscheme for use with
|
||||
" the [onedark.vim](https://github.com/joshdick/onedark.vim) colorscheme.
|
||||
|
||||
let s:colors = onedark#GetColors()
|
||||
|
||||
if get(g:, 'onedark_termcolors', 256) == 16
|
||||
let s:term_red = s:colors.red.cterm16
|
||||
let s:term_green = s:colors.green.cterm16
|
||||
let s:term_yellow = s:colors.yellow.cterm16
|
||||
let s:term_blue = s:colors.blue.cterm16
|
||||
let s:term_purple = s:colors.purple.cterm16
|
||||
let s:term_white = s:colors.white.cterm16
|
||||
let s:term_black = s:colors.black.cterm16
|
||||
let s:term_grey = s:colors.cursor_grey.cterm16
|
||||
else
|
||||
let s:term_red = s:colors.red.cterm
|
||||
let s:term_green = s:colors.green.cterm
|
||||
let s:term_yellow = s:colors.yellow.cterm
|
||||
let s:term_blue = s:colors.blue.cterm
|
||||
let s:term_purple = s:colors.purple.cterm
|
||||
let s:term_white = s:colors.white.cterm
|
||||
let s:term_black = s:colors.black.cterm
|
||||
let s:term_grey = s:colors.cursor_grey.cterm
|
||||
endif
|
||||
|
||||
let s:red = [ s:colors.red.gui, s:term_red ]
|
||||
let s:green = [ s:colors.green.gui, s:term_green ]
|
||||
let s:yellow = [ s:colors.yellow.gui, s:term_yellow ]
|
||||
let s:blue = [ s:colors.blue.gui, s:term_blue ]
|
||||
let s:purple = [ s:colors.purple.gui, s:term_purple ]
|
||||
let s:white = [ s:colors.white.gui, s:term_white ]
|
||||
let s:black = [ s:colors.black.gui, s:term_black ]
|
||||
let s:grey = [ s:colors.visual_grey.gui, s:term_grey ]
|
||||
|
||||
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
|
||||
let s:p.normal.left = [ [ s:black, s:green ], [ s:white, s:grey ] ]
|
||||
let s:p.normal.right = [ [ s:black, s:green ], [ s:white, s:grey ] ]
|
||||
let s:p.inactive.left = [ [ s:white, s:grey ], [ s:white, s:grey ] ]
|
||||
let s:p.inactive.right = [ [ s:black, s:white ], [ s:black, s:white ] ]
|
||||
let s:p.insert.left = [ [ s:black, s:blue ], [ s:white, s:grey ] ]
|
||||
let s:p.insert.right = [ [ s:black, s:blue ], [ s:white, s:grey ] ]
|
||||
let s:p.replace.left = [ [ s:black, s:red ], [ s:white, s:grey ] ]
|
||||
let s:p.replace.right = [ [ s:black, s:red ], [ s:white, s:grey ] ]
|
||||
let s:p.visual.left = [ [ s:black, s:purple ], [ s:white, s:grey ] ]
|
||||
let s:p.visual.right = [ [ s:black, s:purple ], [ s:white, s:grey ] ]
|
||||
let s:p.normal.middle = [ [ s:white, s:black ] ]
|
||||
let s:p.inactive.middle = [ [ s:white, s:grey ] ]
|
||||
let s:p.tabline.left = [ [ s:white, s:grey ] ]
|
||||
let s:p.tabline.tabsel = [ [ s:black, s:white ] ]
|
||||
let s:p.tabline.middle = [ [ s:white, s:black ] ]
|
||||
let s:p.tabline.right = [ [ s:white, s:grey ] ]
|
||||
let s:p.normal.error = [ [ s:black, s:red ] ]
|
||||
let s:p.normal.warning = [ [ s:black, s:yellow ] ]
|
||||
|
||||
let g:lightline#colorscheme#onedark#palette = lightline#colorscheme#flatten(s:p)
|
||||
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
" =============================================================================
|
||||
" Filename: autoload/lightline/colorscheme/onehalfdark.vim
|
||||
" Author: sonph
|
||||
" License: MIT License
|
||||
" Last Change: 2019/12/01
|
||||
" =============================================================================
|
||||
|
||||
let s:mono0 = [ '#282c34', 236 ]
|
||||
let s:mono1 = [ '#313640', 238 ]
|
||||
let s:mono2 = [ '#5d677a', 243 ]
|
||||
let s:mono3 = [ '#dcdfe4', 255 ]
|
||||
|
||||
let s:yellow = [ '#e5c07b', 180 ]
|
||||
let s:red = [ '#e06c75', 168 ]
|
||||
let s:magenta = [ '#c678dd', 176 ]
|
||||
let s:blue = [ '#61afef', 75 ]
|
||||
let s:cyan = [ '#56b6c2', 73 ]
|
||||
let s:green = [ '#98c379', 114 ]
|
||||
|
||||
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
|
||||
|
||||
let s:p.normal.left = [ [ s:mono0, s:green ], [ s:mono3, s:mono2 ] ]
|
||||
let s:p.normal.middle = [ [ s:green, s:mono1 ] ]
|
||||
let s:p.normal.right = [ [ s:mono0, s:green ], [ s:mono3, s:mono2 ] ]
|
||||
|
||||
let s:p.normal.error = [ [ s:mono0, s:red ] ]
|
||||
let s:p.normal.warning = [ [ s:mono0, s:yellow ] ]
|
||||
|
||||
let s:p.inactive.left = [ [ s:mono3, s:mono2 ], [ s:mono3, s:mono2 ] ]
|
||||
let s:p.inactive.middle = [ [ s:mono3, s:mono1 ] ]
|
||||
let s:p.inactive.right = [ [ s:mono0, s:mono3 ], [ s:mono3, s:mono2 ] ]
|
||||
|
||||
let s:p.insert.left = [ [ s:mono0, s:blue ], [ s:mono3, s:mono2 ] ]
|
||||
let s:p.insert.middle = [ [ s:blue, s:mono1 ] ]
|
||||
let s:p.insert.right = [ [ s:mono0, s:blue ], [ s:mono3, s:mono2 ] ]
|
||||
|
||||
let s:p.replace.left = [ [ s:mono0, s:red ], [ s:mono3, s:mono2 ] ]
|
||||
let s:p.replace.middle = [ [ s:red, s:mono1 ] ]
|
||||
let s:p.replace.right = [ [ s:mono0, s:red ], [ s:mono3, s:mono2 ] ]
|
||||
|
||||
let s:p.visual.left = [ [ s:mono0, s:yellow ], [ s:mono3, s:mono2 ] ]
|
||||
let s:p.visual.middle = [ [ s:yellow, s:mono1 ] ]
|
||||
let s:p.visual.right = [ [ s:mono0, s:yellow ], [ s:mono3, s:mono2 ] ]
|
||||
|
||||
let s:p.tabline.left = [ [ s:mono2, s:mono1] ]
|
||||
let s:p.tabline.tabsel = [ [ s:mono3, s:mono2 ] ]
|
||||
let s:p.tabline.middle = [ [ s:mono2, s:mono1] ]
|
||||
let s:p.tabline.right = [ [ s:mono0, s:mono3 ] ]
|
||||
|
||||
let g:lightline#colorscheme#onehalfdark#palette = lightline#colorscheme#flatten(s:p)
|
||||
|
|
@ -1,168 +0,0 @@
|
|||
" Vim color file
|
||||
" Author: Viet Phan
|
||||
" Colorscheme Name: monokai pro
|
||||
" Inspired by https://www.monokai.pro/
|
||||
|
||||
set background=dark
|
||||
highlight clear
|
||||
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
|
||||
let g:colors_name = "monokai_pro"
|
||||
|
||||
" Default group
|
||||
hi Cursor ctermfg=236 ctermbg=231 cterm=NONE guifg=#2d2a2e guibg=#fcfcfa gui=NONE
|
||||
hi SignColumn ctermfg=NONE ctermbg=237 cterm=NONE guibg=#3a3a3a guifg=NONE guisp=NONE gui=NONE
|
||||
hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#403e41 gui=NONE
|
||||
hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#423f42 gui=NONE
|
||||
hi CursorColumn ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#423f42 gui=NONE
|
||||
hi ColorColumn ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#423f42 gui=NONE
|
||||
hi LineNr ctermfg=246 ctermbg=59 cterm=NONE guifg=#959394 guibg=#423f42 gui=NONE
|
||||
hi VertSplit ctermfg=59 ctermbg=59 cterm=NONE guifg=#696769 guibg=#696769 gui=NONE
|
||||
hi MatchParen ctermfg=204 ctermbg=NONE cterm=underline guifg=#ff6188 guibg=NONE gui=underline
|
||||
hi StatusLine ctermfg=231 ctermbg=59 cterm=bold guifg=#fcfcfa guibg=#696769 gui=bold
|
||||
hi StatusLineNC ctermfg=231 ctermbg=59 cterm=NONE guifg=#fcfcfa guibg=#696769 gui=NONE
|
||||
hi Pmenu ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#403e41 gui=NONE
|
||||
hi IncSearch ctermfg=236 ctermbg=221 cterm=NONE guifg=#2d2a2e guibg=#ffd866 gui=NONE
|
||||
hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
|
||||
hi Directory ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fc9867 guibg=NONE gui=NONE
|
||||
hi Folded ctermfg=189 ctermbg=60 cterm=NONE guifg=#d7d7ff guibg=#5f5f87 gui=NONE
|
||||
hi Normal ctermfg=231 ctermbg=236 cterm=NONE guifg=#fcfcfa guibg=#2d2a2e gui=NONE
|
||||
hi Boolean ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi Character ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi Comment ctermfg=59 ctermbg=NONE cterm=NONE guifg=#727072 guibg=NONE gui=italic
|
||||
hi Conditional ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi Constant ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi Define ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#fcfcfa guibg=#47840e gui=bold
|
||||
hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8c0809 guibg=NONE gui=NONE
|
||||
hi DiffChange ctermfg=231 ctermbg=23 cterm=NONE guifg=#fcfcfa guibg=#273a5b gui=NONE
|
||||
hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#fcfcfa guibg=#204a87 gui=bold
|
||||
hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
||||
hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
||||
hi Float ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi Function ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi Identifier ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=italic
|
||||
hi Keyword ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi Label ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi NonText ctermfg=240 ctermbg=236 cterm=NONE guifg=#5b595c guibg=#2d2a2e gui=NONE
|
||||
hi Number ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi Special ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi Operator ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi PreProc ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi SpecialKey ctermfg=240 ctermbg=59 cterm=NONE guifg=#5b595c guibg=#423f42 gui=NONE
|
||||
hi Statement ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi StorageClass ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=italic
|
||||
hi String ctermfg=221 ctermbg=NONE cterm=NONE guifg=#ffd866 guibg=NONE gui=NONE
|
||||
hi Tag ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#fcfcfa guibg=NONE gui=bold
|
||||
hi Todo ctermfg=231 ctermbg=NONE cterm=inverse,bold guifg=#fcfcfa guibg=NONE gui=inverse,bold,italic
|
||||
hi Type ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=italic
|
||||
hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
|
||||
|
||||
" Color for custom group
|
||||
" hi EndColons ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
" hi link Braces EndColons
|
||||
" hi link Parens EndColons
|
||||
" hi link Brackets EndColons
|
||||
" hi link Arrow EndColons
|
||||
|
||||
" Custom group
|
||||
" syn match EndColons /[;,]/
|
||||
" syn match Braces /[\[\]]/
|
||||
" syn match Parens /[()]/
|
||||
" syn match Brackets /[{}]/
|
||||
" syn match Arrow /->/
|
||||
|
||||
|
||||
" Ruby
|
||||
hi rubyClass ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi rubyFunction ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
||||
hi rubySymbol ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fc9867 guibg=NONE gui=NONE
|
||||
hi rubyConstant ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=NONE
|
||||
hi rubyStringDelimiter ctermfg=221 ctermbg=NONE cterm=NONE guifg=#ffd866 guibg=NONE gui=NONE
|
||||
hi rubyBlockParameter ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fc9867 guibg=NONE gui=italic
|
||||
hi rubyInstanceVariable ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fc9867 guibg=NONE gui=italic
|
||||
hi rubyInclude ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi rubyGlobalVariable ctermfg=231 ctermbg=NONE cterm=NONE guifg=#fcfcfa guibg=NONE gui=NONE
|
||||
hi rubyRegexp ctermfg=221 ctermbg=NONE cterm=NONE guifg=#ffd866 guibg=NONE gui=NONE
|
||||
hi rubyRegexpDelimiter ctermfg=221 ctermbg=NONE cterm=NONE guifg=#ffd866 guibg=NONE gui=NONE
|
||||
hi rubyEscape ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi rubyControl ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi rubyClassVariable ctermfg=231 ctermbg=NONE cterm=NONE guifg=#fcfcfa guibg=NONE gui=NONE
|
||||
hi rubyOperator ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi rubyException ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi rubyKeywordAsMethod ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi rubyPseudoVariable ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=italic
|
||||
hi rubyRailsUserClass ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=NONE
|
||||
hi rubyRailsARAssociationMethod ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi rubyRailsARMethod ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi rubyRailsRenderMethod ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi rubyRailsMethod ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi erubyDelimiter ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fc9867 guibg=NONE gui=NONE
|
||||
hi erubyComment ctermfg=59 ctermbg=NONE cterm=NONE guifg=#727072 guibg=NONE gui=italic
|
||||
hi erubyRailsMethod ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
|
||||
" HTML
|
||||
hi htmlTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
||||
hi htmlEndTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
||||
hi htmlTagName ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
||||
hi htmlArg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
|
||||
hi htmlSpecialChar ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
|
||||
|
||||
" XML
|
||||
hi XmlTagName ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi XmlTag ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi XmlEndTag ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
|
||||
" YAML
|
||||
hi yamlKey ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi yamlAnchor ctermfg=231 ctermbg=NONE cterm=NONE guifg=#fcfcfa guibg=NONE gui=NONE
|
||||
hi yamlAlias ctermfg=231 ctermbg=NONE cterm=NONE guifg=#fcfcfa guibg=NONE gui=NONE
|
||||
hi yamlDocumentHeader ctermfg=221 ctermbg=NONE cterm=NONE guifg=#ffd866 guibg=NONE gui=NONE
|
||||
|
||||
" CSS
|
||||
hi cssURL ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fc9867 guibg=NONE gui=italic
|
||||
hi cssFunctionName ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi cssColor ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi cssPseudoClassId ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=italic
|
||||
hi cssClassName ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi cssValueLength ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi cssCommonAttr ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=NONE
|
||||
hi cssBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi cssUnitDecorators ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
|
||||
" js
|
||||
hi javaScriptFunction ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=italic
|
||||
hi javaScriptRailsFunction ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi javaScriptBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsFuncCall ctermfg=150 ctermbg=NONE cterm=NONE guifg=#a9dc76 guibg=NONE gui=NONE
|
||||
hi jsFunction ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=NONE
|
||||
hi jsFuncArgs ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fc9867 guibg=NONE gui=italic
|
||||
hi jsObjectKey ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fc9867 guibg=NONE gui=italic
|
||||
hi jsThis ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
hi jsGlobalObjects ctermfg=116 ctermbg=NONE cterm=NONE guifg=#78dce8 guibg=NONE gui=NONE
|
||||
hi jsFuncBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsFuncParens ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsParens ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsIfElseBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsRepeatBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsObjectBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsBrackets ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsModuleBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsNoise ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsObjectSeparator ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
hi jsLabel ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi jsArrowFunction ctermfg=204 ctermbg=NONE cterm=NONE guifg=#ff6188 guibg=NONE gui=NONE
|
||||
hi jsUndefined ctermfg=147 ctermbg=NONE cterm=NONE guifg=#ab9df2 guibg=NONE gui=NONE
|
||||
|
||||
" GraphQL
|
||||
hi graphqlType ctermfg=231 ctermbg=236 cterm=NONE guifg=#fcfcfa guibg=#2d2a2e gui=NONE
|
||||
hi graphqlName ctermfg=221 ctermbg=NONE cterm=NONE guifg=#ffd866 guibg=NONE gui=NONE
|
||||
hi graphqlBraces ctermfg=246 ctermbg=NONE cterm=NONE guifg=#939293 guibg=NONE gui=NONE
|
||||
|
|
@ -1,646 +0,0 @@
|
|||
" vim:fdm=marker
|
||||
" Vim Color File
|
||||
" Name: onedark.vim
|
||||
" Maintainer: https://github.com/joshdick/onedark.vim/
|
||||
" License: The MIT License (MIT)
|
||||
" Based On: https://github.com/MaxSt/FlatColor/
|
||||
|
||||
" A companion [vim-airline](https://github.com/bling/vim-airline) theme is available at: https://github.com/joshdick/airline-onedark.vim
|
||||
|
||||
" Color Reference {{{
|
||||
|
||||
" The following colors were measured inside Atom using its built-in inspector.
|
||||
|
||||
" +---------------------------------------------+
|
||||
" | Color Name | RGB | Hex |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Black | rgb(40, 44, 52) | #282c34 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | White | rgb(171, 178, 191) | #abb2bf |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Light Red | rgb(224, 108, 117) | #e06c75 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Dark Red | rgb(190, 80, 70) | #be5046 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Green | rgb(152, 195, 121) | #98c379 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Light Yellow | rgb(229, 192, 123) | #e5c07b |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Dark Yellow | rgb(209, 154, 102) | #d19a66 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Blue | rgb(97, 175, 239) | #61afef |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Magenta | rgb(198, 120, 221) | #c678dd |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Cyan | rgb(86, 182, 194) | #56b6c2 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Gutter Grey | rgb(76, 82, 99) | #4b5263 |
|
||||
" |--------------+--------------------+---------|
|
||||
" | Comment Grey | rgb(92, 99, 112) | #5c6370 |
|
||||
" +---------------------------------------------+
|
||||
|
||||
" }}}
|
||||
|
||||
" Initialization {{{
|
||||
|
||||
highlight clear
|
||||
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
|
||||
set t_Co=256
|
||||
|
||||
let g:colors_name="onedark"
|
||||
|
||||
" Set to "256" for 256-color terminals, or
|
||||
" set to "16" to use your terminal emulator's native colors
|
||||
" (a 16-color palette for this color scheme is available; see
|
||||
" < https://github.com/joshdick/onedark.vim/blob/master/README.md >
|
||||
" for more information.)
|
||||
if !exists("g:onedark_termcolors")
|
||||
let g:onedark_termcolors = 256
|
||||
endif
|
||||
|
||||
" Not all terminals support italics properly. If yours does, opt-in.
|
||||
if !exists("g:onedark_terminal_italics")
|
||||
let g:onedark_terminal_italics = 0
|
||||
endif
|
||||
|
||||
" This function is based on one from FlatColor: https://github.com/MaxSt/FlatColor/
|
||||
" Which in turn was based on one found in hemisu: https://github.com/noahfrederick/vim-hemisu/
|
||||
let s:group_colors = {} " Cache of default highlight group settings, for later reference via `onedark#extend_highlight`
|
||||
function! s:h(group, style, ...)
|
||||
if (a:0 > 0) " Will be true if we got here from onedark#extend_highlight
|
||||
let s:highlight = s:group_colors[a:group]
|
||||
for style_type in ["fg", "bg", "sp"]
|
||||
if (has_key(a:style, style_type))
|
||||
let l:default_style = (has_key(s:highlight, style_type) ? s:highlight[style_type] : { "cterm16": "NONE", "cterm": "NONE", "gui": "NONE" })
|
||||
let s:highlight[style_type] = extend(l:default_style, a:style[style_type])
|
||||
endif
|
||||
endfor
|
||||
if (has_key(a:style, "gui"))
|
||||
let s:highlight.gui = a:style.gui
|
||||
endif
|
||||
else
|
||||
let s:highlight = a:style
|
||||
let s:group_colors[a:group] = s:highlight " Cache default highlight group settings
|
||||
endif
|
||||
|
||||
if g:onedark_terminal_italics == 0
|
||||
if has_key(s:highlight, "cterm") && s:highlight["cterm"] == "italic"
|
||||
unlet s:highlight.cterm
|
||||
endif
|
||||
if has_key(s:highlight, "gui") && s:highlight["gui"] == "italic"
|
||||
unlet s:highlight.gui
|
||||
endif
|
||||
endif
|
||||
|
||||
if g:onedark_termcolors == 16
|
||||
let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm16 : "NONE")
|
||||
let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm16 : "NONE")
|
||||
else
|
||||
let l:ctermfg = (has_key(s:highlight, "fg") ? s:highlight.fg.cterm : "NONE")
|
||||
let l:ctermbg = (has_key(s:highlight, "bg") ? s:highlight.bg.cterm : "NONE")
|
||||
endif
|
||||
|
||||
execute "highlight" a:group
|
||||
\ "guifg=" (has_key(s:highlight, "fg") ? s:highlight.fg.gui : "NONE")
|
||||
\ "guibg=" (has_key(s:highlight, "bg") ? s:highlight.bg.gui : "NONE")
|
||||
\ "guisp=" (has_key(s:highlight, "sp") ? s:highlight.sp.gui : "NONE")
|
||||
\ "gui=" (has_key(s:highlight, "gui") ? s:highlight.gui : "NONE")
|
||||
\ "ctermfg=" . l:ctermfg
|
||||
\ "ctermbg=" . l:ctermbg
|
||||
\ "cterm=" (has_key(s:highlight, "cterm") ? s:highlight.cterm : "NONE")
|
||||
endfunction
|
||||
|
||||
" public {{{
|
||||
|
||||
function! onedark#set_highlight(group, style)
|
||||
call s:h(a:group, a:style)
|
||||
endfunction
|
||||
|
||||
function! onedark#extend_highlight(group, style)
|
||||
call s:h(a:group, a:style, 1)
|
||||
endfunction
|
||||
|
||||
" }}}
|
||||
|
||||
" }}}
|
||||
|
||||
" Color Variables {{{
|
||||
|
||||
let s:colors = onedark#GetColors()
|
||||
|
||||
let s:red = s:colors.red
|
||||
let s:dark_red = s:colors.dark_red
|
||||
let s:green = s:colors.green
|
||||
let s:yellow = s:colors.yellow
|
||||
let s:dark_yellow = s:colors.dark_yellow
|
||||
let s:blue = s:colors.blue
|
||||
let s:purple = s:colors.purple
|
||||
let s:cyan = s:colors.cyan
|
||||
let s:white = s:colors.white
|
||||
let s:black = s:colors.black
|
||||
let s:visual_black = s:colors.visual_black " Black out selected text in 16-color visual mode
|
||||
let s:comment_grey = s:colors.comment_grey
|
||||
let s:gutter_fg_grey = s:colors.gutter_fg_grey
|
||||
let s:cursor_grey = s:colors.cursor_grey
|
||||
let s:visual_grey = s:colors.visual_grey
|
||||
let s:menu_grey = s:colors.menu_grey
|
||||
let s:special_grey = s:colors.special_grey
|
||||
let s:vertsplit = s:colors.vertsplit
|
||||
|
||||
" }}}
|
||||
|
||||
" Terminal Colors {{{
|
||||
|
||||
let g:terminal_ansi_colors = [
|
||||
\ s:black.gui, s:red.gui, s:green.gui, s:yellow.gui,
|
||||
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui,
|
||||
\ s:visual_grey.gui, s:dark_red.gui, s:green.gui, s:dark_yellow.gui,
|
||||
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui
|
||||
\]
|
||||
|
||||
" }}}
|
||||
|
||||
" Syntax Groups (descriptions and ordering from `:h w18`) {{{
|
||||
|
||||
call s:h("Comment", { "fg": s:comment_grey, "gui": "italic", "cterm": "italic" }) " any comment
|
||||
call s:h("Constant", { "fg": s:cyan }) " any constant
|
||||
call s:h("String", { "fg": s:green }) " a string constant: "this is a string"
|
||||
call s:h("Character", { "fg": s:green }) " a character constant: 'c', '\n'
|
||||
call s:h("Number", { "fg": s:dark_yellow }) " a number constant: 234, 0xff
|
||||
call s:h("Boolean", { "fg": s:dark_yellow }) " a boolean constant: TRUE, false
|
||||
call s:h("Float", { "fg": s:dark_yellow }) " a floating point constant: 2.3e10
|
||||
call s:h("Identifier", { "fg": s:red }) " any variable name
|
||||
call s:h("Function", { "fg": s:blue }) " function name (also: methods for classes)
|
||||
call s:h("Statement", { "fg": s:purple }) " any statement
|
||||
call s:h("Conditional", { "fg": s:purple }) " if, then, else, endif, switch, etc.
|
||||
call s:h("Repeat", { "fg": s:purple }) " for, do, while, etc.
|
||||
call s:h("Label", { "fg": s:purple }) " case, default, etc.
|
||||
call s:h("Operator", { "fg": s:purple }) " sizeof", "+", "*", etc.
|
||||
call s:h("Keyword", { "fg": s:red }) " any other keyword
|
||||
call s:h("Exception", { "fg": s:purple }) " try, catch, throw
|
||||
call s:h("PreProc", { "fg": s:yellow }) " generic Preprocessor
|
||||
call s:h("Include", { "fg": s:blue }) " preprocessor #include
|
||||
call s:h("Define", { "fg": s:purple }) " preprocessor #define
|
||||
call s:h("Macro", { "fg": s:purple }) " same as Define
|
||||
call s:h("PreCondit", { "fg": s:yellow }) " preprocessor #if, #else, #endif, etc.
|
||||
call s:h("Type", { "fg": s:yellow }) " int, long, char, etc.
|
||||
call s:h("StorageClass", { "fg": s:yellow }) " static, register, volatile, etc.
|
||||
call s:h("Structure", { "fg": s:yellow }) " struct, union, enum, etc.
|
||||
call s:h("Typedef", { "fg": s:yellow }) " A typedef
|
||||
call s:h("Special", { "fg": s:blue }) " any special symbol
|
||||
call s:h("SpecialChar", { "fg": s:dark_yellow }) " special character in a constant
|
||||
call s:h("Tag", {}) " you can use CTRL-] on this
|
||||
call s:h("Delimiter", {}) " character that needs attention
|
||||
call s:h("SpecialComment", { "fg": s:comment_grey }) " special things inside a comment
|
||||
call s:h("Debug", {}) " debugging statements
|
||||
call s:h("Underlined", { "gui": "underline", "cterm": "underline" }) " text that stands out, HTML links
|
||||
call s:h("Ignore", {}) " left blank, hidden
|
||||
call s:h("Error", { "fg": s:red }) " any erroneous construct
|
||||
call s:h("Todo", { "fg": s:purple }) " anything that needs extra attention; mostly the keywords TODO FIXME and XXX
|
||||
|
||||
" }}}
|
||||
|
||||
" Highlighting Groups (descriptions and ordering from `:h highlight-groups`) {{{
|
||||
call s:h("ColorColumn", { "bg": s:cursor_grey }) " used for the columns set with 'colorcolumn'
|
||||
call s:h("Conceal", {}) " placeholder characters substituted for concealed text (see 'conceallevel')
|
||||
call s:h("Cursor", { "fg": s:black, "bg": s:blue }) " the character under the cursor
|
||||
call s:h("CursorIM", {}) " like Cursor, but used when in IME mode
|
||||
call s:h("CursorColumn", { "bg": s:cursor_grey }) " the screen column that the cursor is in when 'cursorcolumn' is set
|
||||
if &diff
|
||||
" Don't change the background color in diff mode
|
||||
call s:h("CursorLine", { "gui": "underline" }) " the screen line that the cursor is in when 'cursorline' is set
|
||||
else
|
||||
call s:h("CursorLine", { "bg": s:cursor_grey }) " the screen line that the cursor is in when 'cursorline' is set
|
||||
endif
|
||||
call s:h("Directory", { "fg": s:blue }) " directory names (and other special names in listings)
|
||||
call s:h("DiffAdd", { "bg": s:green, "fg": s:black }) " diff mode: Added line
|
||||
call s:h("DiffChange", { "fg": s:yellow, "gui": "underline", "cterm": "underline" }) " diff mode: Changed line
|
||||
call s:h("DiffDelete", { "bg": s:red, "fg": s:black }) " diff mode: Deleted line
|
||||
call s:h("DiffText", { "bg": s:yellow, "fg": s:black }) " diff mode: Changed text within a changed line
|
||||
if get(g:, 'onedark_hide_endofbuffer', 0)
|
||||
" If enabled, will style end-of-buffer filler lines (~) to appear to be hidden.
|
||||
call s:h("EndOfBuffer", { "fg": s:black }) " filler lines (~) after the last line in the buffer
|
||||
endif
|
||||
call s:h("ErrorMsg", { "fg": s:red }) " error messages on the command line
|
||||
call s:h("VertSplit", { "fg": s:vertsplit }) " the column separating vertically split windows
|
||||
call s:h("Folded", { "fg": s:comment_grey }) " line used for closed folds
|
||||
call s:h("FoldColumn", {}) " 'foldcolumn'
|
||||
call s:h("SignColumn", {}) " column where signs are displayed
|
||||
call s:h("IncSearch", { "fg": s:yellow, "bg": s:comment_grey }) " 'incsearch' highlighting; also used for the text replaced with ":s///c"
|
||||
call s:h("LineNr", { "fg": s:gutter_fg_grey }) " Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
|
||||
call s:h("CursorLineNr", {}) " Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
|
||||
call s:h("MatchParen", { "fg": s:blue, "gui": "underline", "cterm": "underline" }) " The character under the cursor or just before it, if it is a paired bracket, and its match.
|
||||
call s:h("ModeMsg", {}) " 'showmode' message (e.g., "-- INSERT --")
|
||||
call s:h("MoreMsg", {}) " more-prompt
|
||||
call s:h("NonText", { "fg": s:special_grey }) " '~' and '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line).
|
||||
call s:h("Normal", { "fg": s:white, "bg": s:black }) " normal text
|
||||
call s:h("Pmenu", { "bg": s:menu_grey }) " Popup menu: normal item.
|
||||
call s:h("PmenuSel", { "fg": s:black, "bg": s:blue }) " Popup menu: selected item.
|
||||
call s:h("PmenuSbar", { "bg": s:special_grey }) " Popup menu: scrollbar.
|
||||
call s:h("PmenuThumb", { "bg": s:white }) " Popup menu: Thumb of the scrollbar.
|
||||
call s:h("Question", { "fg": s:purple }) " hit-enter prompt and yes/no questions
|
||||
call s:h("QuickFixLine", { "fg": s:black, "bg": s:yellow }) " Current quickfix item in the quickfix window.
|
||||
call s:h("Search", { "fg": s:black, "bg": s:yellow }) " Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out.
|
||||
call s:h("SpecialKey", { "fg": s:special_grey }) " Meta and special keys listed with ":map", also for text used to show unprintable characters in the text, 'listchars'. Generally: text that is displayed differently from what it really is.
|
||||
call s:h("SpellBad", { "fg": s:red, "gui": "underline", "cterm": "underline" }) " Word that is not recognized by the spellchecker. This will be combined with the highlighting used otherwise.
|
||||
call s:h("SpellCap", { "fg": s:dark_yellow }) " Word that should start with a capital. This will be combined with the highlighting used otherwise.
|
||||
call s:h("SpellLocal", { "fg": s:dark_yellow }) " Word that is recognized by the spellchecker as one that is used in another region. This will be combined with the highlighting used otherwise.
|
||||
call s:h("SpellRare", { "fg": s:dark_yellow }) " Word that is recognized by the spellchecker as one that is hardly ever used. spell This will be combined with the highlighting used otherwise.
|
||||
call s:h("StatusLine", { "fg": s:white, "bg": s:cursor_grey }) " status line of current window
|
||||
call s:h("StatusLineNC", { "fg": s:comment_grey }) " status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
|
||||
call s:h("StatusLineTerm", { "fg": s:white, "bg": s:cursor_grey }) " status line of current :terminal window
|
||||
call s:h("StatusLineTermNC", { "fg": s:comment_grey }) " status line of non-current :terminal window
|
||||
call s:h("TabLine", { "fg": s:comment_grey }) " tab pages line, not active tab page label
|
||||
call s:h("TabLineFill", {}) " tab pages line, where there are no labels
|
||||
call s:h("TabLineSel", { "fg": s:white }) " tab pages line, active tab page label
|
||||
call s:h("Terminal", { "fg": s:white, "bg": s:black }) " terminal window (see terminal-size-color)
|
||||
call s:h("Title", { "fg": s:green }) " titles for output from ":set all", ":autocmd" etc.
|
||||
call s:h("Visual", { "fg": s:visual_black, "bg": s:visual_grey }) " Visual mode selection
|
||||
call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim is "Not Owning the Selection". Only X11 Gui's gui-x11 and xterm-clipboard supports this.
|
||||
call s:h("WarningMsg", { "fg": s:yellow }) " warning messages
|
||||
call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion
|
||||
|
||||
" }}}
|
||||
|
||||
" Termdebug highlighting for Vim 8.1+ {{{
|
||||
|
||||
" See `:h hl-debugPC` and `:h hl-debugBreakpoint`.
|
||||
call s:h("debugPC", { "bg": s:special_grey }) " the current position
|
||||
call s:h("debugBreakpoint", { "fg": s:black, "bg": s:red }) " a breakpoint
|
||||
|
||||
" }}}
|
||||
|
||||
" Language-Specific Highlighting {{{
|
||||
|
||||
" CSS
|
||||
call s:h("cssAttrComma", { "fg": s:purple })
|
||||
call s:h("cssAttributeSelector", { "fg": s:green })
|
||||
call s:h("cssBraces", { "fg": s:white })
|
||||
call s:h("cssClassName", { "fg": s:dark_yellow })
|
||||
call s:h("cssClassNameDot", { "fg": s:dark_yellow })
|
||||
call s:h("cssDefinition", { "fg": s:purple })
|
||||
call s:h("cssFontAttr", { "fg": s:dark_yellow })
|
||||
call s:h("cssFontDescriptor", { "fg": s:purple })
|
||||
call s:h("cssFunctionName", { "fg": s:blue })
|
||||
call s:h("cssIdentifier", { "fg": s:blue })
|
||||
call s:h("cssImportant", { "fg": s:purple })
|
||||
call s:h("cssInclude", { "fg": s:white })
|
||||
call s:h("cssIncludeKeyword", { "fg": s:purple })
|
||||
call s:h("cssMediaType", { "fg": s:dark_yellow })
|
||||
call s:h("cssProp", { "fg": s:white })
|
||||
call s:h("cssPseudoClassId", { "fg": s:dark_yellow })
|
||||
call s:h("cssSelectorOp", { "fg": s:purple })
|
||||
call s:h("cssSelectorOp2", { "fg": s:purple })
|
||||
call s:h("cssTagName", { "fg": s:red })
|
||||
|
||||
" Fish Shell
|
||||
call s:h("fishKeyword", { "fg": s:purple })
|
||||
call s:h("fishConditional", { "fg": s:purple })
|
||||
|
||||
" Go
|
||||
call s:h("goDeclaration", { "fg": s:purple })
|
||||
call s:h("goBuiltins", { "fg": s:cyan })
|
||||
call s:h("goFunctionCall", { "fg": s:blue })
|
||||
call s:h("goVarDefs", { "fg": s:red })
|
||||
call s:h("goVarAssign", { "fg": s:red })
|
||||
call s:h("goVar", { "fg": s:purple })
|
||||
call s:h("goConst", { "fg": s:purple })
|
||||
call s:h("goType", { "fg": s:yellow })
|
||||
call s:h("goTypeName", { "fg": s:yellow })
|
||||
call s:h("goDeclType", { "fg": s:cyan })
|
||||
call s:h("goTypeDecl", { "fg": s:purple })
|
||||
|
||||
" HTML (keep consistent with Markdown, below)
|
||||
call s:h("htmlArg", { "fg": s:dark_yellow })
|
||||
call s:h("htmlBold", { "fg": s:dark_yellow, "gui": "bold", "cterm": "bold" })
|
||||
call s:h("htmlEndTag", { "fg": s:white })
|
||||
call s:h("htmlH1", { "fg": s:red })
|
||||
call s:h("htmlH2", { "fg": s:red })
|
||||
call s:h("htmlH3", { "fg": s:red })
|
||||
call s:h("htmlH4", { "fg": s:red })
|
||||
call s:h("htmlH5", { "fg": s:red })
|
||||
call s:h("htmlH6", { "fg": s:red })
|
||||
call s:h("htmlItalic", { "fg": s:purple, "gui": "italic", "cterm": "italic" })
|
||||
call s:h("htmlLink", { "fg": s:cyan, "gui": "underline", "cterm": "underline" })
|
||||
call s:h("htmlSpecialChar", { "fg": s:dark_yellow })
|
||||
call s:h("htmlSpecialTagName", { "fg": s:red })
|
||||
call s:h("htmlTag", { "fg": s:white })
|
||||
call s:h("htmlTagN", { "fg": s:red })
|
||||
call s:h("htmlTagName", { "fg": s:red })
|
||||
call s:h("htmlTitle", { "fg": s:white })
|
||||
|
||||
" JavaScript
|
||||
call s:h("javaScriptBraces", { "fg": s:white })
|
||||
call s:h("javaScriptFunction", { "fg": s:purple })
|
||||
call s:h("javaScriptIdentifier", { "fg": s:purple })
|
||||
call s:h("javaScriptNull", { "fg": s:dark_yellow })
|
||||
call s:h("javaScriptNumber", { "fg": s:dark_yellow })
|
||||
call s:h("javaScriptRequire", { "fg": s:cyan })
|
||||
call s:h("javaScriptReserved", { "fg": s:purple })
|
||||
" https://github.com/pangloss/vim-javascript
|
||||
call s:h("jsArrowFunction", { "fg": s:purple })
|
||||
call s:h("jsClassKeyword", { "fg": s:purple })
|
||||
call s:h("jsClassMethodType", { "fg": s:purple })
|
||||
call s:h("jsDocParam", { "fg": s:blue })
|
||||
call s:h("jsDocTags", { "fg": s:purple })
|
||||
call s:h("jsExport", { "fg": s:purple })
|
||||
call s:h("jsExportDefault", { "fg": s:purple })
|
||||
call s:h("jsExtendsKeyword", { "fg": s:purple })
|
||||
call s:h("jsFrom", { "fg": s:purple })
|
||||
call s:h("jsFuncCall", { "fg": s:blue })
|
||||
call s:h("jsFunction", { "fg": s:purple })
|
||||
call s:h("jsGenerator", { "fg": s:yellow })
|
||||
call s:h("jsGlobalObjects", { "fg": s:yellow })
|
||||
call s:h("jsImport", { "fg": s:purple })
|
||||
call s:h("jsModuleAs", { "fg": s:purple })
|
||||
call s:h("jsModuleWords", { "fg": s:purple })
|
||||
call s:h("jsModules", { "fg": s:purple })
|
||||
call s:h("jsNull", { "fg": s:dark_yellow })
|
||||
call s:h("jsOperator", { "fg": s:purple })
|
||||
call s:h("jsStorageClass", { "fg": s:purple })
|
||||
call s:h("jsSuper", { "fg": s:red })
|
||||
call s:h("jsTemplateBraces", { "fg": s:dark_red })
|
||||
call s:h("jsTemplateVar", { "fg": s:green })
|
||||
call s:h("jsThis", { "fg": s:red })
|
||||
call s:h("jsUndefined", { "fg": s:dark_yellow })
|
||||
" https://github.com/othree/yajs.vim
|
||||
call s:h("javascriptArrowFunc", { "fg": s:purple })
|
||||
call s:h("javascriptClassExtends", { "fg": s:purple })
|
||||
call s:h("javascriptClassKeyword", { "fg": s:purple })
|
||||
call s:h("javascriptDocNotation", { "fg": s:purple })
|
||||
call s:h("javascriptDocParamName", { "fg": s:blue })
|
||||
call s:h("javascriptDocTags", { "fg": s:purple })
|
||||
call s:h("javascriptEndColons", { "fg": s:white })
|
||||
call s:h("javascriptExport", { "fg": s:purple })
|
||||
call s:h("javascriptFuncArg", { "fg": s:white })
|
||||
call s:h("javascriptFuncKeyword", { "fg": s:purple })
|
||||
call s:h("javascriptIdentifier", { "fg": s:red })
|
||||
call s:h("javascriptImport", { "fg": s:purple })
|
||||
call s:h("javascriptMethodName", { "fg": s:white })
|
||||
call s:h("javascriptObjectLabel", { "fg": s:white })
|
||||
call s:h("javascriptOpSymbol", { "fg": s:cyan })
|
||||
call s:h("javascriptOpSymbols", { "fg": s:cyan })
|
||||
call s:h("javascriptPropertyName", { "fg": s:green })
|
||||
call s:h("javascriptTemplateSB", { "fg": s:dark_red })
|
||||
call s:h("javascriptVariable", { "fg": s:purple })
|
||||
|
||||
" JSON
|
||||
call s:h("jsonCommentError", { "fg": s:white })
|
||||
call s:h("jsonKeyword", { "fg": s:red })
|
||||
call s:h("jsonBoolean", { "fg": s:dark_yellow })
|
||||
call s:h("jsonNumber", { "fg": s:dark_yellow })
|
||||
call s:h("jsonQuote", { "fg": s:white })
|
||||
call s:h("jsonMissingCommaError", { "fg": s:red, "gui": "reverse" })
|
||||
call s:h("jsonNoQuotesError", { "fg": s:red, "gui": "reverse" })
|
||||
call s:h("jsonNumError", { "fg": s:red, "gui": "reverse" })
|
||||
call s:h("jsonString", { "fg": s:green })
|
||||
call s:h("jsonStringSQError", { "fg": s:red, "gui": "reverse" })
|
||||
call s:h("jsonSemicolonError", { "fg": s:red, "gui": "reverse" })
|
||||
|
||||
" LESS
|
||||
call s:h("lessVariable", { "fg": s:purple })
|
||||
call s:h("lessAmpersandChar", { "fg": s:white })
|
||||
call s:h("lessClass", { "fg": s:dark_yellow })
|
||||
|
||||
" Markdown (keep consistent with HTML, above)
|
||||
call s:h("markdownBlockquote", { "fg": s:comment_grey })
|
||||
call s:h("markdownBold", { "fg": s:dark_yellow, "gui": "bold", "cterm": "bold" })
|
||||
call s:h("markdownCode", { "fg": s:green })
|
||||
call s:h("markdownCodeBlock", { "fg": s:green })
|
||||
call s:h("markdownCodeDelimiter", { "fg": s:green })
|
||||
call s:h("markdownH1", { "fg": s:red })
|
||||
call s:h("markdownH2", { "fg": s:red })
|
||||
call s:h("markdownH3", { "fg": s:red })
|
||||
call s:h("markdownH4", { "fg": s:red })
|
||||
call s:h("markdownH5", { "fg": s:red })
|
||||
call s:h("markdownH6", { "fg": s:red })
|
||||
call s:h("markdownHeadingDelimiter", { "fg": s:red })
|
||||
call s:h("markdownHeadingRule", { "fg": s:comment_grey })
|
||||
call s:h("markdownId", { "fg": s:purple })
|
||||
call s:h("markdownIdDeclaration", { "fg": s:blue })
|
||||
call s:h("markdownIdDelimiter", { "fg": s:purple })
|
||||
call s:h("markdownItalic", { "fg": s:purple, "gui": "italic", "cterm": "italic" })
|
||||
call s:h("markdownLinkDelimiter", { "fg": s:purple })
|
||||
call s:h("markdownLinkText", { "fg": s:blue })
|
||||
call s:h("markdownListMarker", { "fg": s:red })
|
||||
call s:h("markdownOrderedListMarker", { "fg": s:red })
|
||||
call s:h("markdownRule", { "fg": s:comment_grey })
|
||||
call s:h("markdownUrl", { "fg": s:cyan, "gui": "underline", "cterm": "underline" })
|
||||
|
||||
" Perl
|
||||
call s:h("perlFiledescRead", { "fg": s:green })
|
||||
call s:h("perlFunction", { "fg": s:purple })
|
||||
call s:h("perlMatchStartEnd",{ "fg": s:blue })
|
||||
call s:h("perlMethod", { "fg": s:purple })
|
||||
call s:h("perlPOD", { "fg": s:comment_grey })
|
||||
call s:h("perlSharpBang", { "fg": s:comment_grey })
|
||||
call s:h("perlSpecialString",{ "fg": s:dark_yellow })
|
||||
call s:h("perlStatementFiledesc", { "fg": s:red })
|
||||
call s:h("perlStatementFlow",{ "fg": s:red })
|
||||
call s:h("perlStatementInclude", { "fg": s:purple })
|
||||
call s:h("perlStatementScalar",{ "fg": s:purple })
|
||||
call s:h("perlStatementStorage", { "fg": s:purple })
|
||||
call s:h("perlSubName",{ "fg": s:yellow })
|
||||
call s:h("perlVarPlain",{ "fg": s:blue })
|
||||
|
||||
" PHP
|
||||
call s:h("phpVarSelector", { "fg": s:red })
|
||||
call s:h("phpOperator", { "fg": s:white })
|
||||
call s:h("phpParent", { "fg": s:white })
|
||||
call s:h("phpMemberSelector", { "fg": s:white })
|
||||
call s:h("phpType", { "fg": s:purple })
|
||||
call s:h("phpKeyword", { "fg": s:purple })
|
||||
call s:h("phpClass", { "fg": s:yellow })
|
||||
call s:h("phpUseClass", { "fg": s:white })
|
||||
call s:h("phpUseAlias", { "fg": s:white })
|
||||
call s:h("phpInclude", { "fg": s:purple })
|
||||
call s:h("phpClassExtends", { "fg": s:green })
|
||||
call s:h("phpDocTags", { "fg": s:white })
|
||||
call s:h("phpFunction", { "fg": s:blue })
|
||||
call s:h("phpFunctions", { "fg": s:cyan })
|
||||
call s:h("phpMethodsVar", { "fg": s:dark_yellow })
|
||||
call s:h("phpMagicConstants", { "fg": s:dark_yellow })
|
||||
call s:h("phpSuperglobals", { "fg": s:red })
|
||||
call s:h("phpConstants", { "fg": s:dark_yellow })
|
||||
|
||||
" Ruby
|
||||
call s:h("rubyBlockParameter", { "fg": s:red})
|
||||
call s:h("rubyBlockParameterList", { "fg": s:red })
|
||||
call s:h("rubyClass", { "fg": s:purple})
|
||||
call s:h("rubyConstant", { "fg": s:yellow})
|
||||
call s:h("rubyControl", { "fg": s:purple })
|
||||
call s:h("rubyEscape", { "fg": s:red})
|
||||
call s:h("rubyFunction", { "fg": s:blue})
|
||||
call s:h("rubyGlobalVariable", { "fg": s:red})
|
||||
call s:h("rubyInclude", { "fg": s:blue})
|
||||
call s:h("rubyIncluderubyGlobalVariable", { "fg": s:red})
|
||||
call s:h("rubyInstanceVariable", { "fg": s:red})
|
||||
call s:h("rubyInterpolation", { "fg": s:cyan })
|
||||
call s:h("rubyInterpolationDelimiter", { "fg": s:red })
|
||||
call s:h("rubyInterpolationDelimiter", { "fg": s:red})
|
||||
call s:h("rubyRegexp", { "fg": s:cyan})
|
||||
call s:h("rubyRegexpDelimiter", { "fg": s:cyan})
|
||||
call s:h("rubyStringDelimiter", { "fg": s:green})
|
||||
call s:h("rubySymbol", { "fg": s:cyan})
|
||||
|
||||
" Sass
|
||||
" https://github.com/tpope/vim-haml
|
||||
call s:h("sassAmpersand", { "fg": s:red })
|
||||
call s:h("sassClass", { "fg": s:dark_yellow })
|
||||
call s:h("sassControl", { "fg": s:purple })
|
||||
call s:h("sassExtend", { "fg": s:purple })
|
||||
call s:h("sassFor", { "fg": s:white })
|
||||
call s:h("sassFunction", { "fg": s:cyan })
|
||||
call s:h("sassId", { "fg": s:blue })
|
||||
call s:h("sassInclude", { "fg": s:purple })
|
||||
call s:h("sassMedia", { "fg": s:purple })
|
||||
call s:h("sassMediaOperators", { "fg": s:white })
|
||||
call s:h("sassMixin", { "fg": s:purple })
|
||||
call s:h("sassMixinName", { "fg": s:blue })
|
||||
call s:h("sassMixing", { "fg": s:purple })
|
||||
call s:h("sassVariable", { "fg": s:purple })
|
||||
" https://github.com/cakebaker/scss-syntax.vim
|
||||
call s:h("scssExtend", { "fg": s:purple })
|
||||
call s:h("scssImport", { "fg": s:purple })
|
||||
call s:h("scssInclude", { "fg": s:purple })
|
||||
call s:h("scssMixin", { "fg": s:purple })
|
||||
call s:h("scssSelectorName", { "fg": s:dark_yellow })
|
||||
call s:h("scssVariable", { "fg": s:purple })
|
||||
|
||||
" TeX
|
||||
call s:h("texStatement", { "fg": s:purple })
|
||||
call s:h("texSubscripts", { "fg": s:dark_yellow })
|
||||
call s:h("texSuperscripts", { "fg": s:dark_yellow })
|
||||
call s:h("texTodo", { "fg": s:dark_red })
|
||||
call s:h("texBeginEnd", { "fg": s:purple })
|
||||
call s:h("texBeginEndName", { "fg": s:blue })
|
||||
call s:h("texMathMatcher", { "fg": s:blue })
|
||||
call s:h("texMathDelim", { "fg": s:blue })
|
||||
call s:h("texDelimiter", { "fg": s:dark_yellow })
|
||||
call s:h("texSpecialChar", { "fg": s:dark_yellow })
|
||||
call s:h("texCite", { "fg": s:blue })
|
||||
call s:h("texRefZone", { "fg": s:blue })
|
||||
|
||||
" TypeScript
|
||||
call s:h("typescriptReserved", { "fg": s:purple })
|
||||
call s:h("typescriptEndColons", { "fg": s:white })
|
||||
call s:h("typescriptBraces", { "fg": s:white })
|
||||
|
||||
" XML
|
||||
call s:h("xmlAttrib", { "fg": s:dark_yellow })
|
||||
call s:h("xmlEndTag", { "fg": s:red })
|
||||
call s:h("xmlTag", { "fg": s:red })
|
||||
call s:h("xmlTagName", { "fg": s:red })
|
||||
|
||||
" }}}
|
||||
|
||||
" Plugin Highlighting {{{
|
||||
|
||||
" airblade/vim-gitgutter
|
||||
hi link GitGutterAdd SignifySignAdd
|
||||
hi link GitGutterChange SignifySignChange
|
||||
hi link GitGutterDelete SignifySignDelete
|
||||
|
||||
" dense-analysis/ale
|
||||
call s:h("ALEError", { "fg": s:red, "gui": "underline", "cterm": "underline" })
|
||||
call s:h("ALEWarning", { "fg": s:yellow, "gui": "underline", "cterm": "underline"})
|
||||
call s:h("ALEInfo", { "gui": "underline", "cterm": "underline"})
|
||||
|
||||
" easymotion/vim-easymotion
|
||||
call s:h("EasyMotionTarget", { "fg": s:red, "gui": "bold", "cterm": "bold" })
|
||||
call s:h("EasyMotionTarget2First", { "fg": s:yellow, "gui": "bold", "cterm": "bold" })
|
||||
call s:h("EasyMotionTarget2Second", { "fg": s:dark_yellow, "gui": "bold", "cterm": "bold" })
|
||||
call s:h("EasyMotionShade", { "fg": s:comment_grey })
|
||||
|
||||
" mhinz/vim-signify
|
||||
call s:h("SignifySignAdd", { "fg": s:green })
|
||||
call s:h("SignifySignChange", { "fg": s:yellow })
|
||||
call s:h("SignifySignDelete", { "fg": s:red })
|
||||
|
||||
" neomake/neomake
|
||||
call s:h("NeomakeWarningSign", { "fg": s:yellow })
|
||||
call s:h("NeomakeErrorSign", { "fg": s:red })
|
||||
call s:h("NeomakeInfoSign", { "fg": s:blue })
|
||||
|
||||
" plasticboy/vim-markdown (keep consistent with Markdown, above)
|
||||
call s:h("mkdDelimiter", { "fg": s:purple })
|
||||
call s:h("mkdHeading", { "fg": s:red })
|
||||
call s:h("mkdLink", { "fg": s:blue })
|
||||
call s:h("mkdURL", { "fg": s:cyan, "gui": "underline", "cterm": "underline" })
|
||||
|
||||
" tpope/vim-fugitive
|
||||
call s:h("diffAdded", { "fg": s:green })
|
||||
call s:h("diffRemoved", { "fg": s:red })
|
||||
|
||||
" }}}
|
||||
|
||||
" Git Highlighting {{{
|
||||
|
||||
call s:h("gitcommitComment", { "fg": s:comment_grey })
|
||||
call s:h("gitcommitUnmerged", { "fg": s:green })
|
||||
call s:h("gitcommitOnBranch", {})
|
||||
call s:h("gitcommitBranch", { "fg": s:purple })
|
||||
call s:h("gitcommitDiscardedType", { "fg": s:red })
|
||||
call s:h("gitcommitSelectedType", { "fg": s:green })
|
||||
call s:h("gitcommitHeader", {})
|
||||
call s:h("gitcommitUntrackedFile", { "fg": s:cyan })
|
||||
call s:h("gitcommitDiscardedFile", { "fg": s:red })
|
||||
call s:h("gitcommitSelectedFile", { "fg": s:green })
|
||||
call s:h("gitcommitUnmergedFile", { "fg": s:yellow })
|
||||
call s:h("gitcommitFile", {})
|
||||
call s:h("gitcommitSummary", { "fg": s:white })
|
||||
call s:h("gitcommitOverflow", { "fg": s:red })
|
||||
hi link gitcommitNoBranch gitcommitBranch
|
||||
hi link gitcommitUntracked gitcommitComment
|
||||
hi link gitcommitDiscarded gitcommitComment
|
||||
hi link gitcommitSelected gitcommitComment
|
||||
hi link gitcommitDiscardedArrow gitcommitDiscardedFile
|
||||
hi link gitcommitSelectedArrow gitcommitSelectedFile
|
||||
hi link gitcommitUnmergedArrow gitcommitUnmergedFile
|
||||
|
||||
" }}}
|
||||
|
||||
" Neovim-Specific Highlighting {{{
|
||||
|
||||
if has("nvim")
|
||||
" Neovim terminal colors {{{
|
||||
let g:terminal_color_0 = s:black.gui
|
||||
let g:terminal_color_1 = s:red.gui
|
||||
let g:terminal_color_2 = s:green.gui
|
||||
let g:terminal_color_3 = s:yellow.gui
|
||||
let g:terminal_color_4 = s:blue.gui
|
||||
let g:terminal_color_5 = s:purple.gui
|
||||
let g:terminal_color_6 = s:cyan.gui
|
||||
let g:terminal_color_7 = s:white.gui
|
||||
let g:terminal_color_8 = s:visual_grey.gui
|
||||
let g:terminal_color_9 = s:dark_red.gui
|
||||
let g:terminal_color_10 = s:green.gui " No dark version
|
||||
let g:terminal_color_11 = s:dark_yellow.gui
|
||||
let g:terminal_color_12 = s:blue.gui " No dark version
|
||||
let g:terminal_color_13 = s:purple.gui " No dark version
|
||||
let g:terminal_color_14 = s:cyan.gui " No dark version
|
||||
let g:terminal_color_15 = s:comment_grey.gui
|
||||
let g:terminal_color_background = g:terminal_color_0
|
||||
let g:terminal_color_foreground = g:terminal_color_7
|
||||
" }}}
|
||||
" Neovim LSP colors {{{
|
||||
call s:h("LspDiagnosticsDefaultError", { "fg": s:red })
|
||||
call s:h("LspDiagnosticsDefaultWarning", { "fg": s:yellow })
|
||||
call s:h("LspDiagnosticsDefaultInformation", { "fg": s:white })
|
||||
call s:h("LspDiagnosticsDefaultHint", { "fg": s:comment_grey })
|
||||
call s:h("LspDiagnosticsUnderlineError", { "fg": s:red, "gui": "underline", "cterm": "underline" })
|
||||
call s:h("LspDiagnosticsUnderlineWarning", { "fg": s:yellow, "gui": "underline", "cterm": "underline" })
|
||||
call s:h("LspDiagnosticsUnderlineInformation", { "fg": s:white, "gui": "underline", "cterm": "underline" })
|
||||
call s:h("LspDiagnosticsUnderlineHint", { "fg": s:comment_grey, "gui": "underline", "cterm": "underline" })
|
||||
" }}}
|
||||
endif
|
||||
|
||||
" }}}
|
||||
|
||||
" Must appear at the end of the file to work around this oddity:
|
||||
" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
|
||||
set background=dark
|
||||
|
|
@ -1,224 +0,0 @@
|
|||
" ==============================================================================
|
||||
" Name: One Half Dark
|
||||
" Author: Son A. Pham <sp@sonpham.me>
|
||||
" Url: https://github.com/sonph/onehalf
|
||||
" License: The MIT License (MIT)
|
||||
"
|
||||
" A dark vim color scheme based on Atom's One. See github.com/sonph/onehalf
|
||||
" for installation instructions, a light color scheme, versions for other
|
||||
" editors/terminals, and a matching theme for vim-airline.
|
||||
" ==============================================================================
|
||||
|
||||
set background=dark
|
||||
highlight clear
|
||||
syntax reset
|
||||
|
||||
let g:colors_name="onehalfdark"
|
||||
let colors_name="onehalfdark"
|
||||
|
||||
|
||||
let s:black = { "gui": "#282c34", "cterm": "236" }
|
||||
let s:red = { "gui": "#e06c75", "cterm": "168" }
|
||||
let s:green = { "gui": "#98c379", "cterm": "114" }
|
||||
let s:yellow = { "gui": "#e5c07b", "cterm": "180" }
|
||||
let s:blue = { "gui": "#61afef", "cterm": "75" }
|
||||
let s:purple = { "gui": "#c678dd", "cterm": "176" }
|
||||
let s:cyan = { "gui": "#56b6c2", "cterm": "73" }
|
||||
let s:white = { "gui": "#dcdfe4", "cterm": "188" }
|
||||
|
||||
let s:fg = s:white
|
||||
let s:bg = s:black
|
||||
|
||||
let s:comment_fg = { "gui": "#5c6370", "cterm": "241" }
|
||||
let s:gutter_bg = { "gui": "#282c34", "cterm": "236" }
|
||||
let s:gutter_fg = { "gui": "#919baa", "cterm": "247" }
|
||||
let s:non_text = { "gui": "#373C45", "cterm": "239" }
|
||||
|
||||
let s:cursor_line = { "gui": "#313640", "cterm": "237" }
|
||||
let s:color_col = { "gui": "#313640", "cterm": "237" }
|
||||
|
||||
let s:selection = { "gui": "#474e5d", "cterm": "239" }
|
||||
let s:vertsplit = { "gui": "#313640", "cterm": "237" }
|
||||
|
||||
|
||||
function! s:h(group, fg, bg, attr)
|
||||
if type(a:fg) == type({})
|
||||
exec "hi " . a:group . " guifg=" . a:fg.gui . " ctermfg=" . a:fg.cterm
|
||||
else
|
||||
exec "hi " . a:group . " guifg=NONE cterm=NONE"
|
||||
endif
|
||||
if type(a:bg) == type({})
|
||||
exec "hi " . a:group . " guibg=" . a:bg.gui . " ctermbg=" . a:bg.cterm
|
||||
else
|
||||
exec "hi " . a:group . " guibg=NONE ctermbg=NONE"
|
||||
endif
|
||||
if a:attr != ""
|
||||
exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
|
||||
else
|
||||
exec "hi " . a:group . " gui=NONE cterm=NONE"
|
||||
endif
|
||||
endfun
|
||||
|
||||
|
||||
" User interface colors {
|
||||
call s:h("Normal", s:fg, s:bg, "")
|
||||
|
||||
call s:h("Cursor", s:bg, s:blue, "")
|
||||
call s:h("CursorColumn", "", s:cursor_line, "")
|
||||
call s:h("CursorLine", "", s:cursor_line, "")
|
||||
|
||||
call s:h("LineNr", s:gutter_fg, s:gutter_bg, "")
|
||||
call s:h("CursorLineNr", s:fg, "", "")
|
||||
|
||||
call s:h("DiffAdd", s:green, "", "")
|
||||
call s:h("DiffChange", s:yellow, "", "")
|
||||
call s:h("DiffDelete", s:red, "", "")
|
||||
call s:h("DiffText", s:blue, "", "")
|
||||
|
||||
call s:h("IncSearch", s:bg, s:yellow, "")
|
||||
call s:h("Search", s:bg, s:yellow, "")
|
||||
|
||||
call s:h("ErrorMsg", s:fg, "", "")
|
||||
call s:h("ModeMsg", s:fg, "", "")
|
||||
call s:h("MoreMsg", s:fg, "", "")
|
||||
call s:h("WarningMsg", s:red, "", "")
|
||||
call s:h("Question", s:purple, "", "")
|
||||
|
||||
call s:h("Pmenu", s:bg, s:fg, "")
|
||||
call s:h("PmenuSel", s:fg, s:blue, "")
|
||||
call s:h("PmenuSbar", "", s:selection, "")
|
||||
call s:h("PmenuThumb", "", s:fg, "")
|
||||
|
||||
call s:h("SpellBad", s:red, "", "")
|
||||
call s:h("SpellCap", s:yellow, "", "")
|
||||
call s:h("SpellLocal", s:yellow, "", "")
|
||||
call s:h("SpellRare", s:yellow, "", "")
|
||||
|
||||
call s:h("StatusLine", s:blue, s:cursor_line, "")
|
||||
call s:h("StatusLineNC", s:comment_fg, s:cursor_line, "")
|
||||
call s:h("TabLine", s:comment_fg, s:cursor_line, "")
|
||||
call s:h("TabLineFill", s:comment_fg, s:cursor_line, "")
|
||||
call s:h("TabLineSel", s:fg, s:bg, "")
|
||||
|
||||
call s:h("Visual", "", s:selection, "")
|
||||
call s:h("VisualNOS", "", s:selection, "")
|
||||
|
||||
call s:h("ColorColumn", "", s:color_col, "")
|
||||
call s:h("Conceal", s:fg, "", "")
|
||||
call s:h("Directory", s:blue, "", "")
|
||||
call s:h("VertSplit", s:vertsplit, s:vertsplit, "")
|
||||
call s:h("Folded", s:fg, "", "")
|
||||
call s:h("FoldColumn", s:fg, "", "")
|
||||
call s:h("SignColumn", s:fg, "", "")
|
||||
|
||||
call s:h("MatchParen", s:blue, "", "underline")
|
||||
call s:h("SpecialKey", s:fg, "", "")
|
||||
call s:h("Title", s:green, "", "")
|
||||
call s:h("WildMenu", s:fg, "", "")
|
||||
" }
|
||||
|
||||
|
||||
" Syntax colors {
|
||||
" Whitespace is defined in Neovim, not Vim.
|
||||
" See :help hl-Whitespace and :help hl-SpecialKey
|
||||
call s:h("Whitespace", s:non_text, "", "")
|
||||
call s:h("NonText", s:non_text, "", "")
|
||||
call s:h("Comment", s:comment_fg, "", "italic")
|
||||
call s:h("Constant", s:cyan, "", "")
|
||||
call s:h("String", s:green, "", "")
|
||||
call s:h("Character", s:green, "", "")
|
||||
call s:h("Number", s:yellow, "", "")
|
||||
call s:h("Boolean", s:yellow, "", "")
|
||||
call s:h("Float", s:yellow, "", "")
|
||||
|
||||
call s:h("Identifier", s:red, "", "")
|
||||
call s:h("Function", s:blue, "", "")
|
||||
call s:h("Statement", s:purple, "", "")
|
||||
|
||||
call s:h("Conditional", s:purple, "", "")
|
||||
call s:h("Repeat", s:purple, "", "")
|
||||
call s:h("Label", s:purple, "", "")
|
||||
call s:h("Operator", s:fg, "", "")
|
||||
call s:h("Keyword", s:red, "", "")
|
||||
call s:h("Exception", s:purple, "", "")
|
||||
|
||||
call s:h("PreProc", s:yellow, "", "")
|
||||
call s:h("Include", s:purple, "", "")
|
||||
call s:h("Define", s:purple, "", "")
|
||||
call s:h("Macro", s:purple, "", "")
|
||||
call s:h("PreCondit", s:yellow, "", "")
|
||||
|
||||
call s:h("Type", s:yellow, "", "")
|
||||
call s:h("StorageClass", s:yellow, "", "")
|
||||
call s:h("Structure", s:yellow, "", "")
|
||||
call s:h("Typedef", s:yellow, "", "")
|
||||
|
||||
call s:h("Special", s:blue, "", "")
|
||||
call s:h("SpecialChar", s:fg, "", "")
|
||||
call s:h("Tag", s:fg, "", "")
|
||||
call s:h("Delimiter", s:fg, "", "")
|
||||
call s:h("SpecialComment", s:fg, "", "")
|
||||
call s:h("Debug", s:fg, "", "")
|
||||
call s:h("Underlined", s:fg, "", "")
|
||||
call s:h("Ignore", s:fg, "", "")
|
||||
call s:h("Error", s:red, s:gutter_bg, "")
|
||||
call s:h("Todo", s:purple, "", "")
|
||||
" }
|
||||
|
||||
|
||||
" Plugins {
|
||||
" GitGutter
|
||||
call s:h("GitGutterAdd", s:green, s:gutter_bg, "")
|
||||
call s:h("GitGutterDelete", s:red, s:gutter_bg, "")
|
||||
call s:h("GitGutterChange", s:yellow, s:gutter_bg, "")
|
||||
call s:h("GitGutterChangeDelete", s:red, s:gutter_bg, "")
|
||||
" Fugitive
|
||||
call s:h("diffAdded", s:green, "", "")
|
||||
call s:h("diffRemoved", s:red, "", "")
|
||||
" }
|
||||
|
||||
|
||||
" Git {
|
||||
call s:h("gitcommitComment", s:comment_fg, "", "")
|
||||
call s:h("gitcommitUnmerged", s:red, "", "")
|
||||
call s:h("gitcommitOnBranch", s:fg, "", "")
|
||||
call s:h("gitcommitBranch", s:purple, "", "")
|
||||
call s:h("gitcommitDiscardedType", s:red, "", "")
|
||||
call s:h("gitcommitSelectedType", s:green, "", "")
|
||||
call s:h("gitcommitHeader", s:fg, "", "")
|
||||
call s:h("gitcommitUntrackedFile", s:cyan, "", "")
|
||||
call s:h("gitcommitDiscardedFile", s:red, "", "")
|
||||
call s:h("gitcommitSelectedFile", s:green, "", "")
|
||||
call s:h("gitcommitUnmergedFile", s:yellow, "", "")
|
||||
call s:h("gitcommitFile", s:fg, "", "")
|
||||
hi link gitcommitNoBranch gitcommitBranch
|
||||
hi link gitcommitUntracked gitcommitComment
|
||||
hi link gitcommitDiscarded gitcommitComment
|
||||
hi link gitcommitSelected gitcommitComment
|
||||
hi link gitcommitDiscardedArrow gitcommitDiscardedFile
|
||||
hi link gitcommitSelectedArrow gitcommitSelectedFile
|
||||
hi link gitcommitUnmergedArrow gitcommitUnmergedFile
|
||||
" }
|
||||
|
||||
" Fix colors in neovim terminal buffers {
|
||||
if has('nvim')
|
||||
let g:terminal_color_0 = s:black.gui
|
||||
let g:terminal_color_1 = s:red.gui
|
||||
let g:terminal_color_2 = s:green.gui
|
||||
let g:terminal_color_3 = s:yellow.gui
|
||||
let g:terminal_color_4 = s:blue.gui
|
||||
let g:terminal_color_5 = s:purple.gui
|
||||
let g:terminal_color_6 = s:cyan.gui
|
||||
let g:terminal_color_7 = s:white.gui
|
||||
let g:terminal_color_8 = s:black.gui
|
||||
let g:terminal_color_9 = s:red.gui
|
||||
let g:terminal_color_10 = s:green.gui
|
||||
let g:terminal_color_11 = s:yellow.gui
|
||||
let g:terminal_color_12 = s:blue.gui
|
||||
let g:terminal_color_13 = s:purple.gui
|
||||
let g:terminal_color_14 = s:cyan.gui
|
||||
let g:terminal_color_15 = s:white.gui
|
||||
let g:terminal_color_background = s:bg.gui
|
||||
let g:terminal_color_foreground = s:fg.gui
|
||||
endif
|
||||
" }
|
||||
|
|
@ -1,224 +0,0 @@
|
|||
" ==============================================================================
|
||||
" Name: One Half Light
|
||||
" Author: Son A. Pham <sp@sonpham.me>
|
||||
" Url: https://github.com/sonph/onehalf
|
||||
" License: The MIT License (MIT)
|
||||
"
|
||||
" A light vim color scheme based on Atom's One. See github.com/sonph/onehalf
|
||||
" for installation instructions, a dark color scheme, versions for other
|
||||
" editors/terminals, and a matching theme for vim-airline.
|
||||
" ==============================================================================
|
||||
|
||||
set background=light
|
||||
highlight clear
|
||||
syntax reset
|
||||
|
||||
let g:colors_name="onehalflight"
|
||||
let colors_name="onehalflight"
|
||||
|
||||
|
||||
let s:black = { "gui": "#383a42", "cterm": "237" }
|
||||
let s:red = { "gui": "#e45649", "cterm": "167" }
|
||||
let s:green = { "gui": "#50a14f", "cterm": "71" }
|
||||
let s:yellow = { "gui": "#c18401", "cterm": "136" }
|
||||
let s:blue = { "gui": "#0184bc", "cterm": "31" }
|
||||
let s:purple = { "gui": "#a626a4", "cterm": "127" }
|
||||
let s:cyan = { "gui": "#0997b3", "cterm": "31" }
|
||||
let s:white = { "gui": "#fafafa", "cterm": "231" }
|
||||
|
||||
let s:fg = s:black
|
||||
let s:bg = s:white
|
||||
|
||||
let s:comment_fg = { "gui": "#a0a1a7", "cterm": "247" }
|
||||
let s:gutter_bg = { "gui": "#fafafa", "cterm": "231" }
|
||||
let s:gutter_fg = { "gui": "#d4d4d4", "cterm": "252" }
|
||||
let s:non_text = { "gui": "#e5e5e5", "cterm": "252" }
|
||||
|
||||
let s:cursor_line = { "gui": "#f0f0f0", "cterm": "255" }
|
||||
let s:color_col = { "gui": "#f0f0f0", "cterm": "255" }
|
||||
|
||||
let s:selection = { "gui": "#bfceff", "cterm": "153" }
|
||||
let s:vertsplit = { "gui": "#f0f0f0", "cterm": "255" }
|
||||
|
||||
|
||||
function! s:h(group, fg, bg, attr)
|
||||
if type(a:fg) == type({})
|
||||
exec "hi " . a:group . " guifg=" . a:fg.gui . " ctermfg=" . a:fg.cterm
|
||||
else
|
||||
exec "hi " . a:group . " guifg=NONE cterm=NONE"
|
||||
endif
|
||||
if type(a:bg) == type({})
|
||||
exec "hi " . a:group . " guibg=" . a:bg.gui . " ctermbg=" . a:bg.cterm
|
||||
else
|
||||
exec "hi " . a:group . " guibg=NONE ctermbg=NONE"
|
||||
endif
|
||||
if a:attr != ""
|
||||
exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
|
||||
else
|
||||
exec "hi " . a:group . " gui=NONE cterm=NONE"
|
||||
endif
|
||||
endfun
|
||||
|
||||
|
||||
" User interface colors {
|
||||
call s:h("Normal", s:fg, s:bg, "")
|
||||
|
||||
call s:h("Cursor", s:bg, s:blue, "")
|
||||
call s:h("CursorColumn", "", s:cursor_line, "")
|
||||
call s:h("CursorLine", "", s:cursor_line, "")
|
||||
|
||||
call s:h("LineNr", s:gutter_fg, s:gutter_bg, "")
|
||||
call s:h("CursorLineNr", s:fg, "", "")
|
||||
|
||||
call s:h("DiffAdd", s:green, "", "")
|
||||
call s:h("DiffChange", s:yellow, "", "")
|
||||
call s:h("DiffDelete", s:red, "", "")
|
||||
call s:h("DiffText", s:blue, "", "")
|
||||
|
||||
call s:h("IncSearch", s:bg, s:yellow, "")
|
||||
call s:h("Search", s:bg, s:yellow, "")
|
||||
|
||||
call s:h("ErrorMsg", s:fg, "", "")
|
||||
call s:h("ModeMsg", s:fg, "", "")
|
||||
call s:h("MoreMsg", s:fg, "", "")
|
||||
call s:h("WarningMsg", s:red, "", "")
|
||||
call s:h("Question", s:purple, "", "")
|
||||
|
||||
call s:h("Pmenu", s:fg, s:cursor_line, "")
|
||||
call s:h("PmenuSel", s:bg, s:blue, "")
|
||||
call s:h("PmenuSbar", "", s:cursor_line, "")
|
||||
call s:h("PmenuThumb", "", s:comment_fg, "")
|
||||
|
||||
call s:h("SpellBad", s:red, "", "")
|
||||
call s:h("SpellCap", s:yellow, "", "")
|
||||
call s:h("SpellLocal", s:yellow, "", "")
|
||||
call s:h("SpellRare", s:yellow, "", "")
|
||||
|
||||
call s:h("StatusLine", s:blue, s:cursor_line, "")
|
||||
call s:h("StatusLineNC", s:comment_fg, s:cursor_line, "")
|
||||
call s:h("TabLine", s:comment_fg, s:cursor_line, "")
|
||||
call s:h("TabLineFill", s:comment_fg, s:cursor_line, "")
|
||||
call s:h("TabLineSel", s:fg, s:bg, "")
|
||||
|
||||
call s:h("Visual", "", s:selection, "")
|
||||
call s:h("VisualNOS", "", s:selection, "")
|
||||
|
||||
call s:h("ColorColumn", "", s:color_col, "")
|
||||
call s:h("Conceal", s:fg, "", "")
|
||||
call s:h("Directory", s:blue, "", "")
|
||||
call s:h("VertSplit", s:vertsplit, s:vertsplit, "")
|
||||
call s:h("Folded", s:fg, "", "")
|
||||
call s:h("FoldColumn", s:fg, "", "")
|
||||
call s:h("SignColumn", s:fg, "", "")
|
||||
|
||||
call s:h("MatchParen", s:blue, "", "underline")
|
||||
call s:h("SpecialKey", s:fg, "", "")
|
||||
call s:h("Title", s:green, "", "")
|
||||
call s:h("WildMenu", s:fg, "", "")
|
||||
" }
|
||||
|
||||
|
||||
" Syntax colors {
|
||||
" Whitespace is defined in Neovim, not Vim.
|
||||
" See :help hl-Whitespace and :help hl-SpecialKey
|
||||
call s:h("Whitespace", s:non_text, "", "")
|
||||
call s:h("NonText", s:non_text, "", "")
|
||||
call s:h("Comment", s:comment_fg, "", "italic")
|
||||
call s:h("Constant", s:cyan, "", "")
|
||||
call s:h("String", s:green, "", "")
|
||||
call s:h("Character", s:green, "", "")
|
||||
call s:h("Number", s:yellow, "", "")
|
||||
call s:h("Boolean", s:yellow, "", "")
|
||||
call s:h("Float", s:yellow, "", "")
|
||||
|
||||
call s:h("Identifier", s:red, "", "")
|
||||
call s:h("Function", s:blue, "", "")
|
||||
call s:h("Statement", s:purple, "", "")
|
||||
|
||||
call s:h("Conditional", s:purple, "", "")
|
||||
call s:h("Repeat", s:purple, "", "")
|
||||
call s:h("Label", s:purple, "", "")
|
||||
call s:h("Operator", s:fg, "", "")
|
||||
call s:h("Keyword", s:red, "", "")
|
||||
call s:h("Exception", s:purple, "", "")
|
||||
|
||||
call s:h("PreProc", s:yellow, "", "")
|
||||
call s:h("Include", s:purple, "", "")
|
||||
call s:h("Define", s:purple, "", "")
|
||||
call s:h("Macro", s:purple, "", "")
|
||||
call s:h("PreCondit", s:yellow, "", "")
|
||||
|
||||
call s:h("Type", s:yellow, "", "")
|
||||
call s:h("StorageClass", s:yellow, "", "")
|
||||
call s:h("Structure", s:yellow, "", "")
|
||||
call s:h("Typedef", s:yellow, "", "")
|
||||
|
||||
call s:h("Special", s:blue, "", "")
|
||||
call s:h("SpecialChar", s:fg, "", "")
|
||||
call s:h("Tag", s:fg, "", "")
|
||||
call s:h("Delimiter", s:fg, "", "")
|
||||
call s:h("SpecialComment", s:fg, "", "")
|
||||
call s:h("Debug", s:fg, "", "")
|
||||
call s:h("Underlined", s:fg, "", "")
|
||||
call s:h("Ignore", s:fg, "", "")
|
||||
call s:h("Error", s:red, s:gutter_bg, "")
|
||||
call s:h("Todo", s:purple, "", "")
|
||||
" }
|
||||
|
||||
|
||||
" Plugins {
|
||||
" GitGutter
|
||||
call s:h("GitGutterAdd", s:green, s:gutter_bg, "")
|
||||
call s:h("GitGutterDelete", s:red, s:gutter_bg, "")
|
||||
call s:h("GitGutterChange", s:yellow, s:gutter_bg, "")
|
||||
call s:h("GitGutterChangeDelete", s:red, s:gutter_bg, "")
|
||||
" Fugitive
|
||||
call s:h("diffAdded", s:green, "", "")
|
||||
call s:h("diffRemoved", s:red, "", "")
|
||||
" }
|
||||
|
||||
|
||||
" Git {
|
||||
call s:h("gitcommitComment", s:comment_fg, "", "")
|
||||
call s:h("gitcommitUnmerged", s:red, "", "")
|
||||
call s:h("gitcommitOnBranch", s:fg, "", "")
|
||||
call s:h("gitcommitBranch", s:purple, "", "")
|
||||
call s:h("gitcommitDiscardedType", s:red, "", "")
|
||||
call s:h("gitcommitSelectedType", s:green, "", "")
|
||||
call s:h("gitcommitHeader", s:fg, "", "")
|
||||
call s:h("gitcommitUntrackedFile", s:cyan, "", "")
|
||||
call s:h("gitcommitDiscardedFile", s:red, "", "")
|
||||
call s:h("gitcommitSelectedFile", s:green, "", "")
|
||||
call s:h("gitcommitUnmergedFile", s:yellow, "", "")
|
||||
call s:h("gitcommitFile", s:fg, "", "")
|
||||
hi link gitcommitNoBranch gitcommitBranch
|
||||
hi link gitcommitUntracked gitcommitComment
|
||||
hi link gitcommitDiscarded gitcommitComment
|
||||
hi link gitcommitSelected gitcommitComment
|
||||
hi link gitcommitDiscardedArrow gitcommitDiscardedFile
|
||||
hi link gitcommitSelectedArrow gitcommitSelectedFile
|
||||
hi link gitcommitUnmergedArrow gitcommitUnmergedFile
|
||||
" }
|
||||
|
||||
" Fix colors in neovim terminal buffers {
|
||||
if has('nvim')
|
||||
let g:terminal_color_0 = s:black.gui
|
||||
let g:terminal_color_1 = s:red.gui
|
||||
let g:terminal_color_2 = s:green.gui
|
||||
let g:terminal_color_3 = s:yellow.gui
|
||||
let g:terminal_color_4 = s:blue.gui
|
||||
let g:terminal_color_5 = s:purple.gui
|
||||
let g:terminal_color_6 = s:cyan.gui
|
||||
let g:terminal_color_7 = s:white.gui
|
||||
let g:terminal_color_8 = s:black.gui
|
||||
let g:terminal_color_9 = s:red.gui
|
||||
let g:terminal_color_10 = s:green.gui
|
||||
let g:terminal_color_11 = s:yellow.gui
|
||||
let g:terminal_color_12 = s:blue.gui
|
||||
let g:terminal_color_13 = s:purple.gui
|
||||
let g:terminal_color_14 = s:cyan.gui
|
||||
let g:terminal_color_15 = s:white.gui
|
||||
let g:terminal_color_background = s:bg.gui
|
||||
let g:terminal_color_foreground = s:fg.gui
|
||||
endif
|
||||
" }
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 7db2ed5b825a311d0f6d12694d4738cf60106dc8
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 141c775ace6b71992305f144a8ab68e9a8ca4a25
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 05e534f9fea9a8e4cbf69a1523c785845deabe4e
|
||||
176
init.vim
Normal file
176
init.vim
Normal file
|
|
@ -0,0 +1,176 @@
|
|||
" set runtimepath^=~/.vim runtimepath+=~/.vim/after
|
||||
" let &packpath = &runtimepath
|
||||
" source ~/.vimrc
|
||||
|
||||
call plug#begin()
|
||||
" The default plugin directory will be as follows:
|
||||
" - Vim (Linux/macOS): '~/.vim/plugged'
|
||||
" - Vim (Windows): '~/vimfiles/plugged'
|
||||
" - Neovim (Linux/macOS/Windows): stdpath('data') . '/plugged'
|
||||
" You can specify a custom plugin directory by passing it as the argument
|
||||
" - e.g. `call plug#begin('~/.vim/plugged')`
|
||||
" - Avoid using standard Vim directory names like 'plugin'
|
||||
|
||||
" Make sure you use single quotes
|
||||
|
||||
Plug 'neovim/nvim-lspconfig'
|
||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
||||
Plug 'joshdick/onedark.vim'
|
||||
Plug 'mileszs/ack.vim'
|
||||
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
|
||||
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'tpope/vim-unimpaired'
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
Plug 'christoomey/vim-tmux-navigator'
|
||||
|
||||
" Initialize plugin system
|
||||
call plug#end()
|
||||
|
||||
let g:python3_host_prog = '~/.pyenv/versions/base/bin/python'
|
||||
|
||||
lua << EOF
|
||||
-- Mappings.
|
||||
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
|
||||
local opts = { noremap=true, silent=true }
|
||||
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
|
||||
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
|
||||
|
||||
-- Use an on_attach function to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
local on_attach = function(client, bufnr)
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- Mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
local bufopts = { noremap=true, silent=true, buffer=bufnr }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
|
||||
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, bufopts)
|
||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||
vim.keymap.set('n', '<space>f', vim.lsp.buf.formatting, bufopts)
|
||||
end
|
||||
|
||||
local lsp_flags = {
|
||||
-- This is the default in Nvim 0.7+
|
||||
debounce_text_changes = 150,
|
||||
}
|
||||
require('lspconfig')['pylsp'].setup{
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
}
|
||||
require('lspconfig')['fortls'].setup{
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
}
|
||||
EOF
|
||||
|
||||
map ; :Files<CR>
|
||||
if executable('ag')
|
||||
let g:ackprg = 'ag --vimgrep'
|
||||
endif
|
||||
|
||||
if exists('+termguicolors') && ($COLORTERM == "24bit" || $COLORTERM == "truecolor")
|
||||
set termguicolors
|
||||
endif
|
||||
colorscheme onedark
|
||||
|
||||
set cursorline
|
||||
let mapleader=","
|
||||
|
||||
set number
|
||||
set relativenumber
|
||||
set listchars=trail:.,tab:>_
|
||||
set list
|
||||
set wrap
|
||||
set linebreak
|
||||
set autoread
|
||||
|
||||
au BufRead,BufNewFile *.ipynb setlocal filetype=json
|
||||
au BufRead,BufNewFile *.md setlocal spell
|
||||
au BufRead,BufNewFile *.code-workspace setlocal filetype=json
|
||||
au BufRead,BufNewFile *.csv setlocal nowrap
|
||||
au BufRead,BufNewFile *.service[a-zA-Z0-9]* setlocal filetype=systemd
|
||||
au TermOpen * setlocal nonumber norelativenumber
|
||||
syntax on
|
||||
|
||||
if &diff
|
||||
highlight! link DiffText MatchParen
|
||||
endif
|
||||
au OptionSet diff highlight! link DiffText MatchParen
|
||||
|
||||
set expandtab
|
||||
set autoindent
|
||||
set smartindent
|
||||
filetype plugin indent on
|
||||
|
||||
imap jk <Esc>
|
||||
command Bd b# | bd #
|
||||
command! BufOnly silent! execute "%bd|e#|bd#"
|
||||
nnoremap <Leader>b :buffers<CR>:buffer<Space>
|
||||
nnoremap <Leader>i :!zimports %<CR>:!black %<CR><CR>
|
||||
nnoremap <leader>n :NERDTreeFocus<CR>
|
||||
nnoremap <C-n> :NERDTree<CR>
|
||||
nnoremap <C-t> :NERDTreeToggle<CR>
|
||||
nnoremap <C-f> :NERDTreeFind<CR>
|
||||
nnoremap <Leader>a :Ack!<Space>
|
||||
|
||||
" Exit Vim if NERDTree is the only window remaining in the only tab.
|
||||
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
|
||||
|
||||
set splitbelow
|
||||
set splitright
|
||||
|
||||
function! GitStatus()
|
||||
let [a,m,r] = GitGutterGetHunkSummary()
|
||||
return printf('%s +%d ~%d -%d', FugitiveHead(), a, m, r)
|
||||
endfunction
|
||||
|
||||
let g:netrw_list_hide= '\(^\|\s\s\)\zs\.\S\+'
|
||||
|
||||
" let g:slime_target = "tmux"
|
||||
" let g:slime_default_config = {"socket_name": get(split($TMUX, ","), 0), "target_pane": "{last}"}
|
||||
|
||||
" let g:lightline = { 'colorscheme': 'onehalfdark' }
|
||||
" let g:lightline.component_expand = {
|
||||
" \ 'linter_checking': 'lightline#ale#checking',
|
||||
" \ 'linter_infos': 'lightline#ale#infos',
|
||||
" \ 'linter_warnings': 'lightline#ale#warnings',
|
||||
" \ 'linter_errors': 'lightline#ale#errors',
|
||||
" \ 'linter_ok': 'lightline#ale#ok',
|
||||
" \ }
|
||||
" let g:lightline.component_type = {
|
||||
" \ 'linter_checking': 'right',
|
||||
" \ 'linter_infos': 'right',
|
||||
" \ 'linter_warnings': 'warning',
|
||||
" \ 'linter_errors': 'error',
|
||||
" \ 'linter_ok': 'right',
|
||||
" \ }
|
||||
" let g:lightline.component_function = {
|
||||
" \ 'gitstatus': 'GitStatus'
|
||||
" \ }
|
||||
" let g:lightline.active = {
|
||||
" \ 'left': [ [ 'mode', 'paste' ],
|
||||
" \ [ 'gitstatus', 'readonly', 'filename', 'modified' ] ],
|
||||
" \ 'right': [ [ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_infos', 'linter_ok', 'lineinfo' ],
|
||||
" \ [ 'percent' ],
|
||||
" \ [ 'fileformat', 'fileencoding', 'filetype' ] ]
|
||||
" \ }
|
||||
" set laststatus=0
|
||||
" set noshowmode
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 5d4615707fc7bce8a4f1fdaa5f7f07c11637bc30
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 36e40f9ec91bdbf6f1adf408522a73a6925c3042
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 6c51bb1573f0bf5deff04508769208fd503b5ff7
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit d5f1f8641b24c0fd5b10a299824362a2a1b20ae0
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 7753505f3c500ec88d11e9373d05250f49c1d900
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 11931e2de42cb1a14887a002a874f0b2daf12bc2
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit a861f691ac7e40b1b359bc7a147078fa1e0570ce
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 2cc00ba72929ea5f9456a26782db57fb4cc56a65
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 362e99292e6c56e79bdf2230d6f44364b68d6d5f
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 339091ac4dd1f17e225fe7d57b48aff55f99b23a
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 80ab990c7ff7251f43262aae4b60ff6eff2ef3a4
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit b7287bd5421da62986d9abf9131509b2c9f918e4
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 988a6dbad9a9777cd94aab18ba7821a41068685b
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 772de97c97d37e5e22d7bd6884b17b858a687bc2
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 440ecbf0b6a75586d445012d6bee9c657c814829
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 93d202278004fbc8eb3ec9d734916214e6c7f034
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 9ca5bfe5bd274051b5dd796cc150348afc993b80
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 89bcca8a3aeab360f6dfe5ce70999fc928669411
|
||||
134
vimrc
134
vimrc
|
|
@ -1,134 +0,0 @@
|
|||
unlet! skip_defaults_vim
|
||||
" source $VIMRUNTIME/defaults.vim
|
||||
|
||||
" Set base python for JEDI
|
||||
let g:python3_host_prog = '~/.pyenv/versions/base/bin/python'
|
||||
|
||||
" fix for wsl starting with REPLACE mode
|
||||
nnoremap <esc>^[ <esc>^[
|
||||
|
||||
" disable mouse so that clipboard works properly
|
||||
set mouse=nv
|
||||
|
||||
set t_TI=""
|
||||
set t_TE=""
|
||||
set t_ut=""
|
||||
|
||||
set updatetime=1000
|
||||
set signcolumn=yes
|
||||
|
||||
set rtp+=~/.fzf
|
||||
set rtp+=/opt/homebrew/opt/fzf
|
||||
map ; :Files<CR>
|
||||
|
||||
if executable('ag')
|
||||
let g:ackprg = 'ag --vimgrep'
|
||||
endif
|
||||
|
||||
if exists('+termguicolors') && ($COLORTERM == "24bit" || $COLORTERM == "truecolor")
|
||||
set termguicolors
|
||||
endif
|
||||
colorscheme onehalfdark
|
||||
|
||||
set cursorline
|
||||
set laststatus=2
|
||||
let mapleader=","
|
||||
|
||||
set number
|
||||
set relativenumber
|
||||
set listchars=trail:.,tab:>_
|
||||
set list
|
||||
set wrap
|
||||
set linebreak
|
||||
set autoread
|
||||
set colorcolumn=+1
|
||||
set shiftwidth=2
|
||||
set softtabstop=2
|
||||
|
||||
au BufRead,BufNewFile *.ipynb setlocal filetype=json
|
||||
au BufRead,BufNewFile *.md setlocal spell
|
||||
au BufRead,BufNewFile *.code-workspace setlocal filetype=json
|
||||
au BufRead,BufNewFile *.csv setlocal nowrap
|
||||
au BufRead,BufNewFile *.service[a-zA-Z0-9]* setlocal filetype=systemd
|
||||
au TermOpen * setlocal nonumber norelativenumber
|
||||
syntax on
|
||||
|
||||
if &diff
|
||||
highlight! link DiffText MatchParen
|
||||
endif
|
||||
au OptionSet diff highlight! link DiffText MatchParen
|
||||
|
||||
set expandtab
|
||||
set autoindent
|
||||
set smartindent
|
||||
filetype plugin indent on
|
||||
|
||||
imap jk <Esc>
|
||||
command Bd b# | bd #
|
||||
command! BufOnly silent! execute "%bd|e#|bd#"
|
||||
nnoremap <Leader>b :buffers<CR>:buffer<Space>
|
||||
nnoremap <Leader>i :!zimports %<CR>:!black %<CR><CR>
|
||||
nnoremap <leader>n :NERDTreeFocus<CR>
|
||||
nnoremap <C-n> :NERDTree<CR>
|
||||
nnoremap <C-t> :NERDTreeToggle<CR>
|
||||
nnoremap <C-f> :NERDTreeFind<CR>
|
||||
nnoremap <Leader>a :Ack!<Space>
|
||||
|
||||
" Exit Vim if NERDTree is the only window remaining in the only tab.
|
||||
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
|
||||
|
||||
set splitbelow
|
||||
set splitright
|
||||
|
||||
function! GitStatus()
|
||||
let [a,m,r] = GitGutterGetHunkSummary()
|
||||
return printf('%s +%d ~%d -%d', FugitiveHead(), a, m, r)
|
||||
endfunction
|
||||
|
||||
let g:slime_target = "tmux"
|
||||
let g:slime_default_config = {"socket_name": get(split($TMUX, ","), 0), "target_pane": "{last}"}
|
||||
|
||||
let g:netrw_list_hide= '\(^\|\s\s\)\zs\.\S\+'
|
||||
|
||||
let g:python_highlight_all = 1
|
||||
|
||||
let g:lightline = { 'colorscheme': 'onehalfdark' }
|
||||
|
||||
let g:lightline.component_expand = {
|
||||
\ 'linter_checking': 'lightline#ale#checking',
|
||||
\ 'linter_infos': 'lightline#ale#infos',
|
||||
\ 'linter_warnings': 'lightline#ale#warnings',
|
||||
\ 'linter_errors': 'lightline#ale#errors',
|
||||
\ 'linter_ok': 'lightline#ale#ok',
|
||||
\ }
|
||||
|
||||
let g:lightline.component_type = {
|
||||
\ 'linter_checking': 'right',
|
||||
\ 'linter_infos': 'right',
|
||||
\ 'linter_warnings': 'warning',
|
||||
\ 'linter_errors': 'error',
|
||||
\ 'linter_ok': 'right',
|
||||
\ }
|
||||
|
||||
let g:lightline.component_function = {
|
||||
\ 'gitstatus': 'GitStatus'
|
||||
\ }
|
||||
|
||||
|
||||
let g:lightline.active = {
|
||||
\ 'left': [ [ 'mode', 'paste' ],
|
||||
\ [ 'gitstatus', 'readonly', 'filename', 'modified' ] ],
|
||||
\ 'right': [ [ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_infos', 'linter_ok', 'lineinfo' ],
|
||||
\ [ 'percent' ],
|
||||
\ [ 'fileformat', 'fileencoding', 'filetype' ] ]
|
||||
\ }
|
||||
set noshowmode
|
||||
|
||||
" Load all plugins now.
|
||||
" Plugins need to be added to runtimepath before helptags can be generated.
|
||||
packloadall
|
||||
|
||||
packadd! jedi-vim
|
||||
" Load all of the helptags now, after plugins have been loaded.
|
||||
" All messages and errors will be ignored.
|
||||
silent! helptags ALL
|
||||
Loading…
Reference in a new issue