m-vim_plugins/onedark.vim
1
0
Fork 0
mirror of https://github.com/joshdick/onedark.vim.git synced 2025-11-08 11:03:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaks and Updates (#100)

Browse Source 
* Change comment style to use folds, in turn necessitating changing the template delimeters

* Add "Underlined" styling

* Update the gui gutter foreground color

* Automatically generate terminal color palette files

* README.md: Add 'Relatives of onedark.vim' section

* README.md tweaks to (hopefully) make installation and troubleshooting easier.

* README.md: Update preview image information

* README.md: Re-update preview image information

* README.md: Fixed wording about italics troubleshooting screenshot

* README.md: "setting" -> "option" where appropriate

* README.md: Fix typos
This commit is contained in:
Josh Dick
2017-05-11 11:22:53 -04:00
committed by GitHub
parent 22c8bb6067
commit 8d2720a7a7
18 changed files with 618 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

344
One Dark.itermcolors
View File

@@ -1,344 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.15356595814228058</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.12867720425128937</real>
<key>Red Component</key>
<real>0.11784578859806061</real>
</dict>
<key>Ansi 1 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.38427835702896118</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.33154332637786865</real>
<key>Red Component</key>
<real>0.83982789516448975</real>
</dict>
<key>Ansi 10 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.39974293112754822</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.72638434171676636</real>
<key>Red Component</key>
<real>0.53152436017990112</real>
</dict>
<key>Ansi 11 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.32740181684494019</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.53406417369842529</real>
<key>Red Component</key>
<real>0.77367901802062988</real>
</dict>
<key>Ansi 12 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.92034518718719482</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.61757242679595947</real>
<key>Red Component</key>
<real>0.31691098213195801</real>
</dict>
<key>Ansi 13 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.83443140983581543</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.36372148990631104</real>
<key>Red Component</key>
<real>0.72034633159637451</real>
</dict>
<key>Ansi 14 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.70909905433654785</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.65958327054977417</real>
<key>Red Component</key>
<real>0.28184390068054199</real>
</dict>
<key>Ansi 15 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.36364352703094482</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.32518172264099121</real>
<key>Red Component</key>
<real>0.28983011841773987</real>
</dict>
<key>Ansi 2 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.39974293112754822</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.72638434171676636</real>
<key>Red Component</key>
<real>0.53152436017990112</real>
</dict>
<key>Ansi 3 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.40846776962280273</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.70514953136444092</real>
<key>Red Component</key>
<real>0.86970341205596924</real>
</dict>
<key>Ansi 4 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.92034518718719482</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.61757242679595947</real>
<key>Red Component</key>
<real>0.31691098213195801</real>
</dict>
<key>Ansi 5 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.83443140983581543</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.36372148990631104</real>
<key>Red Component</key>
<real>0.72034633159637451</real>
</dict>
<key>Ansi 6 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.70909905433654785</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.65958327054977417</real>
<key>Red Component</key>
<real>0.28184390068054199</real>
</dict>
<key>Ansi 7 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.69588643312454224</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.63642364740371704</real>
<key>Red Component</key>
<real>0.60774457454681396</real>
</dict>
<key>Ansi 8 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.25302234292030334</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.2037905752658844</real>
<key>Red Component</key>
<real>0.18584296107292175</real>
</dict>
<key>Ansi 9 Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.21343094110488892</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.23213338851928711</real>
<key>Red Component</key>
<real>0.68343335390090942</real>
</dict>
<key>Background Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.15356595814228058</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.12867720425128937</real>
<key>Red Component</key>
<real>0.11784578859806061</real>
</dict>
<key>Badge Color</key>
<dict>
<key>Alpha Component</key>
<real>0.5</real>
<key>Blue Component</key>
<real>0.0</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.0</real>
<key>Red Component</key>
<real>1</real>
</dict>
<key>Bold Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.70040369033813477</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.63625657558441162</real>
<key>Red Component</key>
<real>0.60773354768753052</real>
</dict>
<key>Cursor Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.73333334922790527</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.73333334922790527</real>
<key>Red Component</key>
<real>0.73333334922790527</real>
</dict>
<key>Cursor Guide Color</key>
<dict>
<key>Alpha Component</key>
<real>0.25</real>
<key>Blue Component</key>
<real>1</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.9100000262260437</real>
<key>Red Component</key>
<real>0.64999997615814209</real>
</dict>
<key>Cursor Text Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>1</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>1</real>
<key>Red Component</key>
<real>1</real>
</dict>
<key>Foreground Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.70040369033813477</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.63625657558441162</real>
<key>Red Component</key>
<real>0.60773354768753052</real>
</dict>
<key>Link Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.93489384651184082</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.61235702037811279</real>
<key>Red Component</key>
<real>0.30268973112106323</real>
</dict>
<key>Selected Text Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.70040369033813477</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.63625657558441162</real>
<key>Red Component</key>
<real>0.60773354768753052</real>
</dict>
<key>Selection Color</key>
<dict>
<key>Alpha Component</key>
<real>1</real>
<key>Blue Component</key>
<real>0.25302234292030334</real>
<key>Color Space</key>
<string>Calibrated</string>
<key>Green Component</key>
<real>0.2037905752658844</real>
<key>Red Component</key>
<real>0.18584296107292175</real>
</dict>
</dict>
</plist>

143
README.md
View File

