From 12efeede26f2791e29dd0108f449fa47f0239d57 Mon Sep 17 00:00:00 2001 From: js0ny Date: Thu, 9 Jan 2025 15:16:12 +0000 Subject: [PATCH] format with stylua --- common/ideavimrc | 152 +++++++++++----- tools/nvim/lua/config/keymaps.lua | 1 - tools/nvim/lua/config/options.lua | 1 - tools/nvim/lua/config/servers.lua | 30 ++-- tools/nvim/lua/keymaps/basic.lua | 6 +- tools/nvim/lua/keymaps/init.lua | 26 ++- tools/nvim/lua/keymaps/language.lua | 20 +-- tools/nvim/lua/keymaps/leaders.lua | 19 +- tools/nvim/lua/keymaps/nvim-tree.lua | 120 ++++++------- tools/nvim/lua/plugins/appearance.lua | 8 +- tools/nvim/lua/plugins/fileutils.lua | 6 +- tools/nvim/lua/plugins/init.lua | 13 +- tools/nvim/lua/plugins/lsp.lua | 32 +++- tools/nvim/lua/plugins/misc.lua | 4 +- tools/nvim/lua/plugins/mod/alpha-nvim.lua | 22 +-- tools/nvim/lua/plugins/mod/auto-session.lua | 8 +- tools/nvim/lua/plugins/mod/bufferline.lua | 30 ++-- tools/nvim/lua/plugins/mod/lspconfig.lua | 2 +- tools/nvim/lua/plugins/mod/lualine.lua | 118 ++++++------- tools/nvim/lua/plugins/mod/markview.lua | 12 +- tools/nvim/lua/plugins/mod/nvim-cmp.lua | 8 +- tools/nvim/lua/plugins/mod/nvim-tree.lua | 9 +- .../nvim/lua/plugins/mod/nvim-treesitter.lua | 18 +- tools/nvim/lua/plugins/mod/obsidian-nvim.lua | 8 +- tools/nvim/lua/plugins/mod/projects.lua | 24 +-- tools/nvim/lua/plugins/mod/telescope.lua | 13 +- tools/nvim/lua/plugins/mod/winbar-nvim.lua | 43 +++-- tools/nvim/lua/plugins/syntax.lua | 7 +- tools/vscode/vscode.vimrc | 163 ++++++++++-------- tools/wezterm/wezterm.lua | 131 +++++++------- 30 files changed, 571 insertions(+), 483 deletions(-) diff --git a/common/ideavimrc b/common/ideavimrc index f1236ac..f4b0436 100644 --- a/common/ideavimrc +++ b/common/ideavimrc @@ -67,6 +67,11 @@ Plug 'easymotion/vim-easymotion' """ Keybindings """ +"" don't lose selection when indenting "" +vnoremap < >gv +vnoremap = =gv + "" edit ideavim config v + "" nnoremap vv :e ~/.ideavimrc nnoremap vr :source ~/.ideavimrc @@ -82,49 +87,7 @@ nmap S (easymotion-F) nmap f (sneak-s) nmap F (sneak-S) -"" Miscs "" -nnoremap : :action GotoAction -nnoremap :action GotoFile - -"" AI Related a + "" -nnoremap ac :action copilot.chat.show -nnoremap ad :action copilot.disableCopilot -nnoremap ae :action copilot.enableCopilot -nnoremap ai :action copilot.openCopilot - -"" Codes Action c + "" -nnoremap cf :action ReformatCode -nnoremap cs :action GotoSymbol -nnoremap c/ :action CommentByLineComment - -"" Project Action p + "" -nnoremap pr :action Run -nnoremap pd :action Debug -nnoremap pb :action Build - -"" Files Action f + "" -nnoremap fe :NERDTreeToggle -nnoremap ft :action ActivateTerminalToolWindow - -"" Tab Actions + "" -nnoremap :action Switcher - -"" Collapse and Expand z + "" -nnoremap zi :action ExpandCollapseToggleAction -nnoremap zc :action CollapseRegion -nnoremap zC :action CollapseRegionRecursively -nnoremap zM :action CollapseAll -nnoremap zo :action ExpandRegion -nnoremap zO :action ExpandRegionRecursively -nnoremap zR :action ExpandAll - -"" don't lose selection when indenting "" -vnoremap < >gv -vnoremap = =gv - - -nnoremap a :action FindInPath +"" Language Server Protocol "" nnoremap gd :action GotoDeclaration nnoremap gtd :action GotoTypeDeclaration nnoremap gtD :action QuickTypeDefinition @@ -136,13 +99,82 @@ nnoremap ga :action nnoremap gq :action ShowIntentionActions nnoremap ge :action GotoNextError -nnoremap :action ParameterInfo -inoremap :action ParameterInfo +"" Collapse and Expand z + "" +nnoremap zi :action ExpandCollapseToggleAction +nnoremap zc :action CollapseRegion +nnoremap zC :action CollapseRegionRecursively +nnoremap zM :action CollapseAll +nnoremap zo :action ExpandRegion +nnoremap zO :action ExpandRegionRecursively +nnoremap zR :action ExpandAll -"" Refractor r + "" +"" Miscs "" +nnoremap : :action GotoAction +nnoremap :action GotoFile +nnoremap h :action PrevSplitter +nnoremap i :action NextSplitter +"" AI Related a + "" +nnoremap ac :action copilot.chat.show +nnoremap ad :action copilot.disableCopilot +nnoremap ae :action copilot.enableCopilot +nnoremap aa :action copilot.openCopilot + +" b : +buffer +nnoremap bb :action Switcher +noremap bd :bdelete +noremap bh :bprevious +noremap bi :bnext +noremap bp :bprevious +noremap bn :bnext + +" c : +code/compile +nnoremap cr :action Run +nnoremap cf :action ReformatCode +nnoremap cs :action GotoSymbol +nnoremap cS :action GotoSymbol +nnoremap cR :action RenameElement +""" Works for Rider only +nnoremap ce :action ReSharperGotoNextErrorInSolution +nnoremap cE :action ReSharperGotoPrevErrorInSolution + +" d : +debug + +" f : +file +nnoremap ff :action GotoFile +nnoremap fF :action TextSearchAction +nnoremap fc :action ShowSettings +nnoremap fC :action ShowSettings +nnoremap fe :NERDTreeToggle +nnoremap fo :OpenInAssociatedApplication +nnoremap ft :action ActivateTerminalToolWindow +nnoremap fx :action WelcomeScreen.Plugins + +" g : +git +nnoremap gp :action Git.Pull +nnoremap gP :action Vcs.Push +nnoremap gb :action Git.Branches +nnoremap gR :action Git.Rebase +nnoremap gM :action Git.Merge +nnoremap gc :action CheckinProject +nnoremap gC :action Git.Clone +nnoremap gg :action ActivateVersionControlToolWindow +nnoremap gS :action Git.Stash + +" h : +help + +" p : +project +nnoremap pr :action Run +nnoremap pd :action Debug +nnoremap pb :action Build + +" q : +quit +nnoremap qq :action Exit +nnoremap Q :action Exit + +" r : +refactor nnoremap ri :action Inline -nnoremap rr :action RenameElement +nnoremap rr :action RenamElement nnoremap rev :action IntroduceVariable vnoremap rev :action IntroduceVariable nnoremap rem :action ExtractMethod @@ -151,6 +183,32 @@ nnoremap rm :action Move nnoremap ro :action OptimizeImports nnoremap rG :action Generate +" t : +test +nnoremap tt :action RiderUnitTestRunSolutionAction +nnoremap tT :action Rider.UnitTesting.MainMenu + +" u : +ui +nnoremap ui :action ChangeLaf +nnoremap uw :action EditorToggleUseSoftWraps + +" w : +write/window +nnoremap ww :write +nnoremap wa :wall +nnoremap wq :wq +nnoremap W :write +nnoremap wh :action PrevSplitter +nnoremap wi :action NextSplitter +nnoremap wH :action SplitHorizontally +nnoremap wI :action SplitHorizontally +nnoremap wN :action SplitVertically +nnoremap wE :action SplitVertically +nnoremap w- :action SplitHorizontally +nnoremap w| :action SplitVertically +nnoremap w\ :action SplitVertically + +nnoremap :action ParameterInfo +inoremap :action ParameterInfo + """ Handling Ctrls """ sethandler i:ide diff --git a/tools/nvim/lua/config/keymaps.lua b/tools/nvim/lua/config/keymaps.lua index dfc1d55..85058c1 100644 --- a/tools/nvim/lua/config/keymaps.lua +++ b/tools/nvim/lua/config/keymaps.lua @@ -1,2 +1 @@ require("keymaps") - diff --git a/tools/nvim/lua/config/options.lua b/tools/nvim/lua/config/options.lua index dea8357..a3d6e36 100644 --- a/tools/nvim/lua/config/options.lua +++ b/tools/nvim/lua/config/options.lua @@ -54,4 +54,3 @@ opt.sidescrolloff = 10 opt.conceallevel = 2 vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" - diff --git a/tools/nvim/lua/config/servers.lua b/tools/nvim/lua/config/servers.lua index 38cc888..e99c5da 100644 --- a/tools/nvim/lua/config/servers.lua +++ b/tools/nvim/lua/config/servers.lua @@ -3,21 +3,21 @@ --- for available server and name local M = {} M.servers = { - "arduino_language_server", -- Arduino - "bashls", -- Bash - "clangd", -- C/C++ - -- "cmake", -- CMake - "eslint", -- JavaScript - "gopls", -- Go - "html", -- HTML - "julials", -- Julia - "lua_ls", -- Lua - "omnisharp", -- C# & F# - "powershell_es", -- PowerShell - "pyright", -- Python - "rust_analyzer", -- Rust - "taplo", -- TOML - "vimls", -- vimscript + "arduino_language_server", -- Arduino + "bashls", -- Bash + "clangd", -- C/C++ + -- "cmake", -- CMake + "eslint", -- JavaScript + "gopls", -- Go + "html", -- HTML + "julials", -- Julia + "lua_ls", -- Lua + "omnisharp", -- C# & F# + "powershell_es", -- PowerShell + "pyright", -- Python + "rust_analyzer", -- Rust + "taplo", -- TOML + "vimls", -- vimscript } M.server_config = { diff --git a/tools/nvim/lua/keymaps/basic.lua b/tools/nvim/lua/keymaps/basic.lua index 00fa177..325c6ae 100644 --- a/tools/nvim/lua/keymaps/basic.lua +++ b/tools/nvim/lua/keymaps/basic.lua @@ -5,8 +5,8 @@ local keymaps_basic = { -- Modification of Original Keymap - Colemak { mode = mode_arrow, keys = "e", cmd = "k" }, { mode = mode_arrow, keys = "i", cmd = "l" }, { keys = "H", cmd = ":bprevious" }, - { keys = "N", cmd = "J" }, - { keys = "E", cmd = "K" }, + { keys = "N", cmd = "5j" }, + { keys = "E", cmd = "5k" }, { keys = "I", cmd = ":bnext" }, { keys = "l", cmd = "i" }, { keys = "L", cmd = "I" }, @@ -14,7 +14,7 @@ local keymaps_basic = { -- Modification of Original Keymap - Colemak { keys = "K", cmd = "N" }, { keys = "j", cmd = "e" }, { keys = "J", cmd = "E" }, - { keys = "Y", cmd = "y$"}, + { keys = "Y", cmd = "y$" }, } return keymaps_basic diff --git a/tools/nvim/lua/keymaps/init.lua b/tools/nvim/lua/keymaps/init.lua index 4849d72..ed688e2 100644 --- a/tools/nvim/lua/keymaps/init.lua +++ b/tools/nvim/lua/keymaps/init.lua @@ -11,8 +11,6 @@ local function set_keymaps(maps, default_opts, default_mode) end end - - local keymaps_basic = require("keymaps.basic") local keymaps_nvim_tree_general = require("keymaps.nvim-tree").global local keymaps_leader = require("keymaps.leaders") @@ -26,25 +24,25 @@ M.nvim_tree_keymaps = require("keymaps.nvim-tree").plugin --- `map` default for `cmp.mapping` function M.cmp_nvim_keymaps(map) return { - { keys = "", cmd = map.select_next_item(), desc = "Select next completion item" }, - { keys = "", cmd = map.select_prev_item(), desc = "Select previous completion item" }, - { keys = "", cmd = map.confirm({ select = true }), desc = "Confirm completion" }, - { keys = "", cmd = map.confirm({ select = true }), desc = "Confirm completion" }, - { keys = "", cmd = map.complete(), desc = "Trigger completion" }, - { keys = "", cmd = map.abort(), desc = "Abort completion" }, + { keys = "", cmd = map.select_next_item(), desc = "Select next completion item" }, + { keys = "", cmd = map.select_prev_item(), desc = "Select previous completion item" }, + { keys = "", cmd = map.confirm({ select = true }), desc = "Confirm completion" }, + { keys = "", cmd = map.confirm({ select = true }), desc = "Confirm completion" }, + { keys = "", cmd = map.complete(), desc = "Trigger completion" }, + { keys = "", cmd = map.abort(), desc = "Abort completion" }, } end local function set_markdown_keymaps(bufnr) - local opts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set("v", "`", "c`\"`", opts) + local opts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set("v", "`", 'c`"`', opts) end vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - callback = function() - set_markdown_keymaps(0) - end, + pattern = "markdown", + callback = function() + set_markdown_keymaps(0) + end, }) require("keymaps.language") diff --git a/tools/nvim/lua/keymaps/language.lua b/tools/nvim/lua/keymaps/language.lua index 29f5d97..a2093b1 100644 --- a/tools/nvim/lua/keymaps/language.lua +++ b/tools/nvim/lua/keymaps/language.lua @@ -1,6 +1,5 @@ local M = {} - -- Markdown local function set_markdown_keymaps(bufnr) @@ -11,20 +10,19 @@ local function set_markdown_keymaps(bufnr) end end - M.markdown = { - { mode = "v", keys = "`", cmd = "c`pi`" , desc = "Wrap selection in ` for inline code" }, - { mode = "v", keys = "*", cmd = "c**pi**" , desc = "Wrap selection in ** for bold" }, - { mode = "v", keys = "_", cmd = "c*pi*" , desc = "Wrap selection in * for italic" }, + { mode = "v", keys = "`", cmd = "c`pi`", desc = "Wrap selection in ` for inline code" }, + { mode = "v", keys = "*", cmd = "c**pi**", desc = "Wrap selection in ** for bold" }, + { mode = "v", keys = "_", cmd = "c*pi*", desc = "Wrap selection in * for italic" }, } vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - callback = function() - set_markdown_keymaps(0) - vim.opt_local.shiftwidth = 2 - vim.opt_local.tabstop = 2 - end, + pattern = "markdown", + callback = function() + set_markdown_keymaps(0) + vim.opt_local.shiftwidth = 2 + vim.opt_local.tabstop = 2 + end, }) return M diff --git a/tools/nvim/lua/keymaps/leaders.lua b/tools/nvim/lua/keymaps/leaders.lua index 3cfe04a..e79bd3f 100644 --- a/tools/nvim/lua/keymaps/leaders.lua +++ b/tools/nvim/lua/keymaps/leaders.lua @@ -2,10 +2,17 @@ local M = {} local leader_general = { { keys = "", cmd = ":Telescope find_files", desc = "Find Files" }, - { keys = "/", cmd = ":Telescope live_grep", desc = "Grep Files" }, + { keys = "/", cmd = ":Telescope live_grep", desc = "Grep Files" }, + { keys = "-", cmd = ":split", desc = "Split to down" }, + { keys = "\\", cmd = ":vsplit", desc = "Split to right" }, + { keys = "|", cmd = ":vsplit", desc = "Split to right" }, + { keys = "h", cmd = "h", desc = "Left Window" }, + { keys = "n", cmd = "j", desc = "Down Window" }, + { keys = "e", cmd = "k", desc = "Up Window" }, + { keys = "i", cmd = "l", desc = "Right Window" }, } -for _,map in ipairs(leader_general) do +for _, map in ipairs(leader_general) do map.keys = "" .. map.keys table.insert(M, map) end @@ -36,9 +43,9 @@ local leader_w = { -- leader w: Windows Management } local leader_f = { -- leader f: Files/Find - { keys = "f", cmd = ":Telescope fd", desc = "Find Files"}, - { keys = "s", cmd = ":Telescope live_grep", desc = "Grep Files"}, - { keys = "b", cmd = ":Telescope buffers", desc = "List Buffers"}, + { keys = "f", cmd = ":Telescope fd", desc = "Find Files" }, + { keys = "s", cmd = ":Telescope live_grep", desc = "Grep Files" }, + { keys = "b", cmd = ":Telescope buffers", desc = "List Buffers" }, { keys = "e", cmd = ":NvimTreeToggle", desc = "Toggle File Explorer" }, } @@ -46,6 +53,7 @@ local leader_p = { -- leader p: Project } local leader_b = { -- leader b: Buffer + { keys = "a", cmd = ":Alpha", desc = "Dashboard" }, { keys = "d", cmd = ":bdelete", desc = "Delete Buffer" }, { keys = "h", cmd = ":bprevious", desc = "Previous Buffer" }, { keys = "i", cmd = ":bnext", desc = "Next Buffer" }, @@ -54,6 +62,7 @@ local leader_b = { -- leader b: Buffer { keys = "0", cmd = ":bfirst", desc = "First Buffer" }, { keys = "^", cmd = ":bfirst", desc = "First Buffer" }, { keys = "$", cmd = ":blast", desc = "Last Buffer" }, + { keys = "s", cmd = ":Telescope buffers", desc = "Search buffers" }, } for _, map in ipairs(leader_q) do diff --git a/tools/nvim/lua/keymaps/nvim-tree.lua b/tools/nvim/lua/keymaps/nvim-tree.lua index 2e8f57b..262944e 100644 --- a/tools/nvim/lua/keymaps/nvim-tree.lua +++ b/tools/nvim/lua/keymaps/nvim-tree.lua @@ -8,73 +8,73 @@ function M.plugin(api, opts) -- mode is set to "n" by default, in `./lua/plugins/nvim-tree.lua` return { -- Toggle - { keys = "e", cmd = ":NvimTreeToggle", opts = opts("Toggle") }, + { keys = "e", cmd = ":NvimTreeToggle", opts = opts("Toggle") }, -- Arrow 箭头 hnei - { keys = "h", cmd = api.node.navigate.parent_close, opts = opts("Close node") }, - { keys = "i", cmd = api.node.open.edit, opts = opts("Open") }, - { keys = "H", cmd = api.tree.toggle_hidden_filter, opts = opts("Toggle Dotfiles") }, - { keys = "N", cmd = api.node.navigate.sibling.next, opts = opts("Next Sibling") }, - { keys = "E", cmd = api.node.navigate.sibling.prev, opts = opts("Previous Sibling") }, - { keys = "I", cmd = api.tree.toggle_gitignore_filter, opts = opts("Toggle GitIgnored") }, + { keys = "h", cmd = api.node.navigate.parent_close, opts = opts("Close node") }, + { keys = "i", cmd = api.node.open.edit, opts = opts("Open") }, + { keys = "H", cmd = api.tree.toggle_hidden_filter, opts = opts("Toggle Dotfiles") }, + { keys = "N", cmd = api.node.navigate.sibling.next, opts = opts("Next Sibling") }, + { keys = "E", cmd = api.node.navigate.sibling.prev, opts = opts("Previous Sibling") }, + { keys = "I", cmd = api.tree.toggle_gitignore_filter, opts = opts("Toggle GitIgnored") }, -- CONTROL KEYS 控制键 - { keys = "", cmd = api.node.navigate.parent_close, opts = opts("Close node") }, - { keys = "", cmd = api.node.open.edit, opts = opts("Open") }, - { keys = "", cmd = api.node.open.preview, opts = opts("Open Preview") }, + { keys = "", cmd = api.node.navigate.parent_close, opts = opts("Close node") }, + { keys = "", cmd = api.node.open.edit, opts = opts("Open") }, + { keys = "", cmd = api.node.open.preview, opts = opts("Open Preview") }, -- Alpha 字母键 - { keys = "a", cmd = api.fs.create, opts = opts("Create") }, - { keys = "A", cmd = api.fs.create, opts = opts("Create") }, - { keys = "bd", cmd = api.marks.bulk.delete, opts = opts("Delete Bookmarked") }, - { keys = "bt", cmd = api.marks.bulk.trash, opts = opts("Trash Bookmarked") }, - { keys = "bmv", cmd = api.marks.bulk.move, opts = opts("Move Bookmarked") }, - { keys = "B", cmd = api.tree.toggle_no_buffer_filter, opts = opts("Toggle Filter: No Buffer") }, - { keys = "c", cmd = api.fs.copy.node, opts = opts("Copy") }, - { keys = "C", cmd = api.fs.copy.filename, opts = opts("Copy") }, - { keys = "d", cmd = api.fs.remove, opts = opts("Delete") }, - { keys = "D", cmd = api.fs.trash, opts = opts("Trash") }, - { keys = "]e", cmd = api.node.navigate.diagnostics.next, opts = opts("Next Diagnostic") }, - { keys = "[e", cmd = api.node.navigate.diagnostics.prev, opts = opts("Prev Diagnostic") }, - { keys = "F", cmd = api.live_filter.clear, opts = opts("Live Filter: Clear") }, - { keys = "f", cmd = api.live_filter.start, opts = opts("Live Filter: Start") }, - { keys = "[g", cmd = api.node.navigate.git.prev, opts = opts("Prev Git") }, - { keys = "]g", cmd = api.node.navigate.git.next, opts = opts("Next Git") }, - { keys = "L", cmd = api.node.open.toggle_group_empty, opts = opts("Toggle Group Empty") }, - { keys = "M", cmd = api.tree.toggle_no_bookmark_filter, opts = opts("Toggle Filter: No Bookmark") }, - { keys = "m", cmd = api.marks.toggle, opts = opts("Toggle Bookmark") }, - { keys = "o", cmd = api.node.open.edit, opts = opts("Open") }, - { keys = "O", cmd = api.node.open.no_window_picker, opts = opts("Open: No Window Picker") }, - { keys = "p", cmd = api.fs.paste, opts = opts("Paste") }, - { keys = "P", cmd = api.node.navigate.parent, opts = opts("Parent Directory") }, - { keys = "q", cmd = api.tree.close, opts = opts("Close") }, - { keys = "r", cmd = api.fs.rename, opts = opts("Rename") }, - { keys = "R", cmd = api.tree.reload, opts = opts("Refresh") }, - { keys = "s", cmd = api.node.run.system, opts = opts("Run System") }, - { keys = "S", cmd = api.tree.search_node, opts = opts("Search") }, - { keys = "u", cmd = api.fs.rename_full, opts = opts("Rename: Full Path") }, - { keys = "U", cmd = api.tree.toggle_custom_filter, opts = opts("Toggle Filter: Hidden") }, - { keys = "W", cmd = api.tree.collapse_all, opts = opts("Collapse") }, - { keys = "x", cmd = api.fs.cut, opts = opts("Cut") }, - { keys = "y", cmd = api.fs.copy.relative_path, opts = opts("Copy Relative Path") }, - { keys = "Y", cmd = api.fs.copy.absolute_path, opts = opts("Copy Absolute Path") }, + { keys = "a", cmd = api.fs.create, opts = opts("Create") }, + { keys = "A", cmd = api.fs.create, opts = opts("Create") }, + { keys = "bd", cmd = api.marks.bulk.delete, opts = opts("Delete Bookmarked") }, + { keys = "bt", cmd = api.marks.bulk.trash, opts = opts("Trash Bookmarked") }, + { keys = "bmv", cmd = api.marks.bulk.move, opts = opts("Move Bookmarked") }, + { keys = "B", cmd = api.tree.toggle_no_buffer_filter, opts = opts("Toggle Filter: No Buffer") }, + { keys = "c", cmd = api.fs.copy.node, opts = opts("Copy") }, + { keys = "C", cmd = api.fs.copy.filename, opts = opts("Copy") }, + { keys = "d", cmd = api.fs.remove, opts = opts("Delete") }, + { keys = "D", cmd = api.fs.trash, opts = opts("Trash") }, + { keys = "]e", cmd = api.node.navigate.diagnostics.next, opts = opts("Next Diagnostic") }, + { keys = "[e", cmd = api.node.navigate.diagnostics.prev, opts = opts("Prev Diagnostic") }, + { keys = "F", cmd = api.live_filter.clear, opts = opts("Live Filter: Clear") }, + { keys = "f", cmd = api.live_filter.start, opts = opts("Live Filter: Start") }, + { keys = "[g", cmd = api.node.navigate.git.prev, opts = opts("Prev Git") }, + { keys = "]g", cmd = api.node.navigate.git.next, opts = opts("Next Git") }, + { keys = "L", cmd = api.node.open.toggle_group_empty, opts = opts("Toggle Group Empty") }, + { keys = "M", cmd = api.tree.toggle_no_bookmark_filter, opts = opts("Toggle Filter: No Bookmark") }, + { keys = "m", cmd = api.marks.toggle, opts = opts("Toggle Bookmark") }, + { keys = "o", cmd = api.node.open.edit, opts = opts("Open") }, + { keys = "O", cmd = api.node.open.no_window_picker, opts = opts("Open: No Window Picker") }, + { keys = "p", cmd = api.fs.paste, opts = opts("Paste") }, + { keys = "P", cmd = api.node.navigate.parent, opts = opts("Parent Directory") }, + { keys = "q", cmd = api.tree.close, opts = opts("Close") }, + { keys = "r", cmd = api.fs.rename, opts = opts("Rename") }, + { keys = "R", cmd = api.tree.reload, opts = opts("Refresh") }, + { keys = "s", cmd = api.node.run.system, opts = opts("Run System") }, + { keys = "S", cmd = api.tree.search_node, opts = opts("Search") }, + { keys = "u", cmd = api.fs.rename_full, opts = opts("Rename: Full Path") }, + { keys = "U", cmd = api.tree.toggle_custom_filter, opts = opts("Toggle Filter: Hidden") }, + { keys = "W", cmd = api.tree.collapse_all, opts = opts("Collapse") }, + { keys = "x", cmd = api.fs.cut, opts = opts("Cut") }, + { keys = "y", cmd = api.fs.copy.relative_path, opts = opts("Copy Relative Path") }, + { keys = "Y", cmd = api.fs.copy.absolute_path, opts = opts("Copy Absolute Path") }, -- Numeric 数字键 - { keys = "!", cmd = api.node.run.cmd, opts = opts("Run Command") }, + { keys = "!", cmd = api.node.run.cmd, opts = opts("Run Command") }, -- Non-Alphanumeric 非字母数字键 - { keys = "?", cmd = api.tree.toggle_help, opts = opts("Help") }, - { keys = ">", cmd = api.node.navigate.sibling.next, opts = opts("Next Sibling") }, - { keys = "<", cmd = api.node.navigate.sibling.prev, opts = opts("Previous Sibling") }, - { keys = ".", cmd = api.node.run.cmd, opts = opts("Run Command") }, - { keys = ";", cmd = api.node.run.cmd, opts = opts("Run Command") }, - { keys = "-", cmd = api.tree.change_root_to_parent, opts = opts("Up") }, + { keys = "?", cmd = api.tree.toggle_help, opts = opts("Help") }, + { keys = ">", cmd = api.node.navigate.sibling.next, opts = opts("Next Sibling") }, + { keys = "<", cmd = api.node.navigate.sibling.prev, opts = opts("Previous Sibling") }, + { keys = ".", cmd = api.node.run.cmd, opts = opts("Run Command") }, + { keys = ";", cmd = api.node.run.cmd, opts = opts("Run Command") }, + { keys = "-", cmd = api.tree.change_root_to_parent, opts = opts("Up") }, -- MOD KEYS Ctrl+ - { keys = "", cmd = api.tree.change_root_to_node, opts = opts("CD") }, - { keys = "", cmd = api.node.open.replace_tree_buffer, opts = opts("Open: In Place") }, - { keys = "", cmd = api.node.show_info_popup, opts = opts("Info") }, - { keys = "", cmd = api.fs.rename_sub, opts = opts("Rename: Omit Filename") }, - { keys = "", cmd = api.node.open.tab, opts = opts("Open: New Tab") }, - { keys = "", cmd = api.node.open.vertical, opts = opts("Open: Vertical Split") }, - { keys = "", cmd = api.node.open.horizontal, opts = opts("Open: Horizontal Split") }, + { keys = "", cmd = api.tree.change_root_to_node, opts = opts("CD") }, + { keys = "", cmd = api.node.open.replace_tree_buffer, opts = opts("Open: In Place") }, + { keys = "", cmd = api.node.show_info_popup, opts = opts("Info") }, + { keys = "", cmd = api.fs.rename_sub, opts = opts("Rename: Omit Filename") }, + { keys = "", cmd = api.node.open.tab, opts = opts("Open: New Tab") }, + { keys = "", cmd = api.node.open.vertical, opts = opts("Open: Vertical Split") }, + { keys = "", cmd = api.node.open.horizontal, opts = opts("Open: Horizontal Split") }, -- Mouse 鼠标键 - { keys = "<2-LeftMouse>", cmd = api.node.open.edit, opts = opts("Open") }, - { keys = "<2-RightMouse>", cmd = api.tree.change_root_to_node, opts = opts("CD") }, + { keys = "<2-LeftMouse>", cmd = api.node.open.edit, opts = opts("Open") }, + { keys = "<2-RightMouse>", cmd = api.tree.change_root_to_node, opts = opts("CD") }, } end diff --git a/tools/nvim/lua/plugins/appearance.lua b/tools/nvim/lua/plugins/appearance.lua index f6c58b3..c6e8f88 100644 --- a/tools/nvim/lua/plugins/appearance.lua +++ b/tools/nvim/lua/plugins/appearance.lua @@ -2,8 +2,8 @@ return { { "catppuccin/nvim", name = "catppuccin" }, { "RRethy/vim-illuminate" }, { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, config = function() require("plugins.mod.lualine") end, @@ -18,9 +18,9 @@ return { timer = 500, }, }) - end + end, }, { import = "plugins.mod.alpha-nvim" }, - { import = "plugins.mod.winbar-nvim"}, + { import = "plugins.mod.winbar-nvim" }, { import = "plugins.mod.bufferline" }, } diff --git a/tools/nvim/lua/plugins/fileutils.lua b/tools/nvim/lua/plugins/fileutils.lua index 1744739..ec30275 100644 --- a/tools/nvim/lua/plugins/fileutils.lua +++ b/tools/nvim/lua/plugins/fileutils.lua @@ -1,6 +1,6 @@ return { { import = "plugins.mod.auto-session" }, - { import = "plugins.mod.nvim-tree" }, - { import = "plugins.mod.telescope" }, - { import = "plugins.mod.projects" } + { import = "plugins.mod.nvim-tree" }, + { import = "plugins.mod.telescope" }, + { import = "plugins.mod.projects" }, } diff --git a/tools/nvim/lua/plugins/init.lua b/tools/nvim/lua/plugins/init.lua index 866228d..53217be 100644 --- a/tools/nvim/lua/plugins/init.lua +++ b/tools/nvim/lua/plugins/init.lua @@ -15,12 +15,11 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) - require("lazy").setup({ - { import = "plugins.appearance" }, - { import = "plugins.completion" }, - { import = "plugins.fileutils" }, - { import = "plugins.lsp" }, - { import = "plugins.syntax" }, - { import = "plugins.misc" }, + { import = "plugins.appearance" }, + { import = "plugins.completion" }, + { import = "plugins.fileutils" }, + { import = "plugins.lsp" }, + { import = "plugins.syntax" }, + { import = "plugins.misc" }, }) diff --git a/tools/nvim/lua/plugins/lsp.lua b/tools/nvim/lua/plugins/lsp.lua index 67931fe..ea0cd3a 100644 --- a/tools/nvim/lua/plugins/lsp.lua +++ b/tools/nvim/lua/plugins/lsp.lua @@ -1,29 +1,28 @@ - return { { import = "plugins.mod.lspconfig" }, { "NoahTheDuke/vim-just", - ft = { "just" } + ft = { "just" }, }, { import = "plugins.mod.render-markdown" }, -- { import = "plugins.mod.markview" }, { "lervag/vimtex", - lazy = false, -- we don't want to lazy load VimTeX + lazy = false, -- we don't want to lazy load VimTeX -- tag = "v2.15", -- uncomment to pin to a specific release init = function() -- VimTeX configuration goes here, e.g. vim.g.vimtex_view_method = "sioyek" - end + end, }, { "iurimateus/luasnip-latex-snippets.nvim", -- vimtex isn't required if using treesitter requires = { "L3MON4D3/LuaSnip", "lervag/vimtex" }, config = function() - require'luasnip-latex-snippets'.setup() + require("luasnip-latex-snippets").setup() -- or setup({ use_treesitter = true }) - require("luasnip").config.setup { enable_autosnippets = true } + require("luasnip").config.setup({ enable_autosnippets = true }) end, }, { "williamboman/mason.nvim", config = true }, @@ -41,6 +40,25 @@ return { mason_lspconfig.setup({ ensure_installed = servers, }) - end + end, + }, + { + "nvim-orgmode/orgmode", + event = "VeryLazy", + ft = { "org" }, + config = function() + -- Setup orgmode + require("orgmode").setup({ + org_agenda_files = "~/orgfiles/**/*", + org_default_notes_file = "~/orgfiles/refile.org", + }) + + -- NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option + -- add ~org~ to ignore_install + -- require('nvim-treesitter.configs').setup({ + -- ensure_installed = 'all', + -- ignore_install = { 'org' }, + -- }) + end, }, } diff --git a/tools/nvim/lua/plugins/misc.lua b/tools/nvim/lua/plugins/misc.lua index 15b2070..ae0965e 100644 --- a/tools/nvim/lua/plugins/misc.lua +++ b/tools/nvim/lua/plugins/misc.lua @@ -1,5 +1,5 @@ return { - { 'wakatime/vim-wakatime', lazy = false }, + { "wakatime/vim-wakatime", lazy = false }, { import = "plugins.mod.obsidian-nvim" }, { "folke/which-key.nvim", @@ -22,5 +22,5 @@ return { { "github/copilot.vim", lazy = false, - } + }, } diff --git a/tools/nvim/lua/plugins/mod/alpha-nvim.lua b/tools/nvim/lua/plugins/mod/alpha-nvim.lua index 3fe33dc..5db1a28 100644 --- a/tools/nvim/lua/plugins/mod/alpha-nvim.lua +++ b/tools/nvim/lua/plugins/mod/alpha-nvim.lua @@ -1,14 +1,14 @@ -- alpha-nvim.lua return { { - 'goolord/alpha-nvim', + "goolord/alpha-nvim", dependencies = { -- 'echasnovski/mini.icons', -- 'nvim-lua/plenary.nvim' }, - config = function () - local alpha = require'alpha' - local dashboard = require'alpha.themes.dashboard' + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.dashboard") dashboard.section.header.val = { " ", "================= =============== =============== ======== ========", @@ -34,11 +34,11 @@ return { dashboard.section.buttons.val.leader = "SPC" dashboard.section.buttons.val = { -- leader = "SPC", - dashboard.button('p', '󰈞 查找项目', ':Telescope projects'), - dashboard.button('h', ' 历史文件', ':Telescope oldfiles'), - dashboard.button('l', ' 加载会话', ':SessionSearch'), - dashboard.button('c', ' 转到设置', ':Telescope find_files cwd=~/.config/nvim'), - dashboard.button('SPC q', '󱊷 退出', ':qa'), + dashboard.button("p", "󰈞 查找项目", ":Telescope projects"), + dashboard.button("h", " 历史文件", ":Telescope oldfiles"), + dashboard.button("l", " 加载会话", ":SessionSearch"), + dashboard.button("c", " 转到设置", ":Telescope find_files cwd=~/.config/nvim"), + dashboard.button("SPC q", "󱊷 退出", ":qa"), } dashboard.section.footer.val = "今日 " .. os.date("%Y-%m-%d %A") .. " " @@ -47,6 +47,6 @@ return { -- vim.cmd[[autocmd User AlphaReady echo 'Alpha ready!']] alpha.setup(dashboard.config) - end - }; + end, + }, } diff --git a/tools/nvim/lua/plugins/mod/auto-session.lua b/tools/nvim/lua/plugins/mod/auto-session.lua index 80ab9f7..829f1c5 100644 --- a/tools/nvim/lua/plugins/mod/auto-session.lua +++ b/tools/nvim/lua/plugins/mod/auto-session.lua @@ -1,15 +1,15 @@ ---@diagnostic disable: undefined-doc-name return { { - 'rmagatti/auto-session', + "rmagatti/auto-session", lazy = false, ---enables autocomplete for opts ---@module "auto-session" ---@type AutoSession.Config opts = { - suppressed_dirs = { '~/', '~/Projects', '~/Downloads', '/' }, + suppressed_dirs = { "~/", "~/Projects", "~/Downloads", "/" }, -- log_level = 'debug', - } - } + }, + }, } diff --git a/tools/nvim/lua/plugins/mod/bufferline.lua b/tools/nvim/lua/plugins/mod/bufferline.lua index e389de8..c02f345 100644 --- a/tools/nvim/lua/plugins/mod/bufferline.lua +++ b/tools/nvim/lua/plugins/mod/bufferline.lua @@ -1,17 +1,17 @@ return { - "akinsho/bufferline.nvim", - dependencies = "nvim-tree/nvim-web-devicons", -- 图标支持 - config = function() - require("bufferline").setup({ - options = { - numbers = "ordinal", -- 显示 buffer 序号 - close_command = "bdelete! %d", -- 关闭 buffer 的命令 - right_mouse_command = "bdelete! %d", -- 右键关闭 - offsets = { - { filetype = "NvimTree", text = "资源管理器", text_align = "center" }, - }, - separator_style = "thin", - }, - }) - end, + "akinsho/bufferline.nvim", + dependencies = "nvim-tree/nvim-web-devicons", -- 图标支持 + config = function() + require("bufferline").setup({ + options = { + numbers = "ordinal", -- 显示 buffer 序号 + close_command = "bdelete! %d", -- 关闭 buffer 的命令 + right_mouse_command = "bdelete! %d", -- 右键关闭 + offsets = { + { filetype = "NvimTree", text = "资源管理器", text_align = "center" }, + }, + separator_style = "thin", + }, + }) + end, } diff --git a/tools/nvim/lua/plugins/mod/lspconfig.lua b/tools/nvim/lua/plugins/mod/lspconfig.lua index a190a7c..3d657d0 100644 --- a/tools/nvim/lua/plugins/mod/lspconfig.lua +++ b/tools/nvim/lua/plugins/mod/lspconfig.lua @@ -1,4 +1,4 @@ return { "neovim/nvim-lspconfig", - lazy = false + lazy = false, } diff --git a/tools/nvim/lua/plugins/mod/lualine.lua b/tools/nvim/lua/plugins/mod/lualine.lua index 5cddc86..7282117 100644 --- a/tools/nvim/lua/plugins/mod/lualine.lua +++ b/tools/nvim/lua/plugins/mod/lualine.lua @@ -1,6 +1,6 @@ -- Author: shadmansaleh -- Credit: glepnir -local lualine = require('lualine') +local lualine = require("lualine") -- Color table for highlights -- stylua: ignore @@ -20,14 +20,14 @@ local colors = { local conditions = { buffer_not_empty = function() - return vim.fn.empty(vim.fn.expand('%:t')) ~= 1 + return vim.fn.empty(vim.fn.expand("%:t")) ~= 1 end, hide_in_width = function() return vim.fn.winwidth(0) > 80 end, check_git_workspace = function() - local filepath = vim.fn.expand('%:p:h') - local gitdir = vim.fn.finddir('.git', filepath .. ';') + local filepath = vim.fn.expand("%:p:h") + local gitdir = vim.fn.finddir(".git", filepath .. ";") return gitdir and #gitdir > 0 and #gitdir < #filepath end, } @@ -36,11 +36,11 @@ local conditions = { local config = { options = { disabled_filetypes = { - statusline = { "NvimTree", "alpha" } + statusline = { "NvimTree", "alpha" }, }, -- Disable sections and component separators - component_separators = '', - section_separators = '', + component_separators = "", + section_separators = "", theme = { -- We are going to use lualine_c an lualine_x as left and -- right section. Both are highlighted by c theme . So we @@ -80,18 +80,18 @@ local function ins_right(component) table.insert(config.sections.lualine_x, component) end -ins_left { +ins_left({ function() - return '▊' + return "▊" end, color = { fg = colors.blue }, -- Sets highlighting of component padding = { left = 0, right = 1 }, -- We don't need space before this -} +}) -ins_left { +ins_left({ -- mode component function() - return '' + return "" end, color = function() -- auto change color according to neovims mode @@ -99,13 +99,13 @@ ins_left { n = colors.red, i = colors.green, v = colors.blue, - [''] = colors.blue, + [""] = colors.blue, V = colors.blue, c = colors.magenta, no = colors.red, s = colors.orange, S = colors.orange, - [''] = colors.orange, + [""] = colors.orange, ic = colors.yellow, R = colors.violet, Rv = colors.violet, @@ -113,14 +113,14 @@ ins_left { ce = colors.red, r = colors.cyan, rm = colors.cyan, - ['r?'] = colors.cyan, - ['!'] = colors.red, + ["r?"] = colors.cyan, + ["!"] = colors.red, t = colors.red, } return { fg = mode_color[vim.fn.mode()] } end, padding = { right = 1 }, -} +}) -- ins_left { -- -- filesize component @@ -134,42 +134,39 @@ ins_left { -- color = { fg = colors.magenta, gui = 'bold' }, -- } - -- ins_left { 'location' } -ins_right { 'progress', color = { fg = colors.fg, gui = 'bold' } } +ins_right({ "progress", color = { fg = colors.fg, gui = "bold" } }) -ins_left { - 'diagnostics', - sources = { 'nvim_diagnostic' }, - symbols = { error = ' ', warn = ' ', info = ' ' }, +ins_left({ + "diagnostics", + sources = { "nvim_diagnostic" }, + symbols = { error = " ", warn = " ", info = " " }, diagnostics_color = { error = { fg = colors.red }, warn = { fg = colors.yellow }, info = { fg = colors.cyan }, }, -} +}) -ins_left { +ins_left({ function() return vim.bo.filetype end, - color = { fg = colors.blue, gui = 'bold' }, -} + color = { fg = colors.blue, gui = "bold" }, +}) -ins_left { +ins_left({ function() return vim.bo.shiftwidth .. " space" end, -} +}) - - -ins_left { +ins_left({ -- Lsp server name . function() - local msg = 'No Active Lsp' - local buf_ft = vim.api.nvim_get_option_value('filetype', { buf = 0 }) + local msg = "No Active Lsp" + local buf_ft = vim.api.nvim_get_option_value("filetype", { buf = 0 }) local clients = vim.lsp.get_clients() if next(clients) == nil then return msg @@ -182,59 +179,58 @@ ins_left { end return msg end, - icon = ' ', - color = { fg = '#ffffff', gui = 'bold' }, -} + icon = " ", + color = { fg = "#ffffff", gui = "bold" }, +}) -- Insert mid section. You can make any number of sections in neovim :) -- for lualine it's any number greater then 2 -ins_left { +ins_left({ function() - return '%=' + return "%=" end, -} +}) -- Add components to right sections -ins_right { - 'o:encoding', -- option component same as &encoding in viml +ins_right({ + "o:encoding", -- option component same as &encoding in viml fmt = string.upper, -- I'm not sure why it's upper case either ;) cond = conditions.hide_in_width, - color = { fg = colors.green, gui = 'bold' }, -} + color = { fg = colors.green, gui = "bold" }, +}) -ins_right { - 'fileformat', +ins_right({ + "fileformat", fmt = string.upper, icons_enabled = false, -- I think icons are cool but Eviline doesn't have them. sigh - color = { fg = colors.green, gui = 'bold' }, -} + color = { fg = colors.green, gui = "bold" }, +}) -ins_right { - 'branch', - icon = '', - color = { fg = colors.violet, gui = 'bold' }, -} +ins_right({ + "branch", + icon = "", + color = { fg = colors.violet, gui = "bold" }, +}) - -ins_right { - 'diff', +ins_right({ + "diff", -- Is it me or the symbol for modified us really weird - symbols = { added = ' ', modified = '󰝤 ', removed = ' ' }, + symbols = { added = " ", modified = "󰝤 ", removed = " " }, diff_color = { added = { fg = colors.green }, modified = { fg = colors.orange }, removed = { fg = colors.red }, }, cond = conditions.hide_in_width, -} +}) -ins_right { +ins_right({ function() - return '▊' + return "▊" end, color = { fg = colors.blue }, padding = { left = 1 }, -} +}) -- Now don't forget to initialize lualine lualine.setup(config) diff --git a/tools/nvim/lua/plugins/mod/markview.lua b/tools/nvim/lua/plugins/mod/markview.lua index 98e7261..f4a097f 100644 --- a/tools/nvim/lua/plugins/mod/markview.lua +++ b/tools/nvim/lua/plugins/mod/markview.lua @@ -15,16 +15,16 @@ return { shift_width = 1, heading_1 = { style = "label", - hl = "MarkviewH1" - } + hl = "MarkviewH1", + }, }, code_blocks = { style = "language", language_direction = "right", hl = "MarkviewCode", - info_hl = "MarkviewCodeInfo" - } + info_hl = "MarkviewCodeInfo", + }, }) - end - } + end, + }, } diff --git a/tools/nvim/lua/plugins/mod/nvim-cmp.lua b/tools/nvim/lua/plugins/mod/nvim-cmp.lua index 100697b..165da17 100644 --- a/tools/nvim/lua/plugins/mod/nvim-cmp.lua +++ b/tools/nvim/lua/plugins/mod/nvim-cmp.lua @@ -1,9 +1,9 @@ local function set_keymaps(keymaps_cmp) local mappings = {} - for _, map in ipairs(keymaps_cmp) do - mappings[map.keys] = map.cmd - end - return mappings + for _, map in ipairs(keymaps_cmp) do + mappings[map.keys] = map.cmd + end + return mappings end return { diff --git a/tools/nvim/lua/plugins/mod/nvim-tree.lua b/tools/nvim/lua/plugins/mod/nvim-tree.lua index 32c312c..53b0bf0 100644 --- a/tools/nvim/lua/plugins/mod/nvim-tree.lua +++ b/tools/nvim/lua/plugins/mod/nvim-tree.lua @@ -1,6 +1,6 @@ local function my_on_attach(bufnr) -- local keymaps = require("config.keymaps") - local api = require "nvim-tree.api" + local api = require("nvim-tree.api") local default_mode = { "n" } local keymaps = require("keymaps") @@ -8,7 +8,6 @@ local function my_on_attach(bufnr) return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } end - local function set_keymaps(maps) for _, map in ipairs(maps) do local mode = map.mode or default_mode @@ -28,10 +27,10 @@ return { "nvim-tree/nvim-web-devicons", }, config = function() - require("nvim-tree").setup { + require("nvim-tree").setup({ on_attach = my_on_attach, sync_root_with_cwd = true, respect_buf_cwd = true, - } - end + }) + end, } diff --git a/tools/nvim/lua/plugins/mod/nvim-treesitter.lua b/tools/nvim/lua/plugins/mod/nvim-treesitter.lua index f4366fc..ca5ba90 100644 --- a/tools/nvim/lua/plugins/mod/nvim-treesitter.lua +++ b/tools/nvim/lua/plugins/mod/nvim-treesitter.lua @@ -1,11 +1,11 @@ return { - "nvim-treesitter/nvim-treesitter", - run = ":TSUpdate", - config = function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { "markdown", "markdown_inline", "latex", "python"}, - highlight = { enable = true }, - indent = { enable = true }, - }) - end, + "nvim-treesitter/nvim-treesitter", + run = ":TSUpdate", + config = function() + require("nvim-treesitter.configs").setup({ + ensure_installed = { "markdown", "markdown_inline", "latex", "python" }, + highlight = { enable = true }, + indent = { enable = true }, + }) + end, } diff --git a/tools/nvim/lua/plugins/mod/obsidian-nvim.lua b/tools/nvim/lua/plugins/mod/obsidian-nvim.lua index f20b8e8..b71bef5 100644 --- a/tools/nvim/lua/plugins/mod/obsidian-nvim.lua +++ b/tools/nvim/lua/plugins/mod/obsidian-nvim.lua @@ -1,6 +1,6 @@ return { "epwalsh/obsidian.nvim", - version = "*", -- recommended, use latest release instead of latest commit + version = "*", -- recommended, use latest release instead of latest commit lazy = false, ft = "markdown", -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: @@ -26,11 +26,11 @@ return { }, completion = { nvim_cmp = true, - min_chars = 2 + min_chars = 2, }, ui = { - enable = false - } + enable = false, + }, -- see below for full list of options 👇 }, } diff --git a/tools/nvim/lua/plugins/mod/projects.lua b/tools/nvim/lua/plugins/mod/projects.lua index 9135b33..d8b66e0 100644 --- a/tools/nvim/lua/plugins/mod/projects.lua +++ b/tools/nvim/lua/plugins/mod/projects.lua @@ -1,15 +1,15 @@ return { - "ahmedkhalf/project.nvim", - config = function() - require("project_nvim").setup({ - detection_methods = { "lsp", "pattern" }, - patterns = { ".git", "Makefile", "package.json" }, - sync_root_with_cwd = true, - silent_chdir = true, - scope_chdir = "global", - }) + "ahmedkhalf/project.nvim", + config = function() + require("project_nvim").setup({ + detection_methods = { "lsp", "pattern" }, + patterns = { ".git", "Makefile", "package.json" }, + sync_root_with_cwd = true, + silent_chdir = true, + scope_chdir = "global", + }) - require("telescope").load_extension("projects") - end, - dependencies = { "nvim-telescope/telescope.nvim" }, + require("telescope").load_extension("projects") + end, + dependencies = { "nvim-telescope/telescope.nvim" }, } diff --git a/tools/nvim/lua/plugins/mod/telescope.lua b/tools/nvim/lua/plugins/mod/telescope.lua index b5dba1e..5f1f53a 100644 --- a/tools/nvim/lua/plugins/mod/telescope.lua +++ b/tools/nvim/lua/plugins/mod/telescope.lua @@ -1,7 +1,7 @@ return { "nvim-telescope/telescope.nvim", - config = function () - require("telescope").setup { + config = function() + require("telescope").setup({ defaults = { mappings = { n = { @@ -11,11 +11,10 @@ return { ["r"] = "preview_scrolling_down", ["a"] = "preview_scrolling_left", ["s"] = "preview_scrolling_right", - } - } - } - } + }, + }, + }, + }) end, dependencies = { "nvim-lua/plenary.nvim" }, } - diff --git a/tools/nvim/lua/plugins/mod/winbar-nvim.lua b/tools/nvim/lua/plugins/mod/winbar-nvim.lua index ca27161..496ce0c 100644 --- a/tools/nvim/lua/plugins/mod/winbar-nvim.lua +++ b/tools/nvim/lua/plugins/mod/winbar-nvim.lua @@ -7,33 +7,32 @@ return { show_file_path = true, show_symbols = true, colors = { - path = '#9c1d91', - file_name = '', - symbols = '', + path = "#9c1d91", + file_name = "", + symbols = "", }, icons = { - file_icon_default = '', - seperator = '>', - editor_state = '●', - lock_icon = '', + file_icon_default = "", + seperator = ">", + editor_state = "●", + lock_icon = "", }, exclude_filetype = { - 'help', - 'startify', - 'dashboard', - 'packer', - 'neogitstatus', - 'NvimTree', - 'Trouble', - 'alpha', - 'lir', - 'Outline', - 'spectre_panel', - 'toggleterm', - 'qf', - } + "help", + "startify", + "dashboard", + "packer", + "neogitstatus", + "NvimTree", + "Trouble", + "alpha", + "lir", + "Outline", + "spectre_panel", + "toggleterm", + "qf", + }, }) end, }, } - diff --git a/tools/nvim/lua/plugins/syntax.lua b/tools/nvim/lua/plugins/syntax.lua index f32cff2..eea5c64 100644 --- a/tools/nvim/lua/plugins/syntax.lua +++ b/tools/nvim/lua/plugins/syntax.lua @@ -1,9 +1,10 @@ return { - { import = "plugins.mod.nvim-treesitter", }, - { 'echasnovski/mini.pairs', version = false, + { import = "plugins.mod.nvim-treesitter" }, + { + "echasnovski/mini.pairs", + version = false, config = function() require("mini.pairs").setup() end, }, } - diff --git a/tools/vscode/vscode.vimrc b/tools/vscode/vscode.vimrc index 84ab90d..f63ba45 100644 --- a/tools/vscode/vscode.vimrc +++ b/tools/vscode/vscode.vimrc @@ -50,14 +50,102 @@ noremap gpt editor.action.peekTypeDefinition noremap gh editor.action.showDefinitionPreviewHover noremap workbench.action.quickOpen +noremap / workbench.action.quickTextSearch noremap : workbench.action.showCommands noremap E workbench.view.explorer +noremap - workbench.action.splitEditorDown +noremap | workbench.action.splitEditorRight +noremap \ workbench.action.splitEditorRight + +" a : +ai/action +noremap aa inlineChat.start +noremap aA workbench.panel.chat +noremap ae workbench.action.chat.openEditSession + +" b : +buffer +noremap bb workbench.action.showAllEditors +noremap bd :bdelete +noremap bh :bprevious +noremap bi :bnext +noremap bp :bprevious +noremap bn :bnext + +" c : +code/compile +noremap cr code-runner.run +noremap cf editor.action.formatDocument +noremap c editor.action.trimTrailingWhitespace +noremap cs workbench.action.gotoSymbol +noremap cS workbench.action.showAllSymbols +noremap ce editor.action.marker.next +noremap cE editor.action.marker.prev +noremap cg editor.action.dirtydiff.next +noremap cG editor.action.dirtydiff.previous +noremap cR editor.action.rename + +" d : +debug + +" f : +file +noremap ff workbench.action.quickOpen +noremap fF workbench.view.search +noremap fc workbench.action.openSettings +noremap fC workbench.action.openFolderSettingsFile +noremap fe workbench.view.explorer +noremap fo openInExternalApp.open +noremap fr workbench.action.showAllEditorsByMostRecentlyUsed +noremap fR git.rename " Rename file +" noremap fs workbench.action.search.toggleQueryDetails +noremap ft workbench.action.terminal.toggleTerminal +noremap fx workbench.view.extensions + +" g : +git +noremap gg workbench.view.scm +noremap gS git.stageAll + +" h : +help + +" j : +jump +noremap jj workbench.action.gotoLine + +" l : +language (define in settings.json) + +" p : +project (requires Project Manager extension) +noremap pp projectManager.listProjects +noremap pP projectManager.listAnyProjects#sideBarAny +noremap pc projectManager.openSettings#sideBarAny +noremap pe projectManager.editProjects +noremap pf projectManager.addToFavorites +noremap pF projectManager.filterProjectsByTag +noremap pg projectManager.listGitProjects#sideBarGit +noremap pr workbench.action.openRecent +noremap ps projectManager.saveProject " q : +quit noremap qq :quit noremap qQ :qall noremap Q :quit +" r : +refactor + +" s : +search + +" t : +test +noremap tt testing.runAll +noremap tT testing.debugAll +noremap ta testing.runAll +noremap tA testing.debugAll +noremap tf testing.reRunFailedTests +noremap tF testing.debugFailedTests +noremap tl testing.reRunLastRun +noremap tL testing.debugLastRun +noremap tc testing.runCurrentTest +noremap tC testing.debugCurrentTest +noremap tx testing.cancelTestRun + +" u : +ui +noremap ui workbench.action.selectTheme +noremap uw editor.action.toggleWordWrap +noremap uz workbench.action.toggleZenMode + " w : +write/window noremap ww :write noremap wa :wall @@ -71,75 +159,6 @@ noremap we workbench.action.focusAboveGroup noremap wE workbench.action.splitEditorUp noremap wi workbench.action.focusRightGroup noremap wI workbench.action.splitEditorRight - -" f : +find/file -noremap ff workbench.action.quickOpen -noremap fF workbench.view.search -noremap fc workbench.action.openSettings -noremap fC workbench.action.openFolderSettingsFile -noremap fe workbench.view.explorer -noremap fr workbench.action.showAllEditorsByMostRecentlyUsed -noremap fR workbench.action.openRecent -noremap fs workbench.action.search.toggleQueryDetails -noremap ft workbench.action.terminal.toggleTerminal -noremap fx workbench.view.extensions - -" p : +project (requires Project Manager extension) -noremap pp projectManager.listProjects -noremap pP projectManager.listAnyProjects#sideBarAny -noremap pc projectManager.openSettings#sideBarAny -noremap pe projectManager.editProjects -noremap pf projectManager.addToFavorites -noremap pF projectManager.filterProjectsByTag -noremap pg projectManager.listGitProjects#sideBarGit -noremap pr workbench.action.openRecent -noremap ps projectManager.saveProject - -" g : +git -noremap gg workbench.view.scm -noremap gS git.stageAll - -" j : +jump -noremap jj workbench.action.gotoLine - -" l : +language (define in settings.json) - -" u : +ui -noremap ui workbench.action.selectTheme -noremap uw editor.action.toggleWordWrap -noremap uz workbench.action.toggleZenMode -" a : +ai/action -noremap aa inlineChat.start -noremap aA workbench.panel.chat -noremap ae workbench.action.chat.openEditSession -" r : +refactor -" s : +search -" t : +test -noremap tt testing.runAll -noremap tT testing.debugAll -noremap ta testing.runAll -noremap tA testing.debugAll -noremap tf testing.reRunFailedTests -noremap tF testing.debugFailedTests -noremap tl testing.reRunLastRun -noremap tL testing.debugLastRun -noremap tc testing.runCurrentTest -noremap tC testing.debugCurrentTest -noremap tx testing.cancelTestRun -" d : +debug -" h : +help - -" c : +code -noremap cr code-runner.run -noremap cf editor.action.formatDocument -noremap c editor.action.trimTrailingWhitespace -noremap cs workbench.action.gotoSymbol -noremap cS workbench.action.showAllSymbols - -" b : +buffer -noremap bb workbench.action.showAllEditors -noremap bd :bdelete -noremap bh :bprevious -noremap bi :bnext - -" 中文分词测试用例 +noremap w- workbench.action.splitEditorDown +noremap w| workbench.action.splitEditorRight +noremap w\ workbench.action.splitEditorRight diff --git a/tools/wezterm/wezterm.lua b/tools/wezterm/wezterm.lua index b90ce40..4b39b4d 100644 --- a/tools/wezterm/wezterm.lua +++ b/tools/wezterm/wezterm.lua @@ -3,7 +3,7 @@ -- Author: js0ny --#region Import & Setup -local wezterm = require 'wezterm' +local wezterm = require("wezterm") local action = wezterm.action local config = {} @@ -52,15 +52,13 @@ local function detect_os() end -- OS light/dark theme detection -local function detect_theme() -end +local function detect_theme() end --#endregion --#region Constant local os_type = detect_os() --#endregion - --#region Appearance -- Font and color scheme -- config.font = 'FiraCode Nerd Font' @@ -88,11 +86,11 @@ config.tab_bar_at_bottom = true -- config.cursor_blink_rate = 650 -- Visual Bell config.visual_bell = { - fade_in_function = 'EaseIn', + fade_in_function = "EaseIn", fade_in_duration_ms = 250, - fade_out_function = 'EaseOut', + fade_out_function = "EaseOut", fade_out_duration_ms = 250, - target = 'CursorColor', + target = "CursorColor", } --#endregion @@ -100,111 +98,111 @@ config.visual_bell = { config.leader = { key = "q", mods = "CTRL" } config.keys = { { - key = 'q', - mods = 'LEADER', - action = action.SendKey { key = 'q', mods = 'CTRL' }, + key = "q", + mods = "LEADER", + action = action.SendKey({ key = "q", mods = "CTRL" }), }, -- Windows Management { -- leader keys - key = '|', - mods = 'LEADER|SHIFT', - action = action.SplitHorizontal { domain = "CurrentPaneDomain" } + key = "|", + mods = "LEADER|SHIFT", + action = action.SplitHorizontal({ domain = "CurrentPaneDomain" }), }, { - key = '-', - mods = 'LEADER', - action = action.SplitVertical { domain = "CurrentPaneDomain" } + key = "-", + mods = "LEADER", + action = action.SplitVertical({ domain = "CurrentPaneDomain" }), }, { - key = 'h', - mods = 'LEADER', - action = action.ActivatePaneDirection 'Left' + key = "h", + mods = "LEADER", + action = action.ActivatePaneDirection("Left"), }, { - key = 'n', - mods = 'LEADER', - action = action.ActivatePaneDirection 'Down' + key = "n", + mods = "LEADER", + action = action.ActivatePaneDirection("Down"), }, { - key = 'e', - mods = 'LEADER', - action = action.ActivatePaneDirection 'Up' + key = "e", + mods = "LEADER", + action = action.ActivatePaneDirection("Up"), }, { - key = 'i', - mods = 'LEADER', - action = action.ActivatePaneDirection 'Right' + key = "i", + mods = "LEADER", + action = action.ActivatePaneDirection("Right"), }, { - key = 'H', - mods = 'LEADER', - action = action.AdjustPaneSize { 'Left', 5 }, + key = "H", + mods = "LEADER", + action = action.AdjustPaneSize({ "Left", 5 }), }, { - key = 'N', - mods = 'LEADER', - action = action.AdjustPaneSize { 'Down', 5 }, + key = "N", + mods = "LEADER", + action = action.AdjustPaneSize({ "Down", 5 }), }, { - key = 'E', - mods = 'LEADER', - action = action.AdjustPaneSize { 'Up', 5 }, + key = "E", + mods = "LEADER", + action = action.AdjustPaneSize({ "Up", 5 }), }, { - key = 'I', - mods = 'LEADER', - action = action.AdjustPaneSize { 'Right', 5 }, + key = "I", + mods = "LEADER", + action = action.AdjustPaneSize({ "Right", 5 }), }, { key = "/", mods = "LEADER", - action = action.Search { Regex = "" } + action = action.Search({ Regex = "" }), }, { key = "?", mods = "LEADER|SHIFT", - action = action.Search { CaseSensitiveString = "" } + action = action.Search({ CaseSensitiveString = "" }), }, { key = ";", mods = "LEADER", - action = action.ShowLauncher + action = action.ShowLauncher, }, { key = ":", mods = "LEADER|SHIFT", - action = action.ActivateCommandPalette + action = action.ActivateCommandPalette, }, { key = "W", mods = "CTRL", - action = action.CloseCurrentPane { confirm = true } + action = action.CloseCurrentPane({ confirm = true }), }, { -- ^C to copy if selection is active, otherwise send signal -- https://wezfurlong.org/wezterm/config/lua/keyassignment/ClearSelection.html?h=selection - key = 'c', - mods = 'CTRL', + key = "c", + mods = "CTRL", action = wezterm.action_callback(function(window, pane) - local has_selection = window:get_selection_text_for_pane(pane) ~= '' + local has_selection = window:get_selection_text_for_pane(pane) ~= "" if has_selection then - window:perform_action(action.CopyTo 'ClipboardAndPrimarySelection', pane) + window:perform_action(action.CopyTo("ClipboardAndPrimarySelection"), pane) window:perform_action(action.ClearSelection, pane) else - window:perform_action(action.SendKey { key = 'c', mods = 'CTRL' }, pane) + window:perform_action(action.SendKey({ key = "c", mods = "CTRL" }), pane) end end), }, } config.mouse_bindings = { { - event = { Up = { streak = 1, button = 'Left' } }, - mods = 'CTRL', + event = { Up = { streak = 1, button = "Left" } }, + mods = "CTRL", action = action.OpenLinkAtMouseCursor, }, { - event = { Up = { streak = 1, button = 'Left' } }, - mods = 'SUPER', + event = { Up = { streak = 1, button = "Left" } }, + mods = "SUPER", action = action.OpenLinkAtMouseCursor, }, } @@ -222,35 +220,35 @@ if os_type == "Windows" then config.launch_menu = { { label = "Local - PowerShell", - args = { "pwsh.exe", "-NoLogo", "-NoProfileLoadTime" } + args = { "pwsh.exe", "-NoLogo", "-NoProfileLoadTime" }, }, { label = "Local - PowerShell Administator", - args = { "sudo.exe", "pwsh.exe", "-NoLogo", "-NoProfileLoadTime" } + args = { "sudo.exe", "pwsh.exe", "-NoLogo", "-NoProfileLoadTime" }, }, { label = "WSL1 - Arch", - args = { "wsl.exe", "-d", "Arch" } + args = { "wsl.exe", "-d", "Arch" }, }, { label = "WSL2 - kali-linux", - args = { "wsl.exe", "-d", "kali-linux" } + args = { "wsl.exe", "-d", "kali-linux" }, }, { label = "Local - NuShell", - args = { "nu" } + args = { "nu" }, }, { label = "Local - Windows PowerShell", - args = { "powershell.exe" } + args = { "powershell.exe" }, }, { label = "Local - Command Prompt", - args = { "cmd.exe" } + args = { "cmd.exe" }, }, { label = "WSL1 - Arch Zsh", - args = { "wsl.exe", "-d", "Arch", "zsh" } + args = { "wsl.exe", "-d", "Arch", "zsh" }, }, } else @@ -258,23 +256,22 @@ else config.launch_menu = { { label = "Local - Fish", - args = { "fish", "-l" } + args = { "fish", "-l" }, }, { label = "Local - Zsh", - args = { "zsh", "-l" } + args = { "zsh", "-l" }, }, { label = "Local - PowerShell", - args = { "pwsh", "-NoLogo", "-NoProfileLoadTime", "-Login" } + args = { "pwsh", "-NoLogo", "-NoProfileLoadTime", "-Login" }, }, { label = "Local - NuShell", - args = { "nu", "-l" } + args = { "nu", "-l" }, }, } end --#endregion - return config