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

Additional plugin support (releated to #16) #32

Merged
merged 1 commit into from
Jul 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- `folded` colors are configurable
- [Neogit](https://github.com/TimUntersberger/neogit) support
- Plugin Support check #16
- added iTerm colorscheme #14

### Fixes

Expand Down
21 changes: 14 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,26 @@
- minimal inactive statusline
- vim terminal colors
- darker background for sidebar-like windows
- color configs for [Kitty](https://sw.kovidgoyal.net/kitty/conf.html?highlight=include) and [Alacritty](https://github.com/alacritty/alacritty)
- color configs for [kitty](https://sw.kovidgoyal.net/kitty/conf.html?highlight=include),[iTerm2](https://iterm2.com/) and [Alacritty](https://github.com/alacritty/alacritty)
- dynamic **lualine** theme

### Plugin Support

- [TreeSitter](https://github.com/nvim-treesitter/nvim-treesitter)
- [Telescope](https://github.com/nvim-telescope/telescope.nvim)
- [ALE](https://github.com/dense-analysis/ale)
- [dashboard-nvim](https://github.com/glepnir/dashboard-nvim)
- [Git Signs](https://github.com/lewis6991/gitsigns.nvim)
- [Indent Blankline](https://github.com/lukas-reineke/indent-blankline.nvim)
- [LSP Diagnostics](https://neovim.io/doc/user/lsp.html)
- [LSP Trouble](https://github.com/folke/lsp-trouble.nvim)
- [Git Signs](https://github.com/lewis6991/gitsigns.nvim)
- [lspsaga.nvim](https://github.com/glepnir/lspsaga.nvim)
- [Lualine](https://github.com/hoob3rt/lualine.nvim)
- [nvim-bufferline.lua](https://github.com/akinsho/nvim-bufferline.lua)
- [Neogit](https://github.com/TimUntersberger/neogit)
- [NvimTree](https://github.com/kyazdani42/nvim-tree.lua)
- [Lualine](https://github.com/hoob3rt/lualine.nvim)
- [Telescope](https://github.com/nvim-telescope/telescope.nvim)
- [TreeSitter](https://github.com/nvim-treesitter/nvim-treesitter)
- [vim-gitgutter](https://github.com/airblade/vim-gitgutter)
- [which-key.nvim](https://github.com/folke/which-key.nvim/)

## Requirements

Expand Down Expand Up @@ -132,7 +139,7 @@ set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{25

> To generate the configs `make extra` or `:luafile lua/github-theme/extra/init.lua`

Extra color configs for **Kitty**, and **Alacritty** can be found in [extras](extras/). To use them, refer to their respective documentation.
Extra color configs for **kitty**, **iTerm**, and **Alacritty** can be found in [extras](extras/). To use them, refer to their respective documentation.

## Reference

Expand Down Expand Up @@ -241,7 +248,7 @@ require("github-theme").setup({

## Useful Links

- Terminal: [Kitty](https://sw.kovidgoyal.net/kitty)
- Terminal: [kitty](https://sw.kovidgoyal.net/kitty)
- Font: [Ubuntu Mono](https://design.ubuntu.com/font/)
- config: [dotfiles](https://github.com/ful1e5/dotfiles)

Expand Down
30 changes: 14 additions & 16 deletions lua/github-theme/theme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -395,19 +395,18 @@ function M.setup(config)
gitcommitSummary = {fg = c.syntax.tag},

-- Dashboard
DashboardShortCut = {fg = c.magenta},
DashboardHeader = {fg = c.red},
DashboardCenter = {fg = c.blue},
DashboardFooter = {fg = c.yellow, style = "italic"},
DashboardHeader = {fg = c.blue},
DashboardCenter = {fg = c.green, style = "bold"},
DashboardShortCut = {fg = c.yellow},
DashboardFooter = {fg = c.brightWhite, style = "italic"},

-- WhichKey
WhichKey = {fg = c.yellow},
WhichKeyGroup = {fg = c.blue},
WhichKeyDesc = {fg = c.red},
WhichKeySeperator = {fg = c.fg_gutter},
WhichKeySeparator = {fg = c.fg_gutter},
WhichKeyFloat = {bg = c.bg_sidebar},
WhichKeyValue = {fg = c.brightWhite},
WhichKey = {fg = c.blue}, -- the key
WhichKeyGroup = {fg = c.syntax.keyword}, -- a group
WhichKeySeperator = {fg = c.syntax.comment}, -- the separator between the key and its label
WhichKeyDesc = {fg = c.fg}, -- the label of the key
WhichKeyFloat = {bg = c.bg2}, -- Normal in the popup window
WhichKeyValue = {fg = c.syntax.comment}, -- used by plugins that provide values

-- LspSaga
DiagnosticError = {fg = c.error},
Expand All @@ -421,13 +420,12 @@ function M.setup(config)
healthWarning = {fg = c.warning},

-- BufferLine

BufferLineIndicatorSelected = {fg = c.git.change},
BufferLineFill = {bg = c.black},
BufferLineIndicatorSelected = {fg = c.blue},
BufferLineFill = {bg = c.bg2},

-- ALE
ALEWarningSign = {fg = c.yellow},
ALEErrorSign = {fg = c.red}
ALEWarningSign = {fg = c.warning},
ALEErrorSign = {fg = c.error}
}

if config.hideInactiveStatusline then
Expand Down