From 64a7695985b5b0af8d02f0eca39b0990bed58903 Mon Sep 17 00:00:00 2001
From: RNBermudez <r.n.bermudez@gmail.com>
Date: Wed, 8 Apr 2026 15:13:50 -0300
Subject: [PATCH 1/2] Add Atuin themes

---
 extras/atuin/README.md         | 22 ++++++++++++++++++++++
 lua/tokyonight/extra/atuin.lua | 29 +++++++++++++++++++++++++++++
 lua/tokyonight/extra/init.lua  |  1 +
 3 files changed, 52 insertions(+)
 create mode 100644 extras/atuin/README.md
 create mode 100644 lua/tokyonight/extra/atuin.lua

diff --git a/extras/atuin/README.md b/extras/atuin/README.md
new file mode 100644
index 000000000..5db58bbe7
--- /dev/null
+++ b/extras/atuin/README.md
@@ -0,0 +1,22 @@
+# Tokyo Night for Atuin
+
+This directory contains the Tokyo Night color scheme for [Atuin](https://atuin.sh/).
+
+## Installation
+
+1. Choose your preferred Tokyo Night style (Storm, Moon, Night, or Day).
+2. Copy the TOML file to your Atuin themes directory: `~/.config/atuin/themes/`.
+3. Update your configuration in `~/.config/atuin/config.toml`:
+
+```toml
+[theme]
+name = "tokyonight_storm"
+```
+For more details on custom theme configuration, see the [official documentation](https://docs.atuin.sh/cli/guide/theming/).
+
+## Styles
+
+- **tokyonight_storm.json**: Tokyo Night Storm (Dark)
+- **tokyonight_moon.json**: Tokyo Night Moon (Dark)
+- **tokyonight_night.json**: Tokyo Night (Dark)
+- **tokyonight_day.json**: Tokyo Night Day (Light)
diff --git a/lua/tokyonight/extra/atuin.lua b/lua/tokyonight/extra/atuin.lua
new file mode 100644
index 000000000..1cca339b1
--- /dev/null
+++ b/lua/tokyonight/extra/atuin.lua
@@ -0,0 +1,29 @@
+local util = require("tokyonight.util")
+
+local M = {}
+
+--- @param colors ColorScheme
+--- @return string
+function M.generate(colors)
+  return util.template([[
+# Theme: ${_style_name}
+# Upstream: https://github.com/folke/tokyonight.nvim/tree/main/extras/atuin
+
+[theme]
+name = "${_name}"
+parent = "default"
+
+[colors]
+AlertInfo = "${green1}"
+AlertWarn = "${yellow}"
+AlertError = "${red}"
+Annotation = "${terminal_black}"
+Base = "${fg}"
+Guidance = "${orange}"
+Important = "${blue}"
+Title = "${magenta}"
+Muted = "${dark3}"
+]], colors)
+end
+
+return M
diff --git a/lua/tokyonight/extra/init.lua b/lua/tokyonight/extra/init.lua
index 390add6f9..720983d08 100644
--- a/lua/tokyonight/extra/init.lua
+++ b/lua/tokyonight/extra/init.lua
@@ -9,6 +9,7 @@ M.extras = {
   aerc             = { ext = "ini", url = "https://git.sr.ht/~rjarry/aerc/", label = "Aerc" },
   aider            = { ext = "yml", url = "https://aider.chat", label = "Aider" },
   alacritty        = { ext = "toml", url = "https://github.com/alacritty/alacritty", label = "Alacritty" },
+  atuin            = { ext = "toml", url = "https://github.com/atuinsh/atuin", label = "Atuin" },
   btop             = { ext = "theme", url = "https://github.com/aristocratos/btop", label = "Btop++" },
   delta            = { ext = "gitconfig", url = "https://github.com/dandavison/delta", label = "Delta" },
   discord          = { ext = "css", url ="https://betterdiscord.app/", label = "(Better-)Discord"},

From 1923d83ae3b2ea3a0bacaef4e397cb1338af83b4 Mon Sep 17 00:00:00 2001
From: RNBermudez <r.n.bermudez@gmail.com>
Date: Wed, 8 Apr 2026 15:27:32 -0300
Subject: [PATCH 2/2] Fix README style extension

---
 extras/atuin/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/atuin/README.md b/extras/atuin/README.md
index 5db58bbe7..fb8fcfaab 100644
--- a/extras/atuin/README.md
+++ b/extras/atuin/README.md
@@ -16,7 +16,7 @@ For more details on custom theme configuration, see the [official documentation]
 
 ## Styles
 
-- **tokyonight_storm.json**: Tokyo Night Storm (Dark)
-- **tokyonight_moon.json**: Tokyo Night Moon (Dark)
-- **tokyonight_night.json**: Tokyo Night (Dark)
-- **tokyonight_day.json**: Tokyo Night Day (Light)
+- **tokyonight_storm.toml**: Tokyo Night Storm (Dark)
+- **tokyonight_moon.toml**: Tokyo Night Moon (Dark)
+- **tokyonight_night.toml**: Tokyo Night (Dark)
+- **tokyonight_day.toml**: Tokyo Night Day (Light)