Merge remote-tracking branch 'upstream/main'

lua/farout/extra/alacritty.lua

@@ -4,50 +4,51 @@ local M = {}
 
 --- @param colors ColorScheme
 function M.generate(colors)
-  local alacrittyColors = {}
-  for k, v in pairs(colors) do
-    if type(v) == "string" then
-      alacrittyColors[k] = v:gsub("^#", "0x")
-    end
-  end
-
   local alacritty = util.template(
-    [[
+    [=[
 # FarOut Alacritty Colors
-colors:
-  # Default colors
-  primary:
-    background: '${bg}'
-    foreground: '${fg}'
+# Default colors
+[colors.primary]
+background = '${bg}'
+foreground = '${fg}'
 
-  # Normal colors
-  normal:
-    black:   '${black}'
-    red:     '${red}'
-    green:   '${green}'
-    yellow:  '${yellow}'
-    blue:    '${blue}'
-    magenta: '${magenta}'
-    cyan:    '${cyan}'
-    white:   '${fg_dark}'
+#[colors.cursor]
+#cursor = '${fg}'
+#text = '${bg}'
 
-  # Bright colors
-  bright:
-    black:   '${terminal_black}'
-    red:     '${red}'
-    green:   '${green}'
-    yellow:  '${yellow}'
-    blue:    '${blue}'
-    magenta: '${magenta}'
-    cyan:    '${cyan}'
-    white:   '${fg}'
+# Normal colors
+[colors.normal]
+black = '${black}'
+red = '${red}'
+green = '${green}'
+yellow = '${yellow}'
+blue = '${blue}'
+magenta = '${magenta}'
+cyan = '${cyan}'
+white = '${fg_dark}'
 
-  indexed_colors:
-    - { index: 16, color: '${orange}' }
-    - { index: 17, color: '${red1}' }
-    
-  ]],
-    alacrittyColors
+# Bright colors
+[colors.bright]
+black = '${terminal_black}'
+red = '${red}'
+green = '${green}'
+yellow = '${yellow}'
+blue = '${blue}'
+magenta = '${magenta}'
+cyan = '${cyan}'
+white = '${fg}'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '${orange}'
+
+[[colors.indexed_colors]]
+index = 17
+color = '${red1}'
+
+]=],
+    colors
   )
 
   return alacritty

lua/farout/extra/fzf.lua

@@ -0,0 +1,18 @@
+local util = require("farout.util")
+
+local M = {}
+
+--- @param colors ColorScheme
+function M.generate(colors)
+  return util.template(M.template, colors)
+end
+
+M.template = [[
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:${fg},bg:${bg},hl:${orange} \
+--color=fg+:${fg},bg+:${bg_highlight},hl+:${orange} \
+--color=info:${blue},prompt:${cyan},pointer:${cyan} \
+--color=marker:${green},spinner:${green},header:${green}"
+]]
+
+return M

lua/farout/extra/helix.lua

@@ -37,7 +37,7 @@ function M.generate(colors)
     },
     string = {
       "String",
-      regexp = "@string.regex",
+      regexp = "@string.regexp",
       special = {
         "@string.special",
         path = nil,
@@ -57,10 +57,10 @@ function M.generate(colors)
     variable = {
       "@variable",
       builtin = "@variable.builtin",
-      parameter = "@parameter",
+      parameter = "@variable.parameter",
       other = {
         nil,
-        member = "@field",
+        member = "@variable.member",
       },
     },
     label = "@label",
@@ -137,7 +137,7 @@ function M.generate(colors)
       quote = nil,
       raw = {
         "markdownCode",
-        inline = "@text.literal.markdown_inline",
+        inline = "@markup.raw.markdown_inline",
         block = "markdownCodeBlock",
         -- UI --
         completion = nil,

lua/farout/extra/init.lua

@@ -7,7 +7,7 @@ M.extras = {
   kitty = {ext = "conf", url = "https://sw.kovidgoyal.net/kitty/conf.html", label = "Kitty"},
   fish = {ext = "fish", url = "https://fishshell.com/docs/current/index.html", label = "Fish"},
   fish_themes = {ext = "theme", url = "https://fishshell.com/docs/current/interactive.html#syntax-highlighting", label = "Fish Themes"},
-  alacritty = {ext = "yml", url = "https://github.com/alacritty/alacritty", label = "Alacritty"},
+  alacritty = {ext = "toml", url = "https://github.com/alacritty/alacritty", label = "Alacritty"},
   wezterm = {ext = "toml", url = "https://wezfurlong.org/wezterm/config/files.html", label = "WezTerm"},
   tmux = {ext = "tmux", url = "https://github.com/tmux/tmux/wiki", label = "Tmux"},
   xresources = {ext = "Xresources", url = "https://wiki.archlinux.org/title/X_resources", label = "Xresources"},
@@ -25,6 +25,7 @@ M.extras = {
   dunst = {ext = "dunstrc", url = "https://dunst-project.org/", label = "Dunst"},
   gitui = {ext = "ron", url = "https://github.com/extrawurst/gitui", label = "GitUI"},
   helix = { ext = "toml", url = "https://helix-editor.com/", label = "Helix"},
+  fzf = { ext = "zsh", url = "https://github.com/junegunn/fzf", label = "Fzf"},
 }
 
 local function write(str, fileName)

lua/farout/extra/wezterm.lua

@@ -16,6 +16,7 @@ selection_bg = "${bg_visual}"
 selection_fg = "${fg}"
 split = "${blue}"
 compose_cursor = "${orange}"
+scrollbar_thumb = "${bg_highlight}"
 
 ansi = ["${black}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${fg_dark}"]
 brights = ["${terminal_black}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${fg}"]