feat: add font

fish/config.fish

@@ -1,6 +1,10 @@
 
+#################################################################
+# option
 fish_vi_key_bindings
 
+#################################################################
+# basic 
 # 定义一个函数来检查并添加路径到 PATH
 function add_to_path
     # 遍历传递给函数的所有参数
@@ -20,18 +24,48 @@ function add_to_path
     end
 end
 
-## set environment
+function refish 
-# default
+    echo "Updating fish configuration..."
+    source ~/.config/fish/config.fish
+    echo "Fish configuration updated!"
+end
+
+# set environment
 set paths_to_check /usr/sbin /usr/local/bin /usr/bin /bin /usr/sbin /sbin /opt/bin /opt/sbin /usr/syno/sbin /usr/syno/bin /usr/local/sbin
 for path in $paths_to_check
     add_to_path $path
 end
 
+function sudoo
+    eval sudo $history[1]
+end
+
+
+# add my script
+add_to_path $HOME/.dotfile/script $HOME/.app00/script
+
+if test -f ~/.config/fish/custom.fish
+    source ~/.config/fish/custom.fish
+end
+
+function reset_proxy
+    set -e https_proxy
+    set -e ftp_proxy
+    set -e no_proxy
+    set -e HTTP_PROXY
+    set -e HTTPS_PROXY
+    set -e FTP_PROXY
+    set -e NO_PROXY
+    echo "Proxy environment variables have been reset."
+end
+
+#################################################################
 # brew
 set -gx HOMEBREW_BREW_GIT_REMOTE "https://mirrors.ustc.edu.cn/brew.git"
 set -gx HOMEBREW_CORE_GIT_REMOTE "https://mirrors.ustc.edu.cn/homebrew-core.git"
 set -gx HOMEBREW_BOTTLE_DOMAIN "https://mirrors.ustc.edu.cn/homebrew-bottles"
 
+#################################################################
 # go
 set -gx GOPATH $HOME/go:$HOME/workrepo/go
 set -gx GOPROXY "goproxy.cn,direct"
@@ -40,15 +74,29 @@ set -gx GOSUMDB "sum.golang.google.cn"
 add_to_path $HOME/go/bin
 add_to_path $HOME/.yarn/bin $HOME/.config/yarn/global/node_modules/.bin
 
-# add nvim
+function gtr
+    go test -gcflags=all=-l -v -run=$argv
+end
+
+#################################################################
+# python
+set -gx PYENV_ROOT $HOME/.pyenv
+# Pyenv initialization
+if command -v pyenv 1>/dev/null 2>&1
+    pyenv init - | source
+end
+
+add_to_path $PYENV_ROOT/bin
+
+#################################################################
+# nvim
 add_to_path usr/local/nvim/bin /usr/local/osx-64/nvim/bin
 set -gx EDITOR vim
 
-# add my script
-add_to_path $HOME/.dotfile/script $HOME/.app00/script
 
-# alias 
+#################################################################
 # git
+# alias 
 alias gitb="git branch --show-current | tr -d '\n' | pbcopy"
 alias gci="golangci-lint run -c=~/.dotfile/.golangci.yml ./..."
 alias gmt="go mod tidy"
@@ -58,26 +106,13 @@ alias sws="swagger serve -F=swagger"
 alias sourceit="source ~/.config/fish/config.fish"
 
 
-function gtr
+#################################################################
-    go test -gcflags=all=-l -v -run=$argv
+# other
-end
-
 function ctl
     systemctl $argv
 end
 
-
-if test -f ~/.config/fish/custom.fish
-    source ~/.config/fish/custom.fish
-end
-
-
-
 if status is-interactive
     # Commands to run in interactive sessions can go here
 end
 
-
-function sudoo
-    eval sudo $history[1]
-end

nvim/lazy-lock.json

