From 7b423c060393e2a38fdcdda7ac6c1897ff6f8235 Mon Sep 17 00:00:00 2001 From: Matt Anderson Date: Sun, 3 May 2026 11:07:47 +0800 Subject: [PATCH] updates --- ghostty/.config/ghostty/config | 1 + nvim/.config/nvim/lazy-lock.json | 1 + nvim/.config/nvim/lua/plugins.lua | 30 +++---- nvim/.config/nvim/lua/settings.lua | 4 +- opencode/.config/opencode/opencode.json | 20 +---- .../opencode/themes/onedark-black.json | 81 ------------------- opencode/.config/opencode/tui.json | 5 +- 7 files changed, 23 insertions(+), 119 deletions(-) delete mode 100644 opencode/.config/opencode/themes/onedark-black.json diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config index 8890ead..36d3c45 100644 --- a/ghostty/.config/ghostty/config +++ b/ghostty/.config/ghostty/config @@ -19,6 +19,7 @@ cursor-style = block # background-image = ~/.config/ghostty/earth.png # background-image-opacity = 0 # background-image-fit = cover +window-decoration = false macos-icon = xray diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index ed6867c..ae751d0 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -3,6 +3,7 @@ "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "copilot.vim": { "branch": "release", "commit": "a12fd5672110c8aa7e3c8419e28c96943ca179be" }, + "ember": { "branch": "main", "commit": "4dbd9cad1f587b147150e7cf71ac517ac31e3858" }, "formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" }, "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" }, "helm-ls.nvim": { "branch": "main", "commit": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370" }, diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index a125e41..8d0ba6b 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -48,21 +48,21 @@ 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” - }, - }, - }, + -- { + -- "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” + -- }, + -- }, + -- }, -- Utility 'windwp/nvim-autopairs', 'nvim-telescope/telescope.nvim', diff --git a/nvim/.config/nvim/lua/settings.lua b/nvim/.config/nvim/lua/settings.lua index 4b0fcf5..fa599b2 100644 --- a/nvim/.config/nvim/lua/settings.lua +++ b/nvim/.config/nvim/lua/settings.lua @@ -37,7 +37,7 @@ vim.api.nvim_create_autocmd("ColorScheme", { }) -- Global colorscheme based on terminal colors -vim.cmd("Copilot disable") +-- vim.cmd("Copilot disable") vim.cmd([[ autocmd ColorScheme * highlight Statement cterm=bold ctermfg=5 autocmd ColorScheme * highlight Keyword ctermfg=5 @@ -45,7 +45,7 @@ vim.cmd([[ 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 Comment cterm=italic ctermfg=lightgray syntax on set notermguicolors diff --git a/opencode/.config/opencode/opencode.json b/opencode/.config/opencode/opencode.json index 30af7d9..720ece5 100644 --- a/opencode/.config/opencode/opencode.json +++ b/opencode/.config/opencode/opencode.json @@ -1,19 +1,3 @@ { - "$schema": "https://opencode.ai/config.json", - "model": "ollama/llama2-uncensored:7b", - "provider": { - "ollama": { - "models": { - "llama2-uncensored:7b": { - "_launch": true, - "name": "llama2-uncensored:7b" - } - }, - "name": "Ollama", - "npm": "@ai-sdk/openai-compatible", - "options": { - "baseURL": "http://127.0.0.1:11434/v1" - } - } - } -} \ No newline at end of file + "$schema": "https://opencode.ai/config.json" +} diff --git a/opencode/.config/opencode/themes/onedark-black.json b/opencode/.config/opencode/themes/onedark-black.json deleted file mode 100644 index 5fe254c..0000000 --- a/opencode/.config/opencode/themes/onedark-black.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "$schema": "https://opencode.ai/theme.json", - "defs": { - "darkBg": "#000000", - "darkBgAlt": "#21252b", - "darkBgPanel": "#353b45", - "darkFg": "#abb2bf", - "darkFgMuted": "#5c6370", - "darkPurple": "#c678dd", - "darkBlue": "#61afef", - "darkRed": "#e06c75", - "darkGreen": "#98c379", - "darkYellow": "#e5c07b", - "darkOrange": "#d19a66", - "darkCyan": "#56b6c2", - "lightBg": "#eeeeee", - "lightBgAlt": "#e4e4e6", - "lightBgPanel": "#d6d6d9", - "lightFg": "#383a42", - "lightFgMuted": "#a0a1a7", - "lightPurple": "#a626a4", - "lightBlue": "#4078f2", - "lightRed": "#e45649", - "lightGreen": "#50a14f", - "lightYellow": "#c18401", - "lightOrange": "#986801", - "lightCyan": "#0184bc" - }, - "theme": { - "primary": { "dark": "darkBlue", "light": "lightBlue" }, - "secondary": { "dark": "darkPurple", "light": "lightPurple" }, - "accent": { "dark": "darkCyan", "light": "lightCyan" }, - "error": { "dark": "darkRed", "light": "lightRed" }, - "warning": { "dark": "darkYellow", "light": "lightYellow" }, - "success": { "dark": "darkGreen", "light": "lightGreen" }, - "info": { "dark": "darkOrange", "light": "lightOrange" }, - "text": { "dark": "darkFg", "light": "lightFg" }, - "textMuted": { "dark": "darkFgMuted", "light": "lightFgMuted" }, - "background": { "dark": "darkBg", "light": "lightBg" }, - "backgroundPanel": { "dark": "darkBgAlt", "light": "lightBgAlt" }, - "backgroundElement": { "dark": "darkBgPanel", "light": "lightBgPanel" }, - "border": { "dark": "#393f4a", "light": "#c6c6c8" }, - "borderActive": { "dark": "darkBlue", "light": "lightBlue" }, - "borderSubtle": { "dark": "#2c313a", "light": "#d5d5d7" }, - "diffAdded": { "dark": "darkGreen", "light": "lightGreen" }, - "diffRemoved": { "dark": "darkRed", "light": "lightRed" }, - "diffContext": { "dark": "darkFgMuted", "light": "lightFgMuted" }, - "diffHunkHeader": { "dark": "darkCyan", "light": "lightCyan" }, - "diffHighlightAdded": { "dark": "#aad482", "light": "#489447" }, - "diffHighlightRemoved": { "dark": "#e8828b", "light": "#d65145" }, - "diffAddedBg": { "dark": "#2c382b", "light": "#dce8db" }, - "diffRemovedBg": { "dark": "#3a2d2f", "light": "#f0dbd9" }, - "diffContextBg": { "dark": "darkBgAlt", "light": "lightBgAlt" }, - "diffLineNumber": { "dark": "#9398a2", "light": "#666666" }, - "diffAddedLineNumberBg": { "dark": "#283427", "light": "#d3e4d1" }, - "diffRemovedLineNumberBg": { "dark": "#36292b", "light": "#e9d1cf" }, - "markdownText": { "dark": "darkFg", "light": "lightFg" }, - "markdownHeading": { "dark": "darkPurple", "light": "lightPurple" }, - "markdownLink": { "dark": "darkBlue", "light": "lightBlue" }, - "markdownLinkText": { "dark": "darkCyan", "light": "lightCyan" }, - "markdownCode": { "dark": "darkGreen", "light": "lightGreen" }, - "markdownBlockQuote": { "dark": "darkFgMuted", "light": "lightFgMuted" }, - "markdownEmph": { "dark": "darkYellow", "light": "lightYellow" }, - "markdownStrong": { "dark": "darkOrange", "light": "lightOrange" }, - "markdownHorizontalRule": { "dark": "darkFgMuted", "light": "lightFgMuted" }, - "markdownListItem": { "dark": "darkBlue", "light": "lightBlue" }, - "markdownListEnumeration": { "dark": "darkCyan", "light": "lightCyan" }, - "markdownImage": { "dark": "darkBlue", "light": "lightBlue" }, - "markdownImageText": { "dark": "darkCyan", "light": "lightCyan" }, - "markdownCodeBlock": { "dark": "darkFg", "light": "lightFg" }, - "syntaxComment": { "dark": "darkFgMuted", "light": "lightFgMuted" }, - "syntaxKeyword": { "dark": "darkPurple", "light": "lightPurple" }, - "syntaxFunction": { "dark": "darkBlue", "light": "lightBlue" }, - "syntaxVariable": { "dark": "darkRed", "light": "lightRed" }, - "syntaxString": { "dark": "darkGreen", "light": "lightGreen" }, - "syntaxNumber": { "dark": "darkOrange", "light": "lightOrange" }, - "syntaxType": { "dark": "darkYellow", "light": "lightYellow" }, - "syntaxOperator": { "dark": "darkCyan", "light": "lightCyan" }, - "syntaxPunctuation": { "dark": "darkFg", "light": "lightFg" } - } -} \ No newline at end of file diff --git a/opencode/.config/opencode/tui.json b/opencode/.config/opencode/tui.json index 036dca1..4cd0d06 100644 --- a/opencode/.config/opencode/tui.json +++ b/opencode/.config/opencode/tui.json @@ -1,4 +1,3 @@ { - "$schema": "https://opencode.ai/tui.json", - "theme": "onedark-black" -} \ No newline at end of file + "$schema": "https://opencode.ai/tui.json" +}