From 70e3bdb0f56c5162a433e06dbde940e7f33357f4 Mon Sep 17 00:00:00 2001 From: Matt Anderson Date: Thu, 11 Jun 2026 14:16:35 -0500 Subject: [PATCH] just remove custom ember theme, my light ghostty theme with nvim just inheriting defaults is more readable and feels more vanilla anyway. i wanted something new, that is ghostty using ember theme, and i'm really loving it over an extended time period. it looks great, same colors as onedark/onelight, but muted and readable. awesome. just use ANSI colors from terminal wherever i can. --- ghostty/.config/ghostty/themes/ember | 6 +- ghostty/.config/ghostty/themes/ember-light | 6 +- nvim/.config/nvim/lua/plugins.lua | 7 -- nvim/.config/nvim/lua/settings.lua | 75 ++++++++-------------- 4 files changed, 34 insertions(+), 60 deletions(-) diff --git a/ghostty/.config/ghostty/themes/ember b/ghostty/.config/ghostty/themes/ember index d6880d0..791737d 100644 --- a/ghostty/.config/ghostty/themes/ember +++ b/ghostty/.config/ghostty/themes/ember @@ -18,8 +18,10 @@ palette = 5=#b07878 palette = 6=#80a090 palette = 7=#d8d0c0 -# Bright colors (same as normal — Ember's muted philosophy) -palette = 8=#4f4e4c +# Bright colors (mostly mirror normals — Ember's muted philosophy) +# EXCEPT slot 8: repurposed as a subtle "panel" bg tint, used by nvim +# folds and any consumer that wants 'just barely off from bg'. +palette = 8=#26241f palette = 9=#e08060 palette = 10=#8a9868 palette = 11=#c8b468 diff --git a/ghostty/.config/ghostty/themes/ember-light b/ghostty/.config/ghostty/themes/ember-light index 37c07ea..4e84383 100644 --- a/ghostty/.config/ghostty/themes/ember-light +++ b/ghostty/.config/ghostty/themes/ember-light @@ -18,8 +18,10 @@ palette = 5=#743838 palette = 6=#2c5446 palette = 7=#282418 -# Bright colors (same as normal — Ember's muted philosophy) -palette = 8=#282418 +# Bright colors (mostly mirror normals — Ember's muted philosophy) +# EXCEPT slot 8: repurposed as a subtle "panel" bg tint, used by nvim +# folds and any consumer that wants 'just barely off from bg'. +palette = 8=#dccfb6 palette = 9=#9a3a1c palette = 10=#3e5826 palette = 11=#5e5018 diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index f035774..0df77bd 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -29,7 +29,6 @@ require('lazy').setup({ 'nvim-neotest/nvim-nio', 'leoluz/nvim-dap-go', 'nvim-treesitter/nvim-treesitter', - -- 'romus204/tree-sitter-manager.nvim', 'luukvbaal/nnn.nvim', 'nvim-tree/nvim-tree.lua', 'lewis6991/gitsigns.nvim', @@ -48,14 +47,11 @@ require('lazy').setup({ }, } }, - -- Visual - 'ember-theme/nvim', -- Utility 'windwp/nvim-autopairs', 'nvim-telescope/telescope.nvim', 'nvim-telescope/telescope-ui-select.nvim', 'nvim-lua/plenary.nvim', - 'f-person/auto-dark-mode.nvim', -- 'folke/which-key.nvim', { "nvim-orgmode/orgmode", @@ -126,9 +122,6 @@ require('nvim-tree').setup({ }, }, }) --- require('gitsigns').setup() -require('ember').setup({ transparent_floats = true }) -require('auto-dark-mode').setup() require('telescope').setup({ defaults = { file_ignore_patterns = { diff --git a/nvim/.config/nvim/lua/settings.lua b/nvim/.config/nvim/lua/settings.lua index fb26aec..b2c12ea 100644 --- a/nvim/.config/nvim/lua/settings.lua +++ b/nvim/.config/nvim/lua/settings.lua @@ -11,55 +11,32 @@ vim.wo.relativenumber = true vim.g.mapleader = ' ' vim.o.splitright = true --- Tone down ember's coral folders/titles so code stays the visual focus. --- Directory names (incl. nvim-tree folders) and the active tabline entry --- both pick up steel blue instead of coral. -require('ember').setup({ - on_highlights = function(hl, theme) - hl.Directory = { fg = theme.syn.steel, bold = true } - hl.Title = { fg = theme.ui.fg_alt, bold = true } - hl.TabLineSel = { fg = theme.syn.steel, bg = theme.ui.bg, bold = true } - end, -}) -vim.cmd.colorscheme('ember-auto') --- vim.o.scrolloff = 999 --- vim.o.clipboard="unnamedplus" - -vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - command = "setlocal wrap linebreak", -}) -vim.api.nvim_create_autocmd("FileType", { - pattern = "org", - command = "setlocal shiftwidth=2 tabstop=2 expandtab", -}) - -- Highlighting for orgmode files with highlight.nvim --- vim.api.nvim_create_autocmd("ColorScheme", { --- callback = function() --- local cursorline = vim.api.nvim_get_hl(0, { name = "CursorLine" }) --- local sep = vim.api.nvim_get_hl(0, { name = "WinSeparator" }).fg --- or vim.api.nvim_get_hl(0, { name = "Comment" }).fg --- --- vim.api.nvim_set_hl(0, "Headline1", { bg = cursorline.bg, underline = true, sp = sep }) --- vim.api.nvim_set_hl(0, "Headline2", { bg = cursorline.bg, underline = true, sp = sep }) --- vim.api.nvim_set_hl(0, "Headline3", { bg = cursorline.bg, underline = true, sp = sep }) --- vim.api.nvim_set_hl(0, "Headline4", { bg = cursorline.bg, underline = true, sp = sep }) --- end, --- }) +vim.api.nvim_create_autocmd("ColorScheme", { + callback = function() + local cursorline = vim.api.nvim_get_hl(0, { name = "CursorLine" }) + local sep = vim.api.nvim_get_hl(0, { name = "WinSeparator" }).fg + or vim.api.nvim_get_hl(0, { name = "Comment" }).fg + + vim.api.nvim_set_hl(0, "Headline1", { bg = cursorline.bg, underline = true, sp = sep }) + vim.api.nvim_set_hl(0, "Headline2", { bg = cursorline.bg, underline = true, sp = sep }) + vim.api.nvim_set_hl(0, "Headline3", { bg = cursorline.bg, underline = true, sp = sep }) + vim.api.nvim_set_hl(0, "Headline4", { bg = cursorline.bg, underline = true, sp = sep }) + end, +}) -- Global colorscheme based on terminal colors --- vim.cmd("Copilot disable") --- vim.cmd([[ --- autocmd ColorScheme * highlight Statement cterm=bold ctermfg=5 --- autocmd ColorScheme * highlight Keyword ctermfg=5 --- autocmd ColorScheme * highlight Type ctermfg=6 --- autocmd ColorScheme * highlight Function cterm=bold ctermfg=4 --- autocmd ColorScheme * highlight Constant ctermfg=3 --- autocmd ColorScheme * highlight String ctermfg=2 --- autocmd ColorScheme * highlight Comment cterm=italic ctermfg=lightgray --- --- syntax on --- set notermguicolors --- colorscheme default --- ]]) +vim.cmd([[ + autocmd ColorScheme * highlight Statement cterm=bold ctermfg=5 + autocmd ColorScheme * highlight Keyword ctermfg=5 + autocmd ColorScheme * highlight Type ctermfg=6 + autocmd ColorScheme * highlight Function cterm=bold ctermfg=4 + autocmd ColorScheme * highlight Constant ctermfg=3 + autocmd ColorScheme * highlight String ctermfg=2 + autocmd ColorScheme * highlight Comment cterm=italic ctermfg=lightgray + autocmd ColorScheme * highlight Folded cterm=italic ctermfg=lightgray ctermbg=8 + + syntax on + set notermguicolors + colorscheme default +]])