Dev

CHANGELOG.MD

@@ -0,0 +1,53 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+- Light, medium contrast variant themes.
+- Support for user config for bold and italic text.
+- Full TreeSitter support.
+- Lua version of color scheme for neovim.
+- Better vimdiff colors.
+- Popular plugin support:
+    - Vimwiki
+    - Startify
+    - Whichkey
+    - Easymotion
+    - Galaxyline
+
+
+## [0.1.0, Unreleased] - 2020-06-TBD
+
+
+### Added
+- This CHANGELOG file to hopefully serve as an evolving example of a
+  standardized open source project CHANGELOG.
+- New organization created: [Spaceduck Theme](https://github.com/spaceduck-theme)
+    to track all ports.
+- Hot new violet color: #5c65cc
+
+### Changed
+- Changed color names for more semantic consistency.
+    Ie: Went from 'purple1', 'purple2' to 'purple', 'dark purple', etc.
+- Color corrected most colors to focus on 16bit color harmony.
+     (a huge departure from consistency with the 256 version):
+  - Red:        #e33400 -> #f25244
+  - Orange:     #e39400 -> #f2b45c
+  - Yellow:     #f2ce00 -> #f2e15c
+  - Purple:     #7a5ccc -> #946cd9
+  - Cyan:       #00a3cc -> #59C2FF
+  - Magenta:    #ce6f8f -> #cc7893
+  - DarkPurple: #686f9a -> #5966a1
+  - Selection:  #1b1c36 -> #30365F
+
+
+### Removed
+- No longer using estilo as a dependency to manage colors, instead using viml dictionary like other modern color schemes.
+
+
+### Fixed
+- Brighter comment color. Contrast ratio: of 3.43:1 still not full AA compliant but it's brighter. #30365F -> #5966a1
+
+<!--[Unreleased]: https://github.com/pineapplegiant/spaceduck/compare/v1.0.0...HEAD-->

README.md

@@ -48,8 +48,16 @@ _Note: The Syntax color ID's are not an exhaustive & complete list._
 | -------------------------------------------------------------------------------------------------------------------------- | ---------------- | --------- | ------------- | --------------- | --------- | -------------------- |
 | ![Background Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/background.png?raw=true)            | Background       | `#0f111b` | `230,44,11`   | `15, 17, 27`    | `233`     | Background           |
 | ![Foreground Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/foreground.png?raw=true)            | Foreground       | `#ecf0c1` | `65,20,94`    | `236, 240, 193` | `255`     | Foregrond, Delimiter |
-| ![Visual Selection Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/visualSelection.png?raw=true) | Visual Selection | `#1b1c36` | `238, 50, 21` | `27, 28, 54`    | `234`     | Visual               |
+| ![Visual Selection Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/visualSelection.png?raw=true) | Visual Selection | `#30365F` | `232, 49, 37` | `48, 54, 95`    | `237`     | Visual               |
+| ![Cursor Line Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/cursorLine.png?raw=true)           | Cursor Line      | `#1b1c36` | `238, 50, 21`   | `27, 28, 54`    | `234`     | CursorLine           |
+
+<details><summary>Old Special Colors</summary>
+
+  | ![Color Picker Boxes](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/eyedropper.png?raw=true)          | Palette          | Hex       | HSV/HSB       | RGB             | cterm/256 | SYN ID               |
+| -------------------------------------------------------------------------------------------------------------------------- | ---------------- | --------- | ------------- | --------------- | --------- | -------------------- |
+  | ![Visual Selection Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/visualSelection.png?raw=true) | Visual Selection | `#1b1c36` | `238, 50, 21` | `27, 28, 54`    | `234`     | Visual               |
 | ![Cursor Line Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/cursorLine.png?raw=true)           | Cursor Line      | `#16172d` | `237,51,18`   | `22, 23, 45`    | `234`     | CursorLine           |
+</details>
 
 ## Coloration Colors
 
@@ -87,7 +95,6 @@ If using Vim/Neovim I recommend installing the [vim-polyglot](https://github.com
 # Vim and Neovim
 
 This repo hosts the Vim/Neovim color scheme.
-
 Install the plugin with whatever plugin manager you use:
 
 `Plug 'pineapplegiant/spaceduck', { 'branch': 'main' }`
@@ -104,9 +111,7 @@ And add this to your vimrc/init.vim configuration file:
    colorscheme spaceduck
 ```
 
-Or manually add the color theme to your 'runtimepath' for the file.
-
-`:h colors`
+## Plugins
 
 - [Airline](https://github.com/vim-airline/vim-airline)
 
@@ -287,10 +292,6 @@ And in your `.bash_profile or .zshrc`:
 If you'd like to contribute please reach out! I don't know what I'm doing. Try to send a screenshot when posting issues as well.
 If you port it to whatever you're using, send me a link so I can link it here!
 
-## Vim Estilo
-
-I currently use [estilo](https://github.com/jacoborus/estilo) to manage colors for Vim/Neovim, please install the dependencies to compile the colors specified in the YAML into the color scheme.
-
 To find the [current syntax element under the cursor](https://vim.fandom.com/wiki/Identify_the_syntax_highlighting_group_used_at_the_cursor), I use this mapping which maps Ctrl+a to find the id under the cursor:
 
 ```viml
@@ -308,10 +309,11 @@ This will show you the syntax ID to where we can then modify the color of that w
 
 ### Testing colors look good
 
-- To test that colors look good, you can run: `:source $VIMRUNTIME/syntax/hitest.vim` this will open a buffer of all color groups defined!
+- Edit the colors/spaceduck.vim. When finished run `:source %` to source the buffer and see changes live.
+- To test that colors look good, you can also run: `:source $VIMRUNTIME/syntax/hitest.vim` this will open a buffer of all color groups defined!
 - Check current defined colors in buffer `:highlight` or `:hi` for short.
 - Looking for more syntax elements? Check out `$VIMRUNTIME/syntax/` for all of vim's language support.
 
-### TODO
+### TODO/WIP
 
 Check out my [Todo list](https://github.com/pineapplegiant/spaceduck/projects/1)

after/syntax/markdown.vim

@@ -0,0 +1,53 @@
+if spaceduck#should_abort('markdown', 'mkd')
+    finish
+endif
+
+syn match markdownBlockquote ">\%(\s\|$\).*" contained nextgroup=@markdownBlock
+
+if b:current_syntax ==# 'mkd'
+" plasticboy/vim-markdown {{{1
+  hi! link htmlBold       SpaceduckOrangeBold
+  hi! link htmlBoldItalic SpaceduckOrangeBoldItalic
+  hi! link htmlH1         SpaceduckPurpleBold
+  hi! link htmlItalic     SpaceduckYellowItalic
+  hi! link mkdBlockquote  SpaceduckComment
+  hi! link mkdBold        SpaceduckOrangeBold
+  hi! link mkdBoldItalic  SpaceduckOrangeBoldItalic
+  hi! link mkdCode        SpaceduckGreen
+  hi! link mkdCodeEnd     SpaceduckGreen
+  hi! link mkdCodeStart   SpaceduckGreen
+  hi! link mkdHeading     SpaceduckPurpleBold
+  hi! link mkdInlineUrl   SpaceduckLink
+  hi! link mkdItalic      SpaceduckYellowItalic
+  hi! link mkdLink        SpaceduckGreen
+  hi! link mkdListItem    SpaceduckCyan
+  hi! link mkdRule        SpaceduckComment
+  hi! link mkdUrl         SpaceduckLink
+"}}}1
+elseif b:current_syntax ==# 'markdown'
+" Builtin: {{{1
+  hi! link markdownBlockquote        SpaceduckCommentItalic
+  hi! link markdownBold              SpaceduckYellowBold
+  hi! link markdownBoldItalic        SpaceduckYellowBoldItalic
+  hi! link markdownCodeBlock         SpaceduckPurple
+  hi! link markdownCode              SpaceduckPurple
+  hi! link markdownCodeDelimiter     SpaceduckPurple
+  hi! link markdownH1                SpaceduckPurple2Bold
+  hi! link markdownH2                markdownH1
+  hi! link markdownH3                markdownH1
+  hi! link markdownH4                markdownH1
+  hi! link markdownH5                markdownH1
+  hi! link markdownH6                markdownH1
+  hi! link markdownHeadingDelimiter  markdownH1
+  hi! link markdownHeadingRule       markdownH1
+  hi! link markdownItalic            SpaceduckYellowItalic
+  hi! link markdownLinkText          SpaceduckGreen
+  hi! link markdownListMarker        SpaceduckCyan
+  hi! link markdownOrderedListMarker SpaceduckCyan
+  hi! link markdownRule              SpaceduckComment
+  hi! link markdownUrl               SpaceduckCyan
+"}}}
+endif
+
+" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0:
+

autoload/airline/themes/spaceduck.vim

@@ -9,31 +9,67 @@
 
 let g:airline#themes#spaceduck#palette = {}
 
-let s:normal1 = [ "#000000", "#30365F", 0, 237 ]
-let s:normal2 = [ "#30365F", "#686f9a", 237, 60 ]
-let s:normal3 = [ "#30365F", "#686f9a", 237, 60 ]
+let s:normal1 = [ "#1b1c36", "#686f9a", 233, 237 ]
+let s:normal2 = [ "#686f9a", "#1b1c36", 60, 234 ]
+let s:normal3 = [ "#686f9a", "#1b1c36", 60, 234 ]
 let g:airline#themes#spaceduck#palette.normal = airline#themes#generate_color_map(s:normal1, s:normal2, s:normal3)
 
-let s:insert1 = [ "#000000", "#5ccc96", 0, 78 ]
-let s:insert2 = [ "#30365F", "#686f9a", 237, 60 ]
-let s:insert3 = [ "#30365F", "#686f9a", 237, 60 ]
+let s:insert1 = [ "#0f111b", "#5ccc96", 233, 78 ]
+let s:insert2 = [ "#5ccc96", "#1b1c36", 60, 234 ]
+let s:insert3 = [ "#5ccc96", "#1b1c36", 60, 234 ]
 let g:airline#themes#spaceduck#palette.insert = airline#themes#generate_color_map(s:insert1, s:insert2, s:insert3)
 
-let s:replace1 = [ "#000000", "#7a5ccc", 0, 98 ]
+let s:replace1 = [ "#0f111b", "#7a5ccc", 233, 98 ]
 let s:replace2 = [ "#30365F", "#686f9a", 237, 60 ]
 let s:replace3 = [ "#30365F", "#686f9a", 237, 60 ]
 let g:airline#themes#spaceduck#palette.replace = airline#themes#generate_color_map(s:replace1, s:replace2, s:replace3)
 
-let s:visual1 = [ "#000000", "#f2ce00", 0, 220 ]
-let s:visual2 = [ "#30365F", "#686f9a", 237, 60 ]
-let s:visual3 = [ "#30365F", "#686f9a", 237, 60 ]
+let s:visual1 = [ "#0f111b", "#b3a1e6", 233, 220 ]
+let s:visual2 = [ "#b3a1e6", "#1b1c36", 146, 234 ]
+let s:visual3 = [ "#b3a1e6", "#1b1c36", 146, 234 ]
 let g:airline#themes#spaceduck#palette.visual = airline#themes#generate_color_map(s:visual1, s:visual2, s:visual3)
 
-let s:inactive1 = [ "#1b1c36", "#16172d", 234, 234 ]
-let s:inactive2 = [ "#1b1c36", "#16172d", 234, 234 ]
-let s:inactive3 = [ "#1b1c36", "#16172d", 234, 234 ]
+let s:inactive1 = [ "#30365F", "#16172d", 237, 234 ]
+let s:inactive2 = [ "#30365F", "#16172d", 237, 234 ]
+let s:inactive3 = [ "#30365F", "#16172d", 237, 234 ]
 let g:airline#themes#spaceduck#palette.inactive = airline#themes#generate_color_map(s:inactive1, s:inactive2, s:inactive3)
 
+" statusline warnings ( the [3]trailing block at the right end of your status bar)
+let s:warning_color = [ "#686f9a", "#30365F", 0, 237 ]
+let g:airline#themes#spaceduck#palette.normal.airline_warning = s:warning_color
+let g:airline#themes#spaceduck#palette.insert.airline_warning = s:warning_color
+let g:airline#themes#spaceduck#palette.visual.airline_warning = s:warning_color
+
+" statusline errors
+let s:error_color = [ "#ce6f8f", "#1b1c36", 0, 237 ]
+let g:airline#themes#spaceduck#palette.normal.airline_error = s:error_color
+let g:airline#themes#spaceduck#palette.insert.airline_error = s:error_color
+let g:airline#themes#spaceduck#palette.visual.airline_error = s:error_color
+
+" tabline colors
+let s:tab_fill = [ "#ecf0c1", "#0f111b", 255, 233]
+let s:selected_tab = [ "#b3a1e6", "#0f111b", 146, 233 ]
+let s:modified_tab = [ "#5ccc96", "#0f111b", 78, 233 ]
+let s:background_tab = [ "#686f9a", "#0f111b", 60, 233 ]
+
+" reference airline-tabline-hlgroups for more information
+let g:airline#themes#spaceduck#palette.tabline = {
+  \ "airline_tab": s:background_tab,
+  \ "airline_tab_right": s:background_tab,
+  \ "airline_tabsel": s:selected_tab,
+  \ "airline_tabsel_right": s:selected_tab,
+  \ "airline_tabmod": s:modified_tab,
+  \ "airline_tabmod_right": s:modified_tab,
+  \ "airline_tabmod_unsel": s:modified_tab,
+  \ "airline_tabmod_unsel_right": s:modified_tab,
+  \ "airline_tabfill": s:tab_fill,
+  \ "airline_tablabel": s:background_tab,
+  \ "airline_tablabel_right": s:background_tab,
+  \ "airline_tabhid": s:background_tab,
+  \ "airline_tabhid_right": s:background_tab
+  \ }
+
+" ctrlp extension
 if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif

autoload/spaceduck.vim

@@ -0,0 +1,10 @@
+" Helper function that takes a variadic list of filetypes as args and returns
+" whether or not the execution of the ftplugin should be aborted.
+func! spaceduck#should_abort(...)
+    if ! exists('g:colors_name') || g:colors_name !=# 'spaceduck'
+        return 1
+    elseif a:0 > 0 && (! exists('b:current_syntax') || index(a:000, b:current_syntax) == -1)
+        return 1
+    endif
+    return 0
+endfunction