bash

diff --git a/arduino/README.md b/arduino/README.md
index d18661ffad06b5631c35b4556c6b705703e50fa0..bf01f0dfe13b84af0929ae79967c921a4420ef3b 100644 (file)
--- a/arduino/README.md
+++ b/arduino/README.md
@@ -2,5 +2,5 @@ Arduino IDE > Arduino Menu > Preferences > Settings > Setchbook location
 
 ArduinoPath = $HOME/workspace/Arduino
 
-cd $ArduinoPath
+cd $ArduinoPath/libraries
 ln -s "this dir" AceArduino

diff --git a/learn/doc/mac_bash_profile b/learn/doc/mac_bash_profile
index 44968d71c3722363d9a003b65b1139f79f1b1c27..7a8e7f3ffd3d03d05f7418b24fc17613f302689a 100644 (file)
--- a/learn/doc/mac_bash_profile
+++ b/learn/doc/mac_bash_profile
@@ -6,16 +6,30 @@ 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 GOBIN=$HOME/.local/bin
 export IDF_PATH=$HOME/workspace/esp/esp-idf
 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
 #多个GOPATH用';'分隔 go get会存到第一个目录
-export GOPATH=$HOME/go
+export GOPATH=$HOME/workspace/go
+export GOBIN=$HOME/.local/bin
+
 export RTOS_PATH=$HOME/workspace/acecode/rtos/
-export PS1="\W\$ "
-alias ll='ls -lGh'
+
+RED="\[\033[01;31m\]"
+GREEN="\[\033[01;32m\]"
+YELLOW="\[\033[01;33m\]"
+BLUE="\[\033[01;34m\]"
+PURPLE="\[\033[01;35m\]"
+CYAN="\[\033[01;36m\]"
+WHITE="\[\033[01;37m\]"
+GRAY="\[\033[02;37m\]"
+CLOSECOLOR="\[\033[00m\]"
+
+#PS1='\[\033[02;37m\]\t\[\033[00m\]\[\033[01;37m\]@\[\033[01;33m\]\W\[\033[00m\]\$ '
+#PS1='\[\033[02;37m\]\t\[\033[00m\]\[\033[01;37m\]@\[\033[01;33m\]\W\[\033[00m\]\$ '
+PS1="$GRAY\t$CLOSECOLOR$WHITE@$PURPLE\h $CYAN\W$RED\$ $CLOSECOLOR"
+alias ll='ls -lGh --time-style=long-iso'
 alias ls='ls -Gh'
 alias rm='rm -rf'
 alias cls='clear'
@@ -25,7 +39,6 @@ alias msf='msfconsole'
 alias cdw='cd ~/workspace/'
 export PATH="/usr/local/opt/ncurses/bin:$PATH"
 
-
 export GREP_OPTIONS="--exclude-dir=\.svn" 
 
 
@@ -33,3 +46,4 @@ export GREP_OPTIONS="--exclude-dir=\.svn"
 # -bash: warning: setlocale: LC_CTYPE: cannot change locale (UTF-8): No such file or directory
 export LC_ALL=zh_CN.UTF-8
 export LANG=zh_CN.UTF-8
+export LC_CTYPE=zh_CN.UTF-8

diff --git a/learn/doc/vimrc b/learn/doc/vimrc
index 436087c06d09aa76b37a7c7d82d1ec80a743d346..a24b438c1d777585e1deb54b955ec8c2b7dde6ec 100644 (file)
--- a/learn/doc/vimrc
+++ b/learn/doc/vimrc
@@ -116,6 +116,7 @@ imap jj <Esc>
 filetype off
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
+
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'fatih/vim-go'
 Plugin 'Valloric/YouCompleteMe'