From 11025156b6e14dfbeeeed05f132edf15243ef565 Mon Sep 17 00:00:00 2001 From: veypi Date: Fri, 27 Jun 2025 16:33:00 +0800 Subject: [PATCH] update --- README.md | 2 ++ lazy-lock.json | 45 +++++++++++++++++++++++++++++++++++++ lazyvim.json | 8 ++----- lua/config/autocmds.lua | 5 +++++ lua/config/options.lua | 1 - lua/plugins/ai.lua | 31 +++++++++++++++++++++++++ lua/plugins/example.lua | 8 +++++-- lua/plugins/lualine.lua | 8 +++---- lua/plugins/transparent.lua | 42 ++++++++++++++++++++++++++++++++++ 9 files changed, 137 insertions(+), 13 deletions(-) create mode 100644 lazy-lock.json create mode 100644 lua/plugins/ai.lua create mode 100644 lua/plugins/transparent.lua diff --git a/README.md b/README.md index c6640a2..f84f498 100644 --- a/README.md +++ b/README.md @@ -23,3 +23,5 @@ curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/lates tar xf lazygit.tar.gz lazygit sudo install lazygit /usr/local/bin ``` + +## setup diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..7ad5c04 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,45 @@ +{ + "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, + "SchemaStore.nvim": { "branch": "main", "commit": "6af106298a8fd50af775d5281ee39a102556e352" }, + "auto-save.nvim": { "branch": "main", "commit": "5fbcaac0a2698c87a9a1bd2083cb6949505cca12" }, + "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, + "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, + "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, + "copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "gitsigns.nvim": { "branch": "main", "commit": "1b0350ab707713b2bc6c236151f1a324175347b1" }, + "grug-far.nvim": { "branch": "main", "commit": "b3f9412b1ed76f14cfc68e1ee899873544330c80" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.ai": { "branch": "main", "commit": "d172ada7b0281044a06cb9a625a862553c457b6f" }, + "mini.diff": { "branch": "main", "commit": "63a7ce537ced356b8180892d9586826b0afb519c" }, + "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, + "mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" }, + "nvim-lspconfig": { "branch": "master", "commit": "2d0ca00368742c0c7af802b9b2a920c4cd02303a" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "render-markdown.nvim": { "branch": "main", "commit": "24aacee83544ca113055564ed22be7852067c342" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "transparent.nvim": { "branch": "main", "commit": "8ac59883de84e9cd1850ea25cf087031c5ba7d54" }, + "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, + "vim-template": { "branch": "master", "commit": "df6d29a8549a13db026818c27a6b060978db7a3d" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } +} diff --git a/lazyvim.json b/lazyvim.json index 2f363c7..82551af 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -1,14 +1,10 @@ { "extras": [ "lazyvim.plugins.extras.ai.copilot", - "lazyvim.plugins.extras.coding.yanky", - "lazyvim.plugins.extras.lang.docker", "lazyvim.plugins.extras.lang.json", - "lazyvim.plugins.extras.lang.markdown", - "lazyvim.plugins.extras.lang.tailwind", - "lazyvim.plugins.extras.lang.vue", - "lazyvim.plugins.extras.lang.yaml" + "lazyvim.plugins.extras.lang.markdown" ], + "install_version": 8, "news": { "NEWS.md": "10960" }, diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua index 27e9e06..4221e75 100644 --- a/lua/config/autocmds.lua +++ b/lua/config/autocmds.lua @@ -1,3 +1,8 @@ -- Autocmds are automatically loaded on the VeryLazy event -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- -- Add any additional autocmds here +-- with `vim.api.nvim_create_autocmd` +-- +-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) +-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") diff --git a/lua/config/options.lua b/lua/config/options.lua index 6a63330..3ea1454 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -1,4 +1,3 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here --- diff --git a/lua/plugins/ai.lua b/lua/plugins/ai.lua new file mode 100644 index 0000000..383a81f --- /dev/null +++ b/lua/plugins/ai.lua @@ -0,0 +1,31 @@ +#! /usr/bin/env lua +-- +-- ai.lua +-- Copyright (C) 2025 veypi +-- +-- Distributed under terms of the MIT license. +-- + +return { + "zbirenbaum/copilot.lua", + cmd = "Copilot", + build = ":Copilot auth", + event = "BufReadPost", + opts = { + suggestion = { + enabled = not vim.g.ai_cmp, + auto_trigger = true, + hide_during_completion = vim.g.ai_cmp, + keymap = { + accept = false, -- handled by nvim-cmp / blink.cmp + next = "", + prev = "", + }, + }, + panel = { enabled = false }, + filetypes = { + markdown = true, + help = true, + }, + }, +} diff --git a/lua/plugins/example.lua b/lua/plugins/example.lua index 4ad9825..043efd2 100644 --- a/lua/plugins/example.lua +++ b/lua/plugins/example.lua @@ -7,7 +7,7 @@ if true then return {} end -- In your plugin files, you can: -- * add extra plugins -- * disable/enabled LazyVim plugins --- * override the configuration of LazyVim plugins +-- * override the requieconfiguration of LazyVim plugins return { -- add gruvbox { "ellisonleao/gruvbox.nvim" }, @@ -157,7 +157,11 @@ return { "nvim-lualine/lualine.nvim", event = "VeryLazy", opts = function(_, opts) - table.insert(opts.sections.lualine_x, "😄") + table.insert(opts.sections.lualine_x, { + function() + return "😄" + end, + }) end, }, diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 310ea81..8638bf4 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -96,25 +96,25 @@ return { { function() return require("noice").api.status.command.get() end, cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end, - color = function() return Snacks.util.color("Statement") end, + color = function() return { fg = Snacks.util.color("Statement") } end, }, -- stylua: ignore { function() return require("noice").api.status.mode.get() end, cond = function() return package.loaded["noice"] and require("noice").api.status.mode.has() end, - color = function() return Snacks.util.color("Constant") end, + color = function() return { fg = Snacks.util.color("Constant") } end, }, -- stylua: ignore { function() return " " .. require("dap").status() end, cond = function() return package.loaded["dap"] and require("dap").status() ~= "" end, - color = function() return Snacks.util.color("Debug") end, + color = function() return { fg = Snacks.util.color("Debug") } end, }, -- stylua: ignore { require("lazy.status").updates, cond = require("lazy.status").has_updates, - color = function() return Snacks.util.color("Special") end, + color = function() return { fg = Snacks.util.color("Special") } end, }, { "diff", diff --git a/lua/plugins/transparent.lua b/lua/plugins/transparent.lua new file mode 100644 index 0000000..18f736f --- /dev/null +++ b/lua/plugins/transparent.lua @@ -0,0 +1,42 @@ +return { + "xiyaowong/transparent.nvim", + groups = { + "Normal", + "NormalNC", + "Comment", + "Constant", + "Special", + "Identifier", + "Statement", + "PreProc", + "Type", + "Underlined", + "Todo", + "String", + "Function", + "Conditional", + "Repeat", + "Operator", + "Structure", + "LineNr", + "NonText", + "SignColumn", + "CursorLine", + "CursorLineNr", + "StatusLine", + "StatusLineNC", + "EndOfBuffer", + }, + -- table: additional groups that should be cleared + extra_groups = {}, + -- table: groups you don't want to clear + exclude_groups = {}, + -- function: code to be executed after highlight groups are cleared + -- Also the user event "TransparentClear" will be triggered + on_clear = function() end, + config = function() + require("transparent").clear_prefix("lualine") + require("transparent").clear_prefix("NeoTree") + require("transparent").clear_prefix("BufferLine") + end, +}