nvim: color scheme work
This commit is contained in:
Daniel Lundin
parent
0bbe9bb427
commit
a92aa5e070
2 changed files with 71 additions and 34 deletions
|
|
@ -295,37 +295,49 @@ endfun
|
||||||
|
|
||||||
" FIXME: this is a todo
|
" FIXME: this is a todo
|
||||||
|
|
||||||
call <sid>hi("MsgArea", s:orange_900, "", "")
|
call <sid>hi("Floating", s:blue_grey_400, "", "")
|
||||||
call <sid>hi("Normal", s:white_1000, "", "")
|
call <sid>hi("MsgArea", s:orange_900, "", "")
|
||||||
call <sid>hi("Bold", "", "", "bold")
|
call <sid>hi("Normal", s:white_1000, "", "")
|
||||||
call <sid>hi("Italic", "", "", "italic")
|
call <sid>hi("Bold", "", "", "bold")
|
||||||
call <sid>hi("VertSplit", "#112131", s:blue_grey_800, "")
|
call <sid>hi("Italic", "", "", "italic")
|
||||||
call <sid>hi("LineNr", s:grey_800, "", "italic")
|
call <sid>hi("VertSplit", "#112131", s:blue_grey_800, "")
|
||||||
call <sid>hi("SignColumn", s:blue_grey_500, "transparent", "none")
|
call <sid>hi("LineNr", s:grey_800, "", "italic")
|
||||||
call <sid>hi("Visual", s:cyan_100, s:indigo_900, "")
|
call <sid>hi("NonText", s:blue_grey_900, "", "")
|
||||||
|
call <sid>hi("SignColumn", s:blue_grey_500, "transparent", "none")
|
||||||
|
call <sid>hi("Visual", s:cyan_100, s:indigo_900, "")
|
||||||
|
call <sid>hi("Search", "", s:amber_500, "none")
|
||||||
|
|
||||||
call <sid>hi("Bookmark", s:black_1000, s:yellow_700, "none")
|
call <sid>hi("Bookmark", s:black_1000, s:yellow_700, "none")
|
||||||
call <sid>hi("Todo", s:yellow_100, s:orange_900, "none")
|
call <sid>hi("Todo", s:yellow_100, s:orange_900, "none")
|
||||||
|
|
||||||
call <sid>hi("CursorLine", "", "#112131", "")
|
call <sid>hi("CursorLine", "", "#112131", "")
|
||||||
call <sid>hi("CursorLineNR", s:grey_500, "#334455", "")
|
call <sid>hi("CursorLineNR", s:grey_500, "#334455", "")
|
||||||
call <sid>hi("Folded", s:purple_200, s:deep_purple_900, "")
|
call <sid>hi("Folded", s:purple_200, s:deep_purple_900, "")
|
||||||
|
|
||||||
call <sid>hi("Pmenu", s:blue_grey_200, s:blue_grey_800, "none")
|
call <sid>hi("Pmenu", s:blue_grey_500, "#112131", "none")
|
||||||
call <sid>hi("PmenuSbar", s:blue_grey_500, s:blue_grey_900, "none")
|
call <sid>hi("PmenuSbar", s:blue_grey_500, "#111c27", "none")
|
||||||
call <sid>hi("PmenuThumb", s:blue_grey_400, s:blue_grey_700, "none")
|
call <sid>hi("PmenuThumb", s:blue_grey_400, "#112131", "none")
|
||||||
call <sid>hi("PmenuSel", s:black_1000, s:amber_300, "")
|
" call <sid>hi("PmenuSel", s:light_blue_100, "#0D3771", "bold")
|
||||||
call <sid>hi("CocFloating", s:blue_grey_200, s:blue_grey_900, "none")
|
call <sid>hi("PmenuSel", s:amber_100, "#0D3771", "bold")
|
||||||
|
|
||||||
call <sid>hi("ALEErrorSign", s:red_500, "", "none")
|
call <sid>hi("CocFloating", s:light_blue_100, "#0D3771", "italic")
|
||||||
call <sid>hi("ALEWarningSign", s:orange_500, "", "none")
|
|
||||||
call <sid>hi("Statement", s:blue_grey_200, "", "bold")
|
call <sid>hi("GitGutterAdd", s:light_green_900, "", "italic")
|
||||||
call <sid>hi("String", s:light_green_400, "", "italic")
|
call <sid>hi("GitGutterChange", s:light_blue_900, "", "italic")
|
||||||
call <sid>hi("Comment", s:blue_grey_600, "", "italic")
|
call <sid>hi("GitGutterDelete", s:yellow_900, "", "italic")
|
||||||
call <sid>hi("Type", s:deep_purple_100, "", "none")
|
|
||||||
call <sid>hi("Identifier", s:orange_200, "", "")
|
call <sid>hi("ALEErrorLine", s:orange_900, "", "italic")
|
||||||
call <sid>hi("goFunction", s:blue_300, "", "bold")
|
call <sid>hi("ALEWarningLine", s:amber_200, "", "italic")
|
||||||
call <sid>hi("goOperator", s:teal_200, "", "")
|
call <sid>hi("ALEErrorSign", s:red_700, "", "italic")
|
||||||
call <sid>hi("Search", "", s:amber_700, "none")
|
call <sid>hi("ALEWarningSign", s:amber_200, "", "italic")
|
||||||
|
call <sid>hi("ALEInfoSign", s:blue_grey_500, "", "italic")
|
||||||
|
|
||||||
|
call <sid>hi("Statement", s:blue_grey_200, "", "bold")
|
||||||
|
call <sid>hi("String", s:light_green_400, "", "italic")
|
||||||
|
call <sid>hi("Comment", s:blue_grey_600, "", "italic")
|
||||||
|
call <sid>hi("Type", s:deep_purple_100, "", "none")
|
||||||
|
call <sid>hi("Identifier", s:orange_200, "", "")
|
||||||
|
call <sid>hi("goFunction", s:blue_300, "", "bold")
|
||||||
|
call <sid>hi("goOperator", s:teal_200, "", "")
|
||||||
|
call <sid>hi("goSameId", s:yellow_100, "", "underline")
|
||||||
|
|
||||||
call <sid>hi("goSameId", s:yellow_100, "", "underline")
|
|
||||||
|
|
|
||||||
|
|
@ -165,6 +165,7 @@ set wildmode=list:longest
|
||||||
set wildignore=*.swp,*.bak,*.pyc,*.class
|
set wildignore=*.swp,*.bak,*.pyc,*.class
|
||||||
set splitbelow " Preview window
|
set splitbelow " Preview window
|
||||||
set splitright
|
set splitright
|
||||||
|
set updatetime=150
|
||||||
|
|
||||||
let mapleader=","
|
let mapleader=","
|
||||||
|
|
||||||
|
|
@ -172,7 +173,7 @@ let mapleader=","
|
||||||
let g:session_autosave = 'no'
|
let g:session_autosave = 'no'
|
||||||
|
|
||||||
"" Fancy status line.
|
"" Fancy status line.
|
||||||
set laststatus=2
|
set laststatus=0
|
||||||
|
|
||||||
"" Powerline
|
"" Powerline
|
||||||
"set rtp+=/home/dln/.vim/bundle/powerline/powerline/bindings/vim
|
"set rtp+=/home/dln/.vim/bundle/powerline/powerline/bindings/vim
|
||||||
|
|
@ -493,8 +494,31 @@ au FileType xml
|
||||||
\ set errorformat=line\ %l\ column\ %c\ \-\ %m
|
\ set errorformat=line\ %l\ column\ %c\ \-\ %m
|
||||||
|
|
||||||
"" fzf
|
"" fzf
|
||||||
|
function! CreateCenteredFloatingWindow()
|
||||||
|
let width = min([&columns - 4, max([80, &columns - 20])])
|
||||||
|
let height = min([&lines - 4, max([20, &lines - 20])])
|
||||||
|
" let top = ((&lines - height) / 2) - 1
|
||||||
|
let top = 1
|
||||||
|
let left = (&columns - width) / 2
|
||||||
|
let opts = {'relative': 'editor', 'row': top, 'col': left, 'width': width, 'height': height, 'style': 'minimal'}
|
||||||
|
|
||||||
let g:fzf_layout = { 'up': '~40%' }
|
let top = "┌" . repeat("─", width - 2) . "┐"
|
||||||
|
let mid = "│" . repeat(" ", width - 2) . "│"
|
||||||
|
let bot = "└" . repeat("─", width - 2) . "┘"
|
||||||
|
let lines = [top] + repeat([mid], height - 2) + [bot]
|
||||||
|
let s:buf = nvim_create_buf(v:false, v:true)
|
||||||
|
call nvim_buf_set_lines(s:buf, 0, -1, v:true, lines)
|
||||||
|
call nvim_open_win(s:buf, v:true, opts)
|
||||||
|
set winhl=Normal:Floating
|
||||||
|
let opts.row += 1
|
||||||
|
let opts.height -= 2
|
||||||
|
let opts.col += 2
|
||||||
|
let opts.width -= 4
|
||||||
|
call nvim_open_win(nvim_create_buf(v:false, v:true), v:true, opts)
|
||||||
|
au BufWipeout <buffer> exe 'bw '.s:buf
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
let g:fzf_layout = { 'up': '~40%', 'window': 'call CreateCenteredFloatingWindow()' }
|
||||||
let g:fzf_colors =
|
let g:fzf_colors =
|
||||||
\ { 'fg': ['fg', 'Comment'],
|
\ { 'fg': ['fg', 'Comment'],
|
||||||
\ 'bg': ['bg', 'Comment'],
|
\ 'bg': ['bg', 'Comment'],
|
||||||
|
|
@ -565,11 +589,13 @@ let g:vim_markdown_toml_frontmatter = 1
|
||||||
|
|
||||||
|
|
||||||
"" Airline
|
"" Airline
|
||||||
|
let g:airline_theme="minimalist"
|
||||||
let g:airline_powerline_fonts = 0
|
let g:airline_powerline_fonts = 0
|
||||||
let g:airline_skip_empty_sections = 1
|
let g:airline_skip_empty_sections = 1
|
||||||
let g:airline#parts#ffenc#skip_expected_string='utf-8[unix]'
|
let g:airline#parts#ffenc#skip_expected_string='utf-8[unix]'
|
||||||
let g:airline_section_x = '' " Hide file type
|
let g:airline_section_x = '' " Hide file type
|
||||||
let g:airline_section_z = "\uf0c9 %l \ufb87 %c"
|
let g:airline_section_z = "\u2193%l \u2192%c"
|
||||||
|
" let g:airline_section_z = "%l:%c"
|
||||||
let g:airline_mode_map = {
|
let g:airline_mode_map = {
|
||||||
\ '__' : '-',
|
\ '__' : '-',
|
||||||
\ 'c' : 'C',
|
\ 'c' : 'C',
|
||||||
|
|
@ -610,6 +636,7 @@ let &t_8b = "<Esc>[48;2;%lu;%lu;%lum"
|
||||||
color dln-dim
|
color dln-dim
|
||||||
map ,l :color dln-dim<CR>
|
map ,l :color dln-dim<CR>
|
||||||
|
|
||||||
|
|
||||||
let s:hidden_all = 0
|
let s:hidden_all = 0
|
||||||
function! ToggleHiddenAll()
|
function! ToggleHiddenAll()
|
||||||
if s:hidden_all == 0
|
if s:hidden_all == 0
|
||||||
|
|
@ -618,14 +645,12 @@ function! ToggleHiddenAll()
|
||||||
set noruler
|
set noruler
|
||||||
set laststatus=0
|
set laststatus=0
|
||||||
set noshowcmd
|
set noshowcmd
|
||||||
set nonumber
|
|
||||||
else
|
else
|
||||||
let s:hidden_all = 0
|
let s:hidden_all = 0
|
||||||
set showmode
|
set showmode
|
||||||
set ruler
|
set ruler
|
||||||
set laststatus=2
|
set laststatus=2
|
||||||
set showcmd
|
set showcmd
|
||||||
set number
|
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
nnoremap <S-h> :call ToggleHiddenAll()<CR>
|
nnoremap <S-h> :call ToggleHiddenAll()<CR>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue