...

diff --git a/learn/doc/mac_bash_profile b/learn/doc/mac_bash_profile
index 6ec6d2c682d536e41b3b66b35bd717d6364cba83..1ff5aad35c8c642cef3bafe96963d4477d6dc0ce 100644 (file)
--- a/learn/doc/mac_bash_profile
+++ b/learn/doc/mac_bash_profile
@@ -44,3 +44,4 @@ export GREP_OPTIONS="--exclude-dir=\.svn"
 export LC_ALL=zh_CN.UTF-8
 export LANG=zh_CN.UTF-8
 export LC_CTYPE=zh_CN.UTF-8
+. "$HOME/.cargo/env"

diff --git a/learn/doc/zshrc b/learn/doc/zshrc
index ab11d1c94c75aa0862d9376c018962bfc4f23623..adf3a29ca23d8a0a4ce83d5c14cf8c2c8c611935 100644 (file)
--- a/learn/doc/zshrc
+++ b/learn/doc/zshrc
@@ -1,6 +1,8 @@
 # If you come from bash you might have to change your $PATH.
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 export PATH=$HOME/go/bin:$PATH
+export PATH=$HOME/.cargo/bin:$PATH
+export PATH=$PATH:/usr/local/`whoami`/bochs-2.7/bin/
 
 # Path to your oh-my-zsh installation.
 export ZSH="/Users/ace/.oh-my-zsh"
@@ -14,7 +16,8 @@ export ZSH="/Users/ace/.oh-my-zsh"
 # 需要安装字体: https://github.com/powerline/fonts.git
 # 字体安装之后，需要将终端的字体设置为‘Roboto Mono for Powerline
 #ZSH_THEME="agnoster"
-ZSH_THEME="zhaoyanbai"
+#ZSH_THEME="zhaoyanbai"
+ZSH_THEME="acevest"
 
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
@@ -65,6 +68,7 @@ ZSH_THEME="zhaoyanbai"
 # or set a custom format using the strftime function format specifications,
 # see 'man strftime' for details.
 # HIST_STAMPS="mm/dd/yyyy"
+HIST_STAMPS="yyyy-mm-dd"
 
 # Would you like to use another custom folder than $ZSH/custom?
 # ZSH_CUSTOM=/path/to/new-custom-folder
@@ -78,7 +82,12 @@ ZSH_THEME="zhaoyanbai"
 # 将incr-0.2.zsh保存到~/.oh-my-zsh/custom/plugins/incr/并重命名为incr.plugin.zsh
 plugins=(
  git
+ Z
+ vi-mode
+ git-open
+ colored-man-pages
  zsh-autosuggestions
+ zsh-syntax-highlighting
 )
 
 source $ZSH/oh-my-zsh.sh
@@ -114,7 +123,6 @@ export PATH=$HOME/.local/bin:$PATH
 export PATH=$PATH:$HOME/workspace/esp/xtensa-esp32-elf/bin
 export PATH=$PATH:$HOME/workspace/esp/xtensa-lx106-elf/bin
 export IDF_PATH=$HOME/workspace/esp/esp-idf
-#export IDF_PATH=$HOME/workspace/esp/ESP8266_RTOS_SDK
 export PATH=$PATH:/Applications/Arduino.app/Contents/Java/hardware/tools/avr/bin/
 export PATH=$PATH:$HOME/Library/Arduino15/packages/arduino/tools/avrdude/6.0.1-arduino5/bin
 export PATH=$PATH:/usr/local/opt/go/libexec/bin
@@ -122,15 +130,19 @@ export PATH=$PATH:/Users/ace/sys/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.2-201905
 export RTOS_PATH=$HOME/workspace/acecode/rtos/
 export PATH=$PATH:$HOME/go/bin
 
-export PATH=/usr/local/sbin:$PATH
-export PATH=$HOME/.local/bin:$PATH
-export PATH=$PATH:$HOME/workspace/esp/xtensa-esp32-elf/bin
-export PATH=$PATH:$HOME/workspace/esp/xtensa-lx106-elf/bin
-#export IDF_PATH=$HOME/workspace/esp/esp-idf
-export IDF_PATH=$HOME/workspace/esp/ESP8266_RTOS_SDK
-export PATH=$PATH:/Applications/Arduino.app/Contents/Java/hardware/tools/avr/bin/
-export PATH=$PATH:$HOME/Library/Arduino15/packages/arduino/tools/avrdude/6.0.1-arduino5/bin
-export PATH=$PATH:/usr/local/opt/go/libexec/bin
-export PATH=$PATH:/Users/ace/sys/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.2-20190521-0004/bin
-export RTOS_PATH=$HOME/workspace/acecode/rtos/
-
+#. $HOME/workspace/esp/esp-idf/export.sh
+alias getidf='. $HOME/workspace/esp/esp-idf/export.sh'
+alias idf='idf.py'
+#export IDF_TARGET=esp32c3
+
+
+#export PATH=/usr/local/sbin:$PATH
+#export PATH=$HOME/.local/bin:$PATH
+#export PATH=$PATH:$HOME/workspace/esp/xtensa-esp32-elf/bin
+#export PATH=$PATH:$HOME/workspace/esp/xtensa-lx106-elf/bin
+#export PATH=$PATH:/Applications/Arduino.app/Contents/Java/hardware/tools/avr/bin/
+#export PATH=$PATH:$HOME/Library/Arduino15/packages/arduino/tools/avrdude/6.0.1-arduino5/bin
+#export PATH=$PATH:/usr/local/opt/go/libexec/bin
+#export PATH=$PATH:/Users/ace/sys/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.2-20190521-0004/bin
+#export RTOS_PATH=$HOME/workspace/acecode/rtos/
+#