Merge remote-tracking branch 'refs/remotes/github/master'

tools/nvim/lua/plugins/dap.lua

@@ -1,4 +1,15 @@
 -- Debugger setups
 return {
-  { import = "plugins.mod.dap-setup" },
+  { "mfussenegger/nvim-dap" },
+  {
+    "rcarriga/nvim-dap-ui",
+    dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }
+  },
+  { "theHamsta/nvim-dap-virtual-text" },
+  {
+    "mfussenegger/nvim-dap-python",
+    config = function()
+      require("dap-python").setup("uv")
+    end
+  }
 }

tools/nvim/lua/plugins/init.lua

@@ -8,6 +8,7 @@ require("lazy").setup({
     { import = "plugins.completion" },
     { import = "plugins.fileutils" },
     { import = "plugins.lsp" },
+    { import = "plugins.dap" },
     { import = "plugins.edit" },
     { import = "plugins.misc" },
   },

tools/nvim/lua/plugins/mod/dap-setup.lua

@@ -1,3 +1 @@
-return {
-  "mfussenegger/nvim-dap",
-}
+

tools/zsh/mod/navi.zsh

@@ -3,14 +3,13 @@
 # Author: js0ny
 # Sourced by user's zshrc 在用户的 zshrc 中被引用
 
-
 # Define __CD_CMD as "cd" by default
 __CD_CMD="cd"
 
 # If zoxide is available, use it
 if command -v zoxide >/dev/null; then
-    __CD_CMD="z"
-    eval "$(zoxide init zsh)"
+  __CD_CMD="z"
+  eval "$(zoxide init zsh)"
 fi
 
 # Define aliases for quick navigation
@@ -25,7 +24,7 @@ alias - "$__CD_CMD -"
 
 # Define zls function for cd + ls
 zls() {
-    "$__CD_CMD" "$1" && ls
+  "$__CD_CMD" "$1" && ls
 }
 alias cdls=zls