add codecompanin and change theme

init.lua

@@ -5,7 +5,6 @@ require("plugin")
 require("keybindings")
 
 -- require("plugin-config/nvim-tree")
-require("plugin-config/buffer_line")
 require("plugin-config/treesitter")
 require("plugin-config/telescope")
 require("plugin-config/comment")

lazy-lock.json

@@ -3,6 +3,7 @@
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
   "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" },
+  "catppuccin": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
@@ -11,50 +12,51 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "codecompanion.nvim": { "branch": "main", "commit": "18aa8aec501badf2ca288ec1ff02927c315926f3" },
   "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" },
-  "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
+  "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
-  "everforest": { "branch": "master", "commit": "93b89630861a4c8a1be07bc54f6d53487acb2e57" },
+  "everforest": { "branch": "master", "commit": "87b8554b2872ef69018d4b13d288756dd4e47c0f" },
-  "flutter-tools.nvim": { "branch": "main", "commit": "ea1d398f543a54ba95357c3b8bb9d6f68eaec36c" },
+  "flutter-tools.nvim": { "branch": "main", "commit": "ce18f5da5f9c458cd26eef5c3accb0c37b2263c2" },
-  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
+  "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" },
-  "gp.nvim": { "branch": "main", "commit": "f4cbbf489fb621ae8f4e512c38ae234ce1157fa7" },
+  "gp.nvim": { "branch": "main", "commit": "2372d5323c6feaa2e9c19f7ccb537c615d878e18" },
   "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
   "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
   "iron.nvim": { "branch": "master", "commit": "e6b78ec1bc56eab63b3a9112d348b3d79836b672" },
   "jaq-nvim": { "branch": "master", "commit": "236296aae555657487d1bb4d066cbde9d79d8cd4" },
-  "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" },
+  "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
   "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" },
-  "live-command.nvim": { "branch": "main", "commit": "79f89a2e3472e69fe00d4df50605e323d30f2d09" },
+  "live-command.nvim": { "branch": "main", "commit": "b0723697bf60d89ede953c4a5fedce3157784c15" },
   "lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" },
   "lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "material.nvim": { "branch": "main", "commit": "ac8f02e97e359b7d258c0a00ec0949fe880790ad" },
-  "mini.nvim": { "branch": "main", "commit": "5c72e4d74e05f50325641e5fa921fca97a24cb13" },
+  "mini.nvim": { "branch": "main", "commit": "848c5e8f428faf843051768e0d56104cd02aea1f" },
   "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
-  "neocodeium": { "branch": "main", "commit": "d2c968ce714cbab1de99dd254e0baa412e4aec92" },
+  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
-  "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" },
+  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" },
+  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
   "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "3497eb39bf413a57ab5b7e7e2e192683e462148c" },
-  "nvim-lspconfig": { "branch": "master", "commit": "bb682c167a0878338b4313b55538953d1c039085" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0678aa439b82965daf03679cd146e84f10e299c3" },
   "nvim-luapad": { "branch": "master", "commit": "176686eb616a5ada5dfc748f2b5109194bbe8a71" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-treesitter": { "branch": "master", "commit": "4af16a10b7f1e79275f712a1c6dcf725d301a303" },
+  "nvim-treesitter": { "branch": "master", "commit": "707e352df6d737e545e1a7204f7395ba82e6d2d3" },
-  "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" },
   "persistent-breakpoints.nvim": { "branch": "main", "commit": "4b199b1dcfd136cac8b0fa9c8dbbdeb81463f7a9" },
-  "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "c5a14e0550699a7db575805cdb9ddc969ba0f1f5" },
+  "render-markdown.nvim": { "branch": "main", "commit": "e91b042b3865d2d040a0e21e0a3b13fb57f24094" },
-  "telescope.nvim": { "branch": "master", "commit": "927c10f748e49c543b2d544c321a1245302ff324" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "3b8a1e17187cfeedb31decbd625da62398a8ff34" },
+  "telescope.nvim": { "branch": "master", "commit": "eae0d8fbde590b0eaa2f9481948cd6fd7dd21656" },
   "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
+  "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" },
   "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
-  "vimtex": { "branch": "master", "commit": "539a203f19531c6b9d2d1b093ee8911fb7050bbc" },
+  "vimtex": { "branch": "master", "commit": "be2c13c76eb4c72b2d036900aa17b4b8200ddfb5" },
-  "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }
+  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }
 }

lua/autocmd.lua

@@ -17,7 +17,7 @@ end
 
 function set_colorscheme()
 	local colorschemes = vim.fn.getcompletion("", "color")
-	local desired_colorscheme = "material-lighter"
+	local desired_colorscheme = "catppuccin-latte"
 
 	if vim.tbl_contains(colorschemes, desired_colorscheme) then
 		vim.cmd("colorscheme " .. desired_colorscheme)

lua/keybindings.lua

