Updated macOS truecolor scheme

Remove unnecessary autocmd

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://imgrush.com/h0EfiWAdb4Ke.svg"></p>
+<p align="center"><img src="https://morhetz.com/gruvbox.svg"></p>
 
 gruvbox is heavily inspired by [badwolf][], [jellybeans][] and [solarized][].
 
@@ -13,7 +13,7 @@ Attention
 
 1. [Read this first](https://github.com/morhetz/gruvbox/wiki/Terminal-specific)
 2. Typeface from gallery is [Fantasque Sans Mono](https://github.com/belluzj/fantasque-sans)
-3. Typeface from screenshots below is [Fira Mono](http://www.carrois.com/fira-4-1/)
+3. Typeface from screenshots below is [Fira Mono](https://mozilla.github.io/Fira/)
 
 Screenshots
 -----------
@@ -65,8 +65,8 @@ Features
 --------
 
 * Lots of style-customization options (contrast, color invertion, italics usage etc.)
-* Extended filetype highlighting: Html, Xml, Vim (and ES6 with [yajs.vim](https://github.com/othree/yajs.vim)), Clojure, C, Python, JavaScript, CoffeeScript, Ruby, Objective-C, Go, Lua, MoonScript, Java, Markdown, Haskell
-* Supported plugins: [EasyMotion][], [vim-sneak][], [Indent Guides][], [indentLine][], [Rainbow Parentheses][], [Airline][], [GitGutter][], [Signify][], [ShowMarks][], [Signature][], [Syntastic][], [CtrlP][], [Startify][]
+* Extended filetype highlighting: Html, Xml, Vim, Clojure, C, Python, JavaScript, TypeScript, PureScript, CoffeeScript, Ruby, Objective-C, Go, Lua, MoonScript, Java, Markdown, Haskell, Elixir
+* Supported plugins: [EasyMotion][], [vim-sneak][], [Indent Guides][], [indentLine][], [Rainbow Parentheses][], [Airline][], [Lightline][], [GitGutter][], [Signify][], [ShowMarks][], [Signature][], [Syntastic][], [Ale][], [CtrlP][], [Startify][], [NERDTree][], [Dirvish][]
 
    [EasyMotion]: https://github.com/Lokaltog/vim-easymotion
    [vim-sneak]: https://github.com/justinmk/vim-sneak
@@ -74,13 +74,17 @@ Features
    [indentLine]: https://github.com/Yggdroot/indentLine
    [Rainbow Parentheses]: https://github.com/kien/rainbow_parentheses.vim
    [Airline]: https://github.com/bling/vim-airline
+   [Lightline]: https://github.com/itchyny/lightline.vim
    [GitGutter]: https://github.com/airblade/vim-gitgutter
    [Signify]: https://github.com/mhinz/vim-signify
    [ShowMarks]: http://www.vim.org/scripts/script.php?script_id=152
    [Signature]: https://github.com/kshenoy/vim-signature
    [Syntastic]: https://github.com/scrooloose/syntastic
+   [Ale]: https://github.com/w0rp/ale
    [CtrlP]: https://github.com/kien/ctrlp.vim
    [Startify]: https://github.com/mhinz/vim-startify
+   [NERDTree]: https://github.com/scrooloose/nerdtree
+   [Dirvish]: https://github.com/justinmk/vim-dirvish
 
 Contributions
 -------------
@@ -92,9 +96,8 @@ See [gruvbox-contrib][] repo for contributions, ports and extras.
 ToDo
 ----
 
-* Filetype syntax highlighting (R, TeX, Swift, Erlang and I'm still dissatisfied with CSS)
-* Plugin support (MiniBufExplorer, Tagbar, Netrw, VimPLug)
-* Lightline theme
+* Filetype syntax highlighting (R, TeX, Swift, Erlang)
+* Plugin support (Tagbar, VimPlug)
 
 Self-Promotion
 --------------

autoload/airline/themes/gruvbox.vim

@@ -3,7 +3,7 @@
 " Description: Retro groove color scheme for Airline
 " Author: morhetz <morhetz@gmail.com>
 " Source: https://github.com/morhetz/gruvbox
-" Last Modified: 22 Aug 2014
+" Last Modified: 12 Aug 2017
 " -----------------------------------------------------------------------------
 
 let g:airline#themes#gruvbox#palette = {}
@@ -14,22 +14,27 @@ function! airline#themes#gruvbox#refresh()
   let accents_group = airline#themes#get_highlight('Special')
   let modified_group = [M0[0], '', M0[2], '', '']
   let warning_group = airline#themes#get_highlight2(['Normal', 'bg'], ['Question', 'fg'])
+  let error_group = airline#themes#get_highlight2(['Normal', 'bg'], ['WarningMsg', 'fg'])
 
   let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['StatusLineNC', 'bg'])
-  let s:N2 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['StatusLineNC', 'fg'])
+  let s:N2 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['Pmenu', 'bg'])
   let s:N3 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['CursorLine', 'bg'])
   let g:airline#themes#gruvbox#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
   let g:airline#themes#gruvbox#palette.normal_modified = { 'airline_c': modified_group }
   let g:airline#themes#gruvbox#palette.normal.airline_warning = warning_group
   let g:airline#themes#gruvbox#palette.normal_modified.airline_warning = warning_group
+  let g:airline#themes#gruvbox#palette.normal.airline_error = error_group
+  let g:airline#themes#gruvbox#palette.normal_modified.airline_error = error_group
 
   let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Identifier', 'fg'])
   let s:I2 = s:N2
-  let s:I3 = airline#themes#get_highlight2(['Normal', 'fg'], ['StatusLineNC', 'fg'])
+  let s:I3 = airline#themes#get_highlight2(['Normal', 'fg'], ['Pmenu', 'bg'])
   let g:airline#themes#gruvbox#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
   let g:airline#themes#gruvbox#palette.insert_modified = g:airline#themes#gruvbox#palette.normal_modified
   let g:airline#themes#gruvbox#palette.insert.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
   let g:airline#themes#gruvbox#palette.insert_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
+  let g:airline#themes#gruvbox#palette.insert.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
+  let g:airline#themes#gruvbox#palette.insert_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
 
   let s:R1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Structure', 'fg'])
   let s:R2 = s:I2
@@ -38,6 +43,8 @@ function! airline#themes#gruvbox#refresh()
   let g:airline#themes#gruvbox#palette.replace_modified = g:airline#themes#gruvbox#palette.normal_modified
   let g:airline#themes#gruvbox#palette.replace.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
   let g:airline#themes#gruvbox#palette.replace_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
+  let g:airline#themes#gruvbox#palette.replace.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
+  let g:airline#themes#gruvbox#palette.replace_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
 
   let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Question', 'fg'])
   let s:V2 = s:N2
@@ -46,6 +53,8 @@ function! airline#themes#gruvbox#refresh()
   let g:airline#themes#gruvbox#palette.visual_modified = { 'airline_c': [ s:V3[0], '', s:V3[2], '', '' ] }
   let g:airline#themes#gruvbox#palette.visual.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
   let g:airline#themes#gruvbox#palette.visual_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
+  let g:airline#themes#gruvbox#palette.visual.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
+  let g:airline#themes#gruvbox#palette.visual_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
 
   let s:IA = airline#themes#get_highlight2(['TabLine', 'fg'], ['CursorLine', 'bg'])
   let g:airline#themes#gruvbox#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)

autoload/lightline/colorscheme/gruvbox.vim

@@ -0,0 +1,57 @@
+" -----------------------------------------------------------------------------
+" File: gruvbox.vim
+" Description: Gruvbox colorscheme for Lightline (itchyny/lightline.vim)
+" Author: gmoe <me@griffinmoe.com>
+" Source: https://github.com/morhetz/gruvbox
+" Last Modified: 20 Sep 2017
+" -----------------------------------------------------------------------------
+
+function! s:getGruvColor(group)
+  let guiColor = synIDattr(hlID(a:group), "fg", "gui") 
+  let termColor = synIDattr(hlID(a:group), "fg", "cterm") 
+  return [ guiColor, termColor ]
+endfunction
+
+if exists('g:lightline')
+
+  let s:bg0  = s:getGruvColor('GruvboxBg0')
+  let s:bg1  = s:getGruvColor('GruvboxBg1')
+  let s:bg2  = s:getGruvColor('GruvboxBg2')
+  let s:bg4  = s:getGruvColor('GruvboxBg4')
+  let s:fg1  = s:getGruvColor('GruvboxFg1')
+  let s:fg4  = s:getGruvColor('GruvboxFg4')
+
+  let s:yellow = s:getGruvColor('GruvboxYellow')
+  let s:blue   = s:getGruvColor('GruvboxBlue')
+  let s:aqua   = s:getGruvColor('GruvboxAqua')
+  let s:orange = s:getGruvColor('GruvboxOrange')
+  let s:green = s:getGruvColor('GruvboxGreen')
+
+  let s:p = {'normal':{}, 'inactive':{}, 'insert':{}, 'replace':{}, 'visual':{}, 'tabline':{}, 'terminal':{}}
+  let s:p.normal.left = [ [ s:bg0, s:fg4, 'bold' ], [ s:fg4, s:bg2 ] ]
+  let s:p.normal.right = [ [ s:bg0, s:fg4 ], [ s:fg4, s:bg2 ] ]
+  let s:p.normal.middle = [ [ s:fg4, s:bg1 ] ]
+  let s:p.inactive.right = [ [ s:bg4, s:bg1 ], [ s:bg4, s:bg1 ] ]
+  let s:p.inactive.left =  [ [ s:bg4, s:bg1 ], [ s:bg4, s:bg1 ] ]
+  let s:p.inactive.middle = [ [ s:bg4, s:bg1 ] ]
+  let s:p.insert.left = [ [ s:bg0, s:blue, 'bold' ], [ s:fg1, s:bg2 ] ]
+  let s:p.insert.right = [ [ s:bg0, s:blue ], [ s:fg1, s:bg2 ] ]
+  let s:p.insert.middle = [ [ s:fg4, s:bg2 ] ]
+  let s:p.terminal.left = [ [ s:bg0, s:green, 'bold' ], [ s:fg1, s:bg2 ] ]
+  let s:p.terminal.right = [ [ s:bg0, s:green ], [ s:fg1, s:bg2 ] ]
+  let s:p.terminal.middle = [ [ s:fg4, s:bg2 ] ]
+  let s:p.replace.left = [ [ s:bg0, s:aqua, 'bold' ], [ s:fg1, s:bg2 ] ]
+  let s:p.replace.right = [ [ s:bg0, s:aqua ], [ s:fg1, s:bg2 ] ]
+  let s:p.replace.middle = [ [ s:fg4, s:bg2 ] ]
+  let s:p.visual.left = [ [ s:bg0, s:orange, 'bold' ], [ s:bg0, s:bg4 ] ]
+  let s:p.visual.right = [ [ s:bg0, s:orange ], [ s:bg0, s:bg4 ] ]
+  let s:p.visual.middle = [ [ s:fg4, s:bg1 ] ]
+  let s:p.tabline.left = [ [ s:fg4, s:bg2 ] ]
+  let s:p.tabline.tabsel = [ [ s:bg0, s:fg4 ] ]
+  let s:p.tabline.middle = [ [ s:bg0, s:bg0 ] ]
+  let s:p.tabline.right = [ [ s:bg0, s:orange ] ]
+  let s:p.normal.error = [ [ s:bg0, s:orange ] ]
+  let s:p.normal.warning = [ [ s:bg2, s:yellow ] ]
+
+  let g:lightline#colorscheme#gruvbox#palette = lightline#colorscheme#flatten(s:p)
+endif

gruvbox_256palette_osx.sh

@@ -1,116 +1,71 @@
 #!/bin/sh
 
+colors=(
+  # --- Background shades (used in layers, UI sections) ---
+  "234=16/18/19"   # bg0_h - very dark background
+  "235=1e/1e/1e"   # bg0    - base background
+  "236=26/24/23"   # bg1    - slightly lighter bg
+  "237=2e/2a/29"   # bg2    - line numbers, subtle bg
+  "239=3f/39/35"   # bg3    - border lines, splitbars
+  "241=53/4a/42"   # bg4    - cursor line bg, subtle contrast
+  "243=68/5c/51"   # bg5    - low contrast UI elements
+
+  # --- Faded foreground / comments / subdued text ---
+  "244=7f/70/61"   # gray1  - comments
+  "245=7f/70/61"   # gray2  - docstrings, hints (same as gray1)
+
+  # --- Main foreground and subtle variants ---
+  "250=cb/b8/90"   # fg     - default foreground text
+  "248=af/9f/81"   # fg1    - slightly faded text
+  "246=97/87/71"   # fg2    - further dimmed
+
+  # --- Light background highlights (e.g. selection, search) ---
+  "228=ef/df/ae"   # yellow1 - selection bg
+  "229=fa/ee/bb"   # yellow2 - search highlight bg
+  "230=f8/f4/cd"   # lightest - special highlights
+  "223=e6/d4/a3"   # alt highlight bg
+
+  # --- Core Gruvbox accent colors ---
+  "167=f7/30/28"   # red     - errors, removals
+  "142=aa/b0/1e"   # green   - additions, success
+  "214=f7/b1/25"   # yellow  - warnings
+  "175=c7/70/89"   # purple  - function names, git renamed
+  "108=7d/b6/69"   # aqua    - type hints, diffs
+  "109=71/95/86"   # teal    - status bars, cursor
+  "208=fb/6a/16"   # orange  - search match, bright UI
+
+  # --- Darker accent variants for backgrounds or subtle diff ---
+  "88=89/00/09"    # red dark     - error background
+  "100=66/62/0d"   # green dark   - diff bg
+  "136=a5/63/11"   # yellow dark  - change marker
+  "130=9d/28/07"   # orange dark  - symbol/markup
+  "24=0e/53/65"    # blue dark    - info, links
+  "96=7b/2b/5e"    # purple dark  - markdown, hint bg
+  "66=35/6a/46"    # green deep   - background diff +
+)
+
+# Detect terminal escape sequence wrapping
 if [ "${TERM%%-*}" = "screen" ]; then
   if [ -n "$TMUX" ]; then
-    printf "\033Ptmux;\033\033]4;236;rgb:26/24/23\007\033\\"
-    printf "\033Ptmux;\033\033]4;234;rgb:16/18/19\007\033\\"
-
-    printf "\033Ptmux;\033\033]4;235;rgb:1e/1e/1e\007\033\\"
-    printf "\033Ptmux;\033\033]4;237;rgb:2e/2a/29\007\033\\"
-    printf "\033Ptmux;\033\033]4;239;rgb:3f/39/35\007\033\\"
-    printf "\033Ptmux;\033\033]4;241;rgb:53/4a/42\007\033\\"
-    printf "\033Ptmux;\033\033]4;243;rgb:68/5c/51\007\033\\"
-
-    printf "\033Ptmux;\033\033]4;244;rgb:7f/70/61\007\033\\"
-    printf "\033Ptmux;\033\033]4;245;rgb:7f/70/61\007\033\\"
-
-    printf "\033Ptmux;\033\033]4;228;rgb:ef/df/ae\007\033\\"
-    printf "\033Ptmux;\033\033]4;230;rgb:f8/f4/cd\007\033\\"
-
-    printf "\033Ptmux;\033\033]4;229;rgb:fa/ee/bb\007\033\\"
-    printf "\033Ptmux;\033\033]4;223;rgb:e6/d4/a3\007\033\\"
-    printf "\033Ptmux;\033\033]4;250;rgb:cb/b8/90\007\033\\"
-    printf "\033Ptmux;\033\033]4;248;rgb:af/9f/81\007\033\\"
-    printf "\033Ptmux;\033\033]4;246;rgb:97/87/71\007\033\\"
-
-    printf "\033Ptmux;\033\033]4;167;rgb:f7/30/28\007\033\\"
-    printf "\033Ptmux;\033\033]4;142;rgb:aa/b0/1e\007\033\\"
-    printf "\033Ptmux;\033\033]4;214;rgb:f7/b1/25\007\033\\"
-    printf "\033Ptmux;\033\033]4;109;rgb:71/95/86\007\033\\"
-    printf "\033Ptmux;\033\033]4;175;rgb:c7/70/89\007\033\\"
-    printf "\033Ptmux;\033\033]4;108;rgb:7d/b6/69\007\033\\"
-    printf "\033Ptmux;\033\033]4;208;rgb:fb/6a/16\007\033\\"
-
-    printf "\033Ptmux;\033\033]4;88;rgb:89/00/09\007\033\\"
-    printf "\033Ptmux;\033\033]4;100;rgb:66/62/0d\007\033\\"
-    printf "\033Ptmux;\033\033]4;136;rgb:a5/63/11\007\033\\"
-    printf "\033Ptmux;\033\033]4;24;rgb:0e/53/65\007\033\\"
-    printf "\033Ptmux;\033\033]4;96;rgb:7b/2b/5e\007\033\\"
-    printf "\033Ptmux;\033\033]4;66;rgb:35/6a/46\007\033\\"
-    printf "\033Ptmux;\033\033]4;130;rgb:9d/28/07\007\033\\"
+    prefix="\033Ptmux;\033"
+    suffix="\033\\"
   else
-    printf "\033P\033]4;236;rgb:26/24/23\007\033\\"
-    printf "\033P\033]4;234;rgb:16/18/19\007\033\\"
-
-    printf "\033P\033]4;235;rgb:1e/1e/1e\007\033\\"
-    printf "\033P\033]4;237;rgb:2e/2a/29\007\033\\"
-    printf "\033P\033]4;239;rgb:3f/39/35\007\033\\"
-    printf "\033P\033]4;241;rgb:53/4a/42\007\033\\"
-    printf "\033P\033]4;243;rgb:68/5c/51\007\033\\"
-
-    printf "\033P\033]4;244;rgb:7f/70/61\007\033\\"
-    printf "\033P\033]4;245;rgb:7f/70/61\007\033\\"
-
-    printf "\033P\033]4;228;rgb:ef/df/ae\007\033\\"
-    printf "\033P\033]4;230;rgb:f8/f4/cd\007\033\\"
-
-    printf "\033P\033]4;229;rgb:fa/ee/bb\007\033\\"
-    printf "\033P\033]4;223;rgb:e6/d4/a3\007\033\\"
-    printf "\033P\033]4;250;rgb:cb/b8/90\007\033\\"
-    printf "\033P\033]4;248;rgb:af/9f/81\007\033\\"
-    printf "\033P\033]4;246;rgb:97/87/71\007\033\\"
-
-    printf "\033P\033]4;167;rgb:f7/30/28\007\033\\"
-    printf "\033P\033]4;142;rgb:aa/b0/1e\007\033\\"
-    printf "\033P\033]4;214;rgb:f7/b1/25\007\033\\"
-    printf "\033P\033]4;109;rgb:71/95/86\007\033\\"
-    printf "\033P\033]4;175;rgb:c7/70/89\007\033\\"
-    printf "\033P\033]4;108;rgb:7d/b6/69\007\033\\"
-    printf "\033P\033]4;208;rgb:fb/6a/16\007\033\\"
-
-    printf "\033P\033]4;88;rgb:89/00/09\007\033\\"
-    printf "\033P\033]4;100;rgb:66/62/0d\007\033\\"
-    printf "\033P\033]4;136;rgb:a5/63/11\007\033\\"
-    printf "\033P\033]4;24;rgb:0e/53/65\007\033\\"
-    printf "\033P\033]4;96;rgb:7b/2b/5e\007\033\\"
-    printf "\033P\033]4;66;rgb:35/6a/46\007\033\\"
-    printf "\033P\033]4;130;rgb:9d/28/07\007\033\\"
+    prefix="\033P"
+    suffix="\033\\"
   fi
 else
-  printf "\033]4;236;rgb:26/24/23\033\\"
-  printf "\033]4;234;rgb:16/18/19\033\\"
-
-  printf "\033]4;235;rgb:1e/1e/1e\033\\"
-  printf "\033]4;237;rgb:2e/2a/29\033\\"
-  printf "\033]4;239;rgb:3f/39/35\033\\"
-  printf "\033]4;241;rgb:53/4a/42\033\\"
-  printf "\033]4;243;rgb:68/5c/51\033\\"
-
-  printf "\033]4;244;rgb:7f/70/61\033\\"
-  printf "\033]4;245;rgb:7f/70/61\033\\"
-
-  printf "\033]4;228;rgb:ef/df/ae\033\\"
-  printf "\033]4;230;rgb:f8/f4/cd\033\\"
-
-  printf "\033]4;229;rgb:fa/ee/bb\033\\"
-  printf "\033]4;223;rgb:e6/d4/a3\033\\"
-  printf "\033]4;250;rgb:cb/b8/90\033\\"
-  printf "\033]4;248;rgb:af/9f/81\033\\"
-  printf "\033]4;246;rgb:97/87/71\033\\"
-
-  printf "\033]4;167;rgb:f7/30/28\033\\"
-  printf "\033]4;142;rgb:aa/b0/1e\033\\"
-  printf "\033]4;214;rgb:f7/b1/25\033\\"
-  printf "\033]4;109;rgb:71/95/86\033\\"
-  printf "\033]4;175;rgb:c7/70/89\033\\"
-  printf "\033]4;108;rgb:7d/b6/69\033\\"
-  printf "\033]4;208;rgb:fb/6a/16\033\\"
-
-  printf "\033]4;88;rgb:89/00/09\033\\"
-  printf "\033]4;100;rgb:66/62/0d\033\\"
-  printf "\033]4;136;rgb:a5/63/11\033\\"
-  printf "\033]4;24;rgb:0e/53/65\033\\"
-  printf "\033]4;96;rgb:7b/2b/5e\033\\"
-  printf "\033]4;66;rgb:35/6a/46\033\\"
-  printf "\033]4;130;rgb:9d/28/07\033\\"
+  prefix=""
+  suffix="\033\\"
 fi
+
+# Apply one color index+value to the terminal palette
+set_color() {
+  index="${1%%=*}"
+  value="${1#*=}"
+  printf "${prefix}\033]4;%s;rgb:%s\007${suffix}" "$index" "$value"
+}
+
+# Loop over all defined colors
+for color in "${colors[@]}"; do
+  set_color "$color"
+done

package.json

@@ -0,0 +1,10 @@
+{
+  "name": "gruvbox",
+  "version": "2.0.0",
+  "repository": "git@github.com:morhetz/gruvbox.git",
+  "author": "Pavel Pertsev <morhetz@gmail.com>",
+  "license": "MIT",
+  "vim": {
+    "opt": true
+  }
+}