From 65c6a3922cc8879b5f0e6b2531c3d3d32b0b0a19 Mon Sep 17 00:00:00 2001 From: Matt Anderson Date: Tue, 9 Jun 2026 14:58:21 -0500 Subject: [PATCH] using official ember theme for neovim now, looks different and philosophy around neutral readibility with some fire accents, i like it --- nvim/.config/nvim/lazy-lock.json | 7 ++-- nvim/.config/nvim/lua/plugins.lua | 34 +++----------------- nvim/.config/nvim/lua/settings.lua | 51 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 58 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 0d50b49..606915b 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,15 +1,14 @@ { "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, + "auto-dark-mode.nvim": { "branch": "main", "commit": "54058b4fe414bd64bd2904a6f8a63f1f14e3d8df" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, - "formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" }, "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, "helm-ls.nvim": { "branch": "main", "commit": "f0b9a1723890971a6d84890b50dbf5f40974ea1b" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, - "leetcode.nvim": { "branch": "master", "commit": "fdd3f91800b3983e27bc9fcfb99cfa7293d7f11a" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "nnn.nvim": { "branch": "master", "commit": "efe690293eee87558f034a83ed96157e52639cdb" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim": { "branch": "main", "commit": "7365b8dede43a82ed1df741275b75333422e5402" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" }, diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 2f27700..71bdbbe 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -32,7 +32,6 @@ require('lazy').setup({ 'luukvbaal/nnn.nvim', 'nvim-tree/nvim-tree.lua', 'lewis6991/gitsigns.nvim', - 'mhartington/formatter.nvim', { 'folke/zen-mode.nvim', opts = { @@ -48,26 +47,14 @@ require('lazy').setup({ }, } }, - -- { - -- "CopilotC-Nvim/CopilotChat.nvim", - -- dependencies = { - -- { "github/copilot.vim" }, -- or zbirenbaum/copilot.lua - -- }, - -- build = "make tiktoken", -- Only on MacOS or Linux - -- opts = { - -- window = { - -- layout = 'replace', - -- }, - -- mappings = { - -- accept_diff = false, -- disables the default “accept nearest diff” - -- }, - -- }, - -- }, + -- 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", @@ -139,19 +126,8 @@ require('nvim-tree').setup({ }, }) -- require('gitsigns').setup() -require('formatter').setup({ - filetype = { - python = { - function() - return { - exe = "black", - args = { "--quiet", "-" }, - stdin = true - } - end - } - } -}) +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 fa599b2..0cf2eb3 100644 --- a/nvim/.config/nvim/lua/settings.lua +++ b/nvim/.config/nvim/lua/settings.lua @@ -10,6 +10,7 @@ vim.wo.number = true vim.wo.relativenumber = true vim.g.mapleader = ' ' vim.o.splitright = true +vim.cmd.colorscheme('ember-auto') -- vim.o.scrolloff = 999 -- vim.o.clipboard="unnamedplus" @@ -23,31 +24,31 @@ vim.api.nvim_create_autocmd("FileType", { }) -- 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 +-- +-- syntax on +-- set notermguicolors +-- colorscheme default +-- ]])