Skip to content

Commit

Permalink
new vim colors
Browse files Browse the repository at this point in the history
  • Loading branch information
cdaddr committed Jun 13, 2017
1 parent 4e92b63 commit 13501f1
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 122 deletions.
77 changes: 77 additions & 0 deletions .vim/autoload/airline/themes/db32.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
" Color palette
let s:cterm_blue = 110
let s:cterm_dark_gray = 236
let s:cterm_green = 150
let s:cterm_light_gray = 249
let s:cterm_med_gray_hi = 238
let s:cterm_med_gray_lo = 237
let s:cterm_orange = 179
let s:cterm_pink = 182
let s:cterm_purple = 146
let s:cterm_red = 174
let s:gui_blue = '#5fcde4'
let s:gui_blue2 = '#5b6ee1'
let s:gui_green = '#99e550'
let s:gui_green2 = '#6abe30'
let s:gui_light_gray = '#9badb7'
let s:gui_dark_gray = '#000000'
let s:gui_orange = '#df7126'
let s:gui_pink = '#d77bba'
let s:gui_pink2 = '#d95763'
let s:gui_purple = '#76428a'
let s:gui_purple2 = '#45283c'
let s:gui_red = '#d95763'
let s:gui_red2 = '#ac3232'

let g:airline#themes#db32#palette = {}

" Normal mode
let s:N1 = [s:gui_dark_gray, s:gui_green2, s:cterm_dark_gray, s:cterm_green]
let s:N2 = [s:gui_dark_gray, s:gui_green, s:cterm_light_gray, s:cterm_med_gray_lo]
let s:N3 = [s:gui_green, s:gui_dark_gray, s:cterm_green, s:cterm_med_gray_hi]
let g:airline#themes#db32#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
let g:airline#themes#db32#palette.normal_modified = {
\ 'airline_c': [s:gui_orange, s:gui_dark_gray, s:cterm_orange, s:cterm_med_gray_hi, ''],
\ }

" Insert mode
let s:I1 = [s:gui_dark_gray, s:gui_blue2, s:cterm_med_gray_hi, s:cterm_blue]
let s:I2 = [s:gui_dark_gray, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
let s:I3 = [s:gui_blue, s:gui_dark_gray, s:cterm_blue, s:cterm_med_gray_hi]
let g:airline#themes#db32#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
let g:airline#themes#db32#palette.insert_modified = copy(g:airline#themes#db32#palette.normal_modified)
let g:airline#themes#db32#palette.insert_paste = {
\ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
\ }

" Replace mode
let g:airline#themes#db32#palette.replace = {
\ 'airline_a': [s:gui_dark_gray, s:gui_red2, s:cterm_dark_gray, s:cterm_red, ''],
\ 'airline_b': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
\ 'airline_c': [s:gui_red, s:gui_dark_gray, s:cterm_red, s:cterm_med_gray_hi, ''],
\ }
let g:airline#themes#db32#palette.replace_modified = copy(g:airline#themes#db32#palette.insert_modified)

" Visual mode
let s:V1 = [s:gui_dark_gray, s:gui_purple, s:cterm_dark_gray, s:cterm_pink]
let s:V2 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
let s:V3 = [s:gui_pink, s:gui_dark_gray, s:cterm_pink, s:cterm_med_gray_hi]
let g:airline#themes#db32#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
let g:airline#themes#db32#palette.visual_modified = copy(g:airline#themes#db32#palette.insert_modified)

" Inactive window
let s:IA = [s:gui_light_gray, s:gui_dark_gray, s:cterm_light_gray, s:cterm_med_gray_hi, '']
let g:airline#themes#db32#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
let g:airline#themes#db32#palette.inactive_modified = {
\ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
\ }

" CtrlP
if !get(g:, 'loaded_ctrlp', 0)
finish
endif
let g:airline#themes#db32#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
\ [ s:gui_orange, s:gui_dark_gray, s:cterm_orange, s:cterm_med_gray_hi, '' ] ,
\ [ s:gui_orange, s:gui_dark_gray, s:cterm_orange, s:cterm_med_gray_lo, '' ] ,
\ [ s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green, 'bold' ] )

