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/config/keymaps.lua
+30 -3
View File
@@ -79,9 +79,36 @@ keymap("n", "<leader>sv", "<cmd>vsplit<cr>", { desc = "垂直分屏" })
keymap("n", "<leader>sh", "<cmd>split<cr>", { desc = "水平分屏" })
keymap("n", "<leader>sc", "<cmd>close<cr>", { desc = "关闭窗口" })
-- Buffer 导航
keymap("n", "<S-h>", "<cmd>bprevious<cr>", { desc = "下一个 buffer" })
keymap("n", "<S-l>", "<cmd>bnext<cr>", { desc = "上一个 buffer" })
-- Buffer 导航（跳过终端类 buffer）
local function skip_terminal_buffers(direction)
local bufs = vim.api.nvim_list_bufs()
-- 收集所有可显示、非终端、非特殊类型的 buffer
local valid = {}
for _, b in ipairs(bufs) do
if vim.api.nvim_buf_is_loaded(b) and vim.bo[b].buflisted then
local bt = vim.bo[b].buftype
-- 跳过 terminal/nofile/help/quickfix 等
if bt == "" or bt == "acwrite" then
table.insert(valid, b)
end
end
end
if #valid == 0 then return end
-- 找当前 buffer 在 valid 列表中的位置
local current = vim.api.nvim_get_current_buf()
local idx = 1
for i, b in ipairs(valid) do
if b == current then idx = i break end
end
-- 按方向计算下一个（-1 = previous, 1 = next）
local next_idx = (idx + direction - 1) % #valid + 1
vim.api.nvim_set_current_buf(valid[next_idx])
end
keymap("n", "<S-h>", function() skip_terminal_buffers(-1) end, { desc = "上一个 buffer" })
keymap("n", "<S-l>", function() skip_terminal_buffers(1) end, { desc = "下一个 buffer" })
-- Buffer 操作
keymap("n", "<leader>bc", "<cmd>Bdelete<cr>", { desc = "关闭当前 buffer" })
nvim/lua/matugen.lua
+59
View File
@@ -0,0 +1,59 @@
local M = {}
function M.setup()
require('base16-colorscheme').setup({
base00 = '#101418',
base01 = '#1c2025',
base02 = '#272a2f',
base03 = '#8a919c',
base04 = '#c0c7d3',
base05 = '#e0e2e9',
base06 = '#e0e2e9',
base07 = '#e0e2e9',
base08 = '#ffb4ab',
base09 = '#ecb2ff',
base0A = '#adc9ec',
base0B = '#9dcaff',
base0C = '#ecb2ff',
base0D = '#9dcaff',
base0E = '#adc9ec',
base0F = '#d1e4ff',
})
local hi = function(group, opts)
vim.api.nvim_set_hl(0, group, opts)
end
hi('TelescopeNormal', { fg = '#e0e2e9', bg = '#101418' })
hi('TelescopeBorder', { fg = '#8a919c', bg = '#101418' })
hi('TelescopePromptNormal', { fg = '#e0e2e9', bg = '#101418' })
hi('TelescopePromptBorder', { fg = '#8a919c', bg = '#101418' })
hi('TelescopePromptPrefix', { fg = '#9dcaff', bg = '#101418' })
hi('TelescopePromptCounter', { fg = '#c0c7d3', bg = '#101418' })
hi('TelescopePromptTitle', { fg = '#101418', bg = '#9dcaff' })
hi('TelescopePreviewTitle', { fg = '#101418', bg = '#adc9ec' })
hi('TelescopeResultsTitle', { fg = '#101418', bg = '#ecb2ff' })
hi('TelescopeSelection', { fg = '#e0e2e9', bg = '#272a2f' })
hi('TelescopeSelectionCaret', { fg = '#9dcaff', bg = '#272a2f' })
hi('TelescopeMatching', { fg = '#9dcaff', bold = true })
end
-- Register a signal handler for SIGUSR1 (matugen updates).
-- The handler re-requires this module, which re-runs the code below, so the
-- previous handle is stopped first; otherwise handlers double on every signal.
if _G.__matugen_signal then
_G.__matugen_signal:stop()
_G.__matugen_signal:close()
end
local signal = vim.uv.new_signal()
_G.__matugen_signal = signal
signal:start(
'sigusr1',
vim.schedule_wrap(function()
package.loaded['matugen'] = nil
require('matugen').setup()
end)
)
return M
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 = {
nvim/lua/runner.lua
+19 -11
View File
@@ -4,6 +4,14 @@
local M = {}
--- 获取 CPU 核心数，用于并行构建
---@return integer
local function cpu_count()
local info = vim.loop.cpu_info()
return info and #info or 8
end
local NPROC = tostring(cpu_count())
--- 检测当前项目类型
---@return "rust"|"cmake"|"python"|"go"|"unknown"
function M.detect()
@@ -62,31 +70,31 @@ local function run_in_terminal(cmd, title)
term:toggle()
end
--- 构建（使用底部终端）
--- 构建（使用底部终端，多核并行）
function M.build()
local project = M.detect()
if project == "rust" then
run_in_terminal("cargo build", "Cargo Build")
run_in_terminal("cargo build -j " .. NPROC, "Cargo Build")
elseif project == "cmake" then
vim.cmd("CMakeBuild")
elseif project == "go" then
run_in_terminal("go build ./...", "Go Build")
run_in_terminal("go build -p " .. NPROC .. " ./...", "Go Build")
else
vim.notify("未识别的项目类型，无法自动构建", vim.log.levels.WARN)
end
end
--- 运行（使用底部终端）
--- 运行（使用底部终端，编译阶段并行）
function M.run()
local project = M.detect()
if project == "rust" then
run_in_terminal("cargo run", "Cargo Run")
run_in_terminal("cargo run -j " .. NPROC, "Cargo Run")
elseif project == "cmake" then
vim.cmd("CMakeRun")
elseif project == "go" then
run_in_terminal("go run .", "Go Run")
run_in_terminal("go run -p " .. NPROC .. " .", "Go Run")
elseif project == "python" then
run_in_terminal("python " .. vim.fn.expand("%"), "Python Run")
else
@@ -107,19 +115,19 @@ function M.debug()
end
end
--- 测试（使用底部终端）
--- 测试（使用底部终端，并行执行）
function M.test()
local project = M.detect()
if project == "rust" then
run_in_terminal("cargo test", "Cargo Test")
run_in_terminal("cargo test -j " .. NPROC, "Cargo Test")
elseif project == "cmake" then
vim.cmd("CMakeBuild")
run_in_terminal("ctest --test-dir build", "CTest")
run_in_terminal("ctest --test-dir build -j " .. NPROC, "CTest")
elseif project == "go" then
run_in_terminal("go test ./...", "Go Test")
run_in_terminal("go test -p " .. NPROC .. " ./...", "Go Test")
elseif project == "python" then
run_in_terminal("pytest", "Pytest")
run_in_terminal("pytest -n " .. NPROC, "Pytest")
else
vim.notify("未识别的项目类型，无法自动测试", vim.log.levels.WARN)
end