atdunbg/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
atdunbg
2026-09-25 20:54:28 +08:00
parent 88c9035c43
commit 07532d215f
33 changed files with 843 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/lua/plugins/base16.lua
+6
View File
@@ -0,0 +1,6 @@
return { 'RRethy/base16-nvim',
config = function()
local ok, matugen = pcall(require, 'matugen')
if ok then matugen.setup() end
end,
}
nvim/lua/plugins/cmake-tools.lua
+2
View File
@@ -15,6 +15,8 @@ return {
cmake_generate_options = { "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" },
cmake_build_directory = "build",
cmake_soft_link_compile_commands = true,
cmake_parallel_jobs = tostring(vim.loop.cpu_info() and #vim.loop.cpu_info() or 8),
cmake_build_options = { "--parallel", tostring(vim.loop.cpu_info() and #vim.loop.cpu_info() or 8) },
cmake_dap_configuration = {
name = "cpp",
type = "codelldb",
nvim/lua/plugins/colorscheme.lua
+135 -39
View File
@@ -1,45 +1,141 @@
-- =============================================================================
-- colorscheme.lua — 主题
-- colorscheme.lua — tokyonight(UI 主题, 全透明) + VSCode Dark+ 代码配色覆盖
-- =============================================================================
return {
{
"folke/tokyonight.nvim",
lazy = false,
priority = 1000,
opts = {
style = "night",
transparent = true,
styles = {
sidebars = "transparent",
floats = "transparent",
},
on_highlights = function(hl, c)
-- bufferline 标签栏背景透明
hl.BufferLineFill = { bg = "NONE" }
hl.BufferLineBackGround = { bg = "NONE", fg = c.fg_gutter }
hl.BufferLineBackGroundVisible = { bg = "NONE", fg = c.fg }
hl.BufferLineBackGroundSelected = { bg = c.bg_highlight, fg = c.fg, bold = true }
hl.BufferLineSeparator = { fg = c.fg_gutter }
hl.BufferLineSeparatorSelected = { fg = c.blue }
end,
},
config = function(_, opts)
require("tokyonight").setup(opts)
vim.cmd.colorscheme("tokyonight")
{
"folke/tokyonight.nvim",
lazy = false,
priority = 1000,
opts = {
style = "night",
transparent = true,
styles = {
sidebars = "transparent",
floats = "transparent", -- 浮动窗也透明(用户原本就是这个状态)
},
on_highlights = function(hl, c)
-- bufferline 标签栏背景透明
hl.BufferLineFill = { bg = "NONE" }
hl.BufferLineBackGround = { bg = "NONE", fg = c.fg_gutter }
hl.BufferLineBackGroundVisible = { bg = "NONE", fg = c.fg }
hl.BufferLineBackGroundSelected = { bg = c.bg_highlight, fg = c.fg, bold = true }
hl.BufferLineSeparator = { fg = c.fg_gutter }
hl.BufferLineSeparatorSelected = { fg = c.blue }
end,
},
config = function(_, opts)
require("tokyonight").setup(opts)
vim.cmd.colorscheme("tokyonight")
-- inlay hints 去掉背景
vim.api.nvim_create_autocmd("ColorScheme", {
pattern = "tokyonight",
callback = function()
vim.api.nvim_set_hl(0, "LspInlayHint", {
bg = "NONE", fg = "#565f89", italic = true,
})
-- VSCode Dark+ 代码配色覆盖(只覆盖代码高亮组,UI/border/inlay hint 全走 tokyonight 默认)
local vs = {
variable = "#9CDCFE", -- 浅蓝
builtin_var = "#569CD6", -- 蓝
parameter = "#9CDCFE",
field = "#9CDCFE",
property = "#9CDCFE",
func = "#DCDCAA", -- 浅黄
builtin_fn = "#DCDCAA",
method = "#DCDCAA",
type = "#4EC9B0", -- teal
builtin_type = "#4EC9B0",
struct = "#4EC9B0",
class = "#4EC9B0",
enum = "#4EC9B0",
constructor = "#4EC9B0",
module = "#4EC9B0",
constant = "#4FC1FF",
builtin_const = "#569CD6",
macro = "#B5CEA8",
keyword = "#569CD6",
keyword_ctrl = "#C586C0", -- pink(控制流)
operator = "#D4D4D4", -- 灰白
punctuation = "#D4D4D4",
string = "#CE9178", -- 橙
string_escape = "#D7BA7D",
number = "#B5CEA8", -- 浅绿
boolean = "#569CD6",
comment = "#565f89", -- 灰绿
}
local override = function()
local set = function(name, spec)
vim.api.nvim_set_hl(0, name, spec)
end
-- treesitter
set("@variable", { fg = vs.variable })
set("@variable.builtin", { fg = vs.builtin_var })
set("@variable.parameter", { fg = vs.parameter, italic = true })
set("@variable.member", { fg = vs.field })
set("@field", { fg = vs.field })
set("@property", { fg = vs.property })
set("@function", { fg = vs.func })
set("@function.call", { fg = vs.func })
set("@function.builtin", { fg = vs.builtin_fn })
set("@method", { fg = vs.method })
set("@method.call", { fg = vs.method })
set("@constructor", { fg = vs.constructor })
set("@type", { fg = vs.type })
set("@type.builtin", { fg = vs.builtin_type })
set("@type.definition", { fg = vs.type })
set("@struct", { fg = vs.struct })
set("@class", { fg = vs.class })
set("@enum", { fg = vs.enum })
set("@module", { fg = vs.module })
set("@constant", { fg = vs.constant })
set("@constant.builtin", { fg = vs.builtin_const })
set("@macro", { fg = vs.macro })
set("@keyword", { fg = vs.keyword })
set("@keyword.function", { fg = vs.keyword_ctrl })
set("@keyword.operator", { fg = vs.keyword })
set("@keyword.return", { fg = vs.keyword_ctrl })
set("@operator", { fg = vs.operator })
set("@punctuation", { fg = vs.punctuation })
set("@punctuation.bracket", { fg = vs.punctuation })
set("@punctuation.delimiter", { fg = vs.punctuation })
set("@punctuation.special", { fg = vs.string_escape })
set("@string", { fg = vs.string })
set("@string.escape", { fg = vs.string_escape })
set("@string.special", { fg = vs.string_escape })
set("@number", { fg = vs.number })
set("@boolean", { fg = vs.boolean })
set("@float", { fg = vs.number })
set("@comment", { fg = vs.comment, italic = true })
set("@tag", { fg = vs.keyword })
set("@tag.attribute", { fg = vs.variable })
set("@tag.delimiter", { fg = vs.punctuation })
set("@attribute", { fg = vs.keyword })
set("@label", { fg = vs.variable })
-- LSP semantic tokens (clangd / lua_ls 发送)
set("@lsp.type.variable", { fg = vs.variable })
set("@lsp.type.parameter", { fg = vs.parameter, italic = true })
set("@lsp.type.property", { fg = vs.property })
set("@lsp.type.function", { fg = vs.func })
set("@lsp.type.method", { fg = vs.method })
set("@lsp.type.class", { fg = vs.class })
set("@lsp.type.struct", { fg = vs.struct })
set("@lsp.type.enum", { fg = vs.enum })
set("@lsp.type.enumMember", { fg = vs.constant })
set("@lsp.type.constant", { fg = vs.constant })
set("@lsp.type.field", { fg = vs.field })
set("@lsp.type.typeParameter", { fg = vs.type })
set("@lsp.mod.readonly", { fg = vs.constant })
set("@lsp.typemod.variable.readonly", { fg = vs.constant })
set("@lsp.typemod.variable.global", { fg = vs.constant })
-- inlay hint 透明背景 + 用户原来的紫灰色 #565f89
set("LspInlayHint", { bg = "NONE", fg = "#565f89", italic = true })
end
-- 切到 tokyonight 后立即覆盖,ColorScheme 事件再覆盖一次(防 lazy reload)
vim.api.nvim_create_autocmd("ColorScheme", {
pattern = "tokyonight",
callback = override,
})
override()
end,
})
vim.api.nvim_set_hl(0, "LspInlayHint", {
bg = "NONE", fg = "#565f89", italic = true,
})
end,
},
}
},
}
nvim/lua/plugins/conform.lua
+4 -1
View File
@@ -33,7 +33,10 @@ return {
},
formatters = {
["clang-format"] = {
args = { "--style={BasedOnStyle: LLVM, IndentWidth: 4, TabWidth: 4, UseTab: Never, ColumnLimit: 0}" },
-- 用 prepend_args (不是 args!): 保留 conform 默认的 "-assume-filename $FILENAME".
-- 若用 args 会覆盖默认值, 导致 clang-format 读 stdin 时丢失文件名 → 语言检测/样式查找出问题.
-- 优先读项目 .clang-format 文件; 没有该文件时用此内联 4 空格样式兜底.
prepend_args = { "--style={BasedOnStyle: LLVM, IndentWidth: 4, TabWidth: 4, UseTab: Never, ColumnLimit: 0}" },
},
},
},
nvim/lua/plugins/lsp.lua
+43 -7
View File
@@ -25,6 +25,32 @@ return {
},
},
-- lspsaga: LSP UI 增强(hover 滚动、智能定位、诊断、重命名等)
-- 替代手写 hover 滚动逻辑,自带 VSCode 风格滚动键 <C-d>/<C-u>/<C-f>/<C-b>
{
"nvimdev/lspsaga.nvim",
event = "LspAttach",
dependencies = {
"nvim-treesitter/nvim-treesitter",
"nvim-tree/nvim-web-devicons",
},
opts = {
lightbulb = { enable = false },
hover = {
max_width = 0.6,
max_height = 0.8,
},
ui = {
border = "rounded",
code_action = "bulb",
},
scroll_preview = {
scroll_down = "<C-d>",
scroll_up = "<C-u>",
},
},
},
-- LSP 配置（Neovim 0.11+ vim.lsp.config API）
{
"neovim/nvim-lspconfig",
@@ -33,11 +59,12 @@ return {
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
"saghen/blink.cmp",
"nvimdev/lspsaga.nvim",
},
config = function()
local caps = require("blink.cmp").get_lsp_capabilities()
-- LSP 附加时自动开启 inlay hints
-- LSP 附加时绑定 keymap + 开 inlay hints
vim.api.nvim_create_autocmd("LspAttach", {
callback = function(args)
local map = function(keys, func, desc)
@@ -45,18 +72,27 @@ return {
end
map("gd", vim.lsp.buf.definition, "跳转到定义")
map("gr", vim.lsp.buf.references, "查找引用")
map("K", vim.lsp.buf.hover, "悬浮文档")
map("<leader>rn", vim.lsp.buf.rename, "重命名")
map("<M-CR>", vim.lsp.buf.code_action, "代码操作")
map("<leader>d", vim.diagnostic.open_float, "行诊断")
map("[d", vim.diagnostic.goto_prev, "上一个诊断")
map("]d", vim.diagnostic.goto_next, "下一个诊断")
map("K", "<cmd>Lspsaga hover_doc<CR>", "悬浮文档")
map("<leader>rn", "<cmd>Lspsaga rename<CR>", "重命名")
map("<M-CR>", "<cmd>Lspsaga code_action<CR>", "代码操作")
map("<leader>d", "<cmd>Lspsaga show_line_diagnostics<CR>", "行诊断")
map("[d", "<cmd>Lspsaga diagnostic_jump_prev<CR>", "上一个诊断")
map("]d", "<cmd>Lspsaga diagnostic_jump_next<CR>", "下一个诊断")
-- 开启 inlay hints
vim.lsp.inlay_hint.enable(true, { bufnr = args.buf })
end,
})
-- 诊断全局配置
vim.diagnostic.config({
virtual_text = false,
signs = true,
underline = true,
update_in_insert = false,
float = { border = "rounded" },
})
-- Lua
vim.lsp.config['lua_ls'] = {
cmd = { 'lua-language-server' },
nvim/lua/plugins/telescope.lua
+1 -1
View File
@@ -5,7 +5,7 @@
return {
{
"nvim-telescope/telescope.nvim",
branch = "0.1.x",
branch = "master", -- 0.1.x 没适配新 treesitter main 分支 API（ft_to_lang 已移除）
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope-ui-select.nvim",
nvim/lua/plugins/treesitter.lua
+1
View File
@@ -5,6 +5,7 @@
return {
{
"nvim-treesitter/nvim-treesitter",
branch = "main", -- master 已被上游归档，main 是现行分支
event = { "BufReadPre", "BufNewFile" },
build = ":TSUpdate",
opts = {