1 change: 1 addition & 0 deletions .vim/bundle/gentooish.vim
Submodule gentooish.vim added at ff390c
1 change: 1 addition & 0 deletions .vim/bundle/rainbow
Submodule rainbow added at 1c45e0
1 change: 1 addition & 0 deletions .vim/bundle/vim-diminactive
Submodule vim-diminactive added at 8dad0b
1 change: 1 addition & 0 deletions .vim/colors/db32.vim
115 changes: 0 additions & 115 deletions .vim/colors/gentooish.vim

This file was deleted.

19 changes: 12 additions & 7 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
" Don't just copy this. It has screwy stuff and depends on other stuff.
" There's always a good possibility of there being broken or
" experimental stuff in here.
"

" execute pathogen#infect()
" call pathogen#runtime_append_all_bundles()

set nocompatible

Expand Down Expand Up @@ -41,6 +37,9 @@ Plugin 'chrisbra/NrrwRgn'
Plugin 'xolox/vim-misc'
Plugin 'xolox/vim-easytags'
Plugin 'Shougo/neocomplete.vim'
Plugin 'cdaddr/gentooish.vim'
Plugin 'luochen1990/rainbow'
" Plugin 'blueyed/vim-diminactive'
" Plugin 'xolox/vim-lua-inspect'
" Plugin 'bling/vim-bufferline'

Expand All @@ -60,14 +59,15 @@ let g:UltiSnipsExpandTrigger = "<c-j>"
let g:UltiSnipsJumpForwardTrigger = "<c-j>"
let g:UltiSnipsJumpBackwardTrigger = "<c-k>"

let g:airline_theme = 'bubblegum'
let g:airline_theme = 'db32'
let g:airline_powerline_fonts = 1
let g:airline_inactive_collapse = 0
let g:airline_skip_empty_sections = 0
let g:airline#extensions#syntastic#enabled = 1
let g:airline#extensions#branch#enabled = 1
let g:airline#extensions#nrrwrgn#enabled = 1
let g:airline#extensions#ctrlp#show_adjacent_modes = 1
let g:airline_detect_modified=1
"let g:airline#extensions#ycm#enabled = 1

let g:syntastic_always_populate_loc_list = 1
Expand All @@ -77,6 +77,8 @@ let g:syntastic_check_on_wq = 0
let g:syntastic_lua_checkers = ["luac", "luacheck"]
let g:syntastic_lua_luacheck_args = "--no-unused-args --globals love"

let g:rainbow_active = 1

let g:gitgutter_override_sign_column_highlight = 0

let g:neocomplete#enable_at_startup = 1
Expand Down Expand Up @@ -118,8 +120,9 @@ set viminfo='1024,<0,s100,f0,r/tmp,r/mnt
" see :h last-position-jump

" Appearance
colorscheme db32
if has('gui_running')
colorscheme bubblegum-256-dark
"colorscheme bubblegum-256-dark
hi StatusLine gui=NONE
hi User1 gui=NONE
hi User2 gui=NONE
Expand Down Expand Up @@ -204,7 +207,7 @@ set cmdheight=1
set showbreak=
" Stolen from http://github.com/ciaranm/dotfiles-ciaranm/tree/master
if (&termencoding == "utf-8") || has("gui_running")
set list listchars=eol:¬,tab:│›,trail:·,precedes:…,extends:…,nbsp:‗
set list listchars=tab:│›,trail:·,precedes:…,extends:…,nbsp:‗
else
set list listchars=eol:\ ,tab:>-,trail:.,extends:>,nbsp:_
endif
Expand All @@ -220,6 +223,7 @@ if !exists("autocommands_loaded")
au VimEnter * :call FixVimpager()
au BufWritePost *vimrc so %
endif
au BufWritePost */colors/* exe 'colorscheme ' . expand('%:t:r')

" The text to return for a fold
function! FoldText()
Expand Down Expand Up @@ -657,3 +661,4 @@ end
" nnoremap <Down> <Nop>
" nnoremap <Left> <Nop>
" nnoremap <Right> <Nop>

Expand Down

0 comments on commit 13501f1

Please sign in to comment.