@@ -43,7 +43,7 @@ map("n", ",", ":Jaq<CR>", opt)
 
 -- markdown related
 wk.add({
-  { "<Leader>m", ":MarkdownPreview<CR>", desc = "Markdown preview" },
+	{ "<Leader>m", ":RenderMarkdown toggle<CR>", desc = "Markdown preview" },
 })
 
 -- git related
@@ -92,7 +92,6 @@ map("v", ">", ">gv", opt)
 -- neoTree
 map("n", "T", ":NeoTreeFocusToggle<CR>", opt)
 
-
 -- 定义开关quickfix窗口的函数
 
 local function toggle_quickfix()
@@ -121,7 +120,13 @@ wk.add({
 	{ "<Leader>bn", ":ls<CR>", desc = "Buffer numbers" },
 	{ "<Leader>bc", ":noh<CR>", desc = "Cancel highlight" },
 	{ "<Leader>bC", ":call setqflist([], 'r')<CR>", desc = "Clear quickfix" },
-  { "<Leader>bq", function() toggle_quickfix() end, desc = "Toggle quickfix" },
+	{
+		"<Leader>bq",
+		function()
+			toggle_quickfix()
+		end,
+		desc = "Toggle quickfix",
+	},
 	{ "<Leader>bs", ":Telescope current_buffer_fuzzy_find<CR>", desc = "Searching in buffer" },
 })
 
@@ -130,15 +135,14 @@ wk.add({
 })
 
 wk.add({
-  { "<Leader>c", group = "ChatGPT" },
+	{ "<Leader>c", group = "GPT" },
-  { "<Leader>cb", ":%GpAppend<CR>", desc = "gpt response by buffer" },
+	{ "<Leader>ct", ":CodeCompanionChat Toggle<CR>", desc = "Code companion chat" },
+	{
+		mode = { "n", "v" }, -- NORMAL and VISUAL mode
+		{ "<leader>ca", "<cmd>CodeCompanionActions<cr>", desc = "Code companion actions" },
+	},
 })
 
