From ddd6de19fa7e9c956d1848183cf7de097c3ae476 Mon Sep 17 00:00:00 2001 From: shaunsingh Date: Tue, 1 Jun 2021 12:38:31 -0400 Subject: [PATCH] Initial commit --- .idea/.gitignore | 8 + LICENSE | 339 +++++++++++++++++++++++ README.md | 120 ++++++++ colors/moonlight.vim | 22 ++ lua/lualine/themes/solarized.lua | 37 +++ lua/solarized/colors.lua | 48 ++++ lua/solarized/init.lua | 20 ++ lua/solarized/theme.lua | 460 +++++++++++++++++++++++++++++++ lua/solarized/util.lua | 96 +++++++ 9 files changed, 1150 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 colors/moonlight.vim create mode 100644 lua/lualine/themes/solarized.lua create mode 100644 lua/solarized/colors.lua create mode 100644 lua/solarized/init.lua create mode 100644 lua/solarized/theme.lua create mode 100644 lua/solarized/util.lua diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..9485e0d --- /dev/null +++ b/README.md @@ -0,0 +1,120 @@ +# 🌘 shaunsingh/moonlight.nvim + +## Modified version of Marko Cerovac's [Material.nvim](https://github.com/marko-cerovac/material.nvim), based off of the [Moonlight Theme](https://github.com/atomiks/moonlight-vscode-theme) for VSCode + +![preview github](https://user-images.githubusercontent.com/71196912/118175481-27755c80-b3fe-11eb-9d70-85a9f936c33d.png) + +## 🌠 Features + +moonlight.nvim is meant to be a modern colorscheme written in lua for NeoVim that supports a lot of the new features +added to NeoVim like built-in LSP and [TreeSitter](https://github.com/nvim-treesitter/nvim-treesitter) + ++ Supported plugins: + + [TreeSitter](https://github.com/nvim-treesitter/nvim-treesitter) + + [LSP Diagnostics](https://neovim.io/doc/user/lsp.html) + + [Lsp Saga](https://github.com/glepnir/lspsaga.nvim) + + [LSP Trouble](https://github.com/folke/lsp-trouble.nvim) + + [Git Gutter](https://github.com/airblade/vim-gitgutter) + + [git-messenger](https://github.com/rhysd/git-messenger.vim) + + [Git Signs](https://github.com/lewis6991/gitsigns.nvim) + + [Telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) + + [Nvim-Tree.lua](https://github.com/kyazdani42/nvim-tree.lua) + + [NERDTree](https://github.com/preservim/nerdtree) + + [vim-which-key](https://github.com/liuchengxu/vim-which-key) + + [Indent-Blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim) + + [WhichKey](https://github.com/liuchengxu/vim-which-key) + + [Dashboard](https://github.com/glepnir/dashboard-nvim) + + [BufferLine](https://github.com/akinsho/nvim-bufferline.lua) + + [Lualine](https://github.com/hoob3rt/lualine.nvim) + + [Neogit](https://github.com/TimUntersberger/neogit) + + [vim-sneak](https://github.com/justinmk/vim-sneak) + ++ Ability to change background on sidebar-like windows like Nvim-Tree, Packer, terminal etc. + ++ Added functions for live theme switching without the need to restart NeoVim + +## ⚡️ Requirements + ++ Neovim >= 0.5.0 + +## 🌙 Installation + +Install via your favourite package manager: +```vim +" If you are using Vim-Plug +Plug 'shaunsingh/moonlight.nvim' +``` + +```lua +-- If you are using Packer +use 'shaunsingh/moonlight.nvim' +``` + +## 🌓 Usage + +Enable the colorscheme: +```vim +"Vim-Script: +colorscheme moonlight +``` + +```lua +--Lua: +require('moonlight').set() +``` + +To enable the `moonlight` theme for `Lualine`, simply specify it in your lualine settings: + +```lua +require('lualine').setup { + options = { + -- ... your lualine config + theme = 'moonlight' + -- ... your lualine config + } +} +``` + +## ⚙️ Configuration + + +| Option | Default | Description | +| ----------------------------------- | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| moonlight_italic_comments | `false` | Make comments italic | +| moonlight_italic_keywords | `false` | Make keywords italic | +| moonlight_italic_functions | `false` | Make functions italic | +| moonlight_italic_variables | `false` | Make variables and identifiers italic | +| moonlight_contrast | `true` | Make sidebars and popup menus like nvim-tree and telescope have a different background | +| moonlight_borders | `false` | Enable the border between verticaly split windows visable +| moonlight_disable_background | `false` | Disable the setting of background color so that NeoVim can use your terminal background + +```lua +-- Example config in lua +vim.g.moonlight_italic_comments = true +vim.g.moonlight_italic_keywords = true +vim.g.moonlight_italic_functions = true +vim.g.moonlight_italic_variables = false +vim.g.moonlight_contrast = true +vim.g.moonlight_borders = false +vim.g.moonlight_disable_background = false + +-- Load the colorscheme +require('moonlight').set() +``` + +```vim +" Example config in Vim-Script +let g:moonlight_italic_comments = true +let g:moonlight_italic_keywords = true +let g:moonlight_italic_functions = true +let g:moonlight_italic_variables = false +let g:moonlight_contrast = true +let g:moonlight_borders = false +let g:moonlight_disable_background = false + +-- Load the colorsheme +colorscheme moonlight +``` + +Original Readme: https://github.com/marko-cerovac/material.nvim/blob/pure-lua/README.md + diff --git a/colors/moonlight.vim b/colors/moonlight.vim new file mode 100644 index 0000000..a6dca48 --- /dev/null +++ b/colors/moonlight.vim @@ -0,0 +1,22 @@ + +" M O O N L I G H T +" _..._ _..._ _..._ _..._ _..._ +" .:::::::. .::::. `. .:::: `. .::' `. .' `. +" ::::::::::: :::::::. : :::::: : ::: : : : +" ::::::::::: :::::::: : :::::: : ::: : : : +" `:::::::::' `::::::' .' `::::: .' `::. .' `. .' +" `':::'' `'::'-' `'::.-' `':..-' `-...-' +" +" Colorscheme name: moonlight.nvim +" Description: Port of VSCode's Moonlight colorscheme for NeoVim +" Author: https://github.com/shaunsingh + +lua << EOF +package.loaded['moonlight'] = nil +package.loaded['moonlight.util'] = nil +package.loaded['moonlight.colors'] = nil +package.loaded['moonlight.theme'] = nil +package.loaded['moonlight.functions'] = nil + +require('moonlight').set() +EOF diff --git a/lua/lualine/themes/solarized.lua b/lua/lualine/themes/solarized.lua new file mode 100644 index 0000000..8d32642 --- /dev/null +++ b/lua/lualine/themes/solarized.lua @@ -0,0 +1,37 @@ +local colors = require('solarized.colors') + +local solarized = {} + +solarized.normal = { + a = {fg = colors.bg, bg = colors.accent, gui = 'bold'}, + b = {fg = colors.title, bg = colors.active}, + c = {fg = colors.fg, bg = colors.selection}, +} + +solarized.insert = { + a = {fg = colors.bg, bg = colors.green, gui = 'bold'}, + b = {fg = colors.title, bg = colors.active}, +} + +solarized.visual = { + a = {fg = colors.bg, bg = colors.purple, gui = 'bold'}, + b = {fg = colors.title, bg = colors.active}, +} + +solarized.replace = { + a = {fg = colors.bg, bg = colors.red, gui = 'bold'}, + b = {fg = colors.title, bg = colors.active}, +} + +solarized.command = { + a = {fg = colors.bg, bg = colors.yellow, gui = 'bold'}, + b = {fg = colors.title, bg = colors.active}, +} + +solarized.inactive = { + a = {fg = colors.disabled, bg = colors.bg, gui = 'bold'}, + b = {fg = colors.disabled, bg = colors.bg}, + c = {fg = colors.disabled, bg = colors.selection} +} + +return solarized diff --git a/lua/solarized/colors.lua b/lua/solarized/colors.lua new file mode 100644 index 0000000..acd6149 --- /dev/null +++ b/lua/solarized/colors.lua @@ -0,0 +1,48 @@ +local solarized = { + + white = '#eee8d5', + gray = '#073642', + black = '#002b36', + red = '#dc322f', + green = '#859900', + yellow = '#b58900', + paleblue = '#586e75', + cyan = '#2aa198', + blue = '#268bd2', + purple = '#6c71c4', + orange = '#cb4b16', + pink = '#d33682', + + bg = '#eee8d5', + bg_alt = '#fdf6e3', + fg = '#002b36', + text = '#586e75', + comments = '#657b83', + selection = '#d8ccc4', + contrast = '#002b36', + active = '#d8ccc4', + border = '#839496', + line_numbers = '#839496', + highlight = '#d8ccc4', + disabled = '#073642', + cursor = '#268bd2', + accent = '#073642', + + error = '#d33682', + link = '#2aa198', + + none = 'NONE' +} + +-- Optional colors + +-- Enable contrast sidebars, floating windows and popup menus +if vim.g.solarized_contrast == false then + solarized.sidebar = moonlight.bg + solarized.float = moonlight.bg +else + solarized.sidebar = moonlight.bg_alt + solarized.float = moonlight.bg_alt +end + +return solarized diff --git a/lua/solarized/init.lua b/lua/solarized/init.lua new file mode 100644 index 0000000..a49e198 --- /dev/null +++ b/lua/solarized/init.lua @@ -0,0 +1,20 @@ +-- M O O N L I G H T +-- _..._ _..._ _..._ _..._ _..._ +-- .:::::::. .::::. `. .:::: `. .::' `. .' `. +-- ::::::::::: :::::::. : :::::: : ::: : : : +-- ::::::::::: :::::::: : :::::: : ::: : : : +-- `:::::::::' `::::::' .' `::::: .' `::. .' `. .' +-- `':::'' `'::'-' `'::.-' `':..-' `-...-' + +-- Colorscheme name: solarized.nvim +-- Description: Port of VSCode's Solarized colorscheme for NeoVim +-- Author: https://github.com/shaunsingh + +local util = require('solarized.util') + +-- Load the theme +local set = function () + util.load() +end + +return { set = set } diff --git a/lua/solarized/theme.lua b/lua/solarized/theme.lua new file mode 100644 index 0000000..36d0b86 --- /dev/null +++ b/lua/solarized/theme.lua @@ -0,0 +1,460 @@ +local solarized = require("moonlight.colors") + +local theme = {} + +theme.loadSyntax = function () + -- Syntax highlight groups + + local syntax = { + Type = { fg = solarized.purple }, -- int, long, char, etc. + StorageClass = { fg = solarized.cyan }, -- static, register, volatile, etc. + Structure = { fg = solarized.puple }, -- struct, union, enum, etc. + Constant = { fg = solarized.yellow }, -- any constant + String = { fg = solarized.green, bg = moonlight.none, style= 'italic' }, -- Any string + Character = { fg = solarized.orange }, -- any character constant: 'c', '\n' + Number = { fg = solarized.orange }, -- a number constant: 5 + Boolean = { fg = solarized.orange }, -- a boolean constant: TRUE, false + Float = { fg = solarized.orange }, -- a floating point constant: 2.3e10 + Statement = { fg = solarized.pink }, -- any statement + Label = { fg = solarized.purple }, -- case, default, etc. + Operator = { fg = solarized.cyan }, -- sizeof", "+", "*", etc. + Exception = { fg = solarized.cyan }, -- try, catch, throw + PreProc = { fg = solarized.purple }, -- generic Preprocessor + Include = { fg = solarized.blue }, -- preprocessor #include + Define = { fg = solarized.pink }, -- preprocessor #define + Macro = { fg = solarized.cyan }, -- same as Define + Typedef = { fg = solarized.red }, -- A typedef + PreCondit = { fg = solarized.cyan }, -- preprocessor #if, #else, #endif, etc. + Special = { fg = solarized.red }, -- any special symbol + SpecialChar = { fg = solarized.pink }, -- special character in a constant + Tag = { fg = solarized.red }, -- you can use CTRL-] on this + Delimiter = { fg = solarized.cyan }, -- character that needs attention like , or . + SpecialComment = { fg = solarized.gray }, -- special things inside a comment + Debug = { fg = solarized.red }, -- debugging statements + Underlined = { fg = solarized.link, bg = moonlight.none, style = 'underline' }, -- text that stands out, HTML links + Ignore = { fg = solarized.disabled }, -- left blank, hidden + Error = { fg = solarized.error, bg = moonlight.none, style = 'bold,underline' }, -- any erroneous construct + Todo = { fg = solarized.yellow, bg = moonlight.none, style = 'bold,italic' }, -- anything that needs extra attention; mostly the keywords TODO FIXME and XXX + + htmlLink = { fg = solarized.link, style = "underline" }, + htmlH1 = { fg = solarized.cyan, style = "bold" }, + htmlH2 = { fg = solarized.red, style = "bold" }, + htmlH3 = { fg = solarized.green, style = "bold" }, + htmlH4 = { fg = solarized.yellow, style = "bold" }, + htmlH5 = { fg = solarized.purple, style = "bold" }, + markdownH1 = { fg = solarized.cyan, style = "bold" }, + markdownH2 = { fg = solarized.red, style = "bold" }, + markdownH3 = { fg = solarized.green, style = "bold" }, + markdownH1Delimiter = { fg = solarized.cyan }, + markdownH2Delimiter = { fg = solarized.red }, + markdownH3Delimiter = { fg = solarized.green }, + } + + -- Options: + + -- Italic comments + if vim.g.solarized_italic_comments == true then + syntax.Comment = {fg = solarized.comments, bg = moonlight.none, style = 'italic'} -- italic comments + else + syntax.Comment = {fg = solarized.comments} -- normal comments + end + + -- Italic Keywords + if vim.g.solarized_italic_keywords == true then + syntax.Conditional = {fg = solarized.purple, bg = moonlight.none, style = 'italic'} -- italic if, then, else, endif, switch, etc. + syntax.Keyword = {fg = solarized.purple, bg = moonlight.none, style = 'italic'} -- italic for, do, while, etc. + syntax.Repeat = {fg = solarized.purple, bg = moonlight.none, style = 'italic'} -- italic any other keyword + else + syntax.Conditional = {fg = solarized.purple} -- normal if, then, else, endif, switch, etc. + syntax.Keyword = {fg = solarized.purple} -- normal for, do, while, etc. + syntax.Repeat = {fg = solarized.purple} -- normal any other keyword + end + + -- Italic Function names + if vim.g.solarized_italic_functions == true then + syntax.Function = {fg = solarized.blue, bg = moonlight.none, style = 'italic'} -- italic funtion names + else + syntax.Function = {fg = solarized.blue} -- normal function names + end + + if vim.g.solarized_italic_variables == true then + Identifier = {fg = solarized.gray, bg = moonlight.none, style = 'italic'}; -- any variable name + else + Identifier = {fg = solarized.gray}; -- any variable name + end + + return syntax + +end + + +theme.loadEditor = function () + -- Editor highlight groups + + local editor = { + NormalFloat = { fg = solarized.fg, bg = moonlight.float }, -- normal text and background color + ColorColumn = { fg = solarized.none, bg = moonlight.active }, -- used for the columns set with 'colorcolumn' + Conceal = { fg = solarized.disabled }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Cursor = { fg = solarized.cursor, bg = moonlight.none, style = 'reverse' }, -- the character under the cursor + CursorIM = { fg = solarized.cursor, bg = moonlight.none, style = 'reverse' }, -- like Cursor, but used when in IME mode + Directory = { fg = solarized.blue, bg = moonlight.none }, -- directory names (and other special names in listings) + DiffAdd = { fg = solarized.green, bg = moonlight.none, style = 'reverse' }, -- diff mode: Added line + DiffChange = { fg = solarized.orange, bg = moonlight.none, style = 'reverse' }, -- diff mode: Changed line + DiffDelete = { fg = solarized.red, bg = moonlight.none, style = 'reverse' }, -- diff mode: Deleted line + DiffText = { fg = solarized.yellow, bg = moonlight.none, style = 'reverse' }, -- diff mode: Changed text within a changed line + EndOfBuffer = { fg = solarized.disabled }, + ErrorMsg = { fg = solarized.none }, + Folded = { fg = solarized.disabled, bg = moonlight.none, style = 'italic' }, + FoldColumn = { fg = solarized.blue }, + IncSearch = { fg = solarized.highlight, bg = moonlight.white, style = 'reverse' }, + LineNr = { fg = solarized.line_numbers }, + CursorLineNr = { fg = solarized.accent }, + MatchParen = { fg = solarized.yellow, bg = moonlight.none, style = 'bold' }, + ModeMsg = { fg = solarized.accent }, + MoreMsg = { fg = solarized.accent }, + NonText = { fg = solarized.disabled }, + Pmenu = { fg = solarized.text, bg = moonlight.contrast }, + PmenuSel = { fg = solarized.accent, bg = moonlight.active }, + PmenuSbar = { fg = solarized.text, bg = moonlight.contrast }, + PmenuThumb = { fg = solarized.fg, bg = moonlight.accent }, + Question = { fg = solarized.green }, + QuickFixLine = { fg = solarized.highlight, bg = moonlight.white, style = 'reverse' }, + qfLineNr = { fg = solarized.highlight, bg = moonlight.white, style = 'reverse' }, + Search = { fg = solarized.highlight, bg = moonlight.white, style = 'reverse' }, + SpecialKey = { fg = solarized.purple }, + SpellBad = { fg = solarized.red, bg = moonlight.none, style = 'italic,undercurl' }, + SpellCap = { fg = solarized.blue, bg = moonlight.none, style = 'italic,undercurl' }, + SpellLocal = { fg = solarized.cyan, bg = moonlight.none, style = 'italic,undercurl' }, + SpellRare = { fg = solarized.purple, bg = moonlight.none, style = 'italic,undercurl' }, + StatusLine = { fg = solarized.fg, bg = moonlight.contrast }, + StatusLineNC = { fg = solarized.text, bg = moonlight.disabled }, + StatusLineTerm = { fg = solarized.fg, bg = moonlight.contrast }, + StatusLineTermNC = { fg = solarized.text, bg = moonlight.disabled }, + TabLineFill = { fg = solarized.fg }, + TablineSel = { fg = solarized.bg, bg = moonlight.accent }, + Tabline = { fg = solarized.fg }, + Title = { fg = solarized.green, bg = moonlight.none, style = 'bold' }, + Visual = { fg = solarized.none, bg = moonlight.selection }, + VisualNOS = { fg = solarized.none, bg = moonlight.selection }, + WarningMsg = { fg = solarized.yellow }, + WildMenu = { fg = solarized.orange, bg = moonlight.none, style = 'bold' }, + CursorColumn = { fg = solarized.none, bg = moonlight.active }, + CursorLine = { fg = solarized.none, bg = moonlight.none }, + ToolbarLine = { fg = solarized.fg, bg = moonlight.bg_alt }, + ToolbarButton = { fg = solarized.fg, bg = moonlight.none, style = 'bold' }, + NormalMode = { fg = solarized.accent, bg = moonlight.none, style = 'reverse' }, + InsertMode = { fg = solarized.green, bg = moonlight.none, style = 'reverse' }, + ReplacelMode = { fg = solarized.red, bg = moonlight.none, style = 'reverse' }, + VisualMode = { fg = solarized.purple, bg = moonlight.none, style = 'reverse' }, + CommandMode = { fg = solarized.gray, bg = moonlight.none, style = 'reverse' }, + Warnings = { fg = solarized.yellow }, + + healthError = { fg = solarized.error }, + healthSuccess = { fg = solarized.green }, + healthWarning = { fg = solarized.yellow }, + + -- Dashboard + DashboardShortCut = { fg = solarized.blue }, + DashboardHeader = { fg = solarized.red }, + DashboardCenter = { fg = solarized.cyan }, + DashboardFooter = { fg = solarized.green, style = "italic" }, + + } + + -- Options: + + --Set transparent background + if vim.g.solarized_disable_background == true then + editor.Normal = { fg = solarized.fg, bg = moonlight.none } -- normal text and background color + editor.SignColumn = { fg = solarized.fg, bg = moonlight.none } + else + editor.Normal = { fg = solarized.fg, bg = moonlight.bg } -- normal text and background color + editor.SignColumn = { fg = solarized.fg, bg = moonlight.bg } + end + + -- Remove window split borders + if vim.g.solarized_borders == true then + editor.VertSplit = { fg = solarized.border } + else + editor.VertSplit = { fg = solarized.bg } + end + + return editor +end + +theme.loadTerminal = function () + + vim.g.terminal_color_0 = solarized.black + vim.g.terminal_color_1 = solarized.red + vim.g.terminal_color_2 = solarized.green + vim.g.terminal_color_3 = solarized.yellow + vim.g.terminal_color_4 = solarized.blue + vim.g.terminal_color_5 = solarized.purple + vim.g.terminal_color_6 = solarized.cyan + vim.g.terminal_color_7 = solarized.white + vim.g.terminal_color_8 = solarized.gray + vim.g.terminal_color_9 = solarized.red + vim.g.terminal_color_10 = solarized.green + vim.g.terminal_color_11 = solarized.yellow + vim.g.terminal_color_12 = solarized.blue + vim.g.terminal_color_13 = solarized.purple + vim.g.terminal_color_14 = solarized.cyan + vim.g.terminal_color_15 = solarized.white + +end + +theme.loadTreeSitter = function () + -- TreeSitter highlight groups + + local treesitter = { + TSAnnotation = { fg = solarized.red }, -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. + TSAttribute = { fg = solarized.yellow }, -- (unstable) TODO: docs + TSBoolean= { fg = solarized.orange }, -- For booleans. + TSCharacter= { fg = solarized.orange }, -- For characters. + TSConstructor = { fg = solarized.purple }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + TSConstant = { fg = solarized.yellow }, -- For constants + TSConstBuiltin = { fg = solarized.blue }, -- For constant that are built in the language: `nil` in Lua. + TSConstMacro = { fg = solarized.blue }, -- For constants that are defined by macros: `NULL` in C. + TSError = { fg = solarized.error }, -- For syntax/parser errors. + TSException = { fg = solarized.yellow }, -- For exception related keywords. + TSField = { fg = solarized.gray }, -- For fields. + TSFloat = { fg = solarized.red }, -- For floats. + TSFuncMacro = { fg = solarized.blue }, -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. + TSInclude = { fg = solarized.cyan }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. + TSLabel = { fg = solarized.red }, -- For labels: `label:` in C and `:label:` in Lua. + TSNamespace = { fg = solarized.yellow }, -- For identifiers referring to modules and namespaces. + --TSNone = { }, -- TODO: docs + TSNumber = { fg = solarized.orange }, -- For all numbers + TSOperator = { fg = solarized.cyan }, -- For any operator: `+`, but also `->` and `*` in C. + TSParameter = { fg = solarized.paleblue }, -- For parameters of a function. + TSParameterReference= { fg = solarized.paleblue }, -- For references to parameters of a function. + TSProperty = { fg = solarized.paleblue }, -- Same as `TSField`. + TSPunctDelimiter = { fg = solarized.cyan }, -- For delimiters ie: `.` + TSPunctBracket = { fg = solarized.cyan }, -- For brackets and parens. + TSPunctSpecial = { fg = solarized.cyan }, -- For special punctutation that does not fall in the catagories before. + TSString = { fg = solarized.green }, -- For strings. + TSStringRegex = { fg = solarized.blue }, -- For regexes. + TSStringEscape = { fg = solarized.disabled }, -- For escape characters within a string. + TSSymbol = { fg = solarized.yellow }, -- For identifiers referring to symbols or atoms. + TSType = { fg = solarized.purple }, -- For types. + TSTypeBuiltin = { fg = solarized.purple }, -- For builtin types. + TSTag = { fg = solarized.red }, -- Tags like html tag names. + TSTagDelimiter = { fg = solarized.yellow }, -- Tag delimiter like `<` `>` `/` + TSText = { fg = solarized.text }, -- For strings considered text in a markup language. + TSTextReference = { fg = solarized.yellow }, -- FIXME + TSEmphasis = { fg = solarized.paleblue }, -- For text to be represented with emphasis. + TSUnderline = { fg = solarized.fg, bg = moonlight.none, style = 'underline' }, -- For text to be represented with an underline. + TSStrike = { }, -- For strikethrough text. + TSTitle = { fg = solarized.paleblue, bg = moonlight.none, style = 'bold' }, -- Text that is part of a title. + TSLiteral = { fg = solarized.fg }, -- Literal text. + TSURI = { fg = solarized.link }, -- Any URI like a link or email. + } + + -- Options: + + -- Italic comments + if vim.g.solarized_italic_comments == true then + treesitter.TSComment= { fg = solarized.comments , bg = moonlight.none, style = 'italic' } -- For comment blocks. + else + treesitter.TSComment= { fg = solarized.comments } -- For comment blocks. + end + + if vim.g.solarized_italic_keywords == true then + treesitter.TSConditional = { fg = solarized.purple, style = 'italic' } -- For keywords related to conditionnals. + treesitter.TSKeyword = { fg = solarized.purple, style = 'italic' } -- For keywords that don't fall in previous categories. + treesitter.TSRepeat = { fg = solarized.purple, style = 'italic' } -- For keywords related to loops. + treesitter.TSKeywordFunction = { fg = solarized.purple, style = 'italic' } -- For keywords used to define a fuction. + else + treesitter.TSConditional = { fg = solarized.purple } -- For keywords related to conditionnals. + treesitter.TSKeyword = { fg = solarized.purple } -- For keywords that don't fall in previous categories. + treesitter.TSRepeat = { fg = solarized.purple } -- For keywords related to loops. + treesitter.TSKeywordFunction = { fg = solarized.purple } -- For keywords used to define a fuction. + end + + if vim.g.solarized_italic_functions == true then + treesitter.TSFunction = { fg = solarized.blue, style = 'italic' } -- For fuction (calls and definitions). + treesitter.TSMethod = { fg = solarized.blue, style = 'italic' } -- For method calls and definitions. + treesitter.TSFuncBuiltin = { fg = solarized.cyan, style = 'italic' } -- For builtin functions: `table.insert` in Lua. + else + treesitter.TSFunction = { fg = solarized.blue } -- For fuction (calls and definitions). + treesitter.TSMethod = { fg = solarized.blue } -- For method calls and definitions. + treesitter.TSFuncBuiltin = { fg = solarized.cyan } -- For builtin functions: `table.insert` in Lua. + end + + if vim.g.solarized_italic_variables == true then + treesitter.TSVariable = { fg = solarized.gray, style = 'italic' } -- Any variable name that does not have another highlight. + treesitter.TSVariableBuiltin = { fg = solarized.gray, style = 'italic' } -- Variable names that are defined by the languages, like `this` or `self`. + else + treesitter.TSVariable = { fg = solarized.gray } -- Any variable name that does not have another highlight. + treesitter.TSVariableBuiltin = { fg = solarized.gray } -- Variable names that are defined by the languages, like `this` or `self`. + end + + return treesitter + +end + +theme.loadLSP = function () + -- Lsp highlight groups + + local lsp = { + LspDiagnosticsDefaultError = { fg = solarized.error }, -- used for "Error" diagnostic virtual text + LspDiagnosticsSignError = { fg = solarized.error }, -- used for "Error" diagnostic signs in sign column + LspDiagnosticsFloatingError = { fg = solarized.error }, -- used for "Error" diagnostic messages in the diagnostics float + LspDiagnosticsVirtualTextError = { fg = solarized.error }, -- Virtual text "Error" + LspDiagnosticsUnderlineError = { style = 'undercurl', sp = solarized.error }, -- used to underline "Error" diagnostics. + LspDiagnosticsDefaultWarning = { fg = solarized.yellow}, -- used for "Warning" diagnostic signs in sign column + LspDiagnosticsSignWarning = { fg = solarized.yellow}, -- used for "Warning" diagnostic signs in sign column + LspDiagnosticsFloatingWarning = { fg = solarized.yellow}, -- used for "Warning" diagnostic messages in the diagnostics float + LspDiagnosticsVirtualTextWarning = { fg = solarized.yellow}, -- Virtual text "Warning" + LspDiagnosticsUnderlineWarning = { style = 'undercurl', sp = solarized.yellow }, -- used to underline "Warning" diagnostics. + LspDiagnosticsDefaultInformation = { fg = solarized.paleblue }, -- used for "Information" diagnostic virtual text + LspDiagnosticsSignInformation = { fg = solarized.paleblue }, -- used for "Information" diagnostic signs in sign column + LspDiagnosticsFloatingInformation = { fg = solarized.paleblue }, -- used for "Information" diagnostic messages in the diagnostics float + LspDiagnosticsVirtualTextInformation = { fg = solarized.paleblue }, -- Virtual text "Information" + LspDiagnosticsUnderlineInformation = { style = 'undercurl', sp = solarized.paleblue }, -- used to underline "Information" diagnostics. + LspDiagnosticsDefaultHint = { fg = solarized.purple }, -- used for "Hint" diagnostic virtual text + LspDiagnosticsSignHint = { fg = solarized.purple }, -- used for "Hint" diagnostic signs in sign column + LspDiagnosticsFloatingHint = { fg = solarized.purple }, -- used for "Hint" diagnostic messages in the diagnostics float + LspDiagnosticsVirtualTextHint = { fg = solarized.purple }, -- Virtual text "Hint" + LspDiagnosticsUnderlineHint = { style = 'undercurl', sp = solarized.paleblue }, -- used to underline "Hint" diagnostics. + LspReferenceText = { fg = solarized.accent, bg = moonlight.highlight }, -- used for highlighting "text" references + LspReferenceRead = { fg = solarized.accent, bg = moonlight.highlight }, -- used for highlighting "read" references + LspReferenceWrite = { fg = solarized.accent, bg = moonlight.highlight }, -- used for highlighting "write" references + } + + return lsp + +end + +theme.loadPlugins = function() + -- Plugins highlight groups + + local plugins = { + + -- LspTrouble + LspTroubleText = { fg = solarized.text }, + LspTroubleCount = { fg = solarized.purple, bg = moonlight.active }, + LspTroubleNormal = { fg = solarized.fg, bg = moonlight.sidebar }, + + -- Diff + diffAdded = { fg = solarized.green }, + diffRemoved = { fg = solarized.red }, + diffChanged = { fg = solarized.yellow }, + diffOldFile = { fg = solarized.yelow }, + diffNewFile = { fg = solarized.orange }, + diffFile = { fg = solarized.blue }, + diffLine = { fg = solarized.comments }, + diffIndexLine = { fg = solarized.purple }, + + -- Neogit + NeogitBranch = { fg = solarized.paleblue }, + NeogitRemote = { fg = solarized.purple }, + NeogitHunkHeader = { fg = solarized.fg, bg = moonlight.highlight }, + NeogitHunkHeaderHighlight = { fg = solarized.blue, bg = moonlight.contrast }, + NeogitDiffContextHighlight = { fg = solarized.text, bg = moonlight.contrast }, + NeogitDiffDeleteHighlight = { fg = solarized.red }, + NeogitDiffAddHighlight = { fg = solarized.green }, + + -- GitGutter + GitGutterAdd = { fg = solarized.green }, -- diff mode: Added line |diff.txt| + GitGutterChange = { fg = solarized.yellow }, -- diff mode: Changed line |diff.txt| + GitGutterDelete = { fg = solarized.red }, -- diff mode: Deleted line |diff.txt| + + -- GitSigns + GitSignsAdd = { fg = solarized.green }, -- diff mode: Added line |diff.txt| + GitSignsAddNr = { fg = solarized.green }, -- diff mode: Added line |diff.txt| + GitSignsAddLn = { fg = solarized.green }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = solarized.yellow }, -- diff mode: Changed line |diff.txt| + GitSignsChangeNr = { fg = solarized.yellow }, -- diff mode: Changed line |diff.txt| + GitSignsChangeLn = { fg = solarized.yellow }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = solarized.red }, -- diff mode: Deleted line |diff.txt| + GitSignsDeleteNr = { fg = solarized.red }, -- diff mode: Deleted line |diff.txt| + GitSignsDeleteLn = { fg = solarized.red }, -- diff mode: Deleted line |diff.txt| + + -- Telescope + TelescopePromptBorder = { fg = solarized.cyan }, + TelescopeResultsBorder = { fg = solarized.purple }, + TelescopePreviewBorder = { fg = solarized.green }, + TelescopeSelectionCaret = { fg = solarized.purple }, + TelescopeSelection = { fg = solarized.purple }, + TelescopeMatching = { fg = solarized.cyan }, + TelescopeNormal = { fg = solarized.fg, bg = moonlight.float }, + + -- NvimTree + NvimTreeRootFolder = { fg = solarized.blue, style = "bold" }, + NvimTreeGitDirty = { fg = solarized.yellow }, + NvimTreeGitNew = { fg = solarized.green }, + NvimTreeImageFile = { fg = solarized.yellow }, + NvimTreeExecFile = { fg = solarized.green }, + NvimTreeSpecialFile = { fg = solarized.purple , style = "underline" }, + NvimTreeFolderName= { fg = solarized.paleblue }, + NvimTreeEmptyFolderName= { fg = solarized.disabled }, + NvimTreeFolderIcon= { fg = solarized.accent }, + NvimTreeIndentMarker = { fg = solarized.disabled }, + LspDiagnosticsError = { fg = solarized.error }, + LspDiagnosticsWarning = { fg = solarized.yellow }, + LspDiagnosticsInformation = { fg = solarized.paleblue }, + LspDiagnosticsHint = { fg = solarized.purple }, + + -- WhichKey + WhichKey = { fg = solarized.accent , style = 'bold'}, + WhichKeyGroup = { fg = solarized.text }, + WhichKeyDesc = { fg = solarized.blue, style = 'italic' }, + WhichKeySeperator = { fg = solarized.fg }, + WhichKeyFloating = { bg = solarized.float }, + WhichKeyFloat = { bg = solarized.float }, + + -- LspSaga + DiagnosticError = { fg = solarized.error }, + DiagnosticWarning = { fg = solarized.yellow }, + DiagnosticInformation = { fg = solarized.paleblue }, + DiagnosticHint = { fg = solarized.purple }, + DiagnosticTruncateLine = { fg = solarized.fg }, + LspFloatWinNormal = { bg = solarized.contrast }, + LspFloatWinBorder = { fg = solarized.purple }, + LspSagaBorderTitle = { fg = solarized.cyan }, + LspSagaHoverBorder = { fg = solarized.paleblue }, + LspSagaRenameBorder = { fg = solarized.green }, + LspSagaDefPreviewBorder = { fg = solarized.green }, + LspSagaCodeActionBorder = { fg = solarized.blue }, + LspSagaFinderSelection = { fg = solarized.green }, + LspSagaCodeActionTitle = { fg = solarized.paleblue }, + LspSagaCodeActionContent = { fg = solarized.purple }, + LspSagaSignatureHelpBorder = { fg = solarized.pink }, + ReferencesCount = { fg = solarized.purple }, + DefinitionCount = { fg = solarized.purple }, + DefinitionIcon = { fg = solarized.blue }, + ReferencesIcon = { fg = solarized.blue }, + TargetWord = { fg = solarized.cyan }, + + -- BufferLine + BufferLineIndicatorSelected = { fg = solarized.accent }, + BufferLineFill = { bg = solarized.bg_alt }, + + -- Sneak + Sneak = { fg = solarized.bg, bg = moonlight.accent }, + SneakScope = { bg = solarized.selection }, + + -- Indent Blankline + IndentBlanklineChar = { fg = solarized.highlight }, + IndentBlanklineContextChar = { fg = solarized.disabled }, + + -- Nvim dap + DapBreakpoint = { fg = solarized.red }, + DapStopped = { fg = solarized.green }, + } + + -- Options: + + -- Disable nvim-tree background + if vim.g.solarized_disable_background == true then + plugins.NvimTreeNormal = { fg = solarized.fg, bg = moonlight.none } + else + plugins.NvimTreeNormal = { fg = solarized.fg, bg = moonlight.sidebar } + end + + return plugins + +end + +return theme diff --git a/lua/solarized/util.lua b/lua/solarized/util.lua new file mode 100644 index 0000000..7b84e33 --- /dev/null +++ b/lua/solarized/util.lua @@ -0,0 +1,96 @@ +local util = {} +local solarized = require('moonlight.theme') + +-- Go trough the table and highlight the group with the color values +util.highlight = function (group, color) + local style = color.style and "gui=" .. color.style or "gui=NONE" + local fg = color.fg and "guifg=" .. color.fg or "guifg=NONE" + local bg = color.bg and "guibg=" .. color.bg or "guibg=NONE" + local sp = color.sp and "guisp=" .. color.sp or "" + + local hl = "highlight " .. group .. " " .. style .. " " .. fg .. " " .. bg .. " " .. sp + + vim.cmd(hl) + if color.link then vim.cmd("highlight! link " .. group .. " " .. color.link) end +end + +-- Only define Solarized if it's the active colorshceme +function util.onColorScheme() + if vim.g.colors_name ~= "solarized" then + vim.cmd [[autocmd! Solarized]] + vim.cmd [[augroup! Solarized]] + end +end + +-- Change the background for the terminal, packer and qf windows +util.contrast = function () + vim.cmd [[augroup Solarized]] + vim.cmd [[ autocmd!]] + vim.cmd [[ autocmd ColorScheme * lua require("solarized.util").onColorScheme()]] + vim.cmd [[ autocmd TermOpen * setlocal winhighlight=Normal:NormalFloat,SignColumn:NormalFloat]] + vim.cmd [[ autocmd FileType packer setlocal winhighlight=Normal:NormalFloat,SignColumn:NormalFloat]] + vim.cmd [[ autocmd FileType qf setlocal winhighlight=Normal:NormalFloat,SignColumn:NormalFloat]] + vim.cmd [[augroup end]] +end + +-- Load the theme +function util.load() + -- Set the theme environment + vim.cmd("hi clear") + if vim.fn.exists("syntax_on") then vim.cmd("syntax reset") end + vim.o.background = "dark" + vim.o.termguicolors = true + vim.g.colors_name = "solarized" + + -- Load plugins, treesitter and lsp async + local async + async = vim.loop.new_async(vim.schedule_wrap(function () + solarized.loadTerminal() + + -- imort tables for plugins, treesitter and lsp + local plugins = solarized.loadPlugins() + local treesitter = solarized.loadTreeSitter() + local lsp = solarized.loadLSP() + + -- loop trough the plugins table and highlight every member + for group, colors in pairs(plugins) do + util.highlight(group, colors) + end + + -- loop trough the treesitter table and highlight every member + for group, colors in pairs(treesitter) do + util.highlight(group, colors) + end + + -- loop trough the lsp table and highlight every member + for group, colors in pairs(lsp) do + util.highlight(group, colors) + end + + -- if contrast is enabled, apply it to sidebars and floating windows + if vim.g.solarized_contrast == true then + util.contrast() + end + async:close() + + end)) + + -- load the most importaint parts of the theme + local editor = solarized.loadEditor() + local syntax = solarized.loadSyntax() + + -- load editor highlights + for group, colors in pairs(editor) do + util.highlight(group, colors) + end + + -- load syntax highlights + for group, colors in pairs(syntax) do + util.highlight(group, colors) + end + + -- load the rest later ( lsp, treesitter, plugins ) + async:send() +end + +return util