Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/abyss boreal colorscheme #50

Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a207d45
initial draft of boreal variant theme
egotch Dec 30, 2024
2de2d5a
Finalizing base pallete
egotch Dec 31, 2024
cde1298
adding more extension support
egotch Dec 31, 2024
a51d0cf
init boreal lualine theme
egotch Dec 31, 2024
f154734
init airline and lightline themes
egotch Jan 1, 2025
1c80ac5
edits to colorscheme vim setups
egotch Jan 1, 2025
b1b17ab
reinstating original abyss
egotch Jan 1, 2025
a3c24a0
abyss-boreal.lua palette!
egotch Jan 1, 2025
353f928
abyss-boreal lualine theme
egotch Jan 1, 2025
3129ded
removing duplicated/old palettes
egotch Jan 1, 2025
18207c0
darker primary background
egotch Jan 2, 2025
efcc6b9
tweaking a few main colors
egotch Jan 2, 2025
db1be64
adding lightline theme
egotch Jan 2, 2025
7b1cf42
adding airline theme
egotch Jan 2, 2025
61b646c
adding terminal colors
egotch Jan 2, 2025
8a13326
updating readme
egotch Jan 2, 2025
80f20d9
updating lightpink
egotch Jan 4, 2025
61c1db3
changing palette name on the airline theme
egotch Jan 5, 2025
00fd4ac
updating palette name on lightline theme
egotch Jan 5, 2025
d774b32
updating cursor line bg
egotch Jan 5, 2025
db3b6a6
adding abyssboreal to palette spec tests
egotch Jan 5, 2025
53a43fe
renaming airline and lightline theme *.vim files
egotch Jan 5, 2025
cb0dff1
Merge branch 'develop' into feature/abyss-boreal-colorscheme
egotch Jan 5, 2025
eb7fe69
renaming string output of palette test
egotch Jan 5, 2025
1e95c33
adding supporting screenshots
egotch Jan 7, 2025
659597a
adding screenshots to readme
egotch Jan 7, 2025
cc24665
resizing images
egotch Jan 7, 2025
d51f7c1
picture placing
egotch Jan 7, 2025
15a84d5
updating images
egotch Jan 7, 2025
a9017fe
preview image sizing
egotch Jan 7, 2025
0d6c527
updating image
egotch Jan 7, 2025
a2ca490
updating image placement
egotch Jan 7, 2025
676ca5b
previews
egotch Jan 7, 2025
a91807e
previews
egotch Jan 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# 👥 Contributing

If you're reading this file. Surely you want to contribute to the development of
this colorscheme, so thank you so much for considering it!

Any issue or pull request is welcome. In this section, I will guide you to make
your first contribution.

- Before these instructions, it's recommended to before create an issue about
your change to talk about it.

- All branches must be based from `develop` branch. So, make sure to include
the `develop` branch when forking this repository. Then, you need to
create a new branch based on this one.

```shell
$ git switch develop
$ git checkout -b branch-name
```

- Make sure to pull the latest commits from `develop` branch to your branch
before making a commit.

- All pull requests must go from your branch to `develop` branch.

## Making a new abyss variant

Make sure to follow these rulements if you want to contribute creating a new
variant (palette) for abyss.

Note: All files related to their new variant, must be named as the variant's
name.

- Create a new file on `colors/*.vim`.
- Create a new file for Lualine, Vim-airline/Lightline themes of their variant.
- Create a new file on `lua/abyss/palettes/*.lua` (The name of the palette will
be used for naming the colorscheme in use `vim.g.colors_name`).
- Add and test your new variant against the test cases for variants in its file:
`test/abyss/palette_spec.lua`

## Merging the pull request

Your pull request should pass all code reviews (if there is) to
merge it to `develop` . These code reviews are GitHub workflows.

Also make sure you don't include any `CHANGELOG.md` in your pull request so you
don't have conflicts with the original file in the `main` branch.

## How should you write your commits?

