Merge remote-tracking branch 'refs/remotes/origin/main'

ptdewey · Jul 5, 2024 · 785e582 · 785e582
2 parents 494df30 + bf81ae5
commit 785e582
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,20 @@
-# darkearth-nvim
-A dark and earthy colorscheme for Neovim.
+<h1 align="center">DarkEarth Neovim</h1>
+
+<p align="center">
+    A dark and earthy colorscheme for Neovim.
+</p>
+
+<p align="center">
+    <img src="assets/color_bar.png" alt="DarkEarth palette"/>
+</p>
 
 Based on [miasma.nvim](https://github.com/xero/miasma.nvim), and built with [lush](https://github.com/rktjmp/lush.nvim).
+Compared to Miasma, darkearth is built to be more colorful overall to reduce sameyness as well as being more centered around browns than grays to enhance the earthiness.
+
+<p align="center">
+    <img src="assets/screenshot-0.png" alt="DarkEarth theme in neovim"/>
+</p>
 
-![](assets/screenshot-0.png)
 
 ## Installation
 
@@ -23,20 +34,20 @@ use {
 ```
 
 ## Usage
+
 ```lua
 -- enable the colorscheme
 vim.cmd.colorscheme("darkearth")
 ```
 
-## Build/Modify Colorscheme
+## Build or Modify
+
 1. Ensure [lush.nvim](https://github.com/rktjmp/lush.nvim) and [shipwright.nvim](https://github.com/rktjmp/shipwright.nvim) are installed
 2. Add new modifications to [lush_theme/darkearth.lua](lush_theme/darkearth.lua)
-3. Rebuild the colorscheme by running `./build.sh`
+3. Rebuild the colorscheme using `./build.sh`
 
 
-## base16 Colorscheme
-I have also included a base16 colorscheme script [base16-darkearth.sh](base16-darkearth.sh) that can be used to set shell colors.
+## Extras
 
+I have also included a base16 colorscheme script [extras/base16-darkearth.sh](extras/base16-darkearth.sh) that can be used to set shell colors.
 
-## Disclaimer
-This color scheme is fairly early in development and things are subject to change. (Changes will primarily be new additions)
diff --git a/assets/color_bar.png b/assets/color_bar.png
diff --git a/doc/darkearth-nvim.txt b/doc/darkearth-nvim.txt
@@ -1,28 +1,19 @@
-*darkearth-nvim.txt*       For Neovim >= 0.7.0       Last change: 2024 June 11
+*darkearth-nvim.txt*       For Neovim >= 0.7.0       Last change: 2024 June 28
 
 ==============================================================================
 Table of Contents                           *darkearth-nvim-table-of-contents*
 
-1. darkearth-nvim                              |darkearth-nvim-darkearth-nvim|
-  - Installation                  |darkearth-nvim-darkearth-nvim-installation|
-  - Usage                                |darkearth-nvim-darkearth-nvim-usage|
-  - Build/Modify Colorscheme|darkearth-nvim-darkearth-nvim-build/modify-colorscheme|
-  - base16 Colorscheme      |darkearth-nvim-darkearth-nvim-base16-colorscheme|
-  - Disclaimer                      |darkearth-nvim-darkearth-nvim-disclaimer|
-2. Links                                                |darkearth-nvim-links|
-
-==============================================================================
-1. darkearth-nvim                              *darkearth-nvim-darkearth-nvim*
-
-A dark and earthy colorscheme for Neovim.
-
-Based on miasma.nvim <https://github.com/xero/miasma.nvim>, and built with lush
-<https://github.com/rktjmp/lush.nvim>.
-
-
+  - Installation                                 |darkearth-nvim-installation|
+  - Usage                                               |darkearth-nvim-usage|
+  - Build or Modify                           |darkearth-nvim-build-or-modify|
+  - Extras                                             |darkearth-nvim-extras|
+DarkEarth NeovimA dark and earthy colorscheme for Neovim.Based on miasma.nvim <https://github.com/xero/miasma.nvim>, and built with lush
+<https://github.com/rktjmp/lush.nvim>. Compared to Miasma, darkearth is built
+to be more colorful overall to reduce sameyness as well as being more centered
+around browns than grays to enhance the earthiness.
 
 
-INSTALLATION                      *darkearth-nvim-darkearth-nvim-installation*
+INSTALLATION                                     *darkearth-nvim-installation*
 
 Lazy:
 
@@ -42,36 +33,25 @@ Packer:
 <
 
 
-USAGE                                    *darkearth-nvim-darkearth-nvim-usage*
+USAGE                                                   *darkearth-nvim-usage*
 
 >lua
     -- enable the colorscheme
     vim.cmd.colorscheme("darkearth")
 <
 
 
-BUILD/MODIFY COLORSCHEME*darkearth-nvim-darkearth-nvim-build/modify-colorscheme*
+BUILD OR MODIFY                               *darkearth-nvim-build-or-modify*
 
 1. Ensure lush.nvim <https://github.com/rktjmp/lush.nvim> and shipwright.nvim <https://github.com/rktjmp/shipwright.nvim> are installed
 2. Add new modifications to lush_theme/darkearth.lua <lush_theme/darkearth.lua>
-3. Rebuild the colorscheme by running `./build.sh`
+3. Rebuild the colorscheme using `./build.sh`
 
 
-BASE16 COLORSCHEME          *darkearth-nvim-darkearth-nvim-base16-colorscheme*
-
-I have also included a base16 colorscheme script base16-darkearth.sh
-<base16-darkearth.sh> that can be used to set shell colors.
-
-
-DISCLAIMER                          *darkearth-nvim-darkearth-nvim-disclaimer*
-
-This color scheme is fairly early in development and things are subject to
-change. (Changes will primarily be new additions)
-
-==============================================================================
-2. Links                                                *darkearth-nvim-links*
+EXTRAS                                                 *darkearth-nvim-extras*
 
-1. **: assets/screenshot-0.png
+I have also included a base16 colorscheme script extras/base16-darkearth.sh
+<extras/base16-darkearth.sh> that can be used to set shell colors.
 
 Generated by panvimdoc <https://github.com/kdheepak/panvimdoc>
 

diff --git a/base16-darkearth.sh → extras/base16-darkearth.sh b/base16-darkearth.sh → extras/base16-darkearth.sh
@@ -16,7 +16,7 @@ base09="C9/A6/54" # main yellow
 base0A="5F/86/5F" # main teal
 base0B="AC/98/7D" # darker tan - new
 base0C="8A/7A/6B" # ligher grey-brown - new
-base0D="77/82/4A"   # NOTE: duplicate, can be modified
+base0D="b3/66/4d"  # main red
 base0E="BB/78/44"   # NOTE: duplicate, can be modified
 base0F="67/56/42" # darker brown (similar to alt background)
 

diff --git a/extras/darkearth.yaml b/extras/darkearth.yaml
@@ -0,0 +1,18 @@
+scheme: "DarkEarth"
+author: "ptdewey"
+base00: "24211E"
+base01: "AC987D"
+base02: "5F865F"
+base03: "77824A"
+base04: "B36B42"
+base05: "BB7844"
+base06: "C9A654"
+base07: "D7C484"
+base08: "24211E"
+base09: "AC987D"
+base0A: "5F865F"
+base0B: "77824A"
+base0C: "B36B42"
+base0D: "BB7844"
+base0E: "C9A654"
+base0F: "D7C484"
diff --git a/lush_theme/darkearth.lua b/lush_theme/darkearth.lua
@@ -12,7 +12,6 @@ local lnfg = hsl(30, 13, 40)
 local theme = lush(function(injected_functions)
     local sym = injected_functions.sym
     return {
-        -- Normal                                     { fg=hsl(46, 51, 68), bg=hsl(0, 0, 13), }, -- NOTE: original
         Normal                                     { fg=hsl(46, 51, 68), bg=bgc, },
         SpecialKey                                 { fg=hsl(46, 51, 68), },
         TermCursor                                 { gui="reverse", },
@@ -32,7 +31,6 @@ local theme = lush(function(injected_functions)
         Substitute                                 { Search },
         MoreMsg                                    { fg=hsl(120, 17, 45), gui="bold", },
         ModeMsg                                    { gui="bold", },
-        -- LineNr                                     { fg=hsl(0, 0, 40), bg=lnbg, },
         LineNr                                     { fg=hsl(71, 27, 40), bg=lnbg, },
         DefLineNr                                  { fg=lnfg, bg=lnbg, },
         LineNrAbove                                { DefLineNr },
@@ -42,7 +40,6 @@ local theme = lush(function(injected_functions)
         Question                                   { fg=hsl(120, 17, 45), gui="bold", },
         StatusLine                                 { fg=hsl(46, 51, 68), gui="bold", bg=bgc, },
         MsgSeparator                               { StatusLine },
-        -- StatusLineNC                               { fg=hsl(0, 0, 40), gui="bold", bg=bgc, },
         StatusLineNC                               { fg=lnfg, gui="bold", bg=bgc, },
         Ignore                                     { fg=hsl(20, 5, 27), },
         VertSplit                                  { fg=lnbg, bg=bgc, },
@@ -113,7 +110,7 @@ local theme = lush(function(injected_functions)
         NvimInvalid                                { Error },
         Todo                                       { fg=hsl(46, 51, 68), gui="bold", },
         sym"@text.todo"                            { Todo },
-        String                                     { fg=hsl(33, 40, 50), }, -- NOTE: changed l from 33, s from 22
+        String                                     { fg=hsl(33, 40, 50), },
         sym"@string"                               { String },
         NvimString                                 { String },
         phpHereDoc                                 { String },
@@ -130,14 +127,12 @@ local theme = lush(function(injected_functions)
         -- Number                                     { fg=hsl(71, 27, 40), }, -- NOTE: original
         -- Number                                     { fg=hsl(60, 20, 50), },
         -- Number                                     { fg=hsl(40, 55, 60), },
-        -- Number                                     { fg=hsl(25, 70, 60), },
         -- Number                                     { fg=hsl(300, 10, 55), },
         Number                                     { fg=hsl(15, 40, 50), },
         Float                                      { Number },
         sym"@number"                               { Number },
         NvimNumber                                 { Number },
         rubyInstanceVariable                       { Number },
-        -- Boolean                                    { fg=hsl(72, 27, 40), },
         Boolean                                    { Number },
         sym"@boolean"                              { Boolean },
         Function                                   { fg=hsl(72, 27, 40), },
@@ -149,11 +144,9 @@ local theme = lush(function(injected_functions)
         Identifier                                 { fg=hsl(46, 51, 68), },
         sym"@text.reference"                       { Identifier },
         sym"@parameter"                            { Identifier },
-        -- Field                                      { fg=hsl(80, 30, 40), }, -- NOTE: changed from Identifier
-        -- Field                                      { fg=hsl(140, 20, 50), },
         Field                                      { fg=hsl(26, 47, 50), },
-        sym"@field"                                { Field }, -- NOTE: changed from Identifier
-        sym"@property"                             { Field }, -- NOTE: changed from Identifier
+        sym"@field"                                { Field },
+        sym"@property"                             { Field },
         sym"@variable"                             { Identifier },
         sym"@namespace"                            { Identifier },
         sym"@lsp.type.parameter"                   { Identifier },
@@ -170,7 +163,6 @@ local theme = lush(function(injected_functions)
         phpDefine                                  { Statement },
         helpHyperTextEntry                         { Statement },
         Keyword                                    { fg=hsl(120, 17, 45), },
-        -- Keyword                                    { fg=hsl(30, 45, 60), },
         sym"@keyword"                              { Keyword },
         PreProc                                    { Keyword },
         Include                                    { PreProc },
@@ -192,16 +184,15 @@ local theme = lush(function(injected_functions)
         SpecialComment                             { Special },
         Debug                                      { Special },
         sym"@constant.builtin"                     { Special },
-        sym"@function.builtin"                     { Function }, -- NOTE: changed from Special (maybe change to function)
+        sym"@function.builtin"                     { Function },
         sym"@constructor"                          { Special },
         TelescopeMatching                          { Special },
         TelescopeResultsFileIcon                   { Special },
         Delimiter                                  { fg=hsl(46, 25, 40), },
-        DelimiterLight                             { fg=hsl(46, 51, 68), }, -- NOTE: custom color
-        Operator                                   { fg=hsl(140, 20, 50), }, -- NOTE: changed from Delimiter
-        -- Operator                                   { fg=hsl(28, 60, 50), },
+        DelimiterLight                             { fg=hsl(46, 51, 68), },
+        Operator                                   { fg=hsl(140, 20, 50), },
         sym"@punctuation"                          { Delimiter },
-        sym"@punctuation.bracket"                  { DelimiterLight }, -- NOTE: custom definition
+        sym"@punctuation.bracket"                  { DelimiterLight },
         MyParentheses                              { Delimiter },
         NvimParenthesis                            { Delimiter },
         NvimColon                                  { Delimiter },
@@ -240,7 +231,7 @@ local theme = lush(function(injected_functions)
         DiagnosticSignHint                         { fg=hsl(120, 17, 45), bg=lnbg, },
         DiagnosticDeprecated                       { gui="strikethrough", sp=hsl(33, 22, 33), },
         DiagnosticUnnecessary                      { fg=hsl(20, 5, 40), },
-        Comment                                    { fg=hsl(30, 8, 40), gui="italic", }, -- NOTE: changed l from 40, italic, s 0, h 0
+        Comment                                    { fg=hsl(30, 8, 40), gui="italic", },
         sym"@text.literal"                         { Comment },
         sym"@comment"                              { Comment },
         sym"@lsp.type.comment"                     { Comment },