Skip to content

Commit

Permalink
Vim v 1.1.2
Browse files Browse the repository at this point in the history 
vsplit option added + better coc support
  • Loading branch information
@lighthaus-theme
lighthaus-theme committed Mar 10, 2021
1 parent 711e576 commit 5709cf9
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 28 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- v1.0.0
- v1.0.1
- v1.1.1
- v1.1.2
- [Vim-Airline](#vim-airline)
- v1.0.2
- v1.0.1
Expand All @@ -15,6 +16,10 @@
- [License](#license)

### Vim
#### v1.1.2
- Better coc support added (10/03/2021)
- Added option for vertical separator color. See [Issue](https://github.com/lighthaus-theme/vim-lighthaus/issues/3)

#### v1.1.1
- Nvim-Treesitter support added (06/03/2021)

Expand Down
18 changes: 14 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ A [Lighthaus](https://github.com/lighthaus-theme/lighthaus) theme for [Lightline
- [Vim](#vim)
- [Vim-Airline](#vim-airline)
- [Lightline](#lightline)
- [Options](#options)
- [Version](#version)
- [Bugs/Issues](#bugs/issues)
- [License](#license)
Expand All @@ -40,10 +41,10 @@ Vim
<p align="center"><img src="https://github.com/lighthaus-theme/vim/blob/master/assets/vim3.png?raw=true"><p>

Vim-Airline
<p align="center"><img src="https://github.com/lighthaus-theme/vim/blob/master/assets/lighthaus-airline.png?raw=true"><p>
<p align="center"><img src="https://github.com/lighthaus-theme/vim-lighthaus/blob/master/assets/airline.png?raw=true"><p>

Lightline-Vim
<p align="center"><img src="https://github.com/lighthaus-theme/vim/blob/master/assets/lighthaus-lightline.png?raw=true"><p>
<p align="center"><img src="https://github.com/lighthaus-theme/vim-lighthaus/blob/master/assets/lightline.png?raw=true"><p>

Vim-Airline demo
<p align="center"><img src="https://raw.githubusercontent.com/lighthaus-theme/demo-assets/main/assets/airline.gif"><p>
Expand All @@ -57,7 +58,7 @@ Lightline demo
Lighthaus theme for vim can be installed using any vim plugin manager such as [vim-pathogen](https://github.com/tpope/vim-pathogen), [vundle](https://github.com/VundleVim/Vundle.vim) and [vim-plug](https://github.com/junegunn/vim-plug).

Installation instruction for the plugin managers can be found on their own official pages.
For Installation with [vim-plug](https://github.com/junegunn/vim-plug):
For Installation with [vim-plug](https://github.com/junegunn/vim-plug):
- Add `Plug 'lighthaus-theme/vim-lighthaus'` to the _vim-plug's_ installation function in your `vimrc`
- Run `:PlugInstall` inside vim
- Activate the theme by adding `colorscheme lighthaus` in your `vimrc`
Expand Down Expand Up @@ -89,9 +90,18 @@ let g:lightline = {
```
Save and restart vim to activate the theme.

### Options
**Options have to be set before `colorscheme lighthaus` line in your `vimrc` !**
- Vertical Split Line Color can be changed depending on preference.
To have a brighter and more prominent vertical split line, set the following option to `1` in your `vimrc`. _Default is dark_
```vim
let g:lighthaus_vsplit_line_light = 1
```
<p align="center"><img src="https://github.com/lighthaus-theme/vim-lighthaus/blob/master/assets/vim_vsplit.gif?raw=true"><p>

### Version
```vim
v 1.0.1 vim
v 1.1.2 vim
v 1.0.2 vim-airline
v 1.0.0 lightline
```
Expand Down
69 changes: 45 additions & 24 deletions colors/lighthaus.vim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if exists("syntax_on")
endif

let g:colors_name = "lighthaus"
let g:version = "1.0.1"
let g:version = "1.1.2"
" }


Expand Down Expand Up @@ -64,7 +64,8 @@ let s:non_text = { "gui": "#373C45", "cterm": "239" }
let s:selection_bg = s:hl_bg
let s:selection_fg = s:hl_orange

let s:vsplit_fg = s:white2
let s:vsplit_fg = s:hl_bg
let s:vsplit_fg_light = s:white2
let s:vsplit_bg = s:black


Expand Down Expand Up @@ -97,6 +98,13 @@ function! s:h(group, fg, bg, attr)
endfun


" OPTIONS {
if !exists("g:lighthaus_vsplit_line_light")
let g:lighthaus_vsplit_line_light = 0
endif
" }


" ― ― ― ― ― ― ― ― ―
" EDITOR SETTINGS
" ― ― ― ― ― ― ― ― ―
Expand Down Expand Up @@ -142,11 +150,17 @@ call s:h("PmenuThumb", s:white, s:black, "")
" COLUMNS
" ― ― ― ― ― ― ― ― ―
" {
call s:h("Conceal", s:fg, "", "")
call s:h("VertSplit", s:vsplit_fg, s:vsplit_bg, "")
call s:h("Folded", s:purple2, "", "")
call s:h("FoldColumn", s:line_fg, "", "")
call s:h("SignColumn", s:line_fg, "", "")
call s:h("Conceal", s:fg, "", "")

if g:lighthaus_vsplit_line_light == 0
call s:h("VertSplit", s:vsplit_fg, s:vsplit_bg, s:B)
else
call s:h("VertSplit", s:vsplit_fg_light, s:vsplit_bg, "")
endif

call s:h("Folded", s:purple2, "", "")
call s:h("FoldColumn", s:line_fg, "", "")
call s:h("SignColumn", s:line_fg, "", "")
" }


Expand Down Expand Up @@ -298,11 +312,11 @@ hi link markdownH4 markdownH1
hi link markdownH5 markdownH1
hi link markdownH6 markdownH1

call s:h("markdownCode", s:orange2, "", "")
call s:h("markdownCodeBlock", s:orange2, "", "")
call s:h("markdownCode", s:orange2, "", "")
call s:h("markdownCodeBlock", s:orange2, "", "")
hi link markdownCodeDelimiter Delimiter
call s:h("markdownCodeError", s:red2, "", "")
call s:h("markdownCodeSpecial", s:orange, "", "")
call s:h("markdownCodeError", s:red2, "", "")
call s:h("markdownCodeSpecial", s:orange, "", "")

call s:h("markdownUrl", s:purple, "", "")
call s:h("markdownUrlTitleDelimiter", s:cyan, "", "")
Expand Down Expand Up @@ -437,12 +451,14 @@ hi link vimUserFunc Function
" https://github.com/dense-analysis/ale
" ― ― ― ― ― ― ― ― ―
" {
call s:h("CocErrorHighlight", s:red2, "", "")
call s:h("CocWarningHighlight", s:orange2, "", "")
call s:h("AleError", s:red, "", "")
call s:h("AleErrorSign", s:red2, "", "")

call s:h("AleInfo", s:purple, "", "")
call s:h("AleInfoSign", s:purple2, "", "")

call s:h("CocErrorSign", s:red, "", "")
call s:h("CocHintSign", s:fg_alt, "", "")
call s:h("CocInfoSign", s:purple, "", "")
call s:h("AleWarning", s:orange, "", "")
call s:h("AleWarningSign", s:orange2, "", "")
" }


Expand All @@ -451,14 +467,19 @@ call s:h("CocInfoSign", s:purple, "", "")
" https://github.com/neoclide/coc.nvim
" ― ― ― ― ― ― ― ― ―
" {
call s:h("AleError", s:red, "", "")
call s:h("AleErrorSign", s:red2, "", "")

call s:h("AleInfo", s:purple, "", "")

call s:h("AleWarning", s:orange, "", "")
call s:h("AleWarningSign", s:orange2, "", "")

call s:h("CocInfoHighlight", s:purple2, "", "")
call s:h("CocErrorHighlight", s:red2, "", "")
call s:h("CocWarningHighlight", s:orange2, "", "")

call s:h("CocErrorSign", s:red, "", "")
call s:h("CocHintSign", s:fg_alt, "", "")
call s:h("CocInfoSign", s:purple, "", "")
call s:h("CocWarningSign", s:orange, "", "")

call s:h("CocGitAddedSign", s:green, "", "")
call s:h("CocGitChangedSign", s:hl_yellow, "", "")
call s:h("CocGitChangeRemovedSign", s:red, "", "")
call s:h("CocGitRemovedSign", s:red, "", "")
" }


Expand Down

0 comments on commit 5709cf9

Please sign in to comment.