textbringer 23 → 25

data/lib/textbringer/modes/tetris_mode.rb

@@ -0,0 +1,316 @@
+module Textbringer
+  class TetrisMode < GamegridMode
+    BOARD_WIDTH   = 10
+    BOARD_HEIGHT  = 20
+    BORDER_VALUE  = 8   # cell value used for the 1-cell border around the board
+
+    PIECE_COLORS = {
+      1 => :gamegrid_block_cyan,
+      2 => :gamegrid_block_yellow,
+      3 => :gamegrid_block_magenta,
+      4 => :gamegrid_block_green,
+      5 => :gamegrid_block_red,
+      6 => :gamegrid_block_blue,
+      7 => :gamegrid_block_white,
+    }.freeze
+
+    PIECE_NAMES = ["", "I", "O", "T", "S", "Z", "J", "L"].freeze
+
+    # Pieces[type][rotation][row][col] — 4×4 bounding box, 1-indexed types
+    PIECES = [
+      nil,
+      # 1: I (cyan)
+      [
+        [[0,0,0,0],[1,1,1,1],[0,0,0,0],[0,0,0,0]],
+        [[0,0,1,0],[0,0,1,0],[0,0,1,0],[0,0,1,0]],
+        [[0,0,0,0],[0,0,0,0],[1,1,1,1],[0,0,0,0]],
+        [[0,1,0,0],[0,1,0,0],[0,1,0,0],[0,1,0,0]],
+      ],
+      # 2: O (yellow)
+      [
+        [[0,1,1,0],[0,1,1,0],[0,0,0,0],[0,0,0,0]],
+        [[0,1,1,0],[0,1,1,0],[0,0,0,0],[0,0,0,0]],
+        [[0,1,1,0],[0,1,1,0],[0,0,0,0],[0,0,0,0]],
+        [[0,1,1,0],[0,1,1,0],[0,0,0,0],[0,0,0,0]],
+      ],
+      # 3: T (magenta)
+      [
+        [[0,1,0,0],[1,1,1,0],[0,0,0,0],[0,0,0,0]],
+        [[0,1,0,0],[0,1,1,0],[0,1,0,0],[0,0,0,0]],
+        [[0,0,0,0],[1,1,1,0],[0,1,0,0],[0,0,0,0]],
+        [[0,1,0,0],[1,1,0,0],[0,1,0,0],[0,0,0,0]],
+      ],
+      # 4: S (green)
+      [
+        [[0,1,1,0],[1,1,0,0],[0,0,0,0],[0,0,0,0]],
+        [[1,0,0,0],[1,1,0,0],[0,1,0,0],[0,0,0,0]],
+        [[0,1,1,0],[1,1,0,0],[0,0,0,0],[0,0,0,0]],
+        [[1,0,0,0],[1,1,0,0],[0,1,0,0],[0,0,0,0]],
+      ],
+      # 5: Z (red)
+      [
+        [[1,1,0,0],[0,1,1,0],[0,0,0,0],[0,0,0,0]],
+        [[0,0,1,0],[0,1,1,0],[0,1,0,0],[0,0,0,0]],
+        [[1,1,0,0],[0,1,1,0],[0,0,0,0],[0,0,0,0]],
+        [[0,0,1,0],[0,1,1,0],[0,1,0,0],[0,0,0,0]],
+      ],
+      # 6: J (blue)
+      [
+        [[1,0,0,0],[1,1,1,0],[0,0,0,0],[0,0,0,0]],
+        [[0,1,1,0],[0,1,0,0],[0,1,0,0],[0,0,0,0]],
+        [[0,0,0,0],[1,1,1,0],[0,0,1,0],[0,0,0,0]],
+        [[0,1,0,0],[0,1,0,0],[1,1,0,0],[0,0,0,0]],
+      ],
+      # 7: L (white)
+      [
+        [[0,0,1,0],[1,1,1,0],[0,0,0,0],[0,0,0,0]],
+        [[0,1,0,0],[0,1,0,0],[0,1,1,0],[0,0,0,0]],
+        [[0,0,0,0],[1,1,1,0],[1,0,0,0],[0,0,0,0]],
+        [[1,1,0,0],[0,1,0,0],[0,1,0,0],[0,0,0,0]],
+      ],
+    ].freeze
+
+    define_keymap :TETRIS_MODE_MAP
+    TETRIS_MODE_MAP.define_key("q",    :gamegrid_quit_command)
+    TETRIS_MODE_MAP.define_key("n",    :tetris_new_game_command)
+    TETRIS_MODE_MAP.define_key(:left,  :tetris_move_left_command)
+    TETRIS_MODE_MAP.define_key("h",    :tetris_move_left_command)
+    TETRIS_MODE_MAP.define_key(:right, :tetris_move_right_command)
+    TETRIS_MODE_MAP.define_key("l",    :tetris_move_right_command)
+    TETRIS_MODE_MAP.define_key(:down,  :tetris_move_down_command)
+    TETRIS_MODE_MAP.define_key("j",    :tetris_move_down_command)
+    TETRIS_MODE_MAP.define_key(:up,    :tetris_rotate_command)
+    TETRIS_MODE_MAP.define_key("k",    :tetris_rotate_command)
+    TETRIS_MODE_MAP.define_key(" ",    :tetris_drop_command)
+    TETRIS_MODE_MAP.define_key("p",    :tetris_pause_command)
+
+    attr_reader :score, :level, :lines_cleared,
+                :piece_type, :piece_rot, :piece_x, :piece_y,
+                :next_type, :game_over, :paused
+
+    def initialize(buffer)
+      super
+      buffer.keymap = TETRIS_MODE_MAP
+      @game_over = true
+      @paused    = false
+      @grid      = nil
+    end
+
+    define_local_command(:tetris_new_game, doc: "Start a new Tetris game.") do
+      @grid&.stop_timer
+      @grid = gamegrid_init(BOARD_WIDTH + 2, BOARD_HEIGHT + 2, margin_left: 2)
+      @grid.set_display_option(0, char: "  ")
+      @grid.set_display_option(BORDER_VALUE, char: "[]", face: :gamegrid_border)
+      PIECE_COLORS.each { |v, f| @grid.set_display_option(v, char: "[]", face: f) }
+
+      @board         = Array.new(BOARD_HEIGHT) { Array.new(BOARD_WIDTH, 0) }
+      @score         = 0
+      @level         = 1
+      @lines_cleared = 0
+      @game_over     = false
+      @paused        = false
+      @next_type     = random_piece_type
+
+      spawn_piece
+      start_game_timer unless @game_over
+      render_board
+    end
+
+    define_local_command(:tetris_move_left, doc: "Move piece left.") do
+      return unless active?
+      if valid_position?(@piece_x - 1, @piece_y, @piece_type, @piece_rot)
+        @piece_x -= 1
+        render_board
+      end
+    end
+
+    define_local_command(:tetris_move_right, doc: "Move piece right.") do
+      return unless active?
+      if valid_position?(@piece_x + 1, @piece_y, @piece_type, @piece_rot)
+        @piece_x += 1
+        render_board
+      end
+    end
+
+    define_local_command(:tetris_move_down, doc: "Soft-drop current piece.") do
+      return unless active?
+      step_down
+    end
+
+    define_local_command(:tetris_rotate, doc: "Rotate current piece clockwise.") do
+      return unless active?
+      new_rot = (@piece_rot + 1) % 4
+      # Try basic rotation then simple wall-kicks (±1, ±2 columns)
+      [0, -1, 1, -2, 2].each do |kick|
+        if valid_position?(@piece_x + kick, @piece_y, @piece_type, new_rot)
+          @piece_x  += kick
+          @piece_rot = new_rot
+          break
+        end
+      end
+      render_board
+    end
+
+    define_local_command(:tetris_drop, doc: "Hard-drop current piece.") do
+      return unless active?
+      while valid_position?(@piece_x, @piece_y + 1, @piece_type, @piece_rot)
+        @piece_y += 1
+        @score   += 2
+      end
+      lock_and_continue
+      render_board
+    end
+
+    define_local_command(:tetris_pause, doc: "Toggle game pause.") do
+      return if @game_over || !@grid
+      @paused = !@paused
+      if @paused
+        @grid.stop_timer
+      else
+        start_game_timer
+      end
+      render_board
+    end
+
+    private
+
+    def active?
+      !@game_over && !@paused && @grid
+    end
+
+    def random_piece_type
+      rand(1..7)
+    end
+
+    def spawn_piece
+      @piece_type = @next_type
+      @next_type  = random_piece_type
+      @piece_rot  = 0
+      @piece_x    = BOARD_WIDTH / 2 - 2
+      @piece_y    = 0
+      @game_over  = !valid_position?(@piece_x, @piece_y, @piece_type, @piece_rot)
+    end
+
+    def valid_position?(x, y, type, rot)
+      PIECES[type][rot].each_with_index do |row, row_i|
+        row.each_with_index do |cell, col_i|
+          next if cell == 0
+          bx = x + col_i
+          by = y + row_i
+          return false if bx < 0 || bx >= BOARD_WIDTH
+          return false if by >= BOARD_HEIGHT
+          next if by < 0  # piece can start partially above the board
+          return false if @board[by][bx] != 0
+        end
+      end
+      true
+    end
+
+    def lock_piece
+      PIECES[@piece_type][@piece_rot].each_with_index do |row, row_i|
+        row.each_with_index do |cell, col_i|
+          next if cell == 0
+          by = @piece_y + row_i
+          bx = @piece_x + col_i
+          next if by < 0 || by >= BOARD_HEIGHT || bx < 0 || bx >= BOARD_WIDTH
+          @board[by][bx] = @piece_type
+        end
+      end
+    end
+
+    def clear_lines
+      full = (0...BOARD_HEIGHT).select { |y| @board[y].all? { |c| c != 0 } }
+      return 0 if full.empty?
+      full.reverse_each { |y| @board.delete_at(y) }
+      full.size.times { @board.unshift(Array.new(BOARD_WIDTH, 0)) }
+      n = full.size
+      @score         += [0, 100, 300, 500, 800][n].to_i * @level
+      @lines_cleared += n
+      @level          = @lines_cleared / 10 + 1
+      n
+    end
+
+    def step_down
+      if valid_position?(@piece_x, @piece_y + 1, @piece_type, @piece_rot)
+        @piece_y += 1
+      else
+        lock_and_continue
+      end
+      render_board
+    end
+
+    def lock_and_continue
+      lock_piece
+      clear_lines
+      spawn_piece
+      if @game_over
+        @grid.stop_timer
+      else
+        start_game_timer
+      end
+    end
+
+    def start_game_timer
+      @grid.start_timer(timer_interval) { step_down }
+    end
+
+    def timer_interval
+      # Level 1 = 1.0 s, each level adds 0.1 s speed, floor at 0.1 s
+      [1.0 - (@level - 1) * 0.1, 0.1].max
+    end
+
+    def update_grid
+      # Border: top and bottom rows
+      (BOARD_WIDTH + 2).times do |x|
+        @grid.set_cell(x, 0,               BORDER_VALUE)
+        @grid.set_cell(x, BOARD_HEIGHT + 1, BORDER_VALUE)
+      end
+      # Border: left and right columns (inner rows only)
+      BOARD_HEIGHT.times do |y|
+        @grid.set_cell(0,               y + 1, BORDER_VALUE)
+        @grid.set_cell(BOARD_WIDTH + 1, y + 1, BORDER_VALUE)
+      end
+      # Board content, offset by (1, 1)
+      BOARD_HEIGHT.times do |y|
+        BOARD_WIDTH.times do |x|
+          @grid.set_cell(x + 1, y + 1, @board[y][x])
+        end
+      end
+      return if @game_over
+      # Current piece, offset by (1, 1)
+      PIECES[@piece_type][@piece_rot].each_with_index do |row, row_i|
+        row.each_with_index do |cell, col_i|
+          next if cell == 0
+          bx = @piece_x + col_i + 1
+          by = @piece_y + row_i + 1
+          next if bx < 1 || bx > BOARD_WIDTH || by < 1 || by > BOARD_HEIGHT
+          @grid.set_cell(bx, by, @piece_type)
+        end
+      end
+    end
+
+    def render_board
+      update_grid
+      @buffer.read_only_edit do
+        @buffer.clear
+        @buffer.insert(@grid.render)
+        @buffer.insert("\n")
+        @buffer.insert(status_text)
+        @buffer.beginning_of_buffer
+      end
+    end
+
+    def status_text
+      if @game_over
+        "GAME OVER  Score: #{@score}  Level: #{@level}  Lines: #{@lines_cleared}" \
+          "  [n]ew game  [q]uit\n"
+      elsif @paused
+        "PAUSED  Score: #{@score}  Level: #{@level}  Lines: #{@lines_cleared}" \
+          "  [p] resume\n"
+      else
+        "Score: #{@score}  Level: #{@level}  Lines: #{@lines_cleared}" \
+          "  Next: #{PIECE_NAMES[@next_type]}\n"
+      end
+    end
+  end
+end

