Skip to content

Commit 2f37909

Browse files
committed
docs: enhance README with configuration and setup examples
- Add setup() configuration section with default options - Document palette_overrides and highlight_overrides features - Update installation with lazy.nvim best practices - Add LazyVim integration example - Standardize terminology from "variants" to "styles" - Add links to desert.vim and melange inspirations
1 parent fa2f1f7 commit 2f37909

File tree

1 file changed

+112
-22
lines changed

1 file changed

+112
-22
lines changed

README.md

Lines changed: 112 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# 🏜️ Oasis.nvim
22

3-
A modular desert-themed colorscheme for Neovim with warm, earthy tones and multiple palette variants (12 Total Themes). Originally inspired by the classic `desert` theme for vim, also uses the cool/warm philosophy from `melange` (i.e., `warm colors = action/flow` and `cool colors = structure/data`).
3+
A modular desert-themed colorscheme for Neovim with warm, earthy tones and multiple palette styles (12 Total Themes). Originally inspired by the classic [desert theme for vim](https://github.com/fugalh/desert.vim), also uses the [cool/warm philosophy from melange](https://github.com/savq/melange-nvim?tab=readme-ov-file#design) (i.e., `warm colors = action/flow` and `cool colors = structure/data`).
44

55
> [!NOTE]
66
> Use TMUX? There is a companion TMUX plugin for this **Oasis** theme suite: [tmux-oasis](https://github.com/uhs-robert/tmux-oasis)
77
88
## ✨ Features
99

10-
- **12 theme variants**: Covers the entire rainbow of options with an emphasis on being dark. Variants are all desert-inspired.
10+
- **12 theme styles**: Covers the entire rainbow of options with an emphasis on being dark. Styles are all desert-inspired.
1111
- **Comprehensive highlighting** - LSP, Tree-sitter, and plugin support
1212
- **Fast loading** - Direct highlight application for optimal performance
1313
- **Zero dependencies** - Works out of the box without external plugins
1414
- **Modular architecture** - Easy to customize and extend
1515

1616
<details>
17-
<summary>🎨 Supported Plugins</summary>
17+
<summary>💪 Supported Plugins</summary>
1818

1919
<!-- plugins:start -->
2020

@@ -43,12 +43,12 @@ A modular desert-themed colorscheme for Neovim with warm, earthy tones and multi
4343

4444
## 🌅 Overview
4545

46-
Choose from 12 distinct desert-inspired variants, each with its own personality and color palette:
46+
Choose from 12 distinct desert-inspired styles, each with its own personality and color palette:
4747

4848
> [!TIP]
4949
> Click one below to see a larger image along with code syntax preview
5050
>
51-
> **[Vote for your favorite variant](https://github.com/uhs-robert/oasis.nvim/discussions/2)**
51+
> **[Vote for your favorite style](https://github.com/uhs-robert/oasis.nvim/discussions/2)**
5252
5353
<table>
5454
<tr>
@@ -107,7 +107,7 @@ Choose from 12 distinct desert-inspired variants, each with its own personality
107107
</tr>
108108
</table>
109109

110-
**[↓ 👀 View all variants expanded with code syntax](#view-all-theme-variants)**
110+
**[↓ 👀 View all styles expanded with code syntax](#view-all-theme-styles)**
111111

112112
## 📦 Installation
113113

@@ -117,23 +117,100 @@ Install the theme with your preferred package manager, such as
117117
```lua
118118
{
119119
"uhs-robert/oasis.nvim",
120+
lazy = false,
121+
priority = 1000,
120122
config = function()
121-
vim.cmd.colorscheme("oasis") -- or use a variant like ("oasis_desert")
123+
require('oasis').setup({
124+
style = "lagoon", -- Optional: Choose any style like `lagoon` or 'dune'.
125+
})
122126
end
123127
}
124128
```
125129

130+
## ⚙️ Configuration
131+
132+
The theme offers 12 different styles to choose from: `night`, `abyss`, `starlight`, `desert`, `sol`, `canyon`, `dune`, `cactus`, `mirage`, `lagoon`, `twilight`, and `rose`.
133+
134+
Oasis works out of the box, but you can customize it using `setup()`.
135+
136+
<details>
137+
<summary>🍦 Default Options</summary>
138+
139+
<!-- config:start -->
140+
141+
```lua
142+
require('oasis').setup({
143+
style = "lagoon", -- Choose your style (e.g., "lagoon", "desert", "dune", etc:)
144+
useLegacyComments = false, -- Uses the legacy comment color in the `desert` style only (a bright sky blue)
145+
palette_overrides = {}, -- Override colors in specific palettes
146+
highlight_overrides = {}, -- Override specific highlight groups
147+
})
148+
```
149+
150+
<!-- config:end -->
151+
152+
</details>
153+
154+
## 🪓 Overriding Colors & Highlight Groups
155+
156+
**`palette_overrides`** - Customize colors in specific palettes. See [Color Palettes](lua/oasis/color_palettes) for palette structure:
157+
158+
<details>
159+
<summary>🎨 Changing Palette Colors for Each Style</summary>
160+
161+
```lua
162+
require('oasis').setup({
163+
palette_overrides = {
164+
oasis_lagoon = {
165+
syntax = { func = "#E06C75", comment = "#5C6370" },
166+
ui = { border = "#61AFEF" }
167+
}
168+
}
169+
})
170+
```
171+
172+
</details>
173+
174+
**`highlight_overrides`** - Override specific highlight groups (takes precedence over theme) or add new ones. See [Theme Generator](lua/oasis/theme_generator.lua) for highlight groups used:
175+
176+
<details>
177+
<summary>💅 Changing Colors for Highlight Groups</summary>
178+
179+
```lua
180+
require('oasis').setup({
181+
highlight_overrides = {
182+
Comment = { fg = "#5C6370", italic = true },
183+
Function = { fg = "#E06C75", bold = true },
184+
Identifier = "Function" -- Link to another group
185+
}
186+
})
187+
```
188+
189+
</details>
190+
126191
## 🚀 Usage
127192

193+
### ⭐ Recommended: Use `setup()` to launch nvim with your desired style
194+
195+
```lua
196+
-- Use default style (lagoon)
197+
require('oasis').setup()
198+
199+
-- Or specify a style
200+
require('oasis').setup({ style = "desert" })
201+
```
202+
203+
### Alternative: Use `colorscheme` command to swap on the fly
204+
128205
```lua
129-
-- Use default theme (lagoon variant)
130-
vim.cmd.colorscheme("oasis")
206+
vim.cmd.colorscheme("oasis") -- default (lagoon)
207+
vim.cmd.colorscheme("oasis-desert") -- specific style
131208
```
132209

133210
```vim
134211
colorscheme oasis
135212
136-
" You may also use different variants
213+
" You may also use different styles, this method must be prefixed with `oasis-`
137214
colorscheme oasis-abyss
138215
colorscheme oasis-cactus
139216
colorscheme oasis-canyon
@@ -151,27 +228,40 @@ colorscheme oasis-twilight
151228
Some plugins need extra configuration to work with **Oasis**.
152229

153230
<details>
154-
<summary>Click here for more details</summary>
231+
<summary>🌵 Click here for more details</summary>
232+
233+
### LazyVim
234+
235+
To override the tokyonight default and start fresh in the oasis:
236+
237+
```lua
238+
{
239+
"LazyVim/LazyVim",
240+
opts = {
241+
colorscheme = "oasis",
242+
},
243+
},
244+
```
155245

156246
### Lualine
157247

158-
Oasis includes automatic Lualine theme integration that matches your current palette:
248+
To include automatic Lualine theme integration:
159249

160250
```lua
161251
require('lualine').setup {
162252
options = {
163-
theme = 'oasis' -- Automatically matches your current Oasis palette
253+
theme = 'oasis' -- Automatically matches your current Oasis style
164254
}
165255
}
166256
```
167257

168258
### Tabby (Tab Bar)
169259

170-
For enhanced tab bar styling that matches your Oasis theme:
260+
To include tab bar theme integration:
171261

172262
```lua
173263
require('tabby').setup({
174-
theme = 'oasis' -- Uses current Oasis palette for tab styling
264+
theme = 'oasis' -- Automatically matches your current Oasis style
175265
})
176266
```
177267

@@ -187,22 +277,22 @@ There are also companion plugins for other applications:
187277

188278
- **TMUX**: [tmux-oasis](https://github.com/uhs-robert/tmux-oasis)
189279

190-
## 🎯 Vote for Your Favorite Variant
280+
## 🎯 Vote for Your Favorite Style
191281

192282
Want to help shape **Oasis.nvim**?
193283
**[👉 Join the Discussion and Vote Here](https://github.com/uhs-robert/oasis.nvim/discussions/2)**
194284

195285
> [!IMPORTANT]
196-
> Click the screenshot of your favorite variant in the discussion and hit 👍 on the comment.
286+
> Click the screenshot of your favorite style in the discussion and hit 👍 on the comment.
197287
>
198288
> You can vote for more than one and leave feedback about contrast, accents, or plugin integration.
199289
200-
<a id="view-all-theme-variants"></a>
290+
<a id="view-all-theme-styles"></a>
201291

202-
## 👀 View All Theme Variants
292+
## 👀 View All Theme Styles
203293

204294
<details open>
205-
<summary><b>All variants (click to collapse)</b></summary>
295+
<summary><b>All styles (click to collapse)</b></summary>
206296

207297
### Night - Off Black
208298

@@ -213,7 +303,7 @@ Deep desert night sky, almost black for those who prefer softer darkness
213303

214304
### Abyss - Black
215305

216-
Deep, dark variant with mysterious depths
306+
Deep, dark style with mysterious depths
217307

218308
![abyss-dashboard](https://github.com/user-attachments/assets/6ec77ade-b352-4ccc-a0cf-0f1081a458b1)
219309
![abyss-code](https://github.com/user-attachments/assets/f35a4429-ce35-49f5-80d0-e8ee9a339db0)
@@ -269,7 +359,7 @@ Cool teals of shimmering desert mirages
269359

270360
### Lagoon - Blue
271361

272-
The original Oasis theme and default variant, featuring cool blues of the oasis lagoon
362+
The original Oasis theme and default style, featuring cool blues of the oasis lagoon
273363

274364
![lagoon-dashboard](https://github.com/user-attachments/assets/076d4097-d3a0-4051-8e2a-32962a4b2ba5)
275365
![lagoon-code](https://github.com/user-attachments/assets/1bd9c4b6-524b-407f-97f2-a3a5d4ecb3f9)

0 commit comments

Comments
 (0)