From 68e1cdbb135fd87bb0df1170abaae749baa4eb87 Mon Sep 17 00:00:00 2001 From: Xander Swan Date: Wed, 3 Dec 2025 10:00:42 -0500 Subject: update config frfr --- .config/nvim/colors/mine.lua | 10 ++--- .config/nvim/colors/mini-theme.lua | 80 ++++++++++++++++++++++++++++++++++++++ .config/nvim/colors/minimal.lua | 74 ----------------------------------- .config/nvim/init.lua | 19 ++++++--- .config/nvim/nvim-pack-lock.json | 4 ++ 5 files changed, 102 insertions(+), 85 deletions(-) create mode 100644 .config/nvim/colors/mini-theme.lua delete mode 100644 .config/nvim/colors/minimal.lua (limited to '.config/nvim') diff --git a/.config/nvim/colors/mine.lua b/.config/nvim/colors/mine.lua index ccdf48d..06fd8f1 100644 --- a/.config/nvim/colors/mine.lua +++ b/.config/nvim/colors/mine.lua @@ -44,7 +44,7 @@ local colors = { ["Identifier"] = {fg="#FFFFFF"}, ["Function"] = {fg="#5599EE"}, - ["Statement"] = {fg="#FF4499", bold=true}, + ["Statement"] = {fg="#FF4499"}, ["Label"] = {fg="#FF9944"}, ["Operator"] = {fg="#AAAABB"}, @@ -70,12 +70,12 @@ local colors = { ["@function.builtin"] = {link="Function"}, ["@attribute.builtin"] = {link="@attribute"}, - ["@keyword.repeat"] = {fg="#DD66FF", bold=true}, - ["@keyword.conditional"] = {fg="#FF99CC", bold=true}, + ["@keyword.repeat"] = {fg="#DD66FF"}, + ["@keyword.conditional"] = {fg="#FF66DD"}, ["@variable"] = {fg="#CCCCCC"}, ["@variable.parameter.builtin"] = {link="@variable.builtin"}, - ["@variable.parameter"] = {fg="#EDEDED", italic=true}, + ["@variable.parameter"] = {fg="#CCCCCC", italic=true}, ["@variable.builtin"] = {fg="#DD66FF", italic=true}, ["@variable.member"] = {fg="#9999FF"}, @@ -83,7 +83,7 @@ local colors = { ["@lsp.type.parameter"] = {link="@variable.parameter"}, ["@lsp.type.enumMember"] = {link="Constant"}, ["@lsp.typemod.variable.static"] = {link="@lsp.typemod.variable.global"}, - ["@lsp.typemod.variable.global"] = {fg="#FFDD66", italic=true}, + ["@lsp.typemod.variable.global"] = {fg="#FFDD66"}, } for k, v in pairs(colors) do diff --git a/.config/nvim/colors/mini-theme.lua b/.config/nvim/colors/mini-theme.lua new file mode 100644 index 0000000..16b7831 --- /dev/null +++ b/.config/nvim/colors/mini-theme.lua @@ -0,0 +1,80 @@ +---@diagnostic disable: undefined-global + +vim.cmd("hi clear") + +vim.g.colors_name = "mine" +vim.g.background = "dark" + +local colors = { + ["Terminal"] = {link="Normal"}, + ["TermCursor"] = {link="Cursor"}, + ["TermCursorNC"] = {link="Cursor"}, + ["CurSearch"] = {link="Search"}, + ["CursorLineFold"] = {link="CursorLine"}, + ["CursorLineSign"] = {link="CursorLine"}, + ["MessageWindow"] = {link="Pmenu"}, + ["PopupNotification"] = {link="Todo"}, + ["Character"] = {link="String"}, + ["FloatBorder"] = {link="NormalFloat"}, + ["NormalFloat"] = {link="Normal"}, + + ["ModeMsg"] = {fg="#FF88CC", bold=true}, + ["StatusLine"] = {fg="#000000", bg="#AA66DD"}, + ["StatusLineNC"] = {fg="#FFFFFF"}, + ["ColorColumn"] = {bg="#121115"}, + ["WinSeparator"] = {fg="#222222"}, + ["CursorLine"] = {bg="#222222"}, + ["EndOfBuffer"] = {fg="#222222"}, + ["LineNr"] = {fg="#CCCCCC", bg="#121115"}, + ["LineNrAbove"] = {fg="#888888", bg="#121115"}, + ["LineNrBelow"] = {fg="#888888", bg="#121115"}, + ["MatchParen"] = {fg="#EE66AA", bold=true}, + ["Normal"] = {fg="#AAAAAA", bg="#1A191C"}, + ["Pmenu"] = {fg="#FFFFFF", bg="#333333"}, + ["PmenuSel"] = {fg="#333333", bg="#FFFFFF", bold=true}, + ["Search"] = {fg="#333333", bg="#FFFF88", bold=true}, + ["Visual"] = {bg="#333333"}, + + ["Comment"] = {fg="#88DEDE", italic=true}, + + ["Constant"] = {fg="#DDDD66"--[[, bg="#272620"]]}, + ["Number"] = {link="Constant"}, + ["String"] = {link="Constant"}, + ["Boolean"] = {link="Constant"}, + + ["Function"] = {fg="#9999EE"--[[, bg="#23222b"]]}, + ["Identifier"] = {link="Normal"}, + ["Statement"] = {bold=true}, + ["Label"] = {link="Normal"}, + + ["Operator"] = {fg="#505050"}, + + ["Special"] = {fg="#CCCCDD"}, + ["SpecialChar"] = {fg="#FFFFFF"}, + + ["Error"] = {fg="#FF4444", undercurl=true}, + + ["@punctuation"] = {link="Operator"}, + + ["@constant.builtin"] = {link="@constant"}, + + ["@constructor"] = {link="Normal"}, + + ["@lsp.typemod.function.declaration"] = {link="Function"}, + ["@lsp.type.function"] = {link="@function.call"}, + ["@lsp.type.function.lua"] = {link="Function"}, + ["@function.builtin"] = {link="@function.call"}, + ["@function.method.call"] = {link="@function.call"}, + ["@function.call"] = {italic=true}, + + ["@variable"] = {link="Normal"}, + -- ["@variable"] = {fg="#ff0000"}, + ["@variable.builtin"] = {link="@variable"}, + + ["@module"] = {link="Normal"}, + ["@module.builtin"] = {link="@module"}, +} + +for k, v in pairs(colors) do + vim.api.nvim_set_hl(0, k, v) +end diff --git a/.config/nvim/colors/minimal.lua b/.config/nvim/colors/minimal.lua deleted file mode 100644 index 84b7284..0000000 --- a/.config/nvim/colors/minimal.lua +++ /dev/null @@ -1,74 +0,0 @@ ----@diagnostic disable: undefined-global - -vim.cmd("hi clear") - -vim.g.colors_name = "mine" -vim.g.background = "dark" - -local colors = { - ["Terminal"] = {link="Normal"}, - ["TermCursor"] = {link="Cursor"}, - ["TermCursorNC"] = {link="Cursor"}, - ["CurSearch"] = {link="Search"}, - ["CursorLineFold"] = {link="CursorLine"}, - ["CursorLineSign"] = {link="CursorLine"}, - ["MessageWindow"] = {link="Pmenu"}, - ["PopupNotification"] = {link="Todo"}, - ["Character"] = {link="String"}, - ["FloatBorder"] = {link="NormalFloat"}, - ["NormalFloat"] = {link="Normal"}, - - ["ModeMsg"] = {fg="#FF88CC", bold=true}, - ["StatusLine"] = {fg="#000000", bg="#AA66DD"}, - ["StatusLineNC"] = {fg="#FFFFFF"}, - ["ColorColumn"] = {bg="#121115"}, - ["WinSeparator"] = {fg="#222222"}, - ["CursorLine"] = {bg="#222222"}, - ["EndOfBuffer"] = {fg="#222222"}, - ["LineNr"] = {fg="#CCCCCC", bg="#121115"}, - ["LineNrAbove"] = {fg="#888888", bg="#121115"}, - ["LineNrBelow"] = {fg="#888888", bg="#121115"}, - ["MatchParen"] = {fg="#EE66AA", bold=true}, - ["Normal"] = {fg="#AAAAAA", bg="#1A191C"}, - ["Pmenu"] = {fg="#FFFFFF", bg="#333333"}, - ["PmenuSel"] = {fg="#333333", bg="#FFFFFF", bold=true}, - ["Search"] = {fg="#333333", bg="#FFFF88", bold=true}, - ["Visual"] = {bg="#333333"}, - - ["Comment"] = {fg="#88DEDE", italic=true}, - - ["Constant"] = {fg="#DDDD66", bg="#272620"}, - ["Number"] = {link="Constant"}, - ["String"] = {link="Constant"}, - ["Boolean"] = {link="Constant"}, - - ["Function"] = {fg="#9999EE", bg="#23222b"}, - ["Identifier"] = {link="Normal"}, - ["Statement"] = {bold=true}, - ["Label"] = {link="Normal"}, - - ["Operator"] = {fg="#505050"}, - - ["Special"] = {fg="#CCCCDD"}, - ["SpecialChar"] = {fg="#FFFFFF"}, - - ["Error"] = {fg="#FF4444", undercurl=true}, - - ["@punctuation"] = {link="Operator"}, - - ["@constant.builtin"] = {link="@constant"}, - - ["@function.builtin"] = {link="@function.call"}, - ["@function.method.call"] = {link="@function.call"}, - ["@function.call"] = {link="Normal"}, - - ["@variable"] = {link="Normal"}, - ["@variable.builtin"] = {link="@variable"}, - - ["@module"] = {link="Normal"}, - ["@module.builtin"] = {link="@module"}, -} - -for k, v in pairs(colors) do - vim.api.nvim_set_hl(0, k, v) -end diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index dbb21b7..1c289df 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -13,7 +13,7 @@ vim.o.shiftwidth = 0 vim.o.expandtab = true vim.o.undofile = true vim.o.scrolloff = 3 -vim.o.winborder = "bold" +vim.o.winborder = "none" vim.o.mouse = "" vim.o.completeopt = "menu,menuone,noselect" @@ -22,6 +22,7 @@ vim.g.mapleader = " " vim.pack.add({ "https://github.com/neovim/nvim-lspconfig", "https://github.com/nvim-mini/mini.pick", + "https://github.com/projekt0n/github-nvim-theme", }) for _, plugin in ipairs(vim.pack.get()) do @@ -30,7 +31,13 @@ for _, plugin in ipairs(vim.pack.get()) do end end -require("mini.pick").setup() +require("mini.pick").setup({ + window = { + config = { + border = "none" + }, + }, +}) vim.keymap.set("n", "f", ":Pick files tool='rg'") @@ -72,7 +79,7 @@ vim.api.nvim_create_autocmd("LspAttach", { for i = 32, 126 do table.insert(chars, string.char(i)) end - client.server_capabilities.semanticTokensProvider = nil + -- client.server_capabilities.semanticTokensProvider = nil client.server_capabilities.completionProvider.triggerCharacters = chars if client:supports_method("textDocument/completion") then vim.lsp.completion.enable(true, client.id, ev.buf, {autotrigger=true}) @@ -80,8 +87,8 @@ vim.api.nvim_create_autocmd("LspAttach", { end, }) -vim.cmd.colorscheme("minimal") -vim.api.nvim_set_hl(0, "NormalFloat", {link="Normal"}) -vim.api.nvim_set_hl(0, "LineNr", {link="Pmenu"}) +vim.g.adwaita_darker = true + +vim.cmd.colorscheme("github_dark_default") require('vim._extui').enable({}) diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index 2dd82f5..905ad4c 100644 --- a/.config/nvim/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json @@ -1,5 +1,9 @@ { "plugins": { + "github-nvim-theme": { + "rev": "c106c94", + "src": "https://github.com/projekt0n/github-nvim-theme" + }, "mini.pick": { "rev": "96ee37d", "src": "https://github.com/nvim-mini/mini.pick" -- cgit v1.3-2-g0d8e