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

bootstrap/components/mocha-port.bash

@@ -129,8 +129,8 @@ if command_exists fzf; then
   # Check shell type to determine how to set environment variables
   if [ -n "${FISH_VERSION:-}" ] || command_exists fish; then
     # For Fish shell
-        fish -c 'set -U FZF_DEFAULT_OPTS "--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc --color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 --color=selected-bg:#45475a --multi"' ||
-            echo "WARNING: Failed to set FZF options for Fish shell" >&2
+    fish -c 'set -U FZF_DEFAULT_OPTS "--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc --color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 --color=selected-bg:#45475a --multi"' \
+      || echo "WARNING: Failed to set FZF options for Fish shell" >&2
   else
     # For Bash/Zsh - add to both .bashrc and .zshrc if they exist
     FZF_CONFIG="export FZF_DEFAULT_OPTS=\"--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc --color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 --color=selected-bg:#45475a --multi\""

bootstrap/linux/main.bash

@@ -123,10 +123,10 @@ fi
 # TODO: Add this part
 read -p "[ACTION] Do you want to use other package managers? (y/N) " -r choice
 case "$choice" in
-y | Y)
+  y | Y)
     :
     ;;
-*)
+  *)
     :
     ;;
 esac

bootstrap/linux/wsl.bash

@@ -0,0 +1 @@
+

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,7 +3,6 @@
 # Author: js0ny
 # Sourced by user's zshrc 在用户的 zshrc 中被引用
 
-
 # Define __CD_CMD as "cd" by default
 __CD_CMD="cd"