Skip to content

Commit

Permalink
chore: merge branch 'in-progress'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikesmithgh committed Apr 22, 2024
2 parents 68c3c27 + 170e5c9 commit 4d997ef
Show file tree
Hide file tree
Showing 20 changed files with 332 additions and 142 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
doc/tags
10 changes: 10 additions & 0 deletions .stylua.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
column_width = 100
line_endings = "Unix"
indent_type = "Spaces"
indent_width = 2
quote_style = "AutoPreferSingle"
call_parentheses = "Always"

[sort_requires]
enabled = true

9 changes: 4 additions & 5 deletions extra/fzf/gruvsquirrel.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
vim.schedule(
function()
vim.print(require('gruvsquirrel.plugins.fzf-lua').fzf_colors_str())
end
)
vim.opt.eventignore:append('all')
vim.schedule(function()
vim.print(require('gruvsquirrel.plugins.fzf-lua').fzf_colors_str())
end)
10 changes: 6 additions & 4 deletions extra/fzf/gruvsquirrel.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
#!/bin/sh

base_dir=$(cd "$(dirname "$0")" || exit 1; pwd -P)
base_dir=$(
cd "$(dirname "$0")" || exit 1
pwd -P
)
lua_script="$base_dir/gruvsquirrel.lua"

nvim_cmd='nvim --headless'
if [ -n "$1" ]; then
nvim_cmd="$nvim_cmd +'lua vim.g.colors_name = \"$1\"'"
nvim_cmd="$nvim_cmd +'lua vim.g.colors_name = \"$1\"'"
fi
nvim_cmd="$nvim_cmd -S '$lua_script' +quit 2>&1 | sed '1d'"
nvim_cmd="$nvim_cmd -i NONE -S '$lua_script' +quit 2>&1 | sed '1d'"

# example expected commands
# nvim --headless -S '/gitrepos/gruvsquirrel.nvim/extra/fzf/gruvsquirrel.lua' +quit 2>&1 | sed '1d'
# nvim --headless +'lua vim.g.colors_name = "boxsquirrel"' -S '/gitrepos/gruvsquirrel.nvim/extra/fzf/gruvsquirrel.lua' +quit 2>&1 | sed '1d'

eval "$nvim_cmd"

3 changes: 2 additions & 1 deletion extra/kitty/themes/gruvsquirrel.conf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ bell_border_color #d3869b
inactive_border_color #1a1a1a

# Visual Bell
visual_bell_color
visual_bell_color #32302f


# Marks
mark1_background #1a1a1a
Expand Down
1 change: 1 addition & 0 deletions extra/slack/theme.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# deprecated with new version of Slack
#1A1A1A,#121016,#83a598,#282F35,#3C3836,#C7C7C7,#8FAA80,#AF3A03,#070707,#A0A0A0
111 changes: 111 additions & 0 deletions extra/slides/theme.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"document": {
"block_prefix": "\n",
"block_suffix": "\n",
"color": "#c7c7c7",
"margin": 52
},
"block_quote": {
"indent": 1,
"indent_token": " ",
"color": "#968c81"
},
"paragraph": {},
"list": {
"level_indent": 2
},
"heading": {
"block_suffix": "\n",
"color": "#c7c7c7",
"bold": true
},
"h1": {
"prefix": "██ ",
"suffix": "",
"color": "#8faa80",
"bold": true
},
"h2": {
"prefix": "▓▓▓ ",
"suffix": "",
"color": "#83a598"
},
"h3": {
"prefix": "▒▒▒▒ ",
"suffix": "",
"color": "#9dbad4"
},
"h4": {
"prefix": "░░░░░ ",
"color": "#d3869b"
},
"h5": {
"color": "#8faa80"
},
"h6": {
"color": "#d6991d"
},
"text": {},
"strikethrough": {
"crossed_out": true
},
"emph": {
"italic": true
},
"strong": {
"bold": true
},
"hr": {
"color": "#1a1a1a",
"format": "\n▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔\n"
},
"item": {
"block_prefix": ""
},
"enumeration": {
"block_prefix": ". "
},
"task": {
"ticked": "[✓] ",
"unticked": "[ ] "
},
"link": {
"color": "#9dbad4",
"underline": true
},
"link_text": {
"color": "#9dbad4",
"bold": true
},
"image": {
"color": "#d3869b",
"underline": true
},
"image_text": {
"color": "#968c81",
"format": "Image: {{.text}} →"
},
"code": {
"prefix": " ",
"suffix": " ",
"color": "#ff6961",
"background_color": "#1a1a1a"
},
"code_block": {
"color": "#ff6961",
"background_color": "#1a1a1a",
"margin": 0
},
"table": {
"center_separator": "",
"column_separator": "",
"row_separator": ""
},
"definition_list": {},
"definition_term": {},
"definition_description": {
"block_prefix": "\n🠶 "
},
"html_block": {},
"html_span": {}
}
4 changes: 1 addition & 3 deletions extra/vivid/gruvsquirrel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ colors:
alt_blue: "458588"
alt_purple: "b16286"
alt_aqua: "92bbdf"
alt_orange: "b57614"
alt_orange: "ff6961"

