minor fix

bootstrap/macOS/main.zsh

@@ -88,9 +88,10 @@ echo "[INFO] Installing Doom Emacs"
 
 source $DOTFILES/bootstrap/components/emacs.sh
 
+
 echo "[INFO] Installing Color Scheme (Catppuccin Mocha)"
 
-fish $DOTFILES/bootstrap/temp/mocha_port.fish
+bash $DOTFILES/bootstrap/components/mocha-port.bash
 
 # Misc
 
@@ -99,4 +100,7 @@ dotnet tool install --global dotnet-repl
 pnpm install -g typescript
 pnpm install -g tsx
 
-echo "Done!"
+echo "Done! For additional setup, boot to recovery mode and run the following command:"
+echo "csrutil enable --without fs --without debug --without nvram"
+echo "Then, reboot the system"
+echo "Run the post-install script to finish the setup"

platforms/mac/neovide.toml

@@ -2,11 +2,13 @@
 # ln -sf $DOTFILES/mac/neovide.toml $XDG_CONFIG_HOME/neovide/config.toml
 # New-Item -ItemType SymbolicLink -Path $Env:XDG_CONFIG_HOME/neovide/config.toml -Value $DOTFILES\mac\neovide.toml (Mac)
 # https://neovide.dev/config-file.html?highlight=toml#config-file
-fork = false
-frame = "full"
+# 设置为 fork 默认后台运行，不会占用终端
+fork = true
+# frame = "full"
 idle = true
 maximized = false
-neovim-bin = "/opt/homebrew/bin/nvim"
+# neovim-bin = "/opt/homebrew/bin/nvim"
+frame = "transparent"
 no-multigrid = false
 srgb = false
 tabs = true
@@ -16,6 +18,8 @@ vsync = true
 wsl = false
 
 [font]
-normal = ["CaskaydiaCove Nerd Font", "霞鹜文楷等宽"] # Will use the bundled Fira Code Nerd Font by default
+normal = [
+    "Iosevka Nerd Font",
+    "霞鹜文楷等宽",
+] # Will use the bundled Fira Code Nerd Font by default
 size = 14.0
-

platforms/win/neovide.toml

@@ -11,5 +11,8 @@ vsync = false
 wsl = true
 
 [font]
-normal = ["CaskaydiaCove Nerd Font", "霞鹜文楷等宽"] # Will use the bundled Fira Code Nerd Font by default
+normal = [
+  "Iosevka Nerd Font",
+  "霞鹜文楷等宽",
+] # Will use the bundled Fira Code Nerd Font by default
 size = 14.0

tools/nvim/lua/plugins/misc.lua

@@ -1,11 +1,11 @@
 return {
-  { "wakatime/vim-wakatime", lazy = false },
+  { "wakatime/vim-wakatime",               lazy = false },
   {
     "voldikss/vim-floaterm",
     keys = {
-      { "!", ":FloatermToggle<CR>", desc = "Toggle Terminal" },
+      { "<leader>!",  ":FloatermToggle<CR>", desc = "Toggle Terminal" },
       { "<leader>tt", ":FloatermToggle<CR>", desc = "Toggle Terminal" },
-      { "<leader>fT", ":FloatermNew<CR>", desc = "Spawn a float terminal" },
+      { "<leader>fT", ":FloatermNew<CR>",    desc = "Spawn a float terminal" },
     },
     cmd = {
       "FloatermToggle",
@@ -46,8 +46,8 @@ return {
       -- configuration goes here
     },
   },
-  {
-    "3rd/image.nvim",
-    opts = {},
-  },
+  { import = "plugins.mod.image-nvim" },
+  --   "3rd/image.nvim",
+  --   opts = {},
+  -- },
 }

tools/nvim/lua/plugins/mod/image-nvim.lua

@@ -0,0 +1,14 @@
+-- 2025-03-03
+-- If current session is not spawn by neovide, do not load image.nvim
+-- neovide did not support image viewer yet
+-- https://github.com/neovide/neovide/issues/2088
+if vim.g.neovide then
+  return {}
+elseif vim.env.TERM_PROGRAM == "alacritty" then
+  return {}
+else
+  return {
+    "3rd/image.nvim",
+    opts = {}
+  }
+end

tools/wezterm/misc.lua

@@ -2,7 +2,7 @@ return function(config)
   -- Environment
   config.set_environment_variables = {
     TERM = "xterm-256color",
-    TERM_PROGRAM = "wezterm",
+    -- TERM_PROGRAM = "wezterm", -- wezterm already sets this
   }
   config.enable_wayland = false
 end