Fix up treesitter for vim.

TODO.md

@@ -2,15 +2,22 @@
 
 ## Zen todo, to release
 - Rename?
+    * Minimal, functional, workman, simple, clean, elementary, hemingway, breeze
+    * utility
+    * neo, neue
+    * modern `this one`
+- Move classic docs stuff into its own place
+- Fix falcon.vim colours like the master ones
+
+## v3 release
 - Doc how to use
 - Screenshots
-- Palette stuff
+- Palette stuff pics and values
 
-## Todo include statusline
+### Todo include statusline config
 - Set StatusLineNC to take into account inactive bg
 
 ## Todo v3
-- instead of zen, call it hemingway, or similar
 - tweak indigo, more blue
 - colors/falcon_zen.vim version
 - try out using lush, specifically:

colors/falcon.vim

@@ -6,14 +6,13 @@ highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold
 highlight! link mkdBold Bold
 highlight Boolean guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight Character guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight CleverFDefaultLabel guifg=#BDD8FF guibg=NONE guisp=NONE gui=underline cterm=underline
+highlight CleverFDefaultLabel guifg=#E0E0E6 guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline
 highlight ColorColumn guifg=NONE guibg=#161622 guisp=NONE gui=NONE cterm=NONE
 highlight Comment guifg=#6F6F80 guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight! link mkdBlockQuote Comment
 highlight! link rstInterpretedTextOrHyperlinkReference Comment
 highlight Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight Conditional guifg=NONE guibg=NONE guisp=NONE gui=italic cterm=italic
-highlight! link @conditional Conditional
 highlight Constant guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight Cursor guifg=NONE guibg=#787882 guisp=NONE gui=NONE cterm=NONE
 highlight CursorColumn guifg=NONE guibg=#18182A guisp=NONE gui=NONE cterm=NONE
@@ -76,8 +75,6 @@ highlight! link htmlTagName Keyword
 highlight! link rstDirective Keyword
 highlight! link rstSections Keyword
 highlight! link yamlBlockMappingKey Keyword
-highlight! link @keyword Keyword
-highlight! link @keyword.function Keyword
 highlight Label guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight LineNr guifg=#56565D guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight LspCodeLens guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -95,7 +92,7 @@ highlight MsgSeparator guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight NonText guifg=#36363A guibg=#020222 guisp=NONE gui=NONE cterm=NONE
 highlight! link EndOfBuffer NonText
 highlight NormalFloat guifg=NONE guibg=#1E1E2F guisp=NONE gui=NONE cterm=NONE
-highlight NormalNC guifg=#A2A2A9 guibg=#020222 guisp=NONE gui=NONE cterm=NONE
+highlight NormalNC guifg=#A2A2A9 guibg=#161622 guisp=NONE gui=NONE cterm=NONE
 highlight Number guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight NvimTreeCIcon guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight NvimTreeEmptyFolderName guifg=#99A4BD guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -272,7 +269,7 @@ highlight TabLineSel guifg=#E0E0E6 guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight Tag guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight TelescopeBorder guifg=#36363A guibg=#18182A guisp=NONE gui=NONE cterm=NONE
 highlight TelescopeMatching guifg=#E0E0E6 guibg=#18182A guisp=NONE gui=bold cterm=bold
-highlight TelescopeMultiIcon guifg=#B5B5BA guibg=NONE guisp=NONE gui=NONE cterm=NONE
+highlight TelescopeMultiIcon guifg=#A2A2A9 guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight TelescopeMultiSelection guifg=#E0E0E6 guibg=#18182A guisp=NONE gui=bold cterm=bold
 highlight TelescopeNormal guifg=#787882 guibg=#18182A guisp=NONE gui=NONE cterm=NONE
 highlight! link TelescopePreviewNormal TelescopeNormal
@@ -280,7 +277,7 @@ highlight! link TelescopePromptNormal TelescopeNormal
 highlight! link TelescopeResultsNormal TelescopeNormal
 highlight TelescopePromptCounter guifg=#99A4BD guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight TelescopePromptPrefix guifg=#A2A2A9 guibg=#18182A guisp=NONE gui=NONE cterm=NONE
-highlight TelescopeSelection guifg=#B5B5BA guibg=#18182A guisp=NONE gui=NONE cterm=NONE
+highlight TelescopeSelection guifg=#A2A2A9 guibg=#18182A guisp=NONE gui=NONE cterm=NONE
 highlight TelescopeSelectionCaret guifg=#847162 guibg=#18182A guisp=NONE gui=NONE cterm=NONE
 highlight TelescopeTitle guifg=#888891 guibg=#18182A guisp=NONE gui=NONE cterm=NONE
 highlight TermCursor guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -413,23 +410,6 @@ highlight yamlTimestamp guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight yamlTodo guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight yamlYAMLDirective guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
 highlight yamlYAMLVersion guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight @annotation guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight @attribute guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight @boolean guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight @function guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight @function.call guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight! link @function.builtin @keyword
