diff --git a/lazy-lock.json b/lazy-lock.json index ac546fe..7655dc6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,39 +1,37 @@ { "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" }, - "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, - "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, + "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, "bookmarks.nvim": { "branch": "main", "commit": "e719191ba3ec67d45993a6aed2a7abd7f9fd2459" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" }, - "codeium.nvim": { "branch": "main", "commit": "821b570b526dbb05b57aa4ded578b709a704a38a" }, - "conform.nvim": { "branch": "master", "commit": "5ac2bb57a9096f00ca50e1a3c46020d5930319b8" }, + "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "everforest": { "branch": "master", "commit": "b90025cc84dbb9c46df5a2ae540d3f01cf85af74" }, + "everforest": { "branch": "master", "commit": "b03a03148c8b34c24c96960b93da9c8883d11f54" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" }, - "grug-far.nvim": { "branch": "main", "commit": "794f03c97afc7f4b03fb6ec5111be507df1850cf" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ce96a464fdbc24208e24c117e2021794259005d" }, + "grug-far.nvim": { "branch": "main", "commit": "275dbedc96e61a6b8d1dfb28ba51586ddd233dcf" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "80c0130c5f16b551865a69e832f1feadeedb5fbe" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" }, + "mini.ai": { "branch": "main", "commit": "9eae720f2b20f6ad28cbfa0ddc524e10dc2c3201" }, "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" }, - "mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" }, + "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-lint": { "branch": "master", "commit": "ca6ea12daf0a4d92dc24c5c9ae22a1f0418ade37" }, - "nvim-lspconfig": { "branch": "master", "commit": "92ee7d42320edfbb81f3cad851314ab197fa324a" }, - "nvim-treesitter": { "branch": "main", "commit": "8aada0e3940c573e38b417a226b43bc8675f8958" }, - "nvim-treesitter-textobjects": { "branch": "main", "commit": "baa6b4ec28c8be5e4a96f9b1b6ae9db85ec422f8" }, - "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, - "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" }, + "nvim-lint": { "branch": "master", "commit": "bcd1a44edbea8cd473af7e7582d3f7ffc60d8e81" }, + "nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" }, + "nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" }, + "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, - "telescope.nvim": { "branch": "master", "commit": "a8c2223ea6b185701090ccb1ebc7f4e41c4c9784" }, + "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, diff --git a/lazyvim.json b/lazyvim.json index 1e38b13..9cd8d8f 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -1,6 +1,5 @@ { "extras": [ - "lazyvim.plugins.extras.ai.codeium", "lazyvim.plugins.extras.editor.telescope" ], "install_version": 8, diff --git a/lua/config/options.lua b/lua/config/options.lua index 64a7c4d..6ce9d29 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -76,5 +76,5 @@ vim.o.showtabline = 2 vim.o.showmode = false -- vim.o.background = "light" -- vim.o.background = "dark" -vim.g.codeium_enabled = true -vim.g.ai_cmp = false +-- vim.g.codeium_enabled = true +-- vim.g.ai_cmp = false diff --git a/lua/plugins/codeium.lua b/lua/plugins/codeium.lua deleted file mode 100644 index c3a3632..0000000 --- a/lua/plugins/codeium.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "Exafunction/codeium.nvim", - cmd = "Codeium", - event = "InsertEnter", - build = ":Codeium Auth", - opts = { - enable_cmp_source = vim.g.ai_cmp, - virtual_text = { - enabled = not vim.g.ai_cmp, - virtual_text_priority = 65535, - map_keys = true, - key_bindings = { - -- accept = false, -- handled by nvim-cmp / blink.cmp - accept = "", - next = "", - prev = "", - }, - }, - }, -} diff --git a/res/template/cmake/.clang-format b/res/template/cmake/.clang-format deleted file mode 100644 index c47a2d6..0000000 --- a/res/template/cmake/.clang-format +++ /dev/null @@ -1,23 +0,0 @@ -BasedOnStyle: LLVM -IndentWidth: 4 -PointerAlignment: Left -AccessModifierOffset: -4 -BreakBeforeBraces: Custom -BraceWrapping: - AfterFunction: true - AfterClass: true -Cpp11BracedListStyle: true -ReflowComments: true -SpacesBeforeTrailingComments: 3 -TabWidth: 4 -ConstructorInitializerAllOnOneLineOrOnePerLine: true -ColumnLimit: 110 -AllowShortBlocksOnASingleLine: Never -AllowShortFunctionsOnASingleLine: None -AllowShortEnumsOnASingleLine: false -IncludeBlocks: Regroup -IncludeCategories: - - Regex: '^<.*>' - Priority: 1 - - Regex: '^".*"' - Priority: 2 \ No newline at end of file diff --git a/res/template/cmake/.clangd b/res/template/cmake/.clangd deleted file mode 100644 index 21b2a03..0000000 --- a/res/template/cmake/.clangd +++ /dev/null @@ -1,16 +0,0 @@ -Hover: - ShowAKA: Yes -CompileFlags: - Remove: [-fexec-charset=gbk] -Diagnostics: - UnusedIncludes: None # 禁用未使用头文件提示 - Suppress: [ - anon_type_definition, # 禁用匿名的typedef提示 - unused-variable, # 禁用未使用变量提示 - unused-function, # 禁用未使用函数提示 - unused-includes, # 禁用未使用的头文件提示 - unused-parameter, - builtin_definition # clang 显示 mingw windows.h 中 definition of builtin function '__rdtsc - ] - ClangTidy: - Remove: misc-unused-alias-decls diff --git a/res/template/cmake/CMakeLists.txt b/res/template/cmake/CMakeLists.txt deleted file mode 100644 index 9cc2537..0000000 --- a/res/template/cmake/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.16) - -project(replace LANGUAGES CXX) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -if (MSVC) - add_compile_options(/source-charset:utf-8) -endif() - -message(STATUS "System: ${CMAKE_SYSTEM_NAME}") -message(STATUS "Compiler CXX ID: ${CMAKE_CXX_COMPILER_ID}") - -add_executable(replace main.cpp) diff --git a/res/template/cmake/main.cpp b/res/template/cmake/main.cpp deleted file mode 100644 index 157fa26..0000000 --- a/res/template/cmake/main.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main() -{ - std::cout << "Done" << std::endl; - return 0; -} \ No newline at end of file