From 983820590972b97089ecb4d657fc94041b5e6cd1 Mon Sep 17 00:00:00 2001 From: Redoxahmii Date: Fri, 24 Jan 2025 09:21:45 +0500 Subject: [PATCH] fix(termux): termux extra working --- lua/solarized-osaka/extra/init.lua | 68 ++++++++++++++-------------- lua/solarized-osaka/extra/termux.lua | 34 +++++++------- lua/solarized-osaka/extra/vim.lua | 3 -- 3 files changed, 51 insertions(+), 54 deletions(-) diff --git a/lua/solarized-osaka/extra/init.lua b/lua/solarized-osaka/extra/init.lua index 690b93f..b468003 100644 --- a/lua/solarized-osaka/extra/init.lua +++ b/lua/solarized-osaka/extra/init.lua @@ -4,46 +4,45 @@ local M = {} --- @type table -- stylua: ignore M.extras = { - -- aerc = { ext = "ini", url = "https://git.sr.ht/~rjarry/aerc/", label = "Aerc" }, - -- alacritty = { ext = "toml", url = "https://github.com/alacritty/alacritty", label = "Alacritty" }, delta = { ext = "gitconfig", url = "https://github.com/dandavison/delta", label = "Delta" }, - -- discord = { ext = "css", url ="https://betterdiscord.app/", label = "(Better-)Discord"}, - -- dunst = { ext = "dunstrc", url = "https://dunst-project.org/", label = "Dunst" }, - -- 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" }, - -- foot = { ext = "ini", url = "https://codeberg.org/dnkl/foot", label = "Foot" }, - -- fuzzel = { ext = "ini", url = "https://codeberg.org/dnkl/fuzzel", label = "Fuzzel" }, - -- fzf = { ext = "sh", url = "https://github.com/junegunn/fzf", label = "Fzf" }, - -- ghostty = { ext = "", url = "https://github.com/ghostty-org/ghostty", label = "Ghostty" }, - -- gitui = { ext = "ron", url = "https://github.com/extrawurst/gitui", label = "GitUI" }, - -- gnome_terminal = { ext = "dconf", url = "https://gitlab.gnome.org/GNOME/gnome-terminal", label = "GNOME Terminal" }, - --BUG: Some colors not being assigned. - -- helix = { ext = "toml", url = "https://helix-editor.com/", label = "Helix" }, + aerc = { ext = "ini", url = "https://git.sr.ht/~rjarry/aerc/", label = "Aerc" }, + alacritty = { ext = "toml", url = "https://github.com/alacritty/alacritty", label = "Alacritty" }, delta = { ext = "gitconfig", url = "https://github.com/dandavison/delta", label = "Delta" }, + discord = { ext = "css", url ="https://betterdiscord.app/", label = "(Better-)Discord"}, + dunst = { ext = "dunstrc", url = "https://dunst-project.org/", label = "Dunst" }, + 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" }, + foot = { ext = "ini", url = "https://codeberg.org/dnkl/foot", label = "Foot" }, + fuzzel = { ext = "ini", url = "https://codeberg.org/dnkl/fuzzel", label = "Fuzzel" }, + fzf = { ext = "sh", url = "https://github.com/junegunn/fzf", label = "Fzf" }, + ghostty = { ext = "", url = "https://github.com/ghostty-org/ghostty", label = "Ghostty" }, + gitui = { ext = "ron", url = "https://github.com/extrawurst/gitui", label = "GitUI" }, + gnome_terminal = { ext = "dconf", url = "https://gitlab.gnome.org/GNOME/gnome-terminal", label = "GNOME Terminal" }, + helix = { ext = "toml", url = "https://helix-editor.com/", label = "Helix" }, -- BUG: This is not working -- iterm = { ext = "itermcolors", url = "https://iterm2.com/", label = "iTerm" }, - -- kitty = { ext = "conf", url = "https://sw.kovidgoyal.net/kitty/conf.html", label = "Kitty" }, - -- lazygit = { ext = "yml", url = "https://github.com/jesseduffield/lazygit", label = "Lazygit" }, - -- lua = { ext = "lua", url = "https://www.lua.org", label = "Lua Table for testing" }, - -- prism = { ext = "js", url = "https://prismjs.com", label = "Prism" }, - -- process_compose = { ext = "yaml", url = "https://f1bonacc1.github.io/process-compose/", label = "process-compose" }, - -- slack = { ext = "txt", url = "https://slack.com", label = "Slack" }, - -- sublime = { ext = "tmTheme", url = "https://www.sublimetext.com/docs/themes", label = "Sublime Text" }, - -- spotify_player = { ext = "toml", url = "https://github.com/aome510/spotify-player", label = "Spotify Player" }, - -- terminator = { ext = "conf", url = "https://gnome-terminator.readthedocs.io/en/latest/config.html", label = "Terminator" }, - -- BUG: needs terminal colors to work - -- termux = { ext = "properties", url = "https://termux.dev/", label = "Termux" }, -- - -- tilix = { ext = "json", url = "https://github.com/gnunn1/tilix", label = "Tilix" }, + kitty = { ext = "conf", url = "https://sw.kovidgoyal.net/kitty/conf.html", label = "Kitty" }, + lazygit = { ext = "yml", url = "https://github.com/jesseduffield/lazygit", label = "Lazygit" }, + lua = { ext = "lua", url = "https://www.lua.org", label = "Lua Table for testing" }, + prism = { ext = "js", url = "https://prismjs.com", label = "Prism" }, + process_compose = { ext = "yaml", url = "https://f1bonacc1.github.io/process-compose/", label = "process-compose" }, + slack = { ext = "txt", url = "https://slack.com", label = "Slack" }, + sublime = { ext = "tmTheme", url = "https://www.sublimetext.com/docs/themes", label = "Sublime Text" }, + spotify_player = { ext = "toml", url = "https://github.com/aome510/spotify-player", label = "Spotify Player" }, + terminator = { ext = "conf", url = "https://gnome-terminator.readthedocs.io/en/latest/config.html", label = "Terminator" }, + termux = { ext = "properties", url = "https://termux.dev/", label = "Termux" }, + tilix = { ext = "json", url = "https://github.com/gnunn1/tilix", label = "Tilix" }, tmux = { ext = "tmux", url = "https://github.com/tmux/tmux/wiki", label = "Tmux" }, - -- wezterm = { ext = "toml", url = "https://wezfurlong.org/wezterm/config/files.html", label = "WezTerm" }, - -- windows_terminal = { ext = "json", url = "https://aka.ms/terminal-documentation", label = "Windows Terminal" }, - -- xfceterm = { ext = "theme", url = "https://docs.xfce.org/apps/terminal/advanced", label = "Xfce Terminal" }, - -- xresources = { ext = "Xresources", url = "https://wiki.archlinux.org/title/X_resources", label = "Xresources" }, - -- yazi = { ext = "toml", url = "https://github.com/sxyazi/yazi", label = "Yazi" }, + wezterm = { ext = "toml", url = "https://wezfurlong.org/wezterm/config/files.html", label = "WezTerm" }, + windows_terminal = { ext = "json", url = "https://aka.ms/terminal-documentation", label = "Windows Terminal" }, + xfceterm = { ext = "theme", url = "https://docs.xfce.org/apps/terminal/advanced", label = "Xfce Terminal" }, + xresources = { ext = "Xresources", url = "https://wiki.archlinux.org/title/X_resources", label = "Xresources" }, + yazi = { ext = "toml", url = "https://github.com/sxyazi/yazi", label = "Yazi" }, -- BUG: not working -- vim = { ext = "vim", url = "https://vimhelp.org/", label = "Vim", subdir = "colors", sep = "-" }, - -- vimium = { ext = "css", url = "https://vimium.github.io/", label = "Vimium" }, - -- zathura = { ext = "zathurarc", url = "https://pwmt.org/projects/zathura/", label = "Zathura" }, - -- zellij = { ext = "kdl", url = "https://zellij.dev/", label = "Zellij" }, + -- + vimium = { ext = "css", url = "https://vimium.github.io/", label = "Vimium" }, + zathura = { ext = "zathurarc", url = "https://pwmt.org/projects/zathura/", label = "Zathura" }, + zellij = { ext = "kdl", url = "https://zellij.dev/", label = "Zellij" }, } local function write(str, fileName) @@ -102,6 +101,7 @@ function M.setup() local plugin = require("solarized-osaka.extra." .. extra) for style, style_name in pairs(styles) do vim.o.background = style == "dark" and "dark" or "light" + ---@diagnostic disable-next-line: missing-fields config.setup({ style = style, use_background = "auto" }) local colors = require("solarized-osaka.colors").setup({ transform = true }) local fname = extra .. "/solarized_osaka_" .. style .. "." .. info.ext diff --git a/lua/solarized-osaka/extra/termux.lua b/lua/solarized-osaka/extra/termux.lua index 45216d4..3aaf73c 100644 --- a/lua/solarized-osaka/extra/termux.lua +++ b/lua/solarized-osaka/extra/termux.lua @@ -15,28 +15,28 @@ background: ${bg} foreground: ${fg} # Normal colors -color0: ${terminal.black} -color1: ${terminal.red} -color2: ${terminal.green} -color3: ${terminal.yellow} -color4: ${terminal.blue} -color5: ${terminal.magenta} -color6: ${terminal.cyan} -color7: ${terminal.white} +color0: ${base04} +color1: ${red500} +color2: ${green500} +color3: ${yellow500} +color4: ${blue500} +color5: ${magenta500} +color6: ${cyan500} +color7: ${base3} # Bright colors -color8: ${terminal.black_bright} -color9: ${terminal.red_bright} -color10: ${terminal.green_bright} -color11: ${terminal.yellow_bright} -color12: ${terminal.blue_bright} -color13: ${terminal.magenta_bright} -color14: ${terminal.cyan_bright} -color15: ${terminal.white_bright} +color8: ${base02} +color9: ${red300} +color10: ${green300} +color11: ${yellow300} +color12: ${blue300} +color13: ${magenta300} +color14: ${cyan300} +color15: ${base4} # Extended colors color16: ${orange} -color17: ${red300} +color17: ${red700} ]], colors ) diff --git a/lua/solarized-osaka/extra/vim.lua b/lua/solarized-osaka/extra/vim.lua index 9c76af3..d38cc4f 100644 --- a/lua/solarized-osaka/extra/vim.lua +++ b/lua/solarized-osaka/extra/vim.lua @@ -6,9 +6,6 @@ local mapping = { sp = "guisp", } ---- @param colors ColorScheme ---- @param groups .Highlights ---- @param opts tokyonight.Config function M.generate(colors, groups, opts) opts.plugins = { all = false, auto = false, treesitter = false } local Groups = require("solarized-osaka.groups")