@@ -1,74 +1,59 @@
 {
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
-  "LazyVim": { "branch": "main", "commit": "530e94a9fa19577401e968a9673282c3d79f01e3" },
+  "LazyVim": { "branch": "main", "commit": "73f14943bac5830905d715804ca581a91844272a" },
-  "LuaSnip": { "branch": "master", "commit": "4bf40748f6fe939bdcb69325918535b1c5edea51" },
   "SchemaStore.nvim": { "branch": "main", "commit": "22ce6adf3c866a8c3d0c55956c4b8feeb4f10c32" },
-  "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
+  "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
   "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" },
   "catppuccin": { "branch": "main", "commit": "35d8057137af463c9f41f169539e9b190d57d269" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "conform.nvim": { "branch": "master", "commit": "d28ccf945374edd9f1c34a82f6c22261dbd8ab98" },
-  "conform.nvim": { "branch": "master", "commit": "6dc1603ea408f476a57937bbeaf7f86520a21a98" },
+  "dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" },
-  "dashboard-nvim": { "branch": "master", "commit": "a0a78099658c7d4be3714f657b18ca8285d5d106" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
-  "dressing.nvim": { "branch": "master", "commit": "6ef1ca479d37d4ff66f13eed44d08912caff483a" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
-  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" },
   "lualine.nvim": { "branch": "master", "commit": "640260d7c2d98779cab89b1e7088ab14ea354a02" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
-  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.ai": { "branch": "main", "commit": "9b9b7cfa38b4871c3e44cfe89cf6d53fd40684d9" },
-  "mini.bufremove": { "branch": "main", "commit": "285bdac9596ee7375db50c0f76ed04336dcd2685" },
-  "mini.comment": { "branch": "main", "commit": "a56581c40c19fa26f2b39da72504398de3173c5a" },
-  "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
   "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
-  "mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" },
+  "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
-  "neoconf.nvim": { "branch": "main", "commit": "e2528134b185e68f8c7a5584de46a3269037de6b" },
+  "neotest-golang": { "branch": "main", "commit": "df6e3f34ae65f2520db798481a9d3f97581899b7" },
-  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
+  "noice.nvim": { "branch": "main", "commit": "8c9a29acbcb5380c4dadc09f25ab3e99f5ab626e" },
-  "neotest": { "branch": "master", "commit": "5caac5cc235d495a2382bc2980630ef36ac87032" },
-  "neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" },
-  "neotest-golang": { "branch": "main", "commit": "c5d557df0a30e6902d53a072416045006a823762" },
-  "noice.nvim": { "branch": "main", "commit": "5a78b42bec5e775f2db03bf93f6d1e0f3636306c" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" },
+  "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
-  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
+  "nvim-dap": { "branch": "master", "commit": "8517126e9323e346f6a99b3b594c5a940b914dcd" },
-  "nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" },
+  "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
   "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
   "nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "52302604e3c667cfdf33aadf89088e96eb3c5da3" },
-  "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-spectre": { "branch": "master", "commit": "08be31c104df3b4b049607694ebb2b6ced4f928b" },
+  "nvim-tree.lua": { "branch": "master", "commit": "610a1c189bdb2b9b936169b2ea9d1838f971fa2b" },
-  "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" },
+  "nvim-treesitter": { "branch": "master", "commit": "4b9a83f6017ee5edea85722cbfda1b3058a82e69" },
-  "nvim-treesitter": { "branch": "master", "commit": "3607d9c59cb16ed5368ecfed53e8ca1735bb98fb" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "a2a334900d3643de585ac5c6140b03403454124f" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" },
   "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
   "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "4d5fd21bae12ee6e9a79232e1c377f43c419d0c5" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "tokyonight.nvim": { "branch": "main", "commit": "52d67cc5d18c30f618897134620c64a11208fcae" },
+  "tokyonight.nvim": { "branch": "main", "commit": "ce91ba480070c95f40753e4663e32b4632ac6db3" },
   "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
-  "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
-  "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
   "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
-  "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" },
+  "vim-vsnip-integ": { "branch": "master", "commit": "90ae474e8b05ed41e36d6f58382a9fbfb4b672c4" },
   "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
-}
+}

nvim/lazyvim.json

@@ -4,7 +4,7 @@
     "lazyvim.plugins.extras.lang.go"
   ],
   "news": {
-    "NEWS.md": "3314"
+    "NEWS.md": "2123"
   },
-  "version": 3
+  "version": 2
 }

script/nvim-install.sh

@@ -1,30 +1,35 @@
 #!/bin/bash
 
+set -e
+
 # install neovim
 os_arch=$(uname -s)-$(uname -m)
 ver=v0.10.2
 
-if [ "$EUID" -ne 0 ]; then
-	echo "need sudo"
-	exit 1
-fi
-
 case $os_arch in
   "Darwin-x86_64")
 	cd /tmp
 	rm -rf nvim-macos-x86_64.tar.gz
 	wget https://github.com/neovim/neovim/releases/download/$ver/nvim-macos-x86_64.tar.gz
 	tar zxf nvim-macos-x86_64.tar.gz 
+	sudo mv -f /usr/local/nvim /usr/local/nvim-bak
 	sudo mv nvim-macos-x86_64 /usr/local/nvim
 	sudo ln -sf /usr/local/nvim/bin/nvim /usr/local/bin/vim
+	sudo ln -sf /usr/local/nvim/bin/nvim /usr/local/bin/nvim
+	echo ""
+	vim -v
 	;;
   "Linux-x86_64"|"Linux-arm64")
 	cd /tmp
 	rm -rf nvim-linux64.tar.gz
 	wget https://github.com/neovim/neovim/releases/download/$ver/nvim-linux64.tar.gz
 	tar zxf nvim-linux64.tar.gz
+	sudo mv -f /usr/local/nvim /usr/local/nvim-bak
 	sudo mv nvim-linux64 /usr/local/nvim
 	sudo ln -sf /usr/local/nvim/bin/nvim /usr/local/bin/vim
+	sudo ln -sf /usr/local/nvim/bin/nvim /usr/local/bin/nvim
+	echo ""
+	vim -v
 	;;
 esac
         

script/python-install.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+# 设置颜色
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
+# 检查是否已安装 pyenv
+if ! command -v pyenv &> /dev/null
+then
+    echo -e "${RED}pyenv 未安装. 正在安装 pyenv...${NC}"
+    # 安装 pyenv
+    curl https://pyenv.run | bash
+else
+    echo -e "${GREEN}pyenv 已安装${NC}"
+fi
+
+# 询问用户想安装的 Python 版本
+python_version=3.11.10
+
+# 安装指定版本的 Python
+echo -e "${GREEN}正在安装 Python $python_version...${NC}"
+pyenv install $python_version
+
+# 设置全局 Python 版本
+pyenv global $python_version
+
+# 验证安装
+installed_version=$(python --version)
+echo -e "${GREEN}Python 安装完成. 当前版本: $installed_version${NC}"
+
+# 安装一些常用的 Python 包
+echo -e "${GREEN}正在安装一些常用的 Python 包...${NC}"
+pip install --upgrade pip
+pip install ipython jupyter notebook pandas numpy matplotlib scikit-learn
+
+echo -e "${GREEN}Python 环境设置完成!${NC}"