Refer to [release-please-action](https://github.com/googleapis/release-please-action?tab=readme-ov-file#how-should-i-write-my-commits) section.

## Syntax highlight groups

If you want to contribute about wrong syntax highlighting on colorscheme. This
section will help you to determine what highlight group is being applied to a
specific piece of syntax. It'll output the highlight group for the value under
the cursor.

### Treesitter highlighting

Neovim has included a command with these characteristics. Just type: `:Inspect`.

### Vim highlighting

Add this function to your vimrc:

```vim
function! SynStack()
for i1 in synstack(line("."), col("."))
let i2 = synIDtrans(i1)
let n1 = synIDattr(i1, "name")
let n2 = synIDattr(i2, "name")
echo n1 "->" n2
endfor
endfunction

map <F2> <cmd>call SynStack()<cr>
```
72 changes: 11 additions & 61 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ Unofficial port for (Neo)Vim inspired by the Abyss theme from Visual Studio Code

https://github.com/barrientosvctor/abyss.nvim/assets/113469901/7d20f6f0-c438-4ac1-9838-7c1d49f412b9

##  Themes

### Abyss

* TODO - ADD SCREENSHOT OF ORIGINAL ABYSS THEME

### Abyss Boreal

* TODO - ADD SCREENSHOT OF ABYSS-BOREAL THEME

## ⚡️ Requeriments
* [Neovim](https://github.com/neovim/neovim) >= **0.8.0** or [Vim 9](https://www.vim.org/) with lua >= **5.1**.

Expand Down Expand Up @@ -162,6 +172,7 @@ require('abyss').setup({
* [nvim-notify](https://github.com/rcarriga/nvim-notify)
* [Dashboard](https://github.com/glepnir/dashboard-nvim)
* [Which-key](https://github.com/folke/which-key.nvim)
* [Aerial](https://github.com/stevearc/aerial.nvim)

## 🚀 Usage

Expand Down Expand Up @@ -233,67 +244,6 @@ use {

</details>

## 👥 Contributing

Any issue or pull request is welcome. In this section, I will guide you to make
your first contribution.

- Before these instructions, it's recommended to before create an issue about
your change to talk about it.

- All branches must be based from `develop` branch. So, you need to
create a new branch based on this one.

```shell
$ git switch develop
$ git checkout -b branch-name
```

- Make sure to pull the latest commits from `develop` branch to your branch
before make a commit.

- All pull requests must go from your branch to `develop` branch.

### Merging the pull request

Your pull request should pass all code reviews (if there is) to
merge it to `develop` . These code reviews are GitHub workflows.

Also make sure you don't include any `CHANGELOG.md` in your pull request so you
don't have conflicts with the original file in the `main` branch.

### How should you write your commits?

Refer to [release-please-action](https://github.com/googleapis/release-please-action?tab=readme-ov-file#how-should-i-write-my-commits) section.

### Syntax highlight groups

If you want to contribute about wrong syntax highlighting on colorscheme. This
section will help you to determine what highlight group is being applied to a
specific piece of syntax. It'll output the highlight group for the value under
the cursor.

#### Treesitter highlighting

Neovim has included a command with these characteristics. Just type: `:Inspect`.

#### Vim highlighting

Add this function to your vimrc:

```vim
function! SynStack()
for i1 in synstack(line("."), col("."))
let i2 = synIDtrans(i1)
let n1 = synIDattr(i1, "name")
let n2 = synIDattr(i2, "name")
echo n1 "->" n2
endfor
endfunction

map <F2> <cmd>call SynStack()<cr>
```

## 🤗 Acknowledgements

- [nightfox](https://github.com/EdenEast/nightfox.nvim) -> codebase for vim support
64 changes: 64 additions & 0 deletions autoload/airline/themes/abyss-boreal.vim
barrientosvctor marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
let g:airline#themes#abyss#palette = {}
egotch marked this conversation as resolved.
Show resolved Hide resolved

let s:statusline_bg = "#406385"
let s:darkgreen = "#005d55"
let s:white = "#A3D7DA"
let s:fg = "#8c63c9"
let s:shinyblue = "#1f45db"
let s:red = "#ff002f"
let s:black_inactive = "#202020"
let s:yellow = "#d9bb62"
let s:darkyellow = "#808000"
let s:darkred = "#470b1b"

let s:Normal_a = [s:white, s:statusline_bg, 255, 17] " guifg, guibg, ctermfg, ctermbg
let s:Normal_b = [s:fg, s:statusline_bg, 245, 17] " guifg, guibg, ctermfg, ctermbg
let s:Normal_c = [s:fg, s:statusline_bg, 245, 17] " guifg, guibg, ctermfg, ctermbg

let s:Visual_a = [s:shinyblue, s:statusline_bg, 105, 17] " guifg, guibg, ctermfg, ctermbg
let s:Visual_b = [s:fg, s:statusline_bg, 245, 17] " guifg, guibg, ctermfg, ctermbg
let s:Visual_c = [s:fg, s:statusline_bg, 245, 17] " guifg, guibg, ctermfg, ctermbg

let s:Replace_a = [s:red, s:statusline_bg, 9, 17] " guifg, guibg, ctermfg, ctermbg
let s:Replace_b = [s:fg, s:statusline_bg, 245, 17] " guifg, guibg, ctermfg, ctermbg
let s:Replace_c = [s:fg, s:statusline_bg, 245, 17] " guifg, guibg, ctermfg, ctermbg

let s:Insert_a = [s:darkgreen, s:statusline_bg, 2, 17] " guifg, guibg, ctermfg, ctermbg
let s:Insert_b = [s:fg, s:statusline_bg, 245, 17] " guifg, guibg, ctermfg, ctermbg
let s:Insert_c = [s:fg, s:statusline_bg, 245, 17] " guifg, guibg, ctermfg, ctermbg

let s:Inactive_a = [s:fg, s:black_inactive, 245, 0] " guifg, guibg, ctermfg, ctermbg
let s:Inactive_b = [s:fg, s:black_inactive, 245, 0] " guifg, guibg, ctermfg, ctermbg
let s:Inactive_c = [s:fg, s:black_inactive, 245, 0] " guifg, guibg, ctermfg, ctermbg

let s:Warning = [s:yellow, s:statusline_bg, 11, 17] " guifg, guibg, ctermfg, ctermbg
let s:Error = [s:red, s:statusline_bg, 9, 17] " guifg, guibg, ctermfg, ctermbg

let s:IWarning = [s:darkyellow, s:statusline_bg, 3, 17] " guifg, guibg, ctermfg, ctermbg
let s:IError = [s:darkred, s:statusline_bg, 1, 17] " guifg, guibg, ctermfg, ctermbg

let g:airline#themes#abyss#palette.normal = airline#themes#generate_color_map(s:Normal_a, s:Normal_b, s:Normal_c)
let g:airline#themes#abyss#palette.normal.airline_warning = s:Warning
let g:airline#themes#abyss#palette.normal.airline_error = s:Error

let g:airline#themes#abyss#palette.insert = airline#themes#generate_color_map(s:Insert_a, s:Insert_b, s:Insert_c)
let g:airline#themes#abyss#palette.insert.airline_warning = s:Warning
let g:airline#themes#abyss#palette.insert.airline_error = s:Error

let g:airline#themes#abyss#palette.visual = airline#themes#generate_color_map(s:Visual_a, s:Visual_b, s:Visual_c)
let g:airline#themes#abyss#palette.visual.airline_warning = s:Warning
let g:airline#themes#abyss#palette.visual.airline_error = s:Error

let g:airline#themes#abyss#palette.replace = airline#themes#generate_color_map(s:Replace_a, s:Replace_b, s:Replace_c)
let g:airline#themes#abyss#palette.replace.airline_warning = s:Warning
let g:airline#themes#abyss#palette.replace.airline_error = s:Error

let g:airline#themes#abyss#palette.inactive = airline#themes#generate_color_map(s:Inactive_a, s:Inactive_b, s:Inactive_c)
let g:airline#themes#abyss#palette.inactive.airline_warning = s:IWarning
let g:airline#themes#abyss#palette.inactive.airline_error = s:IError

let g:airline#themes#abyss#palette.normal.airline_term = s:Normal_c
let g:airline#themes#abyss#palette.insert.airline_term = s:Insert_c
let g:airline#themes#abyss#palette.replace.airline_term = s:Replace_c
let g:airline#themes#abyss#palette.visual.airline_term = s:Visual_c
let g:airline#themes#abyss#palette.inactive.airline_term = s:Inactive_c
35 changes: 35 additions & 0 deletions autoload/lightline/colorscheme/abyss-boreal.vim
barrientosvctor marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
let s:statusline_bg = "#406385"
let s:darkgreen = "#005d55"
let s:white = "#A3D7DA"
let s:fg = "#8c63c9"
let s:shinyblue = "#2277ff"
let s:red = "#ff002f"
let s:black_inactive = "#202020"

let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:p.normal.left = [ [ s:white, s:statusline_bg, 255, 17, "bold" ] ]
let s:p.normal.right = [ [ s:fg, s:statusline_bg, 245, 17 ] ]
let s:p.normal.middle = [ [ s:fg, s:statusline_bg, 245, 17 ] ]

let s:p.inactive.left = [ [ s:fg, s:black_inactive, 245, 0, "bold" ] ]
let s:p.inactive.right = [ [ s:fg, s:black_inactive, 245, 0 ] ]
let s:p.inactive.middle = [ [ s:fg, s:black_inactive, 245, 0 ] ]

let s:p.insert.left = [ [ s:darkgreen, s:statusline_bg, 2, 17, "bold" ] ]
let s:p.insert.right = [ [ s:fg, s:statusline_bg, 245, 17 ] ]
let s:p.insert.middle = [ [ s:fg, s:statusline_bg, 245, 17 ] ]

let s:p.replace.left = [ [ s:red, s:statusline_bg, 9, 17, "bold" ] ]
let s:p.replace.right = [ [ s:fg, s:statusline_bg, 245, 17 ] ]
let s:p.replace.middle = [ [ s:fg, s:statusline_bg, 245, 17 ] ]

let s:p.visual.left = [ [ s:shinyblue, s:statusline_bg, 105, 17, "bold" ] ]
let s:p.visual.right = [ [ s:fg, s:statusline_bg, 245, 17 ] ]
let s:p.visual.middle = [ [ s:fg, s:statusline_bg, 245, 17 ] ]

let s:p.tabline.left = [ [ s:white, s:statusline_bg, 255, 17, "bold" ] ]
let s:p.tabline.right = [ [ s:red, s:statusline_bg, 9, 17 ] ]
let s:p.tabline.middle = [ [ s:white, s:statusline_bg, 255, 17 ] ]
let s:p.tabline.tabsel = [ [ s:statusline_bg, s:white, 17, 255 ] ]

let g:lightline#colorscheme#abyss#palette = lightline#colorscheme#fill(s:p)
barrientosvctor marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions colors/abyss-boreal.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lua require("abyss").setup { palette = "abyss-boreal" }
2 changes: 1 addition & 1 deletion colors/abyss.vim
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lua require("abyss").setup {}
lua require("abyss").setup { palette = "abyss" }
Loading
Loading