-highlight! link @include @keyword
-highlight! link @repeat @keyword
-highlight! link @tag @keyword
-highlight! link @variable.builtin @keyword
-highlight @method guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight @property guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight @punctuation guifg=#787882 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight! link @punctuation.bracket @punctuation
-highlight! link @tag.delimiter @punctuation
-highlight @tag.attribute guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE
-highlight @text.title guifg=#B5B5BA guibg=NONE guisp=NONE gui=NONE cterm=NONE
 set background=dark
 let g:colors_name="falcon"
 let g:terminal_color_0 = '#000005'

lua/falcon/extras/modern/init.lua

@@ -7,7 +7,7 @@ local extras = {
 
 local loaded_extras = {}
 for index, extra in pairs(extras) do
-    loaded_extras[index] = require('falcon.extras.zen.' .. extra)
+    loaded_extras[index] = require('falcon.extras.modern.' .. extra)
 end
 
 return lush.merge(loaded_extras)

lua/falcon/extras/modern/treesitter.lua

@@ -2,7 +2,7 @@
 local lush = require("lush")
 local colours = require('falcon.colours')
 local styles = require('falcon.styles')
-local zen = require('falcon.zen')
+local modern = require('falcon.modern')
 
 local p = lush(function(injected_functions)
     local sym = injected_functions.sym
@@ -76,9 +76,9 @@ local p = lush(function(injected_functions)
         sym('@annotation')          {},
         sym('@attribute')           {},
         sym('@boolean')             {},
-        sym('@conditional')         {zen.Conditional},
-        sym('@keyword')             {zen.Keyword},
-        sym('@keyword.function')    {zen.Keyword},
+        sym('@conditional')         {modern.Conditional},
+        sym('@keyword')             {modern.Keyword},
+        sym('@keyword.function')    {modern.Keyword},
         sym('@function')            {},
         sym('@function.call')       {},
         sym('@function.builtin')    {sym("@keyword")},
@@ -91,7 +91,7 @@ local p = lush(function(injected_functions)
         sym('@tag')                 {sym("@keyword")},
         sym('@tag.attribute')       {},
         sym('@tag.delimiter')       {sym("@punctuation")},
-        sym('@text.title')          {zen.Normal},
+        sym('@text.title')          {modern.Normal},
         sym('@variable.builtin')    {sym("@keyword")},
     }
 end)

lua/falcon/filetypes/modern/init.lua

@@ -9,7 +9,7 @@ local filetypes = {
 
 local loaded_filetypes = {}
 for index, filetype in pairs(filetypes) do
-    loaded_filetypes[index] = require('falcon.filetypes.zen.' .. filetype)
+    loaded_filetypes[index] = require('falcon.filetypes.modern.' .. filetype)
 end
 
 return lush.merge(loaded_filetypes)

lua/falcon/filetypes/modern/markdown.lua

@@ -1,6 +1,6 @@
 local lush = require("lush")
 local colours = require('falcon.colours')
-local zen = require('falcon.zen')
+local modern = require('falcon.modern')
 local styles = require('falcon.styles')
 
 local p = lush(function(injected_functions)
@@ -36,27 +36,27 @@ local p = lush(function(injected_functions)
         markdownCodeDelimiter     {}, -- Delimiter
         markdownCode              {},
         markdownEscape            {}, -- Special
-        markdownError             {zen.SpellBad}, -- Error
+        markdownError             {modern.SpellBad}, -- Error
         markdownXmlElement        {},
-        htmlH1                    {zen.Keyword},
+        htmlH1                    {modern.Keyword},
         htmlH2                    {htmlH1},
         htmlH3                    {htmlH2},
         htmlH4                    {htmlH2},
         htmlH5                    {htmlH2},
         htmlH6                    {htmlH2},
-        htmlTagName                   {zen.Keyword},
-        mkdLink                   {zen.Underlined},
+        htmlTagName                   {modern.Keyword},
+        mkdLink                   {modern.Underlined},
         mkdURL                    {fg = colours.blue_gray, gui = styles.underline},
         mkdInlineURL              {fg = colours.blue_gray, gui = styles.underline},
-        mkdBold                   {zen.Bold},
+        mkdBold                   {modern.Bold},
         mkdListItem               {},
-        mkdCode                   {zen.String},
-        mkdCodeDelimiter          {zen.Operator},
+        mkdCode                   {modern.String},
+        mkdCodeDelimiter          {modern.Operator},
         mkdHeading                {},
         mkdStrike                 {gui = styles.strikethrough},
-        mkdCodeStart              {zen.Operator},
-        mkdCodeEnd                {zen.Operator},
-        mkdBlockQuote             {zen.Comment}
+        mkdCodeStart              {modern.Operator},
+        mkdCodeEnd                {modern.Operator},
+        mkdBlockQuote             {modern.Comment}
     }
 end)
 

lua/falcon/filetypes/modern/rst.lua

@@ -1,16 +1,16 @@
 local lush = require("lush")
 local colours = require('falcon.colours')
 local styles = require('falcon.styles')
-local zen = require('falcon.zen')
+local modern = require('falcon.modern')
 
 local p = lush(function()
     return {
-        rstSections {zen.Keyword},
+        rstSections {modern.Keyword},
         rstCodeBlock {fg = colours.mid_gray_alt},
-        rstDirective {zen.Keyword},
+        rstDirective {modern.Keyword},
         rstHyperlinkTarget {fg = colours.blue_gray, gui = styles.underline},
         rstExDirective {fg = colours.blue_gray},
-        rstInterpretedTextOrHyperlinkReference {zen.Comment}
+        rstInterpretedTextOrHyperlinkReference {modern.Comment}
     }
 end)
 

lua/falcon/filetypes/modern/xml.lua

@@ -1,13 +1,13 @@
 local lush = require("lush")
 local colours = require('falcon.colours')
-local zen = require('falcon.zen')
+local modern = require('falcon.modern')
 
 local p = lush(function()
     return {
         xmlEndTag          {},
-        xmlEqual           {zen.Operator},
+        xmlEqual           {modern.Operator},
         xmlTagName         {},
-        xmlAttrib          {zen.Normal},
+        xmlAttrib          {modern.Normal},
         xmlTag             {},
         xmlProcessingDelim {},
     }

lua/falcon/filetypes/modern/yaml.lua

@@ -1,6 +1,6 @@
 local lush = require("lush")
 local colours = require('falcon.colours')
-local zen = require('falcon.zen')
+local modern = require('falcon.modern')
 local styles = require('falcon.styles')
 
 local p = lush(function()
@@ -22,7 +22,7 @@ local p = lush(function()
         yamlEscape                   {}, -- SpecialChar
         yamlSingleEscape             {}, -- SpecialChar
         yamlBlockCollectionItemStart {}, -- Label
-        yamlBlockMappingKey          {zen.Keyword}, -- Identifier
+        yamlBlockMappingKey          {modern.Keyword}, -- Identifier
         yamlBlockMappingMerge        {}, -- Special
         yamlFlowMappingKey           {}, -- Identifier
         yamlFlowMappingMerge         {}, -- Special
@@ -32,8 +32,8 @@ local p = lush(function()
         yamlConstant                 {}, -- Constant
         yamlNull                     {}, -- yamlConstant
         yamlBool                     {}, -- yamlConstant
-        yamlAnchor                   {zen.Normal}, -- Type
-        yamlAlias                    {zen.Normal}, -- Type
+        yamlAnchor                   {modern.Normal}, -- Type
+        yamlAlias                    {modern.Normal}, -- Type
         yamlNodeTag                  {}, -- Type
         yamlInteger                  {}, -- Number
         yamlFloat                    {}, -- Float

lua/falcon/init.lua

@@ -65,14 +65,14 @@ local function setup()
     })
   end
 
-  if settings.variation == 'zen' then
+  if settings.variation == 'modern' then
     return lush.merge({
-      require('falcon.zen'),
+      require('falcon.modern'),
       require('falcon.plugins.common'),
-      require('falcon.plugins.zen'),
-      require('falcon.filetypes.zen'),
+      require('falcon.plugins.modern'),
+      require('falcon.filetypes.modern'),
       require('falcon.extras.common'),
-      require('falcon.extras.zen'),
+      require('falcon.extras.modern'),
     })
   end
 

lua/falcon/plugins/modern/init.lua

@@ -8,7 +8,7 @@ local plugins = {
 
 local loaded_plugins = {}
 for index, plugin in pairs(plugins) do
-  loaded_plugins[index] = require('falcon.plugins.zen.' .. plugin)
+  loaded_plugins[index] = require('falcon.plugins.modern.' .. plugin)
 end
 
 return lush.merge(loaded_plugins)

lua/falcon/shipwright/runners/kitty.lua

@@ -67,5 +67,5 @@ builder.run(
     name = "Falcon",
   },
   kitty,
-  {overwrite, 'kitty/kitty.falcon.zen.conf'}
+  {overwrite, 'kitty/kitty.falcon.modern.conf'}
 )

lua/falcon/shipwright/runners/vim.lua

@@ -29,6 +29,12 @@ builder.run(
   falcon,
   lushwright.to_vimscript,
   lushwright.vim_compatible_vimscript,
+  function(lines)
+    local filtered_lines = vim.tbl_filter(function(line)
+      return not string.match(line, "@")
+    end, lines)
+    return filtered_lines
+  end,
   {append, {"set background=dark", "let g:colors_name=\"falcon\""}},
   {append, term_colours},
   {overwrite, "colors/falcon.vim"}