diff --git a/.gitmodules b/.gitmodules index 6d352a6..942fa08 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "vim/bundle/vim-bad-whitespace"] path = vim/bundle/vim-bad-whitespace url = https://github.com/bitc/vim-bad-whitespace +[submodule "vim/bundle/vim-airline-themes"] + path = vim/bundle/vim-airline-themes + url = https://github.com/vim-airline/vim-airline-themes diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes new file mode 160000 index 0000000..13bad30 --- /dev/null +++ b/vim/bundle/vim-airline-themes @@ -0,0 +1 @@ +Subproject commit 13bad30d4ee3892cae755c83433ee85fbc96d028 diff --git a/vim/colors/luna-term.vim b/vim/colors/luna-term.vim deleted file mode 100644 index 3cca9d6..0000000 --- a/vim/colors/luna-term.vim +++ /dev/null @@ -1,208 +0,0 @@ -" Name: Luna vim colorscheme -" Author: Pratheek -" URL: http://github.com/Pychimp/vim-luna -" (see this url for latest release & screenshots) -" License: MIT (see LICENSE.rst in the root of project) -" Created: In the middle of Earth's Rotation -" Version: 0.0.7 -" -" -" TODO: {{{ -" --------------------------------------------------------------------- -" -- Clean up ! -" -- create a terminal version -" -- add more lang specifics -" -- (Will think of some more sutff !) -" }}} -" -" Usage and Requirements "{{{ -" --------------------------------------------------------------------- -" REQUIREMENTS: -" --------------------------------------------------------------------- -" Currently, -" -" This colourscheme is intended for use on: -" - Console Vim >= 7.3 for Linux, Mac and Windows. -" (Use luna.vim, if you use gvim rather than console vim) -" -" --------------------------------------------------------------------- -" INSTALLATION: -" --------------------------------------------------------------------- -" Two options for installation: manual or pathogen -" -" --------------------------------------------------------------------- -" MANUAL INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download the luna distribution (as a zip archive, available on the github page) -" and unarchive the file. -" 2. Move `colors/luna.vim` to your `.vim/colors` directory. -" 3. Move `colors/luna-term.vim` to your `.vim/colors` directory. -" 4. Enjoy ! -" -" --------------------------------------------------------------------- -" HIGHLY RECOMMENDED PATHOGEN INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download and install Tim Pope's Pathogen from: -" https://github.com/tpope/vim-pathogen -" -" 2. Next, move or clone the `vim-luna` directory so that it is -" a subdirectory of the `.vim/bundle` directory. -" -" a. **clone with git:** -" -" $ cd ~/.vim/bundle -" $ git clone git://github.com/Pychimp/vim-luna.git -" -" --------------------------------------------------------------------- -" MODIFY VIMRC: -" --------------------------------------------------------------------- -" -" After either manual or pathogen installation, put the following two lines in your -" .vimrc: -" -" syntax enable -" colorscheme luna -" }}} -" -" Colorscheme initialization "{{{ -" --------------------------------------------------------------------- -set background=dark -highlight clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name = "luna-term" -" }}} -" -" Console vim Highlighting: (see :help highlight-groups)"{{{ -" --------------------------------------------------------------------- -" First, the Normal -hi Normal ctermfg=254 ctermbg=234 cterm=NONE -" --------------------------------------------------------------------- -" The Languages stuff -hi Title ctermfg=195 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi Comment ctermfg=240 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi Constant ctermfg=227 ctermbg=NONE cterm=NONE -hi String ctermfg=74 ctermbg=NONE cterm=NONE -hi Character ctermfg=211 ctermbg=NONE cterm=NONE -hi Number ctermfg=227 ctermbg=NONE cterm=NONE -hi Boolean ctermfg=227 ctermbg=NONE cterm=NONE -hi Float ctermfg=227 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi Identifier ctermfg=37 ctermbg=NONE cterm=NONE -hi Function ctermfg=37 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi Statement ctermfg=204 ctermbg=NONE cterm=NONE -hi Conditional ctermfg=184 ctermbg=NONE cterm=NONE -hi Operator ctermfg=202 ctermbg=NONE cterm=NONE -hi Exception ctermfg=184 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi PreProc ctermfg=149 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi Type ctermfg=203 ctermbg=NONE cterm=NONE -hi StorageClass ctermfg=173 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi Special ctermfg=211 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi Underlined ctermfg=111 ctermbg=NONE cterm=NONE -" --------------------------------------------------------------------- -hi Error ctermfg=88 ctermbg=214 cterm=NONE -" --------------------------------------------------------------------- -hi TODO ctermfg=198 ctermbg=228 cterm=NONE - -" --------------------------------------------------------------------- -" Extended Highlighting - -hi NonText ctermfg=244 ctermbg=NONE cterm=NONE -hi Visual ctermfg=235 ctermbg=227 cterm=NONE -hi ErrorMsg ctermfg=88 ctermbg=214 cterm=NONE -hi IncSearch ctermfg=235 ctermbg=208 cterm=NONE -hi Search ctermfg=235 ctermbg=208 cterm=NONE -hi MoreMsg ctermfg=241 ctermbg=NONE cterm=NONE -hi ModeMsg ctermfg=241 ctermbg=NONE cterm=NONE -hi LineNr ctermfg=244 ctermbg=NONE cterm=NONE -hi VertSplit ctermfg=0 ctermbg=238 cterm=NONE -hi VisualNOS ctermfg=235 ctermbg=227 cterm=NONE -hi Folded ctermfg=23 ctermbg=235 cterm=NONE -hi DiffAdd ctermfg=231 ctermbg=22 cterm=NONE -hi DiffChange ctermfg=231 ctermbg=30 cterm=NONE -hi DiffDelete ctermfg=196 ctermbg=88 cterm=NONE -hi DiffText ctermfg=000 ctermbg=214 cterm=NONE -hi SpellBad ctermfg=160 ctermbg=228 cterm=NONE -hi SpellCap ctermfg=130 ctermbg=228 cterm=NONE -hi SpellRare ctermfg=196 ctermbg=228 cterm=NONE -hi SpellLocal ctermfg=28 ctermbg=228 cterm=NONE -hi StatusLine ctermfg=231 ctermbg=23 cterm=NONE -hi StatusLineNC ctermfg=231 ctermbg=238 cterm=NONE -hi Pmenu ctermfg=14 ctermbg=23 cterm=NONE -hi PmenuSel ctermfg=23 ctermbg=15 cterm=NONE -hi PmenuSbar ctermfg=235 ctermbg=235 cterm=NONE -hi PmenuThumb ctermfg=235 ctermbg=235 cterm=NONE -hi MatchParen ctermfg=16 ctermbg=203 cterm=NONE -hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE -hi CursorLineNr ctermfg=117 ctermbg=NONE cterm=NONE -hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE -hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE -hi WildMenu ctermfg=23 ctermbg=231 cterm=NONE -hi SignColumn ctermfg=NONE ctermbg=234 cterm=NONE -" -" }}} -" -" Language Specifics: {{{ -" --------------------------------------------------------------------- -" These are language specifics. These are set explicitly to override the group -" highlighting provided by vim (Simply to make the language that you're working -" on more awesome, and fun to work with !) -" --------------------------------------------------------------------- -" Python Specifics -hi pythonDot ctermfg=161 ctermbg=NONE cterm=NONE -hi pythonParameters ctermfg=149 ctermbg=NONE cterm=NONE -hi pythonClassParameters ctermfg=149 ctermbg=NONE cterm=NONE -hi pythonClass ctermfg=37 ctermbg=NONE cterm=NONE -" -" --------------------------------------------------------------------- -" Ruby Specifics -hi rubyInterpolation ctermfg=203 ctermbg=NONE cterm=NONE -hi rubyMethodBlock ctermfg=216 ctermbg=NONE cterm=NONE -hi rubyCurlyBlock ctermfg=204 ctermbg=NONE cterm=NONE -hi rubyDoBlock ctermfg=204 ctermbg=NONE cterm=NONE -hi rubyBlockExpression ctermfg=204 ctermbg=NONE cterm=NONE -hi rubyArrayDelimiter ctermfg=37 ctermbg=NONE cterm=NONE -" -" --------------------------------------------------------------------- -" -" }}} -" -" Extras: {{{ -" --------------------------------------------------------------------- -" These are extra parts for highlighting certain external plugins -" --------------------------------------------------------------------- -" -" Startify (https://github.com/mhinz/vim-startify) -" -hi StartifyBracket ctermfg=98 guibg=NONE gui=NONE -hi StartifyNumber ctermfg=179 guibg=NONE gui=NONE -hi StartifySpecial ctermfg=23 guibg=NONE gui=NONE -hi StartifyPath ctermfg=239 guibg=NONE gui=NONE -hi StartifySlash ctermfg=238 guibg=NONE gui=NONE -hi StartifyFile ctermfg=204 guibg=NONE gui=NONE -hi StartifyHeader ctermfg=216 guibg=NONE gui=NONE -hi StartifyFooter ctermfg=167 guibg=NONE gui=NONE -" -" --------------------------------------------------------------------- -" -" Signify (https://github.com/mhinz/vim-signify) -" -hi SignifySignAdd ctermfg=40 ctermbg=234 cterm=NONE -hi SignifySignChange ctermfg=214 ctermbg=234 cterm=NONE -hi SignifySignDelete ctermfg=196 ctermbg=234 cterm=NONE -" -" --------------------------------------------------------------------- -" }}} -" -" vim:foldmethod=marker:foldlevel=0:textwidth=79 -" diff --git a/vim/colors/luna.vim b/vim/colors/luna.vim deleted file mode 100644 index 09ef100..0000000 --- a/vim/colors/luna.vim +++ /dev/null @@ -1,255 +0,0 @@ -" Name: Luna vim colorscheme -" Author: Pratheek -" URL: http://github.com/Pychimp/vim-luna -" (see this url for latest release & screenshots) -" License: MIT (see LICENSE.rst in the root of project) -" Created: In the middle of Earth's Rotation -" Version: 0.0.7 -" -" -" TODO: {{{ -" --------------------------------------------------------------------- -" -- Clean up ! -" -- create a terminal version -" -- add more lang specifics -" -- (Will think of some more sutff !) -" }}} -" -" Usage and Requirements "{{{ -" --------------------------------------------------------------------- -" REQUIREMENTS: -" --------------------------------------------------------------------- -" Currently, -" -" This colourscheme is intended for use on: -" - gVim >= 7.3 for Linux, Mac and Windows. (Since, all colours are in hex -" values, hence works with gvim. Terminal vim will be supported in future) -" -" --------------------------------------------------------------------- -" INSTALLATION: -" --------------------------------------------------------------------- -" Two options for installation: manual or pathogen -" -" --------------------------------------------------------------------- -" MANUAL INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download the luna distribution (as a zip archive, available on the github page) -" and unarchive the file. -" 2. Move `colors/luna.vim` to your `.vim/colors` directory. -" 3. Enjoy ! -" -" --------------------------------------------------------------------- -" HIGHLY RECOMMENDED PATHOGEN INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download and install Tim Pope's Pathogen from: -" https://github.com/tpope/vim-pathogen -" -" 2. Next, move or clone the `vim-luna` directory so that it is -" a subdirectory of the `.vim/bundle` directory. -" -" a. **clone with git:** -" -" $ cd ~/.vim/bundle -" $ git clone git://github.com/Pychimp/vim-luna.git -" -" --------------------------------------------------------------------- -" MODIFY VIMRC: -" --------------------------------------------------------------------- -" -" After either manual or pathogen installation, put the following two lines in your -" .vimrc: -" -" syntax enable -" colorscheme luna -" }}} -" -" Colorscheme initialization "{{{ -" --------------------------------------------------------------------- -set background=dark -highlight clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name = "luna" -" }}} -" -" Gvim Highlighting: (see :help highlight-groups)"{{{ -" --------------------------------------------------------------------- -" First, the Normal -hi Normal guifg=#e5e5e5 guibg=#212121 gui=NONE -" --------------------------------------------------------------------- -" The Languages stuff -hi Title guifg=#c9f0fa guibg=NONE gui=NONE -" --------------------------------------------------------------------- -hi Comment guifg=#616161 guibg=NONE gui=NONE -" --------------------------------------------------------------------- -" hi Constant guifg=#e3588d guibg=NONE gui=NONE -hi Constant guifg=#fff159 guibg=NONE gui=NONE -hi String guifg=#60bdf4 guibg=NONE gui=NONE -hi Character guifg=#ff8da1 guibg=NONE gui=NONE -hi Number guifg=#fff159 guibg=NONE gui=NONE -hi Boolean guifg=#fff159 guibg=NONE gui=NONE -hi Float guifg=#fff159 guibg=NONE gui=NONE -" --------------------------------------------------------------------- -"hi Identifier guifg=#40ffff guibg=NONE gui=NONE -hi Identifier guifg=#00bcbc guibg=NONE gui=NONE -hi Function guifg=#00bcbc guibg=NONE gui=NONE -" --------------------------------------------------------------------- -"hi Statement guifg=#ff8036 guibg=NONE gui=NONE -"hi Statement guifg=#ee82ee guibg=NONE gui=NONE -"hi Statement guifg=#f26d99 guibg=NONE gui=NONE -"hi Statement guifg=#b06bfc guibg=NONE gui=NONE -"hi Statement guifg=#f88379 guibg=NONE gui=NONE -hi Statement guifg=#f64a8a guibg=NONE gui=NONE -"hi Conditional guifg=#c72723 guibg=NONE gui=NONE -hi Conditional guifg=#e4d00a guibg=NONE gui=NONE -" hi Repeat guifg= guibg=NONE gui=NONE -" hi Label guifg= guibg=NONE gui=NONE -hi Operator guifg=#ff8036 guibg=NONE gui=NONE -" hi Keyword guifg= guibg=NONE gui=NONE -hi Exception guifg=#e4d00a guibg=NONE gui=NONE -" --------------------------------------------------------------------- -hi PreProc guifg=#bada55 guibg=NONE gui=NONE -" hi Include guifg= guibg=NONE gui=NONE -"hi Define guifg=#bada55 guibg=NONE gui=NONE -" hi Macro guifg=#bada55 guibg=NONE gui=NONE -" hi PreCondit guifg=#bada55 guibg=NONE gui=NONE -" --------------------------------------------------------------------- -"hi Type guifg=#26ffa1 guibg=NONE gui=NONE -"hi Type guifg=#ff3800 guibg=NONE gui=NONE -hi Type guifg=#ff4040 guibg=NONE gui=NONE -"hi StorageClass guifg=#f4bbff guibg=NONE gui=NONE -hi StorageClass guifg=#da8a67 guibg=NONE gui=NONE -" hi Structure guifg= guibg=NONE gui=NONE -" hi Typedef guifg= guibg=NONE gui=NONE -" --------------------------------------------------------------------- -hi Special guifg=#ff8da1 guibg=NONE gui=NONE -" hi SpecialChar guifg=#ff8da1 guibg=NONE gui=NONE -" hi Tag guifg= guibg=NONE gui=NONE -" hi Delimiter guifg= guibg=NONE gui=NONE -" hi SpecialComment guifg= guibg=NONE gui=NONE -" hi Debug guifg= guibg=NONE gui=NONE -" --------------------------------------------------------------------- -hi Underlined guifg=#80a0ff guibg=NONE gui=NONE -" --------------------------------------------------------------------- -" hi Ignore guifg= guibg=NONE gui=NONE -" --------------------------------------------------------------------- -hi Error guifg=#870000 guibg=#ffa40b gui=NONE -" --------------------------------------------------------------------- -hi TODO guifg=#ff0087 guibg=#ffff87 gui=NONE - -" --------------------------------------------------------------------- -" Extended Highlighting - -hi NonText guifg=#838383 guibg=NONE gui=NONE -hi Visual guifg=#262626 guibg=#ffff4d gui=NONE -hi ErrorMsg guifg=#870000 guibg=#ffa40b gui=NONE -hi IncSearch guifg=#262626 guibg=#ff9933 gui=NONE -hi Search guifg=#262626 guibg=#ff9933 gui=NONE -hi MoreMsg guifg=#616161 guibg=NONE gui=NONE -hi ModeMsg guifg=#616161 guibg=NONE gui=NONE -hi LineNr guifg=#838383 guibg=NONE gui=NONE -hi VertSplit guifg=#212121 guibg=#474747 gui=NONE -hi VisualNOS guifg=#262626 guibg=#ffff4d gui=NONE -"hi Folded guifg=#2e4545 guibg=#1e2d2d gui=NONE -hi Folded guifg=#426464 guibg=#1e2d2d gui=NONE -hi DiffAdd guifg=#ffffff guibg=#006600 gui=NONE -hi DiffChange guifg=#ffffff guibg=#007878 gui=NONE -hi DiffDelete guifg=#ff0101 guibg=#9a0000 gui=NONE -hi DiffText guifg=#000000 guibg=#ffb733 gui=NONE -hi SpellBad guifg=#d80000 guibg=#ffff9a gui=NONE -hi SpellCap guifg=#8b4600 guibg=#ffff9a gui=NONE -hi SpellRare guifg=#ff0000 guibg=#ffff9a gui=NONE -hi SpellLocal guifg=#008b00 guibg=#ffff9a gui=NONE -" hi StatusLine guifg=#000000 guibg=#8d8d8d gui=NONE -" hi StatusLine guifg=#ffffff guibg=#2e4545 gui=NONE -" hi StatusLine guifg=#ffffff guibg=#1e2d2d gui=NONE -" hi StatusLine guifg=#ffffff guibg=#353535 gui=NONE -" hi StatusLine guifg=#ffffff guibg=#1f2e2e gui=NONE -hi StatusLine guifg=#ffffff guibg=#002b2b gui=NONE -hi StatusLineNC guifg=#ffffff guibg=#474747 gui=NONE -" hi Pmenu guifg=#586e75 guibg=#fdf6e3 gui=NONE -" hi PmenuSel guifg=#fdf6e3 guibg=#2aa198 gui=NONE -" hi PmenuSbar guifg=#fdf6e3 guibg=#fdf6e3 gui=NONE -" hi PmenuThumb guifg=#fdf6e3 guibg=#fdf6e3 gui=NONE -" hi Pmenu guifg=#426464 guibg=#002b2b gui=NONE -" hi Pmenu guifg=#609292 guibg=#002b2b gui=NONE -hi Pmenu guifg=#7ca9a9 guibg=#002b2b gui=NONE -hi PmenuSel guifg=#002b2b guibg=#fdf6e3 gui=NONE -hi PmenuSbar guifg=#002b2b guibg=#002b2b gui=NONE -hi PmenuThumb guifg=#002b2b guibg=#002b2b gui=NONE -hi MatchParen guifg=#000000 guibg=#ff4040 gui=NONE -hi CursorLine guifg=NONE guibg=#2e2e2e gui=NONE -"hi CursorLineNr guifg=#50c878 guibg=#2e2e2e gui=NONE -"hi CursorLineNr guifg=#3eb489 guibg=NONE gui=NONE -"hi CursorLineNr guifg=#f5fffa guibg=NONE gui=NONE -hi CursorLineNr guifg=#87ceeb guibg=NONE gui=NONE -hi CursorColumn guifg=NONE guibg=#2e2e2e gui=NONE -hi ColorColumn guifg=NONE guibg=#3e3739 gui=NONE -hi WildMenu guifg=#002b2b guibg=#ffffff gui=NONE -hi SignColumn guifg=NONE guibg=#212121 gui=NONE -" }}} -" -" Language Specifics: {{{ -" --------------------------------------------------------------------- -" These are language specifics. These are set explicitly to override the group -" highlighting provided by vim (Simply to make the language that you're working -" on more awesome, and fun to work with !) -" --------------------------------------------------------------------- -" Python Specifics -"hi pythonDot guifg=#00ffa5 guibg=NONE gui=NONE -"hi pythonDot guifg=#ffff31 guibg=NONE gui=NONE -"hi pythonDot guifg=#ff0800 guibg=NONE gui=NONE -hi pythonDot guifg=#d70a53 guibg=NONE gui=NONE -hi pythonParameters guifg=#bada55 guibg=NONE gui=NONE -hi pythonClassParameters guifg=#bada55 guibg=NONE gui=NONE -hi pythonClass guifg=#00bcbc guibg=NONE gui=NONE -" -" --------------------------------------------------------------------- -" Ruby Specifics -hi rubyInterpolation guifg=#ff4040 guibg=NONE gui=NONE -"hi rubyMethodBlock guifg=#ff8da1 guibg=NONE gui=NONE -"hi rubyMethodBlock guifg=#8ddaff guibg=NONE gui=NONE -hi rubyMethodBlock guifg=#ffb28d guibg=NONE gui=NONE -hi rubyCurlyBlock guifg=#f64a8a guibg=NONE gui=NONE -hi rubyDoBlock guifg=#f64a8a guibg=NONE gui=NONE -hi rubyBlockExpression guifg=#f64a8a guibg=NONE gui=NONE -hi rubyArrayDelimiter guifg=#00bcbc guibg=NONE gui=NONE -" -" --------------------------------------------------------------------- -" }}} -" -" Extras: {{{ -" --------------------------------------------------------------------- -" These are extra parts for highlighting certain external plugins -" --------------------------------------------------------------------- -" -" Startify (https://github.com/mhinz/vim-startify) -" -hi StartifyBracket guifg=#b06bfc guibg=NONE gui=NONE -hi StartifyNumber guifg=#bada55 guibg=NONE gui=NONE -hi StartifySpecial guifg=#2e8857 guibg=NONE gui=NONE -hi StartifyPath guifg=#545454 guibg=NONE gui=NONE -hi StartifySlash guifg=#474747 guibg=NONE gui=NONE -" hi StartifyFile guifg=#00ffa5 guibg=NONE gui=NONE -" hi StartifyFile guifg=#2aa198 guibg=NONE gui=NONE -" hi StartifyFile guifg=#f0e68c guibg=NONE gui=NONE -hi StartifyFile guifg=#fa8072 guibg=NONE gui=NONE -hi StartifyHeader guifg=#f0e68c guibg=NONE gui=NONE -hi StartifyFooter guifg=#a0522d guibg=NONE gui=NONE -" -" --------------------------------------------------------------------- -" -" Signify (https://github.com/mhinz/vim-signify) -" -hi SignifySignAdd guifg=#00ff00 guibg=#212121 gui=NONE -hi SignifySignChange guifg=#ff5f00 guibg=#212121 gui=NONE -hi SignifySignDelete guifg=#ff0000 guibg=#212121 gui=NONE -" -" --------------------------------------------------------------------- -" }}} -" -" vim:foldmethod=marker:foldlevel=0:textwidth=79 -" diff --git a/vim/rcfiles/gvimrc b/vim/rcfiles/gvimrc index cb6c143..055d7d2 100644 --- a/vim/rcfiles/gvimrc +++ b/vim/rcfiles/gvimrc @@ -1,2 +1,2 @@ -colorscheme luna +colorscheme gruvbox set guifont=SauceCodePro+Powerline+Awesome\ Regular\ Nerd\ Font diff --git a/vim/rcfiles/vimrc b/vim/rcfiles/vimrc index 9d97537..1e8655c 100644 --- a/vim/rcfiles/vimrc +++ b/vim/rcfiles/vimrc @@ -3,9 +3,10 @@ version 7.4 syntax on set encoding=utf-8 set background=dark -colorscheme luna-term +colorscheme gruvbox hi BadWhitespace ctermbg=red guibg=red +set t_Co=256 set gdefault set nobackup set nodigraph