@@ -1,77 +1,67 @@
# onedark.vim
A dark Vim color scheme for the GUI and 16/256-color terminals, based on [FlatColor](https://github.com/MaxSt/FlatColor), with colors inspired by the excellent [One Dark syntax theme](https://github.com/atom/one-dark-syntax) for the [Atom text editor](https://atom.io).
A dark Vim/Neovim color scheme for the GUI and 16/256/true-color terminals, based on [FlatColor](https://github.com/MaxSt/FlatColor), with colors inspired by the excellent [One Dark syntax theme](https://github.com/atom/one-dark-syntax) for the [Atom text editor](https://atom.io).
![onedark.vim Preview](https://raw.githubusercontent.com/joshdick/onedark.vim/master/preview.png)
![onedark.vim Preview](https://raw.githubusercontent.com/joshdick/onedark.vim/master/img/preview.png)
## Installation
1. If you use Vim in the terminal, determine whether [your terminal emulator has 24-bit color ("true color") support](https://gist.github.com/XVilka/8346728).
1. Install the theme using your Vim plug-in manager of choice, or by manually placing `colors/onedark.vim` in your `~/.vim/colors/` directory.
Note that proper colors will always be shown when using GUI Vim, regardless of the configuration done in this step.
2. If you use Vim in a terminal, do the following to test whether your terminal emulator supports [24-bit/"true" color](https://gist.github.com/XVilka/8346728), then add relevant `~/.vimrc` configuration if so:
* If your terminal emulator **DOES** support 24-bit color, add the following lines to your `~/.vimrc` (this works for Vim patch 7.4.1799 and above, as well as Neovim version 0.1.3 and above; if you use [tmux](https://tmux.github.io/), see the tmux-related notes at the top):
_Note: GUI (non-terminal) Vim will always display 24-bit color regardless of the configuration done in this step._
```vim
"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
if (empty($TMUX))
if (has("nvim"))
"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
let $NVIM_TUI_ENABLE_TRUE_COLOR=1
endif
"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
if (has("termguicolors"))
set termguicolors
endif
Run the following snippet in your shell:
```shell
printf "\x1b[38;2;255;100;0mTRUECOLOR\x1b[0m\n"
```
If your terminal emulator **does NOT display the word `TRUECOLOR` in red**, it does not support 24-bit color. If you don't want to switch to a different terminal emulator that [supports 24-bit color](https://gist.github.com/XVilka/8346728), **proceed to step 3**. (After installation, the [`g:onedark_termcolors` option](#options) may interest you.)
If your terminal emulator displays the word `TRUECOLOR` **in red**, it supports 24-bit color, and you should add the following lines to your `~/.vimrc` to enable 24-bit color terminal support inside Vim.
(If you use [tmux](https://tmux.github.io/), be sure to view the tmux-related notes in the first few lines.)
```vim
"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
if (empty($TMUX))
if (has("nvim"))
"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
let $NVIM_TUI_ENABLE_TRUE_COLOR=1
endif
```
"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
if (has("termguicolors"))
set termguicolors
endif
endif
```
* If you [additionally] use older versions of Vim/Neovim than mentioned above, or your terminal emulator **DOES NOT** support 24-bit color, or you use tmux 2.1 or earlier:
You have two options, 16-color mode (which is preferred) or 256-color mode. These modes are selected via the `g:onedark_termcolors` setting. **When Vim/Neovim are actively using true-color mode as configured above, the `g:onedark_termcolors` setting will be be ignored. However, `g:onedark_termcolors` can still coexist with the configuration above.** For instance, when tmux 2.1 or earlier and/or older Vim/Neovim versions are used with the configuration above, `g:onedark_termcolors` will be honored/not ignored.
* **16-color mode** is the preferred option, since its colors are more accurate than those of 256-color mode. However, you'll need to set your terminal's color palette to this color scheme's custom 16-color palette, since 16-color mode will cause the color scheme to use your terminal emulator's native 16 colors. If you don't use the custom 16-color palette in your terminal emulator when 16-color mode is enabled, the color scheme's colors will not display correctly.
The canonical version of the 16-color palette is an [iTerm2](https://iterm2.com) color scheme called `One Dark.itermcolors`, which lives in the root of this repository. `One Dark.itermcolors` only works with the test/beta releases of iTerm2 (versions 2.9.x and later.) You should be able to easily convert the iTerm2 color scheme for use with your terminal emulator of choice by using a tool like [termcolors](https://github.com/stayradiated/termcolors).
Assuming you're using the custom 16-color palette as described above, add the following line to your `~/.vimrc` to enable 16-color mode:
```vim
let g:onedark_termcolors=16
```
* **256-color mode** is enabled by default with no additional configuration, but colors are less accurate since they are approximated using a 256-color palette. The background color will appear darker, and most other colors will appear brighter. If you don't want to change your terminal's color palette as described in the 16-color mode section above, and your terminal doesn't support 24-bit color, 256-color mode is your only option.
Although 256-color mode is enabled by default (when not using 24-bit color as described above), you can explicitly enable it by adding the following line to your `~/.vimrc`:
```vim
let g:onedark_termcolors=256
```
2. Place `onedark.vim` in your `~/.vim/colors/` directory either manually or by using your Vim plug-in manager of choice, then add the following lines to your `~/.vimrc` **below the lines you added during step 1**:
3. Add the following to your `~/.vimrc` (below any lines you may have added in step 2):
```vim
syntax on
colorscheme onedark
```
3. Installing the [sheerun/vim-polyglot](https://github.com/sheerun/vim-polyglot) plug-in is recommended for improved syntax highlighting for various languages, but is not required.
4. Installing the [sheerun/vim-polyglot](https://github.com/sheerun/vim-polyglot) plug-in is recommended for improved syntax highlighting for various languages, but is not required.
## Options
**Note:** All options should be set **before** the `colorscheme onedark` line in your `~/.vimrc`.
* `g:onedark_termcolors` **(see [Installation](#installation) (above) before using this setting)**: Set to `256` for 256-color terminals (the default), or set to `16` to use your terminal emulator's native colors.
* `g:onedark_termcolors` **(see [Troubleshooting](#troubleshooting) (below) for more information about this option)**: Set to `256` for 256-color terminals (the default), or set to `16` to use your terminal emulator's native 16 colors.
* `g:onedark_terminal_italics`: Set to `1` if your terminal emulator supports italics; `0` otherwise (the default). If you're using [iTerm2](http://iterm2.com) on macOS, you might need to [use a special TERMINFO](https://gist.github.com/sos4nt/3187620) to get italics working.
* `g:onedark_terminal_italics`: Set to `1` if your terminal emulator supports italics; `0` otherwise (the default).
## lightline.vim Colorscheme
![lightline-onedark.vim Preview](https://raw.github.com/joshdick/onedark.vim/master/preview_lightline.png)
![lightline-onedark.vim Preview](https://raw.github.com/joshdick/onedark.vim/master/img/preview_lightline.png)
This repository includes a companion [lightline.vim](https://github.com/itchyny/lightline.vim) colorscheme for use with onedark.vim.
@@ -94,7 +84,7 @@ let g:lightline = {
## vim-airline Theme
![airline-onedark.vim Preview](https://raw.github.com/joshdick/onedark.vim/master/preview_airline.png)
![airline-onedark.vim Preview](https://raw.github.com/joshdick/onedark.vim/master/img/preview_airline.png)
This repository includes a companion [vim-airline](https://github.com/vim-airline/vim-airline) theme for use with onedark.vim.
@@ -114,6 +104,48 @@ Place `onedark.vim/autoload/airline/themes/onedark.vim` in your `~/.vim/autoload
let g:airline_theme='onedark'
```
## Troubleshooting
**Why do the colors in terminal Vim look totally crazy?**
![Broken Colors](https://raw.githubusercontent.com/joshdick/onedark.vim/master/img/broken_colors.png)
If Vim looks similar to the screenshot above, you have enabled Vim's 24-bit color terminal support, but your terminal doesn't support 24 bit color. Remove the relevant `~/.vimrc` configuration for enabling 24-bit color support to get things looking better.
**Why do the colors in terminal Vim look slightly off/not like the preview image at the top of this README?**
If your terminal doesn't support 24-bit color as described in the [Installation](#installation) section of this README, or 24-bit color support is not always available everywhere you use your Vim configuration, colors will not look like they do in the preview image.
However, you can use the `g:onedark_termcolors` option to control onedark.vim's fallback colors in situations where 24-bit color terminal support is not available.
`g:onedark_termcolors` can be set to one of two values, `256` for 256-color mode (the default), or `16` for 16-color mode (which uses your terminal emulator's native 16 colors.)
**When Vim/Neovim are configured to use use 24-bit color, the `g:onedark_termcolors` option is ignored. However, `g:onedark_termcolors` can still coexist with 24-bit color configuration.** For instance, when tmux 2.1 or earlier and/or older Vim/Neovim versions that don't support 24-bit color are used, the `g:onedark_termcolors` option will take effect.
* **256-color mode** is enabled by default with no additional configuration, but colors are less accurate since they are approximated using a 256-color palette. The background color will appear darker than in the preview image, and most other colors will appear brighter than in the preview image. If you don't want to change your terminal's color palette as described in the 16-color mode section below, and your terminal doesn't support 24-bit color, 256-color mode is your only option.
Although 256-color mode is enabled by default (when not using 24-bit color as described above), you can explicitly enable it by adding the following line to your `~/.vimrc`:
```vim
let g:onedark_termcolors=256
```
* **16-color mode** is the preferred option, since its colors are more accurate than those of 256-color mode. However, you'll need to set your terminal emulator's color palette to this color scheme's custom 16-color palette, since 16-color mode will cause the color scheme to use your terminal emulator's native 16 colors. If you don't use the custom 16-color palette in your terminal emulator when 16-color mode is enabled, onedark.vim's colors will not display correctly in Vim.
The canonical version of the 16-color palette is an [Xresources](https://en.wikipedia.org/wiki/X_resources) file located in this repository at `term/One Dark.Xresources`. [iTerm2](https://iterm2.com) and Mac Terminal.app color schemes are also provided in `term/`. (The iTerm2 color scheme works with iTerm2 versions 2.9.x and later.) You should be able to easily convert the Xresources color scheme for use with your terminal emulator of choice either by hand, or automatically by using [termcolors](https://github.com/stayradiated/termcolors).
Assuming your terminal emulator is configured to use the custom 16-color palette as described above, add the following line to your `~/.vimrc` to enable 16-color mode:
```vim
let g:onedark_termcolors=16
```
**Why do all comments look like they're highlighted?**
![Broken Italics](https://raw.githubusercontent.com/joshdick/onedark.vim/master/img/broken_italics.png)
If all comments look like the one in the screenshot above, you have enabled italics in onedark.vim by setting `g:onedark_terminal_italics=1` in your `~/.vimrc`, but your terminal isn't displaying italics correctly. You can either remove the option or [try to fix your terminal](https://github.com/joshdick/onedark.vim/issues/97#issuecomment-299719352). If you're using [iTerm2](http://iterm2.com) on macOS, you might need to [use a special TERMINFO](https://gist.github.com/sos4nt/3187620) to get italics working.
## Miscellaneous
### Customizing onedark.vim's Look Without Forking the Repository
@@ -146,10 +178,21 @@ If you'd like a tmux theme that complements onedark.vim, [@odedlaz has you cover
If you'd like to contribute to onedark.vim, check out the [contribution guidelines](./CONTRIBUTING.md).
### Relatives of onedark.vim
Several other themes and projects have reused code and/or colors from this project, or were otherwise inspired by it.
If onedark.vim isn't meeting your needs, try one of its relatives!
* [KeitaNakamura/neodark.vim](https://github.com/KeitaNakamura/neodark.vim)
* [base16-onedark.vim](https://github.com/chriskempson/base16-vim/blob/master/colors/base16-onedark.vim)
* Associated base16 scheme: [tilal6991/base16-onedark-scheme](https://github.com/tilal6991/base16-onedark-scheme)
* [rakr/vim-one](https://github.com/rakr/vim-one)
---
Preview images were taken using:
* [iTerm2](https://iterm2.com) terminal emulator on macOS
* 12 pt. [PragmataPro Mono](http://www.fsd.it/fonts/pragmatapro.htm#.VlDa1q6rTOY) font
* 13 pt. [PragmataPro Mono](http://www.fsd.it/fonts/pragmatapro.htm#.VlDa1q6rTOY) font
* [vim-polyglot](https://github.com/sheerun/vim-polyglot) plug-in

38
build/build.js
View File

@@ -1,10 +1,21 @@
#!/usr/bin/env node
const doT = require('doT')
const termcolors = require('termcolors')
const { readFileSync, writeFileSync } = require('fs')
const { resolve } = require('path')
doT.templateSettings.strip = false // preserve whitespace
doT.templateSettings = {
evaluate: /\<\%([\s\S]+?)\%\>/g,
interpolate: /\<\%=([\s\S]+?)\%\>/g,
encode: /\<\%!([\s\S]+?)\%\>/g,
use: /\<\%#([\s\S]+?)\%\>/g,
define: /\<\%##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\%\>/g,
conditional: /\<\%\?(\?)?\s*([\s\S]*?)\s*\%\>/g,
iterate: /\<\%~\s*(?:\%\>|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\%\>)/g,
varname: 'it',
strip: false, // preserve whitespace
}
const baseColors = Object.freeze({
red: { gui: '#E06C75', cterm: '204', cterm16: '1' }, // alternate cterm: 168
@@ -21,7 +32,7 @@ const baseColors = Object.freeze({
const specialColors = Object.freeze({
comment_grey: { gui: '#5C6370', cterm: '59', cterm16: '15' },
gutter_fg_grey: { gui: '#636D83', cterm: '238', cterm16: '15' },
gutter_fg_grey: { gui: '#4B5263', cterm: '238', cterm16: '15' },
cursor_grey: { gui: '#2C323C', cterm: '236', cterm16: '8' },
visual_grey: { gui: '#3E4452', cterm: '237', cterm16: '15' },
menu_grey: { cterm16: '8' }, // vim theme handles gui/cterm values
@@ -32,9 +43,10 @@ const specialColors = Object.freeze({
const colors = Object.assign({}, baseColors, specialColors)
const templateMap = Object.freeze({
'./templates/onedark.template.vim': '../colors/onedark.vim',
'./templates/lightline.template.vim': '../autoload/lightline/colorscheme/onedark.vim',
'./templates/airline.template.vim': '../autoload/airline/themes/onedark.vim'
'templates/onedark.template.vim': '../colors/onedark.vim',
'templates/lightline.template.vim': '../autoload/lightline/colorscheme/onedark.vim',
'templates/airline.template.vim': '../autoload/airline/themes/onedark.vim',
'templates/One Dark.Xresources': '../term/One Dark.Xresources'
})
const shouldCheck = String(process.argv[2]).toLowerCase() === 'check'
@@ -100,5 +112,21 @@ Object.keys(templateMap).forEach(templateFilename => {
})
try {
// Use the Xresources theme as a color source since it was generated above via templating
const xresources = readFileSync(resolve(__dirname, '../term/One Dark.Xresources'), 'utf8')
const terminalPalette = termcolors.xresources.import(xresources)
try {
writeFileSync(resolve(__dirname, '../term/One\ Dark.itermcolors'), termcolors.iterm.export(terminalPalette))
writeFileSync(resolve(__dirname, '../term/One\ Dark.terminal'), termcolors.terminalapp.export(terminalPalette))
} catch (e) {
handleError('Error writing terminal color file', e)
}
} catch (e) {
handleError('Error reading Xresources terminal color file', e)
}
console.log('Success!')

3
build/package.json
View File

@@ -23,6 +23,7 @@
"husky": "^0.13.1"
},
"dependencies": {
"dot": "^1.1.1"
"dot": "^1.1.1",
"termcolors": "latest"
}
}

37
build/templates/One Dark.Xresources Normal file
View File

@@ -0,0 +1,37 @@
! special
*.foreground: <%=it.white.gui%>
*.background: <%=it.black.gui%>
*.cursorColor: <%=it.white.gui%>
! black
*.color0: <%=it.black.gui%>
*.color8: <%=it.visual_grey.gui%>
! red
*.color1: <%=it.red.gui%>
*.color9: <%=it.dark_red.gui%>
! green
*.color2: <%=it.green.gui%>
*.color10: <%=it.green.gui%>
! yellow
*.color3: <%=it.yellow.gui%>
*.color11: <%=it.dark_yellow.gui%>
! blue
*.color4: <%=it.blue.gui%>
*.color12: <%=it.blue.gui%>
! magenta
*.color5: <%=it.purple.gui%>
*.color13: <%=it.purple.gui%>
! cyan
*.color6: <%=it.cyan.gui%>
*.color14: <%=it.cyan.gui%>
! white
*.color7: <%=it.white.gui%>
*.color15: <%=it.comment_grey.gui%>

60
build/templates/airline.template.vim
View File

@@ -7,34 +7,34 @@
function! airline#themes#onedark#refresh()
if get(g:, 'onedark_termcolors', 256) == 16
let s:term_red = {{=it.red.cterm16}}
let s:term_green = {{=it.green.cterm16}}
let s:term_yellow = {{=it.yellow.cterm16}}
let s:term_blue = {{=it.blue.cterm16}}
let s:term_purple = {{=it.purple.cterm16}}
let s:term_white = {{=it.white.cterm16}}
let s:term_black = {{=it.black.cterm16}}
let s:term_grey = {{=it.cursor_grey.cterm16}}
let s:term_red = <%=it.red.cterm16%>
let s:term_green = <%=it.green.cterm16%>
let s:term_yellow = <%=it.yellow.cterm16%>
let s:term_blue = <%=it.blue.cterm16%>
let s:term_purple = <%=it.purple.cterm16%>
let s:term_white = <%=it.white.cterm16%>
let s:term_black = <%=it.black.cterm16%>
let s:term_grey = <%=it.cursor_grey.cterm16%>
else
let s:term_red = {{=it.red.cterm}}
let s:term_green = {{=it.green.cterm}}
let s:term_yellow = {{=it.yellow.cterm}}
let s:term_blue = {{=it.blue.cterm}}
let s:term_purple = {{=it.purple.cterm}}
let s:term_white = {{=it.white.cterm}}
let s:term_black = {{=it.black.cterm}}
let s:term_grey = {{=it.cursor_grey.cterm}}
let s:term_red = <%=it.red.cterm%>
let s:term_green = <%=it.green.cterm%>
let s:term_yellow = <%=it.yellow.cterm%>
let s:term_blue = <%=it.blue.cterm%>
let s:term_purple = <%=it.purple.cterm%>
let s:term_white = <%=it.white.cterm%>
let s:term_black = <%=it.black.cterm%>
let s:term_grey = <%=it.cursor_grey.cterm%>
endif
let g:airline#themes#onedark#palette = {}
let g:airline#themes#onedark#palette.accents = {
\ 'red': [ '{{=it.red.gui}}', '', s:term_red, 0 ]
\ 'red': [ '<%=it.red.gui%>', '', s:term_red, 0 ]
\ }
let s:N1 = [ '{{=it.black.gui}}', '{{=it.green.gui}}', s:term_black, s:term_green ]
let s:N2 = [ '{{=it.white.gui}}', '{{=it.visual_grey.gui}}', s:term_white, s:term_grey ]
let s:N3 = [ '{{=it.green.gui}}', '{{=it.black.gui}}', s:term_green, '' ]
let s:N1 = [ '<%=it.black.gui%>', '<%=it.green.gui%>', s:term_black, s:term_green ]
let s:N2 = [ '<%=it.white.gui%>', '<%=it.visual_grey.gui%>', s:term_white, s:term_grey ]
let s:N3 = [ '<%=it.green.gui%>', '<%=it.black.gui%>', s:term_green, '' ]
let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
let group = airline#themes#get_highlight('vimCommand')
@@ -42,26 +42,26 @@ function! airline#themes#onedark#refresh()
\ 'airline_c': [ group[0], '', group[2], '', '' ]
\ }
let s:I1 = [ '{{=it.black.gui}}', '{{=it.blue.gui}}', s:term_black, s:term_blue ]
let s:I1 = [ '<%=it.black.gui%>', '<%=it.blue.gui%>', s:term_black, s:term_blue ]
let s:I2 = s:N2
let s:I3 = [ '{{=it.blue.gui}}', '{{=it.black.gui}}', s:term_blue, '' ]
let s:I3 = [ '<%=it.blue.gui%>', '<%=it.black.gui%>', s:term_blue, '' ]
let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified
let s:R1 = [ '{{=it.black.gui}}', '{{=it.red.gui}}', s:term_black, s:term_red ]
let s:R1 = [ '<%=it.black.gui%>', '<%=it.red.gui%>', s:term_black, s:term_red ]
let s:R2 = s:N2
let s:R3 = [ '{{=it.red.gui}}', '{{=it.black.gui}}', s:term_red, '' ]
let s:R3 = [ '<%=it.red.gui%>', '<%=it.black.gui%>', s:term_red, '' ]
let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified
let s:V1 = [ '{{=it.black.gui}}', '{{=it.purple.gui}}', s:term_black, s:term_purple ]
let s:V1 = [ '<%=it.black.gui%>', '<%=it.purple.gui%>', s:term_black, s:term_purple ]
let s:V2 = s:N2
let s:V3 = [ '{{=it.purple.gui}}', '{{=it.black.gui}}', s:term_purple, '' ]
let s:V3 = [ '<%=it.purple.gui%>', '<%=it.black.gui%>', s:term_purple, '' ]
let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified
let s:IA1 = [ '{{=it.black.gui}}', '{{=it.white.gui}}', s:term_black, s:term_white ]
let s:IA2 = [ '{{=it.white.gui}}', '{{=it.visual_grey.gui}}', s:term_white, s:term_grey ]
let s:IA1 = [ '<%=it.black.gui%>', '<%=it.white.gui%>', s:term_black, s:term_white ]
let s:IA2 = [ '<%=it.white.gui%>', '<%=it.visual_grey.gui%>', s:term_white, s:term_grey ]
let s:IA3 = s:N2
let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
let g:airline#themes#onedark#palette.inactive_modified = {
@@ -71,7 +71,7 @@ function! airline#themes#onedark#refresh()
" Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim)
" Warnings
let s:WI = [ '{{=it.black.gui}}', '{{=it.yellow.gui}}', s:term_black, s:term_yellow ]
let s:WI = [ '<%=it.black.gui%>', '<%=it.yellow.gui%>', s:term_black, s:term_yellow ]
let g:airline#themes#onedark#palette.normal.airline_warning = [
\ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
\ ]
@@ -98,7 +98,7 @@ function! airline#themes#onedark#refresh()
\ g:airline#themes#onedark#palette.normal.airline_warning
" Errors
let s:ER = [ '{{=it.black.gui}}', '{{=it.red.gui}}', s:term_black, s:term_red ]
let s:ER = [ '<%=it.black.gui%>', '<%=it.red.gui%>', s:term_black, s:term_red ]
let g:airline#themes#onedark#palette.normal.airline_error = [
\ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
\ ]

48
build/templates/lightline.template.vim
View File

@@ -4,33 +4,33 @@
" the [onedark.vim](https://github.com/joshdick/onedark.vim) colorscheme.
if get(g:, 'onedark_termcolors', 256) == 16
let s:term_red = {{=it.red.cterm16}}
let s:term_green = {{=it.green.cterm16}}
let s:term_yellow = {{=it.yellow.cterm16}}
let s:term_blue = {{=it.blue.cterm16}}
let s:term_purple = {{=it.purple.cterm16}}
let s:term_white = {{=it.white.cterm16}}
let s:term_black = {{=it.black.cterm16}}
let s:term_grey = {{=it.cursor_grey.cterm16}}
let s:term_red = <%=it.red.cterm16%>
let s:term_green = <%=it.green.cterm16%>
let s:term_yellow = <%=it.yellow.cterm16%>
let s:term_blue = <%=it.blue.cterm16%>
let s:term_purple = <%=it.purple.cterm16%>
let s:term_white = <%=it.white.cterm16%>
let s:term_black = <%=it.black.cterm16%>
let s:term_grey = <%=it.cursor_grey.cterm16%>
else
let s:term_red = {{=it.red.cterm}}
let s:term_green = {{=it.green.cterm}}
let s:term_yellow = {{=it.yellow.cterm}}
let s:term_blue = {{=it.blue.cterm}}
let s:term_purple = {{=it.purple.cterm}}
let s:term_white = {{=it.white.cterm}}
let s:term_black = {{=it.black.cterm}}
let s:term_grey = {{=it.cursor_grey.cterm}}
let s:term_red = <%=it.red.cterm%>
let s:term_green = <%=it.green.cterm%>
let s:term_yellow = <%=it.yellow.cterm%>
let s:term_blue = <%=it.blue.cterm%>
let s:term_purple = <%=it.purple.cterm%>
let s:term_white = <%=it.white.cterm%>
let s:term_black = <%=it.black.cterm%>
let s:term_grey = <%=it.cursor_grey.cterm%>
endif
let s:red = [ '{{=it.red.gui}}', s:term_red ]
let s:green = [ '{{=it.green.gui}}', s:term_green ]
let s:yellow = [ '{{=it.yellow.gui}}', s:term_yellow ]
let s:blue = [ '{{=it.blue.gui}}', s:term_blue ]
let s:purple = [ '{{=it.purple.gui}}', s:term_purple ]
let s:white = [ '{{=it.white.gui}}', s:term_white ]
let s:black = [ '{{=it.black.gui}}', s:term_black ]
let s:grey = [ '{{=it.visual_grey.gui}}', s:term_grey ]
let s:red = [ '<%=it.red.gui%>', s:term_red ]
let s:green = [ '<%=it.green.gui%>', s:term_green ]
let s:yellow = [ '<%=it.yellow.gui%>', s:term_yellow ]
let s:blue = [ '<%=it.blue.gui%>', s:term_blue ]
let s:purple = [ '<%=it.purple.gui%>', s:term_purple ]
let s:white = [ '<%=it.white.gui%>', s:term_white ]
let s:black = [ '<%=it.black.gui%>', s:term_black ]
let s:grey = [ '<%=it.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 ] ]

97
build/templates/onedark.template.vim
View File

@@ -1,3 +1,4 @@
" vim:fdm=marker
" Vim Color File
" Name: onedark.vim
" Maintainer: https://github.com/joshdick/onedark.vim/
@@ -6,9 +7,7 @@
" A companion [vim-airline](https://github.com/bling/vim-airline) theme is available at: https://github.com/joshdick/airline-onedark.vim
" +-----------------+
" | Color Reference |
" +-----------------+
" Color Reference {{{
" The following colors were measured inside Atom using its built-in inspector.
@@ -35,14 +34,14 @@
" |--------------+--------------------+---------|
" | Cyan | rgb(86, 182, 194) | #56b6c2 |
" |--------------+--------------------+---------|
" | Gutter Grey | rgb(99, 109, 131) | #636d83 |
" | Gutter Grey | rgb(76, 82, 99) | #4b5263 |
" |--------------+--------------------+---------|
" | Comment Grey | rgb(92, 99, 112) | #5c6370 |
" +---------------------------------------------+
" +----------------+
" | Initialization |
" +----------------+
" }}}
" Initialization {{{
highlight clear
@@ -96,48 +95,48 @@ function! s:h(group, style)
\ "cterm=" (has_key(a:style, "cterm") ? a:style.cterm : "NONE")
endfunction
" public
" public {{{
function! onedark#set_highlight(group, style)
call s:h(a:group, a:style)
endfunction
" /public
" }}}
" +-----------------+
" | Color Variables |
" +-----------------+
" }}}
let s:red = { "gui": "{{=it.red.gui}}", "cterm": "{{=it.red.cterm}}", "cterm16": "{{=it.red.cterm16}}" }
let s:dark_red = { "gui": "{{=it.dark_red.gui}}", "cterm": "{{=it.dark_red.cterm}}", "cterm16": "{{=it.dark_red.cterm16}}" }
" Color Variables {{{
let s:green = { "gui": "{{=it.green.gui}}", "cterm": "{{=it.green.cterm}}", "cterm16": "{{=it.green.cterm16}}" }
let s:red = { "gui": "<%=it.red.gui%>", "cterm": "<%=it.red.cterm%>", "cterm16": "<%=it.red.cterm16%>" }
let s:dark_red = { "gui": "<%=it.dark_red.gui%>", "cterm": "<%=it.dark_red.cterm%>", "cterm16": "<%=it.dark_red.cterm16%>" }
let s:yellow = { "gui": "{{=it.yellow.gui}}", "cterm": "{{=it.yellow.cterm}}", "cterm16": "{{=it.yellow.cterm16}}" }
let s:dark_yellow = { "gui": "{{=it.dark_yellow.gui}}", "cterm": "{{=it.dark_yellow.cterm}}", "cterm16": "{{=it.dark_yellow.cterm16}}" }
let s:green = { "gui": "<%=it.green.gui%>", "cterm": "<%=it.green.cterm%>", "cterm16": "<%=it.green.cterm16%>" }
let s:blue = { "gui": "{{=it.blue.gui}}", "cterm": "{{=it.blue.cterm}}", "cterm16": "{{=it.blue.cterm16}}" }
let s:yellow = { "gui": "<%=it.yellow.gui%>", "cterm": "<%=it.yellow.cterm%>", "cterm16": "<%=it.yellow.cterm16%>" }
let s:dark_yellow = { "gui": "<%=it.dark_yellow.gui%>", "cterm": "<%=it.dark_yellow.cterm%>", "cterm16": "<%=it.dark_yellow.cterm16%>" }
let s:purple = { "gui": "{{=it.purple.gui}}", "cterm": "{{=it.purple.cterm}}", "cterm16": "{{=it.purple.cterm16}}" }
let s:blue = { "gui": "<%=it.blue.gui%>", "cterm": "<%=it.blue.cterm%>", "cterm16": "<%=it.blue.cterm16%>" }
let s:cyan = { "gui": "{{=it.cyan.gui}}", "cterm": "{{=it.cyan.cterm}}", "cterm16": "{{=it.cyan.cterm16}}" }
let s:purple = { "gui": "<%=it.purple.gui%>", "cterm": "<%=it.purple.cterm%>", "cterm16": "<%=it.purple.cterm16%>" }
let s:white = { "gui": "{{=it.white.gui}}", "cterm": "{{=it.white.cterm}}", "cterm16": "{{=it.white.cterm16}}" }
let s:cyan = { "gui": "<%=it.cyan.gui%>", "cterm": "<%=it.cyan.cterm%>", "cterm16": "<%=it.cyan.cterm16%>" }
let s:black = { "gui": "{{=it.black.gui}}", "cterm": "{{=it.black.cterm}}", "cterm16": "{{=it.black.cterm16}}" }
let s:white = { "gui": "<%=it.white.gui%>", "cterm": "<%=it.white.cterm%>", "cterm16": "<%=it.white.cterm16%>" }
let s:black = { "gui": "<%=it.black.gui%>", "cterm": "<%=it.black.cterm%>", "cterm16": "<%=it.black.cterm16%>" }
let s:visual_black = { "gui": "NONE", "cterm": "NONE", "cterm16": s:black.cterm16 } " Black out selected text in 16-color visual mode
let s:comment_grey = { "gui": "{{=it.comment_grey.gui}}", "cterm": "{{=it.comment_grey.cterm}}", "cterm16": "{{=it.comment_grey.cterm16}}" }
let s:gutter_fg_grey = { "gui": "{{=it.gutter_fg_grey.gui}}", "cterm": "{{=it.gutter_fg_grey.cterm}}", "cterm16": "{{=it.gutter_fg_grey.cterm16}}" }
let s:cursor_grey = { "gui": "{{=it.cursor_grey.gui}}", "cterm": "{{=it.cursor_grey.cterm}}", "cterm16": "{{=it.cursor_grey.cterm16}}" }
let s:visual_grey = { "gui": "{{=it.visual_grey.gui}}", "cterm": "{{=it.visual_grey.cterm}}", "cterm16": "{{=it.visual_grey.cterm16}}" }
let s:menu_grey = { "gui": s:visual_grey.gui, "cterm": s:visual_grey.cterm, "cterm16": "{{=it.menu_grey.cterm16}}" }
let s:special_grey = { "gui": "{{=it.special_grey.gui}}", "cterm": "{{=it.special_grey.cterm}}", "cterm16": "{{=it.special_grey.cterm16}}" }
let s:vertsplit = { "gui": "{{=it.vertsplit.gui}}", "cterm": "{{=it.vertsplit.cterm}}", "cterm16": "{{=it.vertsplit.cterm16}}" }
let s:comment_grey = { "gui": "<%=it.comment_grey.gui%>", "cterm": "<%=it.comment_grey.cterm%>", "cterm16": "<%=it.comment_grey.cterm16%>" }
let s:gutter_fg_grey = { "gui": "<%=it.gutter_fg_grey.gui%>", "cterm": "<%=it.gutter_fg_grey.cterm%>", "cterm16": "<%=it.gutter_fg_grey.cterm16%>" }
let s:cursor_grey = { "gui": "<%=it.cursor_grey.gui%>", "cterm": "<%=it.cursor_grey.cterm%>", "cterm16": "<%=it.cursor_grey.cterm16%>" }
let s:visual_grey = { "gui": "<%=it.visual_grey.gui%>", "cterm": "<%=it.visual_grey.cterm%>", "cterm16": "<%=it.visual_grey.cterm16%>" }
let s:menu_grey = { "gui": s:visual_grey.gui, "cterm": s:visual_grey.cterm, "cterm16": "<%=it.menu_grey.cterm16%>" }
let s:special_grey = { "gui": "<%=it.special_grey.gui%>", "cterm": "<%=it.special_grey.cterm%>", "cterm16": "<%=it.special_grey.cterm16%>" }
let s:vertsplit = { "gui": "<%=it.vertsplit.gui%>", "cterm": "<%=it.vertsplit.cterm%>", "cterm16": "<%=it.vertsplit.cterm16%>" }
" +---------------------------------------------------------+
" | Syntax Groups (descriptions and ordering from `:h w18`) |
" +---------------------------------------------------------+
" }}}
" Syntax Groups (descriptions and ordering from `:h w18`) {{{
call s:h("Comment", { "fg": s:comment_grey, "gui": "italic", "cterm": "italic" }) " any comment
call s:h("Constant", { "fg": s:cyan }) " any constant
@@ -170,14 +169,14 @@ call s:h("Tag", {}) " you can use CTRL-] on this
call s:h("Delimiter", {}) " character that needs attention
call s:h("SpecialComment", { "fg": s:comment_grey }) " special things inside a comment
call s:h("Debug", {}) " debugging statements
call s:h("Underlined", {}) " text that stands out, HTML links
call s:h("Underlined", { "gui": "underline", "cterm": "underline" }) " text that stands out, HTML links
call s:h("Ignore", {}) " left blank, hidden
call s:h("Error", { "fg": s:red }) " any erroneous construct
call s:h("Todo", { "fg": s:purple }) " anything that needs extra attention; mostly the keywords TODO FIXME and XXX
" +----------------------------------------------------------------------+
" | Highlighting Groups (descriptions and ordering from `:h hitest.vim`) |
" +----------------------------------------------------------------------+
" }}}
" Highlighting Groups (descriptions and ordering from `:h hitest.vim`) {{{
call s:h("ColorColumn", { "bg": s:cursor_grey }) " used for the columns set with 'colorcolumn'
call s:h("Conceal", {}) " placeholder characters substituted for concealed text (see 'conceallevel')
@@ -225,9 +224,9 @@ call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim
call s:h("WarningMsg", { "fg": s:yellow }) " warning messages
call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion
" +--------------------------------+
" | Language-Specific Highlighting |
" +--------------------------------+
" }}}
" Language-Specific Highlighting {{{
" CSS
call s:h("cssAttrComma", { "fg": s:purple })
@@ -453,9 +452,9 @@ call s:h("xmlEndTag", { "fg": s:red })
call s:h("xmlTag", { "fg": s:red })
call s:h("xmlTagName", { "fg": s:red })
" +---------------------+
" | Plugin Highlighting |
" +---------------------+
" }}}
" Plugin Highlighting {{{
" airblade/vim-gitgutter
hi link GitGutterAdd SignifySignAdd
@@ -476,9 +475,9 @@ call s:h("NeomakeInfoSign", { "fg": s:blue })
call s:h("diffAdded", { "fg": s:green })
call s:h("diffRemoved", { "fg": s:red })
" +------------------+
" | Git Highlighting |
" +------------------+
" }}}
" Git Highlighting {{{
call s:h("gitcommitComment", { "fg": s:comment_grey })
call s:h("gitcommitUnmerged", { "fg": s:green })
@@ -502,9 +501,9 @@ hi link gitcommitDiscardedArrow gitcommitDiscardedFile
hi link gitcommitSelectedArrow gitcommitSelectedFile
hi link gitcommitUnmergedArrow gitcommitUnmergedFile
" +------------------------+
" | Neovim terminal colors |
" +------------------------+
" }}}
" Neovim terminal colors {{{
if has("nvim")
let g:terminal_color_0 = s:black.gui
@@ -527,6 +526,8 @@ if has("nvim")
let g:terminal_color_foreground = g:terminal_color_7
endif
" }}}
" Must appear at the end of the file to work around this oddity:
" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
set background=dark

65
colors/onedark.vim
View File

@@ -1,3 +1,4 @@
" vim:fdm=marker
" Vim Color File
" Name: onedark.vim
" Maintainer: https://github.com/joshdick/onedark.vim/
@@ -6,9 +7,7 @@
" A companion [vim-airline](https://github.com/bling/vim-airline) theme is available at: https://github.com/joshdick/airline-onedark.vim
" +-----------------+
" | Color Reference |
" +-----------------+
" Color Reference {{{
" The following colors were measured inside Atom using its built-in inspector.
@@ -35,14 +34,14 @@
" |--------------+--------------------+---------|
" | Cyan | rgb(86, 182, 194) | #56b6c2 |
" |--------------+--------------------+---------|
" | Gutter Grey | rgb(99, 109, 131) | #636d83 |
" | Gutter Grey | rgb(76, 82, 99) | #4b5263 |
" |--------------+--------------------+---------|
" | Comment Grey | rgb(92, 99, 112) | #5c6370 |
" +---------------------------------------------+
" +----------------+
" | Initialization |
" +----------------+
" }}}
" Initialization {{{
highlight clear
@@ -96,17 +95,17 @@ function! s:h(group, style)
\ "cterm=" (has_key(a:style, "cterm") ? a:style.cterm : "NONE")
endfunction
" public
" public {{{
function! onedark#set_highlight(group, style)
call s:h(a:group, a:style)
endfunction
" /public
" }}}
" +-----------------+
" | Color Variables |
" +-----------------+
" }}}
" Color Variables {{{
let s:red = { "gui": "#E06C75", "cterm": "204", "cterm16": "1" }
let s:dark_red = { "gui": "#BE5046", "cterm": "196", "cterm16": "9" }
@@ -128,16 +127,16 @@ let s:black = { "gui": "#282C34", "cterm": "235", "cterm16": "0" }
let s:visual_black = { "gui": "NONE", "cterm": "NONE", "cterm16": s:black.cterm16 } " Black out selected text in 16-color visual mode
let s:comment_grey = { "gui": "#5C6370", "cterm": "59", "cterm16": "15" }
let s:gutter_fg_grey = { "gui": "#636D83", "cterm": "238", "cterm16": "15" }
let s:gutter_fg_grey = { "gui": "#4B5263", "cterm": "238", "cterm16": "15" }
let s:cursor_grey = { "gui": "#2C323C", "cterm": "236", "cterm16": "8" }
let s:visual_grey = { "gui": "#3E4452", "cterm": "237", "cterm16": "15" }
let s:menu_grey = { "gui": s:visual_grey.gui, "cterm": s:visual_grey.cterm, "cterm16": "8" }
let s:special_grey = { "gui": "#3B4048", "cterm": "238", "cterm16": "15" }
let s:vertsplit = { "gui": "#181A1F", "cterm": "59", "cterm16": "15" }
" +---------------------------------------------------------+
" | Syntax Groups (descriptions and ordering from `:h w18`) |
" +---------------------------------------------------------+
" }}}
" Syntax Groups (descriptions and ordering from `:h w18`) {{{
call s:h("Comment", { "fg": s:comment_grey, "gui": "italic", "cterm": "italic" }) " any comment
call s:h("Constant", { "fg": s:cyan }) " any constant
@@ -170,14 +169,14 @@ call s:h("Tag", {}) " you can use CTRL-] on this
call s:h("Delimiter", {}) " character that needs attention
call s:h("SpecialComment", { "fg": s:comment_grey }) " special things inside a comment
call s:h("Debug", {}) " debugging statements
call s:h("Underlined", {}) " text that stands out, HTML links
call s:h("Underlined", { "gui": "underline", "cterm": "underline" }) " text that stands out, HTML links
call s:h("Ignore", {}) " left blank, hidden
call s:h("Error", { "fg": s:red }) " any erroneous construct
call s:h("Todo", { "fg": s:purple }) " anything that needs extra attention; mostly the keywords TODO FIXME and XXX
" +----------------------------------------------------------------------+
" | Highlighting Groups (descriptions and ordering from `:h hitest.vim`) |
" +----------------------------------------------------------------------+
" }}}
" Highlighting Groups (descriptions and ordering from `:h hitest.vim`) {{{
call s:h("ColorColumn", { "bg": s:cursor_grey }) " used for the columns set with 'colorcolumn'
call s:h("Conceal", {}) " placeholder characters substituted for concealed text (see 'conceallevel')
@@ -225,9 +224,9 @@ call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim
call s:h("WarningMsg", { "fg": s:yellow }) " warning messages
call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion
" +--------------------------------+
" | Language-Specific Highlighting |
" +--------------------------------+
" }}}
" Language-Specific Highlighting {{{
" CSS
call s:h("cssAttrComma", { "fg": s:purple })
@@ -453,9 +452,9 @@ call s:h("xmlEndTag", { "fg": s:red })
call s:h("xmlTag", { "fg": s:red })
call s:h("xmlTagName", { "fg": s:red })
" +---------------------+
" | Plugin Highlighting |
" +---------------------+
" }}}
" Plugin Highlighting {{{
" airblade/vim-gitgutter
hi link GitGutterAdd SignifySignAdd
@@ -476,9 +475,9 @@ call s:h("NeomakeInfoSign", { "fg": s:blue })
call s:h("diffAdded", { "fg": s:green })
call s:h("diffRemoved", { "fg": s:red })
" +------------------+
" | Git Highlighting |
" +------------------+
" }}}
" Git Highlighting {{{
call s:h("gitcommitComment", { "fg": s:comment_grey })
call s:h("gitcommitUnmerged", { "fg": s:green })
@@ -502,9 +501,9 @@ hi link gitcommitDiscardedArrow gitcommitDiscardedFile
hi link gitcommitSelectedArrow gitcommitSelectedFile
hi link gitcommitUnmergedArrow gitcommitUnmergedFile
" +------------------------+
" | Neovim terminal colors |
" +------------------------+
" }}}
" Neovim terminal colors {{{
if has("nvim")
let g:terminal_color_0 = s:black.gui
@@ -527,6 +526,8 @@ if has("nvim")
let g:terminal_color_foreground = g:terminal_color_7
endif
" }}}
" Must appear at the end of the file to work around this oddity:
" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
set background=dark

BIN
img/broken_colors.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
img/broken_italics.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
img/preview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

0
preview_airline.png → img/preview_airline.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
preview_lightline.png → img/preview_lightline.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
preview.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 74 KiB

37
term/One Dark.Xresources Normal file
View File

@@ -0,0 +1,37 @@
! special
*.foreground: #ABB2BF
*.background: #282C34
*.cursorColor: #ABB2BF
! black
*.color0: #282C34
*.color8: #3E4452
! red
*.color1: #E06C75
*.color9: #BE5046
! green
*.color2: #98C379
*.color10: #98C379
! yellow
*.color3: #E5C07B
*.color11: #D19A66
! blue
*.color4: #61AFEF
*.color12: #61AFEF
! magenta
*.color5: #C678DD
*.color13: #C678DD
! cyan
*.color6: #56B6C2
*.color14: #56B6C2
! white
*.color7: #ABB2BF
*.color15: #5C6370

259
term/One Dark.itermcolors Normal file
View File

@@ -0,0 +1,259 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Ansi 0 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.20392156862745098</real>
<key>Green Component</key>
<real>0.17254901960784313</real>
<key>Red Component</key>
<real>0.1568627450980392</real>
</dict>
<key>Ansi 1 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.4588235294117647</real>
<key>Green Component</key>
<real>0.4235294117647059</real>
<key>Red Component</key>
<real>0.8784313725490196</real>
</dict>
<key>Ansi 10 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.4745098039215686</real>
<key>Green Component</key>
<real>0.7647058823529411</real>
<key>Red Component</key>
<real>0.596078431372549</real>
</dict>
<key>Ansi 11 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.4</real>
<key>Green Component</key>
<real>0.6039215686274509</real>
<key>Red Component</key>
<real>0.8196078431372549</real>
</dict>
<key>Ansi 12 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.9372549019607843</real>
<key>Green Component</key>
<real>0.6862745098039216</real>
<key>Red Component</key>
<real>0.3803921568627451</real>
</dict>
<key>Ansi 13 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.8666666666666667</real>
<key>Green Component</key>
<real>0.47058823529411764</real>
<key>Red Component</key>
<real>0.7764705882352941</real>
</dict>
<key>Ansi 14 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.7607843137254902</real>
<key>Green Component</key>
<real>0.7137254901960784</real>
<key>Red Component</key>
<real>0.33725490196078434</real>
</dict>
<key>Ansi 15 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.4392156862745098</real>
<key>Green Component</key>
<real>0.38823529411764707</real>
<key>Red Component</key>
<real>0.3607843137254902</real>
</dict>
<key>Ansi 2 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.4745098039215686</real>
<key>Green Component</key>
<real>0.7647058823529411</real>
<key>Red Component</key>
<real>0.596078431372549</real>
</dict>
<key>Ansi 3 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.4823529411764706</real>
<key>Green Component</key>
<real>0.7529411764705882</real>
<key>Red Component</key>
<real>0.8980392156862745</real>
</dict>
<key>Ansi 4 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.9372549019607843</real>
<key>Green Component</key>
<real>0.6862745098039216</real>
<key>Red Component</key>
<real>0.3803921568627451</real>
</dict>
<key>Ansi 5 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.8666666666666667</real>
<key>Green Component</key>
<real>0.47058823529411764</real>
<key>Red Component</key>
<real>0.7764705882352941</real>
</dict>
<key>Ansi 6 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.7607843137254902</real>
<key>Green Component</key>
<real>0.7137254901960784</real>
<key>Red Component</key>
<real>0.33725490196078434</real>
</dict>
<key>Ansi 7 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.7490196078431373</real>
<key>Green Component</key>
<real>0.6980392156862745</real>
<key>Red Component</key>
<real>0.6705882352941176</real>
</dict>
<key>Ansi 8 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.3215686274509804</real>
<key>Green Component</key>
<real>0.26666666666666666</real>
<key>Red Component</key>
<real>0.24313725490196078</real>
</dict>
<key>Ansi 9 Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.27450980392156865</real>
<key>Green Component</key>
<real>0.3137254901960784</real>
<key>Red Component</key>
<real>0.7450980392156863</real>
</dict>
<key>Background Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.20392156862745098</real>
<key>Green Component</key>
<real>0.17254901960784313</real>
<key>Red Component</key>
<real>0.1568627450980392</real>
</dict>
<key>Bold Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.7490196078431373</real>
<key>Green Component</key>
<real>0.6980392156862745</real>
<key>Red Component</key>
<real>0.6705882352941176</real>
</dict>
<key>Cursor Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.7490196078431373</real>
<key>Green Component</key>
<real>0.6980392156862745</real>
<key>Red Component</key>
<real>0.6705882352941176</real>
</dict>
<key>Cursor Text Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.20392156862745098</real>
<key>Green Component</key>
<real>0.17254901960784313</real>
<key>Red Component</key>
<real>0.1568627450980392</real>
</dict>
<key>Foreground Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.7490196078431373</real>
<key>Green Component</key>
<real>0.6980392156862745</real>
<key>Red Component</key>
<real>0.6705882352941176</real>
</dict>
<key>Selected Text Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.7490196078431373</real>
<key>Green Component</key>
<real>0.6980392156862745</real>
<key>Red Component</key>
<real>0.6705882352941176</real>
</dict>
<key>Selection Color</key>
<dict>
<key>Color Space</key>
<string>sRGB</string>
<key>Blue Component</key>
<real>0.20392156862745098</real>
<key>Green Component</key>
<real>0.17254901960784313</real>
<key>Red Component</key>
<real>0.1568627450980392</real>
</dict>
</dict>
</plist>

43
One Dark.terminal → term/One Dark.terminal
View File

@@ -6,7 +6,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjExNzY0NzA1ODggMC4xMjk0MTE3NjQ3IDAuMTUyOTQxMTc2NQAQAYAC0hAREhNaJGNs
LjE1Njg2Mjc0NTEgMC4xNzI1NDkwMTk2IDAuMjAzOTIxNTY4NgAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -15,7 +15,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjMxNzY0NzA1ODggMC42MTU2ODYyNzQ1IDAuOTIxNTY4NjI3NQAQAYAC0hAREhNaJGNs
LjM4MDM5MjE1NjkgMC42ODYyNzQ1MDk4IDAuOTM3MjU0OTAyMAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -24,7 +24,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjE4NDMxMzcyNTUgMC4yMDM5MjE1Njg2IDAuMjU0OTAxOTYwOAAQAYAC0hAREhNaJGNs
LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -33,7 +33,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjMxNzY0NzA1ODggMC42MTU2ODYyNzQ1IDAuOTIxNTY4NjI3NQAQAYAC0hAREhNaJGNs
LjM4MDM5MjE1NjkgMC42ODYyNzQ1MDk4IDAuOTM3MjU0OTAyMAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -42,7 +42,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjI4MjM1Mjk0MTIgMC42NTg4MjM1Mjk0IDAuNzA5ODAzOTIxNgAQAYAC0hAREhNaJGNs
LjMzNzI1NDkwMjAgMC43MTM3MjU0OTAyIDAuNzYwNzg0MzEzNwAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -51,7 +51,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjUzMzMzMzMzMzMgMC43MjU0OTAxOTYxIDAuNDAwMDAwMDAwMAAQAYAC0hAREhNaJGNs
LjU5NjA3ODQzMTQgMC43NjQ3MDU4ODI0IDAuNDc0NTA5ODAzOQAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -60,7 +60,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjcyMTU2ODYyNzUgMC4zNjQ3MDU4ODI0IDAuODM1Mjk0MTE3NgAQAYAC0hAREhNaJGNs
Ljc3NjQ3MDU4ODIgMC40NzA1ODgyMzUzIDAuODY2NjY2NjY2NwAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -69,7 +69,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjY4MjM1Mjk0MTIgMC4yMzEzNzI1NDkwIDAuMjExNzY0NzA1OQAQAYAC0hAREhNaJGNs
Ljc0NTA5ODAzOTIgMC4zMTM3MjU0OTAyIDAuMjc0NTA5ODAzOQAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -78,7 +78,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjI5MDE5NjA3ODQgMC4zMjU0OTAxOTYxIDAuMzY0NzA1ODgyNAAQAYAC0hAREhNaJGNs
LjM2MDc4NDMxMzcgMC4zODgyMzUyOTQxIDAuNDM5MjE1Njg2MwAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -87,7 +87,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
Ljc3MjU0OTAxOTYgMC41MzMzMzMzMzMzIDAuMzI1NDkwMTk2MQAQAYAC0hAREhNaJGNs
LjgxOTYwNzg0MzEgMC42MDM5MjE1Njg2IDAuNDAwMDAwMDAwMAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -96,7 +96,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjI4MjM1Mjk0MTIgMC42NTg4MjM1Mjk0IDAuNzA5ODAzOTIxNgAQAYAC0hAREhNaJGNs
LjMzNzI1NDkwMjAgMC43MTM3MjU0OTAyIDAuNzYwNzg0MzEzNwAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -105,7 +105,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjUzMzMzMzMzMzMgMC43MjU0OTAxOTYxIDAuNDAwMDAwMDAwMAAQAYAC0hAREhNaJGNs
LjU5NjA3ODQzMTQgMC43NjQ3MDU4ODI0IDAuNDc0NTA5ODAzOQAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -114,7 +114,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjcyMTU2ODYyNzUgMC4zNjQ3MDU4ODI0IDAuODM1Mjk0MTE3NgAQAYAC0hAREhNaJGNs
Ljc3NjQ3MDU4ODIgMC40NzA1ODgyMzUzIDAuODY2NjY2NjY2NwAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -123,7 +123,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjgzOTIxNTY4NjMgMC4zMzMzMzMzMzMzIDAuMzg0MzEzNzI1NQAQAYAC0hAREhNaJGNs
Ljg3ODQzMTM3MjUgMC40MjM1Mjk0MTE4IDAuNDU4ODIzNTI5NAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -132,7 +132,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjYwNzg0MzEzNzMgMC42MzUyOTQxMTc2IDAuNjk0MTE3NjQ3MQAQAYAC0hAREhNaJGNs
LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -141,7 +141,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
Ljg3MDU4ODIzNTMgMC43MDU4ODIzNTI5IDAuNDA3ODQzMTM3MwAQAYAC0hAREhNaJGNs
Ljg5ODAzOTIxNTcgMC43NTI5NDExNzY1IDAuNDgyMzUyOTQxMgAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -150,7 +150,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjExNzY0NzA1ODggMC4xMjk0MTE3NjQ3IDAuMTUyOTQxMTc2NQAQAYAC0hAREhNaJGNs
LjE1Njg2Mjc0NTEgMC4xNzI1NDkwMTk2IDAuMjAzOTIxNTY4NgAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -159,7 +159,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjYwNzg0MzEzNzMgMC42MzUyOTQxMTc2IDAuNzAxOTYwNzg0MwAQAYAC0hAREhNaJGNs
LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -168,7 +168,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjI4MjM1Mjk0MTIgMC42NTg4MjM1Mjk0IDAuNzA5ODAzOTIxNgAQAYAC0hAREhNaJGNs
LjMzNzI1NDkwMjAgMC43MTM3MjU0OTAyIDAuNzYwNzg0MzEzNwAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -177,7 +177,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjYwNzg0MzEzNzMgMC42MzUyOTQxMTc2IDAuNzAxOTYwNzg0MwAQAYAC0hAREhNaJGNs
LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -186,7 +186,7 @@
<data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjYwNzg0MzEzNzMgMC42MzUyOTQxMTc2IDAuNzAxOTYwNzg0MwAQAYAC0hAREhNaJGNs
LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -197,4 +197,3 @@
<string>Window Settings</string>
</dict>
</plist>