data/lib/textbringer/theme.rb

@@ -0,0 +1,180 @@
+module Textbringer
+  class Theme
+    DEFAULT_THEME = "github"
+
+    class Palette
+      def initialize
+        @colors = {}
+      end
+
+      def color(name, hex: nil, ansi: nil)
+        @colors[name] = { hex: hex, ansi: ansi }
+      end
+
+      def resolve(name, tier)
+        c = @colors[name]
+        return nil unless c
+        tier == :ansi ? c[:ansi] : c[:hex]
+      end
+    end
+
+    @@themes = {}
+    @@current = nil
+    @@background_mode = nil
+
+    def self.define(name, &block)
+      theme = new(name)
+      block.call(theme)
+      @@themes[name] = theme
+    end
+
+    def self.[](name)
+      @@themes[name]
+    end
+
+    def self.current
+      @@current
+    end
+
+    def self.load(name)
+      user_path = File.expand_path("~/.textbringer/themes/#{name}.rb")
+      if File.exist?(user_path)
+        Kernel.load(user_path)
+      else
+        require "textbringer/themes/#{name}"
+      end
+      theme = @@themes[name]
+      raise EditorError, "Theme '#{name}' not found" unless theme
+      theme.activate
+    end
+
+    def self.load_default
+      return if @@current
+      load(DEFAULT_THEME)
+    end
+
+    def self.background_mode
+      mode = CONFIG[:background_mode]
+      return mode if mode == :dark || mode == :light
+      @@background_mode || :dark
+    end
+
+    def self.detect_background
+      @@background_mode = detect_background_via_osc11 ||
+                          detect_background_via_colorfgbg ||
+                          :dark
+    end
+
+    def self.color_tier
+      Window.colors >= 256 ? :hex : :ansi
+    end
+
+    def initialize(name)
+      @name = name
+      @palettes = {}
+      @face_definitions = []
+      @default_colors = nil
+    end
+
+    attr_reader :name
+
+    def palette(mode, &block)
+      p = Palette.new
+      block.call(p)
+      @palettes[mode] = p
+    end
+
+    def face(name, **attrs)
+      @face_definitions << [name, attrs]
+    end
+
+    def default_colors(foreground:, background:)
+      @default_colors = { foreground: foreground, background: background }
+    end
+
+    def activate
+      mode = self.class.background_mode
+      tier = self.class.color_tier
+      palette = @palettes[mode] || @palettes[:dark] || Palette.new
+      @face_definitions.each do |face_name, attrs|
+        resolved = {}
+        [:foreground, :background].each do |key|
+          val = attrs[key]
+          if val.is_a?(Symbol)
+            color = palette.resolve(val, tier)
+            if color
+              resolved[key] = color
+            else
+              raise EditorError,
+                    "Unknown palette color :#{val} for #{key} in face #{face_name}"
+            end
+          elsif val.is_a?(String)
+            resolved[key] = val
+          end
+        end
+        [:bold, :underline, :reverse, :inherit].each do |key|
+          resolved[key] = attrs[key] if attrs.key?(key)
+        end
+        Face.define(face_name, **resolved)
+      end
+      @@current = self
+      apply_default_colors(palette, tier)
+    end
+
+    private
+
+    def apply_default_colors(palette, tier)
+      if @default_colors
+        fg = resolve_default_color(@default_colors[:foreground], palette, tier)
+        bg = resolve_default_color(@default_colors[:background], palette, tier)
+      else
+        fg = "default"
+        bg = "default"
+      end
+      Window.set_default_colors(fg, bg)
+    end
+
+    def resolve_default_color(val, palette, tier)
+      if val.is_a?(Symbol)
+        color = palette.resolve(val, tier)
+        unless color
+          raise EditorError,
+                "Unknown palette color :#{val} for default_colors"
+        end
+        color
+      else
+        val || "default"
+      end
+    end
+
+    private_class_method def self.detect_background_via_osc11
+      return nil unless $stdin.tty? && $stdout.tty?
+      require "io/console"
+      $stdin.raw(min: 0, time: 1) do |io|
+        $stdout.write("\e]11;?\e\\")
+        $stdout.flush
+        response = +""
+        while (c = io.getc)
+          response << c
+          break if response.include?("\e\\") || response.include?("\a")
+        end
+        if response =~ /\e\]11;rgb:([0-9a-f]+)\/([0-9a-f]+)\/([0-9a-f]+)/i
+          r = $1[0..1].to_i(16)
+          g = $2[0..1].to_i(16)
+          b = $3[0..1].to_i(16)
+          luminance = 0.299 * r + 0.587 * g + 0.114 * b
+          luminance < 128 ? :dark : :light
+        end
+      end
+    rescue
+      nil
+    end
+
+    private_class_method def self.detect_background_via_colorfgbg
+      colorfgbg = ENV["COLORFGBG"]
+      return nil unless colorfgbg
+      bg = colorfgbg.split(";").last.to_i
+      bg <= 6 || bg == 8 ? :dark : :light
+    end
+  end
+end