core:
normal_text:
foreground: light
background: dark

regular_file:
foreground: light
background: dark

reset_to_normal: {}

Expand Down
1 change: 1 addition & 0 deletions lua/gruvsquirrel/common/highlight_aliases.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ local M = {
brazil_nut = { fg = c.scrat_5, bg = c.doreen_2, },
flip_nut = { fg = c.doreen_2, reverse = true }, -- reverse is to avoid conflict with cursorline during diff
calend = { fg = c.rocky_1, },
calendteehee = { fg = c.rocky_1, bg = c.scrat_5, },
calendula = {},
candlenut = { fg = c.scrat_0, bg = c.bucky_0, bold = true },
caraway = { fg = c.rocky_0, bg = c.scrat_0, italic = true },
Expand Down
12 changes: 12 additions & 0 deletions lua/gruvsquirrel/highlight-definitions/kitty-scrollback-nvim.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
local g = require("gruvsquirrel.highlight-groups.kitty-scrollback-nvim")
local mapper = require("gruvsquirrel.util.mapper")
local M = {
attributes = function()
local d = require("gruvsquirrel.common.highlight_aliases").get()
return mapper.highlight_group_mapper({
{ { g.KittyScrollbackNvimPasteWinNormal, g.KittyScrollbackNvimPasteWinFloatTitle }, d.cilantro },
{ { g.KittyScrollbackNvimPasteWinFloatBorder }, d.doowho },
})
end,
}
return M
143 changes: 71 additions & 72 deletions lua/gruvsquirrel/highlight-definitions/standard.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,78 +4,77 @@ local mapper = require("gruvsquirrel.util.mapper")
local M = {
attributes = function()
local d = require("gruvsquirrel.common.highlight_aliases").get()
return mapper.highlight_group_mapper {
{ { g.ColorColumn, }, d.acorn },
{ { g.LineNr, g.LineNrAbove, g.LineNrBelow }, d.chickenbones },
{ { g.CursorLine, }, d.almond },
{ { g.CursorColumn }, d.amaranth },
{ { g.Visual, g.VisualNOS }, d.anise },
{ { g.Statement, g.Conceal, g.Identifier, g.Field, g.Property, }, d.basil },
{ { g.Directory }, d.dorito },
{ { g.CurSearch, g.IncSearch, }, d.bay },
{ { g.Cursor, g.lCursor, g.TermCursor }, d.beechnut },
{ { g.DiffAdd, g.DiffChange, }, d.black_walnut },
{ { g.DiffDelete, }, d.borage },
{ { g.DiffText }, d.flip_nut },
{ { g.NonText, g.Whitespace }, d.calend },
{ { g.EndOfBuffer }, d.onlike },
{ { g.TermCursorNC, }, d.calendula },
{ { g.Folded }, d.caraway },
{ { g.FoldColumn, g.CursorLineFold }, d.cashew },
{ { g.Substitute, g.Search }, d.celery },
{ { g.CursorLineNr }, d.chamomile },
{ { g.MatchParen }, d.barbaradoo },
{ { g.ModeMsg, g.MoreMsg, g.Question }, d.chia },
{ { g.MsgArea }, d.chinquapin },
{ { g.MsgSeparator }, d.chufa },
{ { g.Normal }, d.cilantro },
{ { g.NormalFloat, g.Pmenu, }, d.coconut },
{ { g.FloatBorder }, d.doowhat },
{ { g.FloatShadow }, d.doowhatdow },
{ { g.FloatShadowThrough }, d.invis },
{ { g.NormalNC }, d.cola_nut },
{ { g.PmenuSel, g.QuickFixLine, g.WildMenu, }, d.comfrey },
{ { g.PmenuSbar, g.TabLineFill }, d.coriander },
{ { g.PmenuThumb }, d.anise },
{ { g.SignColumn, g.CursorLineSign, }, d.calendula },
{ { g.SpecialKey }, d.chill },
{ { g.SpellBad }, d.fennel },
{ { g.SpellCap }, d.fenugreek },
{ { g.SpellRare }, d.feverfew },
{ { g.WinBar, g.TabLine }, d.filbert },
{ { g.WinBarNC }, d.dowatnut },
{ { g.StatusLine, }, d.yoohoosl },
{ { g.StatusLineNC, }, d.yoohooslnc },
{ { g.TabLineSel }, d.pepsi },
{ { g.Title, g.Function, g.FloatTitle }, d.ginkgo_nut },
{ { g.FloatTitle }, d.whatdoo },
{ { g.WarningMsg, }, d.jackfruit_seed },
{ { g.Error, g.ErrorMsg, }, d.hazelnut },
{ { g.WinSeparator, g.VertSplit }, d.yoohoo },
{ { g.Operator }, d.hibiscus },
{ { g.Comment }, d.hickory_nut },
{ { g.PreProc, g.Define, g.Macro, g.Include, g.Structure, }, d.indian_nut },
return mapper.highlight_group_mapper({
{ { g.ColorColumn }, d.acorn },
{ { g.LineNr, g.LineNrAbove, g.LineNrBelow }, d.chickenbones },
{ { g.CursorLine }, d.almond },
{ { g.CursorColumn }, d.amaranth },
{ { g.Visual, g.VisualNOS }, d.anise },
{ { g.Statement, g.Conceal, g.Identifier, g.Field, g.Property }, d.basil },
{ { g.Directory }, d.dorito },
{ { g.CurSearch, g.IncSearch }, d.bay },
{ { g.Cursor, g.lCursor, g.TermCursor }, d.beechnut },
{ { g.DiffAdd, g.DiffChange }, d.black_walnut },
{ { g.DiffDelete }, d.borage },
{ { g.DiffText }, d.flip_nut },
{ { g.NonText, g.Whitespace }, d.calend },
{ { g.EndOfBuffer }, d.onlike },
{ { g.TermCursorNC }, d.calendula },
{ { g.Folded }, d.caraway },
{ { g.FoldColumn, g.CursorLineFold }, d.cashew },
{ { g.Substitute, g.Search }, d.celery },
{ { g.CursorLineNr }, d.chamomile },
{ { g.MatchParen }, d.barbaradoo },
{ { g.ModeMsg, g.MoreMsg, g.Question }, d.chia },
{ { g.MsgArea }, d.chinquapin },
{ { g.MsgSeparator }, d.chufa },
{ { g.Normal, g.NormalNC }, d.cilantro },
{ { g.NormalFloat, g.Pmenu }, d.coconut },
{ { g.FloatBorder }, d.doowhat },
{ { g.FloatShadow }, d.doowhatdow },
{ { g.FloatShadowThrough }, d.invis },
-- { { g.NormalNC }, d.cola_nut },
{ { g.PmenuSel, g.QuickFixLine, g.WildMenu }, d.comfrey },
{ { g.PmenuSbar, g.TabLineFill }, d.coriander },
{ { g.PmenuThumb }, d.anise },
{ { g.SignColumn, g.CursorLineSign }, d.calendula },
{ { g.SpecialKey }, d.chill },
{ { g.SpellBad }, d.fennel },
{ { g.SpellCap }, d.fenugreek },
{ { g.SpellRare }, d.feverfew },
{ { g.WinBar, g.TabLine }, d.filbert },
{ { g.WinBarNC }, d.dowatnut },
{ { g.StatusLine }, d.yoohoosl },
{ { g.StatusLineNC }, d.yoohooslnc },
{ { g.TabLineSel }, d.pepsi },
{ { g.Title, g.Function, g.FloatTitle }, d.ginkgo_nut },
{ { g.FloatTitle }, d.whatdoo },
{ { g.WarningMsg }, d.jackfruit_seed },
{ { g.Error, g.ErrorMsg }, d.hazelnut },
{ { g.WinSeparator, g.VertSplit }, d.yoohoo },
{ { g.Operator }, d.hibiscus },
{ { g.Comment }, d.hickory_nut },
{ { g.PreProc, g.Define, g.Macro, g.Include, g.Structure }, d.indian_nut },
{ { g.Delimiter, g.Debug, g.StorageClass, g.Tag, g.Special, g.SpecialChar, g.SpecialComment }, d.jackfruit_seed },
{ { g.String }, d.kola_nut },
{ { g.Character, g.Boolean, g.Number, g.Float, g.Constant, }, d.lavender },
{ { g.Keyword, g.Conditional, g.Repeat, g.Label, g.Exception, }, d.lemon_balm },
{ { g.Type, g.Typedef, }, d.lemongrass },
{ { g.Variable, }, d.peanut },
{ { g.Underlined, }, d.macadamia_nut },
{ { g.Todo, }, d.malabar_chestnut },
{ { g.Done, }, d.marjoram },
{ { g.DiagnosticError, g.DiagnosticFloatingError, g.DiagnosticVirtualTextError, g.DiagnosticSignError, },
d.lemon_balm },
{ { g.DiagnosticHint, g.DiagnosticFloatingHint, g.DiagnosticVirtualTextHint, g.DiagnosticSignHint, }, d.indian_nut },
{ { g.DiagnosticInfo, g.DiagnosticFloatingInfo, g.DiagnosticVirtualTextInfo, g.DiagnosticSignInfo, }, d.nacho },
{ { g.DiagnosticWarn, g.DiagnosticFloatingWarn, g.DiagnosticVirtualTextWarn, g.DiagnosticSignWarn, }, d.lemongrass },
{ { g.DiagnosticOk, g.DiagnosticFloatingOk, g.DiagnosticVirtualTextOk, g.DiagnosticSignOk, }, d.peanut },
{ { g.DiagnosticUnderlineError, }, d.rosemary },
{ { g.DiagnosticUnderlineHint, }, d.sage },
{ { g.DiagnosticUnderlineInfo, }, d.sesame },
{ { g.DiagnosticUnderlineWarn, }, d.sunflower },
{ { g.DiagnosticUnderlineOk, }, d.tarragon },
}
end
{ { g.String }, d.kola_nut },
{ { g.Character, g.Boolean, g.Number, g.Float, g.Constant }, d.lavender },
{ { g.Keyword, g.Conditional, g.Repeat, g.Label, g.Exception }, d.lemon_balm },
{ { g.Type, g.Typedef }, d.lemongrass },
{ { g.Variable }, d.peanut },
{ { g.Underlined }, d.macadamia_nut },
{ { g.Todo }, d.malabar_chestnut },
{ { g.Done }, d.marjoram },
{ { g.DiagnosticError, g.DiagnosticFloatingError, g.DiagnosticVirtualTextError, g.DiagnosticSignError }, d.lemon_balm },
{ { g.DiagnosticHint, g.DiagnosticFloatingHint, g.DiagnosticVirtualTextHint, g.DiagnosticSignHint }, d.indian_nut },
{ { g.DiagnosticInfo, g.DiagnosticFloatingInfo, g.DiagnosticVirtualTextInfo, g.DiagnosticSignInfo }, d.nacho },
{ { g.DiagnosticWarn, g.DiagnosticFloatingWarn, g.DiagnosticVirtualTextWarn, g.DiagnosticSignWarn }, d.lemongrass },
{ { g.DiagnosticOk, g.DiagnosticFloatingOk, g.DiagnosticVirtualTextOk, g.DiagnosticSignOk }, d.peanut },
{ { g.DiagnosticUnderlineError }, d.rosemary },
{ { g.DiagnosticUnderlineHint }, d.sage },
{ { g.DiagnosticUnderlineInfo }, d.sesame },
{ { g.DiagnosticUnderlineWarn }, d.sunflower },
{ { g.DiagnosticUnderlineOk }, d.tarragon },
})
end,
}
return M
6 changes: 3 additions & 3 deletions lua/gruvsquirrel/highlight-definitions/terminal.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
local M = {
attributes = function()
local c = require("gruvsquirrel.colors").get()
local c = require('gruvsquirrel.colors').get()

-- dark (black)
vim.g.terminal_color_0 = c.scrat_0
vim.g.terminal_color_8 = c.scrat_6
vim.g.terminal_color_8 = c.rocky_0

-- red
vim.g.terminal_color_1 = c.bucky_0
Expand Down Expand Up @@ -36,6 +36,6 @@ local M = {

-- no need to return anything this is not a typical highlight definition, we are setting global options
return {}
end
end,
}
return M
13 changes: 13 additions & 0 deletions lua/gruvsquirrel/highlight-definitions/zen-mode.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
local g = require("gruvsquirrel.highlight-groups.zen-mode")
local mapper = require("gruvsquirrel.util.mapper")

local M = {
attributes = function()
local d = require("gruvsquirrel.common.highlight_aliases").get()
return mapper.highlight_group_mapper({
{ { g.ZenBg }, d.coriander },
})
end,
}

return M
Loading

0 comments on commit 4d997ef

Please sign in to comment.