--- use gp to interact with chatgpt to write code
-map("v", "<C-g>r", ":<C-u>'<,'>GpRewrite<cr>", opt)
-map("v", "<C-g>a", ":<C-u>'<,'>GpAppend<cr>", opt)
-
-
 -- 快速切换主题
 -- wk.register({
 -- 	["<Leader>c"] = { ":Telescope colorscheme<CR>", "Quick change colortheme" },
@@ -175,7 +179,11 @@ wk.add({
 	{ "<Leader>dr", ":lua require('dap').continue()<CR>", desc = "Start debug" },
 	{ "<Leader>db", ":lua require('dap').toggle_breakpoint()<CR>", desc = "Set breakpoint" },
 	{ "<Leader>dc", ":lua require('dap').clear_breakpoints()<CR>", desc = "Clear breakpoint" },
-  { "<Leader>de", ":lua require'dap'.close()<CR>:lua require'dap'.terminate()<CR>:lua require'dap.repl'.close()<CR>:lua require'dapui'.close()<CR>:DapVirtualTextDisable<CR><C-w>o<CR>", desc = "Stop debug" },
+	{
+		"<Leader>de",
+		":lua require'dap'.close()<CR>:lua require'dap'.terminate()<CR>:lua require'dap.repl'.close()<CR>:lua require'dapui'.close()<CR>:DapVirtualTextDisable<CR><C-w>o<CR>",
+		desc = "Stop debug",
+	},
 })
 
 -- cmpeletion keys
@@ -214,29 +222,29 @@ function SetKeybinds()
 	local opts = { prefix = "<localleader>", buffer = 0 }
 
 	if fileTy == "markdown" then
-		wk.register({
+		wk.add({
-			["t"] = { ":InsertNToc<CR>", "Insert table of content" },
+			{ "<localleader>t", ":InsertNToc<CR>", desc = "Insert table of content", buffer = 0 },
-			["d"] = { ":HeaderDecrease<CR>", "All header decrease" },
+			{ "<localleader>d", ":HeaderDecrease<CR>", desc = "All header decrease", buffer = 0 },
-			["i"] = { ":HeaderIncrease<CR>", "All header increase" },
+			{ "<localleader>i", ":HeaderIncrease<CR>", desc = "All header increase", buffer = 0 },
-		}, opts)
+		})
 	elseif fileTy == "python" then
-		wk.register({
+		wk.add({
-			["r"] = { ":MagmaEvaluateOperator<CR>", "Jupyter evaluate" },
+			{ "<localleader>r", ":MagmaEvaluateOperator<CR>", desc = "Jupyter evaluate", buffer = 0 },
-			["c"] = { ":MagmaEvaluateCell<CR>", "Jupyter evaluate cell" },
+			{ "<localleader>c", ":MagmaEvaluateCell<CR>", desc = "Jupyter evaluate cell", buffer = 0 },
-		}, opts)
+		})
 	elseif fileTy == "dart" then
-		wk.register({
+		wk.add({
-			["r"] = { ":FlutterRun<CR>", "FlutterRun" },
+			{ "<localleader>r", ":FlutterRun<CR>", desc = "FlutterRun", buffer = 0 },
-			["q"] = { ":FlutterQuit<CR>", "FlutterQuit" },
+			{ "<localleader>q", ":FlutterQuit<CR>", desc = "FlutterQuit", buffer = 0 },
-			["c"] = { ":FlutterCopyProfilerUrl<CR>", "FlutterCopyProfilerUrl" },
+			{ "<localleader>c", ":FlutterCopyProfilerUrl<CR>", desc = "FlutterCopyProfilerUrl", buffer = 0 },
-			["w"] = { ":FlutterDevTools<CR>", "FlutterDevTools" },
+			{ "<localleader>w", ":FlutterDevTools<CR>", desc = "FlutterDevTools", buffer = 0 },
-		}, opts)
+		})
-
 		-- elseif fileTy == "sh" then
-		-- 	wk.register({
+		--     wk.add({
-		-- 		["W"] = { ":w<CR>", "test write" },
+		--         { "<localleader>W", ":w<CR>", desc = "test write", buffer = 0 },
-		-- 		["Q"] = { ":q<CR>", "test quit" },
+		--         { "<localleader>Q", ":q<CR>", desc = "test quit", buffer = 0 },
-		-- 	}, opts)
+		--     })
 	end
 end
+
 return pluginKeys

lua/lsp/cmp.lua

@@ -24,6 +24,7 @@ cmp.setup({
 		{ name = "orgmode" },
 		{ name = "nvim_lsp" },
 		{ name = "omni" },
+		{ name = "codeium" },
 		-- For vsnip users.
 		-- { name = "vsnip" },
 		-- For luasnip users.

lua/plugin-config/buffer_line.lua

@@ -1,3 +0,0 @@
-require("bufferline").setup({
-	options = {},
-})

lua/plugin-config/lua_line.lua

@@ -1,14 +1,14 @@
 -- 显示lsp_name
 local function lsp_name()
 	local msg = "No Active Lsp"
-	local buf_ft = vim.api.nvim_buf_get_option(0, "filetype")
+	local buf_ft = vim.api.nvim_get_option_value("filetype", { buf = 0 })
-	local clients = vim.lsp.get_active_clients()
+	local clients = vim.lsp.get_clients({ bufnr = 0 })
-	if next(clients) == nil then
+	if #clients == 0 then
 		return msg
 	end
 	for _, client in ipairs(clients) do
 		local filetypes = client.config.filetypes
-		if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
+		if filetypes and vim.tbl_contains(filetypes, buf_ft) then
 			return client.name
 		end
 	end

lua/plugins/codecompanian.lua

@@ -0,0 +1,43 @@
+return {
+	"olimorris/codecompanion.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		"nvim-treesitter/nvim-treesitter",
+		"hrsh7th/nvim-cmp", -- Optional: For using slash commands and variables in the chat buffer
+		"nvim-telescope/telescope.nvim", -- Optional: For using slash commands
+		{ "stevearc/dressing.nvim", opts = {} }, -- Optional: Improves the default Neovim UI
+	},
+	config = true,
+	opts = {
+		log_level = "TRACE",
+		strategies = {
+			chat = {
+				adapter = "openai",
+			},
+			inline = {
+				adapter = "openai",
+			},
+			agent = {
+				adapter = "openai",
+			},
+		},
+		adapters = {
+			openai = function()
+				return require("codecompanion.adapters").extend("openai", {
+					env = {
+						api_key = "cmd:sed -n '1p' ~/.config/nvim/secrets/openai_config.txt | tr -d '\n'",
+					},
+					schema = {
+						model = {
+							default = "claude-3-5-sonnet-20240620",
+						},
+					},
+					url = "cmd:sed -n '2p' ~/.config/nvim/secrets/openai_config.txt | tr -d '\n'",
+					opts = {
+						stream = false,
+					},
+				})
+			end,
+		},
+	},
+}

lua/plugins/list.lua

@@ -1,16 +1,23 @@
 return {
 	{ "rafcamlet/nvim-luapad" },
 	{ "echasnovski/mini.nvim", version = false },
+	-- theme 主题
 	{ "sainnhe/everforest" },
+	{
+		"folke/tokyonight.nvim",
+		lazy = false,
+		priority = 1000,
+		opts = {},
+	},
+	{ "catppuccin/nvim", name = "catppuccin", priority = 1000 },
 	{ "marko-cerovac/material.nvim" },
 	{ "akinsho/toggleterm.nvim", version = "*" },
 	{ "smjonas/live-command.nvim" },
 	{ "kdheepak/lazygit.nvim" },
 	{
-		"iamcco/markdown-preview.nvim",
+		"MeanderingProgrammer/render-markdown.nvim",
-		build = function()
+		opts = {},
-			vim.fn["mkdp#util#install"]()
+		dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
-		end,
 	},
 	{ "jakewvincent/mkdnflow.nvim" },
 	{