Add onehalf theme, set as default + theme for lightline
Rename compile_options to configure_options Move tmux.conf into .vim directory to enable consistent behaviour when setting up vim + tmux on other machines
This commit is contained in:
Edward Litherland-Smith
parent
daa10cd4f3
commit
519cf87831
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -40,3 +40,6 @@
|
|||
[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
|
||||
|
|
|
|||
36
autoload/lightline/colorscheme/monokai_pro.vim
Normal file
36
autoload/lightline/colorscheme/monokai_pro.vim
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
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)
|
||||
58
autoload/lightline/colorscheme/onedark.vim
Normal file
58
autoload/lightline/colorscheme/onedark.vim
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
" [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)
|
||||
|
||||
50
autoload/lightline/colorscheme/onehalfdark.vim
Normal file
50
autoload/lightline/colorscheme/onehalfdark.vim
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
" =============================================================================
|
||||
" 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)
|
||||
224
colors/onehalfdark.vim
Normal file
224
colors/onehalfdark.vim
Normal file
|
|
@ -0,0 +1,224 @@
|
|||
" ==============================================================================
|
||||
" 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
|
||||
" }
|
||||
224
colors/onehalflight.vim
Normal file
224
colors/onehalflight.vim
Normal file
|
|
@ -0,0 +1,224 @@
|
|||
" ==============================================================================
|
||||
" 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
|
||||
" }
|
||||
|
|
@ -7,3 +7,5 @@
|
|||
| `--with-features=huge` | Enable all extra VIM features |
|
||||
| `--enable-python3interp` | Compile with python3, *Don't be in virtual env for this* |
|
||||
| `--with-python3-command=python3` | Compile with python3, *Don't be in virtual env for this* |
|
||||
|
||||
Standard command: `./configure --prefix="$HOME/.local" --with-features=huge --enable-python3interp`
|
||||
1
extras/onehalf
Submodule
1
extras/onehalf
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 141c775ace6b71992305f144a8ab68e9a8ca4a25
|
||||
54
tmux.conf
Normal file
54
tmux.conf
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
# Reload tmux conf.
|
||||
unbind r
|
||||
bind r source-file ~/.tmux.conf\; display "Reloaded conf."
|
||||
|
||||
# Set color enabled
|
||||
# set -g default-terminal screen-256color
|
||||
set -g default-terminal "xterm-256color"
|
||||
set -ga terminal-overrides ",*256col*:Tc"
|
||||
|
||||
# Stop automatic window renaming
|
||||
# set -g set-titles off
|
||||
# set-window-option -g automatic-rename off
|
||||
# set-option -g allow-rename off
|
||||
|
||||
# Bind home row keys to help navigation
|
||||
# bind-key h select-pane -L
|
||||
# bind-key j select-pane -D
|
||||
# bind-key k select-pane -U
|
||||
# bind-key l select-pane -R
|
||||
|
||||
# Smart pane switching with awareness of Vim splits.
|
||||
# See: https://github.com/christoomey/vim-tmux-navigator
|
||||
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
|
||||
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
|
||||
bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
|
||||
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
|
||||
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
|
||||
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
|
||||
tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
|
||||
if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
|
||||
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
|
||||
if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
|
||||
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
|
||||
|
||||
bind-key -T copy-mode-vi 'C-h' select-pane -L
|
||||
bind-key -T copy-mode-vi 'C-j' select-pane -D
|
||||
bind-key -T copy-mode-vi 'C-k' select-pane -U
|
||||
bind-key -T copy-mode-vi 'C-l' select-pane -R
|
||||
bind-key -T copy-mode-vi 'C-\' select-pane -l
|
||||
|
||||
setw -g mode-keys vi
|
||||
|
||||
# Status bar styling
|
||||
set -g status-bg black
|
||||
set -g status-fg white
|
||||
set -g status-left '#S #[fg=black,bg=yellow]'
|
||||
|
||||
# set inactive/active window styles
|
||||
set -g window-style 'fg=colour247,bg=colour236'
|
||||
set -g window-active-style 'fg=colour250,bg=black'
|
||||
|
||||
# set the pane border colors
|
||||
set -g pane-border-style 'fg=colour235,bg=colour238'
|
||||
set -g pane-active-border-style 'fg=colour51,bg=colour236'
|
||||
15
vimrc
15
vimrc
|
|
@ -7,10 +7,17 @@ if $TERM =~ 'xterm-256color'
|
|||
set noek
|
||||
endif
|
||||
|
||||
let &t_TI=""
|
||||
let &t_TE=""
|
||||
set t_TI=""
|
||||
set t_TE=""
|
||||
set t_ut=""
|
||||
|
||||
colorscheme slate
|
||||
colorscheme onehalfdark
|
||||
if exists('+termguicolors')
|
||||
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
|
||||
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
|
||||
set termguicolors
|
||||
endif
|
||||
set cursorline
|
||||
set laststatus=2
|
||||
let mapleader=","
|
||||
|
||||
|
|
@ -45,7 +52,7 @@ let g:netrw_list_hide= '\(^\|\s\s\)\zs\.\S\+'
|
|||
|
||||
let g:python_highlight_all = 1
|
||||
|
||||
let g:lightline = {}
|
||||
let g:lightline = { 'colorscheme': 'onehalfdark' }
|
||||
|
||||
let g:lightline.component_expand = {
|
||||
\ 'linter_checking': 'lightline#ale#checking',
|
||||
|
|
|
|||
Loading…
Reference in a new issue