data/lib/textbringer/themes/catppuccin.rb

@@ -0,0 +1,105 @@
+# Catppuccin theme for Textbringer
+# Based on https://github.com/catppuccin/nvim
+#
+# Dark variant: Mocha    Light variant: Latte
+
+Textbringer::Theme.define "catppuccin" do |t|
+  t.palette :dark do |p|
+    # Catppuccin Mocha base tones
+    p.color :text,     hex: "#d7d7ff", ansi: "white"
+    p.color :subtext1, hex: "#afafd7", ansi: "white"
+    p.color :subtext0, hex: "#afafd7", ansi: "white"
+    p.color :overlay2, hex: "#8787af", ansi: "white"
+    p.color :overlay1, hex: "#8787af", ansi: "white"
+    p.color :overlay0, hex: "#767676", ansi: "brightblack"
+    p.color :surface2, hex: "#626262", ansi: "brightblack"
+    p.color :surface1, hex: "#4e4e4e", ansi: "brightblack"
+    p.color :surface0, hex: "#3a3a3a", ansi: "brightblack"
+    p.color :base,     hex: "#262626", ansi: "black"
+    p.color :mantle,   hex: "#1c1c1c", ansi: "black"
+    p.color :crust,    hex: "#121212", ansi: "black"
+
+    # Catppuccin Mocha accent colors
+    p.color :red,       hex: "#ff87af", ansi: "red"
+    p.color :maroon,    hex: "#d7afaf", ansi: "red"
+    p.color :peach,     hex: "#ffaf87", ansi: "yellow"
+    p.color :yellow,    hex: "#ffd7af", ansi: "yellow"
+    p.color :green,     hex: "#afd7af", ansi: "green"
+    p.color :teal,      hex: "#87d7d7", ansi: "cyan"
+    p.color :sky,       hex: "#87d7d7", ansi: "cyan"
+    p.color :sapphire,  hex: "#87d7ff", ansi: "cyan"
+    p.color :blue,      hex: "#87afff", ansi: "blue"
+    p.color :lavender,  hex: "#afafff", ansi: "blue"
+    p.color :mauve,     hex: "#d7afff", ansi: "magenta"
+    p.color :pink,      hex: "#ffafd7", ansi: "magenta"
+    p.color :flamingo,  hex: "#ffd7d7", ansi: "red"
+    p.color :rosewater, hex: "#ffd7d7", ansi: "red"
+  end
+
+  t.palette :light do |p|
+    # Catppuccin Latte base tones
+    p.color :text,     hex: "#585858", ansi: "black"
+    p.color :subtext1, hex: "#5f5f87", ansi: "black"
+    p.color :subtext0, hex: "#767676", ansi: "brightblack"
+    p.color :overlay2, hex: "#878787", ansi: "brightblack"
+    p.color :overlay1, hex: "#949494", ansi: "white"
+    p.color :overlay0, hex: "#a8a8a8", ansi: "white"
+    p.color :surface2, hex: "#b2b2b2", ansi: "white"
+    p.color :surface1, hex: "#c6c6c6", ansi: "white"
+    p.color :surface0, hex: "#d0d0d0", ansi: "white"
+    p.color :base,     hex: "#eeeeee", ansi: "white"
+    p.color :mantle,   hex: "#eeeeee", ansi: "white"
+    p.color :crust,    hex: "#e4e4e4", ansi: "white"
+
+    # Catppuccin Latte accent colors
+    p.color :red,       hex: "#d7005f", ansi: "red"
+    p.color :maroon,    hex: "#d75f5f", ansi: "red"
+    p.color :peach,     hex: "#ff5f00", ansi: "red"
+    p.color :yellow,    hex: "#d78700", ansi: "yellow"
+    p.color :green,     hex: "#5faf00", ansi: "green"
+    p.color :teal,      hex: "#008787", ansi: "cyan"
+    p.color :sky,       hex: "#00afd7", ansi: "cyan"
+    p.color :sapphire,  hex: "#00afaf", ansi: "cyan"
+    p.color :blue,      hex: "#005fff", ansi: "blue"
+    p.color :lavender,  hex: "#5f87ff", ansi: "blue"
+    p.color :mauve,     hex: "#875fff", ansi: "magenta"
+    p.color :pink,      hex: "#d787d7", ansi: "magenta"
+    p.color :flamingo,  hex: "#d78787", ansi: "red"
+    p.color :rosewater, hex: "#d78787", ansi: "red"
+  end
+
+  t.default_colors foreground: :text, background: :base
+
+  # Programming faces (from catppuccin/nvim syntax.lua)
+  t.face :comment,                foreground: :overlay2
+  t.face :preprocessing_directive, foreground: :pink
+  t.face :keyword,                foreground: :mauve
+  t.face :string,                 foreground: :green
+  t.face :number,                 foreground: :peach
+  t.face :constant,               foreground: :peach
+  t.face :function_name,          foreground: :blue
+  t.face :type,                   foreground: :yellow
+  t.face :variable,               foreground: :flamingo
+  t.face :operator,               foreground: :sky
+  t.face :punctuation
+  t.face :builtin,                foreground: :red
+  t.face :property,               foreground: :lavender
+
+  # Basic faces (from catppuccin/nvim editor.lua)
+  t.face :mode_line,              foreground: :text, background: :mantle
+  t.face :link,                   foreground: :blue, underline: true
+  t.face :control
+  t.face :region,                 background: :surface1
+  t.face :isearch,                foreground: :mantle, background: :red
+  t.face :floating_window,        foreground: :text, background: :mantle
+
+  # Completion faces
+  t.face :completion_popup,          foreground: :overlay2, background: :mantle
+  t.face :completion_popup_selected, background: :surface0
+
+  # Dired faces
+  t.face :dired_directory,   foreground: :blue
+  t.face :dired_symlink,     foreground: :teal
+  t.face :dired_executable,  foreground: :green
+  t.face :dired_flagged,     foreground: :red
+end

