From 455fd0a40e88d30c6b80ad45fdc81dd6071a78fd Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 25 Mar 2026 10:48:29 +0100 Subject: [PATCH] clean up repo --- init.lua | 3 +- lazy-lock.json | 6 ++-- lua/config/generated.lua | 64 ---------------------------------------- lua/config/keymaps.lua | 1 + lua/config/options.lua | 1 - lua/plugins/cord.lua | 12 -------- lua/plugins/ui.lua | 24 +++++++++++++-- 7 files changed, 29 insertions(+), 82 deletions(-) delete mode 100644 lua/config/generated.lua delete mode 100644 lua/config/options.lua delete mode 100644 lua/plugins/cord.lua diff --git a/init.lua b/init.lua index ef983a0..fcf2638 100644 --- a/init.lua +++ b/init.lua @@ -6,11 +6,12 @@ opt.relativenumber = true opt.cursorline = true opt.termguicolors = true -opt.winborder = "single" +opt.winborder = "rounded" opt.signcolumn = "yes" vim.lsp.inlay_hint.enable = true opt.tabstop = 8 vim.opt.expandtab = true +vim.g.tinted_background_transparent = 1 opt.shiftwidth = 8 vim.diagnostic.config({ diff --git a/lazy-lock.json b/lazy-lock.json index 928f9a3..62c50fe 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,13 +3,15 @@ "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "cord.nvim": { "branch": "master", "commit": "283e4a5bdafd0d6187f28e5b739cccab6b4c9c64" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lspsaga.nvim": { "branch": "main", "commit": "562d9724e3869ffd1801c572dd149cc9f8d0cc36" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "nvim-lspconfig": { "branch": "master", "commit": "841c6d4139aedb8a3f2baf30cef5327371385b93" }, + "nvim-lspconfig": { "branch": "master", "commit": "4daa1436595dbce4c6151f75c38a0d855796c554" }, "nvim-treesitter": { "branch": "main", "commit": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, - "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" } + "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, + "tinted-vim": { "branch": "main", "commit": "19b03f63f58ffc63aa8e26159a370d6514735581" } } diff --git a/lua/config/generated.lua b/lua/config/generated.lua deleted file mode 100644 index f8b9d76..0000000 --- a/lua/config/generated.lua +++ /dev/null @@ -1,64 +0,0 @@ --- Generated by Matugen - -require('base16-colorscheme').setup({ - base00 = "#0b0e12", - base01 = "#0b0e12", - base02 = "#181c20", - base03 = "#42474e", - base04 = "#c2c7cf", - base05 = "#e0e2e8", - base06 = "#2d3135", - base07 = "#36393e", - - base08 = "#c8acdf", - base09 = "#d4bee6", - base0A = "#b9c8da", - base0B = "#9dcbfb", - base0C = "#504060", - base0D = "#124a73", - base0E = "#3a4857", - base0F = "#98aec8", -}) - - --- We first theme base16, but we also need to fix some other colors that don't --- contrast well by default - --- Helper function to set multiple highlight groups at once -local function set_hl_mutliple(groups, value) - for _, v in pairs(groups) do - vim.api.nvim_set_hl(0, v, value) - end -end - --- Make selected text stand out more -vim.api.nvim_set_hl(0, 'Visual', { - bg = '#124a73', - fg = '#cfe5ff', -- normal text contrast -}) - --- Make "string" text contrast better -set_hl_mutliple({ 'String', 'TSString' }, { - fg = '#af87d1', -}) - --- Grey out comments -set_hl_mutliple({ 'TSComment', 'Comment' }, { - fg = '#8c9199', - italic = true, -}) - --- Color in other highlight groups as you see fit! - -set_hl_mutliple({ 'TSMethod', 'Method' }, { - fg = '#d4bee6', -}) - - -set_hl_mutliple({ 'TSFunction', 'Function' }, { - fg = '#b9c8da', -}) - -set_hl_mutliple({ 'Keyword', 'TSKeyword', 'TSKeywordFunction', 'TSRepeat' }, { - fg = '#31628d', -}) diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 87e2fc1..e7e21b4 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -33,3 +33,4 @@ map("n", "t", " terminal ") map("n", "", "Lspsaga term_toggle") map("t", "", "") map("n", "", "NvimTreeToggle") + diff --git a/lua/config/options.lua b/lua/config/options.lua deleted file mode 100644 index 8b13789..0000000 --- a/lua/config/options.lua +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lua/plugins/cord.lua b/lua/plugins/cord.lua deleted file mode 100644 index f3f86c8..0000000 --- a/lua/plugins/cord.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - { - "vyfor/cord.nvim", - ---@type CordConfig - opts = { - display = { - theme = "atom", - }, - editor = { tooltip = "ur gay x3" }, - }, - }, -} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 0585302..c1cd1b9 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -33,14 +33,34 @@ local function main() }) end return { - { - "RRethy/base16-nvim", + "vyfor/cord.nvim", + ---@type CordConfig + opts = { + display = { + theme = "atom", + }, + editor = { tooltip = "ur gay x3" }, + }, + }, + { + "tinted-theming/tinted-vim", lazy = false, + priority = 1000, init = function() main() end, }, + { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + ---@module "ibl" + ---@type ibl.config + opts = { + scope = { enabled = true }, + }, + }, + { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons", "RRethy/base16-nvim" },