data/lib/textbringer/themes/github.rb

@@ -0,0 +1,89 @@
+# GitHub theme for Textbringer
+# Based on https://github.com/cormacrelf/vim-colors-github
+# Inspired by GitHub's syntax highlighting as of 2018.
+#
+# Light palette: cterm values from source (accurate).
+# Dark palette: GUI hex values — dark-mode cterm values in source are unreliable
+#   (e.g. dcolors.blue has cterm=167 which maps to red, overlay has cterm=123
+#    which maps to bright cyan).
+
+Textbringer::Theme.define "github" do |t|
+  t.palette :light do |p|
+    # Backgrounds / foreground
+    p.color :bg,       hex: "#ffffff", ansi: "white"        # 231  Normal bg
+    p.color :bg1,      hex: "#eeeeee", ansi: "white"        # 255  overlay/gutter/panels
+    p.color :vis,      hex: "#afd7ff", ansi: "blue"         # 153  Visual selection bg (blue2)
+    p.color :search,   hex: "#ffffd7", ansi: "yellow"       # 230  Search bg (yellow)
+    p.color :fg,       hex: "#262626", ansi: "black"        # 235  Normal fg (base0)
+    p.color :comment,  hex: "#767676", ansi: "brightblack"  # 243  Comment (base2)
+    p.color :line_nr,  hex: "#bcbcbc", ansi: "white"        # 250  LineNr fg (base4)
+
+    # Syntax colors
+    p.color :red,      hex: "#d75f5f", ansi: "red"          # 167  Statement, Type, PreProc
+    p.color :darkred,  hex: "#af0000", ansi: "red"          # 124  darkred
+    p.color :purple,   hex: "#8700af", ansi: "magenta"      #  91  Function, Define, Special
+    p.color :green,    hex: "#00875f", ansi: "green"        #  29  html/xml tags
+    p.color :orange,   hex: "#d75f00", ansi: "yellow"       # 166  orange
+    p.color :blue,     hex: "#005fd7", ansi: "blue"         #  26  Identifier, Constant, Macro
+    p.color :darkblue, hex: "#00005f", ansi: "blue"         #  17  String
+  end
+
+  t.palette :dark do |p|
+    # Backgrounds / foreground (GUI hex — cterm values are unreliable in source)
+    p.color :bg,       hex: "#24292e", ansi: "black"        # base0 (Normal bg)
+    p.color :bg1,      hex: "#353a3f", ansi: "brightblack"  # dcolors.overlay (panels/popups)
+    p.color :vis,      hex: "#354a60", ansi: "blue"         # dcolors.blue2 / blues[4]
+    p.color :search,   hex: "#595322", ansi: "yellow"       # dcolors.yellow (Search bg)
+    p.color :fg,       hex: "#fafbfc", ansi: "white"        # fafbfc (Normal fg)
+    p.color :comment,  hex: "#abaeb1", ansi: "brightblack"  # darktext[2] (Comment)
+    p.color :line_nr,  hex: "#76787b", ansi: "brightblack"  # numDarkest (base4 in dark)
+
+    # Syntax colors (GUI hex)
+    p.color :red,      hex: "#f16636", ansi: "red"          # dcolors.red
+    p.color :darkred,  hex: "#b31d28", ansi: "red"          # s:colors.darkred (same both modes)
+    p.color :purple,   hex: "#a887e6", ansi: "magenta"      # dcolors.purple
+    p.color :green,    hex: "#59b36f", ansi: "green"        # dcolors.green
+    p.color :orange,   hex: "#ffa657", ansi: "yellow"       # s:colors.orange (same both modes)
+    p.color :blue,     hex: "#4dacfd", ansi: "blue"         # dcolors.blue
+    p.color :darkblue, hex: "#c1daec", ansi: "blue"         # dcolors.darkblue = blue1
+  end
+
+  t.default_colors foreground: :fg, background: :bg
+
+  # Programming faces
+  t.face :comment,                  foreground: :comment   # Comment = base2
+  t.face :preprocessing_directive,  foreground: :red       # PreProc = red
+  t.face :keyword,                  foreground: :red       # Statement = red
+  t.face :string,                   foreground: :darkblue  # String = darkblue
+  t.face :number,                   foreground: :blue      # Number → Constant = blue
+  t.face :constant,                 foreground: :blue      # Constant = blue
+  t.face :function_name,            foreground: :purple    # Function = purple
+  t.face :type,                     foreground: :orange    # Type = orange
+  t.face :variable,                 foreground: :blue      # Identifier = blue
+  t.face :operator                                         # no explicit color in source
+  t.face :punctuation                                      # Delimiter = fg (ghNormalNoBg)
+  t.face :builtin,                  foreground: :purple    # Special = purple
+  t.face :property,                 foreground: :blue      # Identifier = blue
+
+  # Basic faces
+  # StatusLine: fg=grey2 (~bg1), bg=base0 (~fg) — inverted from Normal in both modes
+  t.face :mode_line,                foreground: :bg1,      background: :fg
+  t.face :link,                     foreground: :blue,     underline: true
+  t.face :control
+  t.face :region,                   background: :vis       # Visual = visualblue
+  # Search has no explicit fg in source; fg inherits from Normal
+  t.face :isearch,                  foreground: :fg,       background: :search
+  t.face :floating_window,          foreground: :fg,       background: :bg1
+
+  # Completion faces
+  # Pmenu: fg=base3 (≈ comment), bg=overlay (≈ bg1)
+  # PmenuSel: fg=overlay (≈ bg1), bg=blue; bold
+  t.face :completion_popup,          foreground: :comment, background: :bg1
+  t.face :completion_popup_selected, foreground: :bg1,     background: :blue, bold: true
+
+  # Dired faces
+  t.face :dired_directory,           foreground: :blue     # Directory → ghBlue
+  t.face :dired_symlink,             foreground: :darkblue
+  t.face :dired_executable,          foreground: :green
+  t.face :dired_flagged,             foreground: :red
+end