diff --git a/doc/tech/.zshrc b/.zshrc similarity index 73% rename from doc/tech/.zshrc rename to .zshrc index 308dd38..97369cd 100644 --- a/doc/tech/.zshrc +++ b/.zshrc @@ -5,7 +5,7 @@ export ZSH=/Users/sdhou/.oh-my-zsh # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -ZSH_THEME="robbyrussell" +ZSH_THEME="bira" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -53,8 +53,11 @@ plugins=(git) # User configuration -export PATH="/usr/local/sbin:/Users/sdhou/.composer/vendor/bin:/Users/sdhou/bin:/usr/local/bin:/Users/sdhou/sbin:/Users/sdhou/share/python:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/local/git/bin:/Users/sdhou/.rvm/bin" +export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" # export MANPATH="/usr/local/man:$MANPATH" +export HOMEBREW_GITHUB_API_TOKEN=2ba63834fcfff1118c5f16b1a434dcf25d7eda34 +export PATH="/usr/local/sbin:$PATH" +export PATH="$HOME/.composer/vendor/bin:$PATH" source $ZSH/oh-my-zsh.sh @@ -82,27 +85,20 @@ source $ZSH/oh-my-zsh.sh # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" - -$(boot2docker shellinit 2> /dev/null) - -ssh-add $HOME/.ssh/id_dsa -ssh-add $HOME/.ssh/id_rsa - -export CLICOLOR=1 -export PATH="$HOME/bin:/usr/local/bin:$HOME/sbin:$HOME/share/python:$PATH" -export LSCOLORS=gxfxaxdxcxegedabagacad -export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/ -export HOMEBREW_GITHUB_API_TOKEN='520bcad92381aa14ba304072dd0412c9f1d6839d' -export PATH=/usr/local/sbin:/Users/sdhou/.composer/vendor/bin:$PATH - alias ll='ls -alh' -alias odlb="ssh remote@123.59.80.161" -alias odapp01="ssh remote@123.59.80.155" -alias odapp02="ssh remote@123.59.80.156" +alias vim='mvim' +alias odlb="ssh remote@106.75.65.156" +alias odapp01="ssh remote@123.59.80.156" +alias odapp02="ssh remote@123.59.80.164" +alias odapp03="ssh remote@180.150.179.19" +alias odapp04="ssh remote@180.150.178.177" alias odjob01="ssh remote@123.59.80.157" -alias odtest01="ssh remote@123.59.80.164" +alias odtest01="ssh remote@106.75.50.140" alias odgit="ssh remote@123.59.80.166" -alias oddb="ssh -qTfnN remote@odjob01 -L 3306/10.10.144.2/3306" +alias oddb="ssh -qTfnN remote@odtest01 -L 3306:127.0.0.1:3306" alias sdhou="ssh remote@sdhou.com" alias gitfb='git fetch && git rebase' -alias idehelp="php artisan ide-helper:generate;php artisan ide-helper:meta;php artisan ide-helper:models -W" +alias brewup="brew update -v && brew upgrade -v && brew cleanup && brew doctor" +alias fmtphp="fmt.phar --psr2 --no-backup --ignore=vendor ./" + +export HOMEBREW_CASK_OPTS="--caskroom=/opt/homebrew-cask/Caskroom" diff --git a/doc/tech/archlinux_install_gnome.md b/doc/archlinux_install_gnome.md similarity index 100% rename from doc/tech/archlinux_install_gnome.md rename to doc/archlinux_install_gnome.md diff --git a/doc/tech/archlinux_vpn.md b/doc/archlinux_vpn.md similarity index 100% rename from doc/tech/archlinux_vpn.md rename to doc/archlinux_vpn.md diff --git a/doc/diary.md b/doc/diary.md new file mode 100644 index 0000000..75ecf03 --- /dev/null +++ b/doc/diary.md @@ -0,0 +1,146 @@ +### 2013-09-15 +- 休息日静坐时间稍长一些,每天2小时左右.实践了南怀瑾的观想和出入息.内心平静了很多,时间过的飞快. +- 静坐时会出现肺部痛感,修六妙门的呬字后稍缓. +- 少有体会南怀瑾说的静坐是这世界上最享受的事情. +- 每次静坐只能半小时,到点就开始腿酸,心烦气躁. + +### 2013-09-16 +- 喵呜查出甲状腺肿瘤,不知良恶性,待查. +- 平日也可观心修出入息.无事独处时易.骑车时稍难,做事说话工作时做不到. + +### 2013-09-20 +- 修出入息时全身表皮会有点发麻 +- 稍有体会每个细胞都会自己呼吸，不一定通过鼻孔。 +- 吃了东西修出入息状态就不太好，早上起来修状态就比较好。 + +### 2013-09-27 +- 无所住 +- 不着相 + +### 2013-10-08 +- 功德 - 戒定慧 +- 福德 +- 福报 + +### 2013-10-29 +- 参话头 念佛的人是谁 我是谁 谁是我 我从哪里来 要去哪里 无答案 +- 这些话头和心经中的 不生不灭 殊途同归 但现在无法参透和实证 +- 今天早上静坐时中心中留下一念参话头 不生不灭 证到心中一点空明平静,但时间很短,一会就散乱了.平时行立坐卧都努力在这境界中,但非常困难,只有走路坐地铁的时候容易保持一些. +- 观自在 静坐中观自在,关本心能进入一个很平静的空明状态,但很难保持,很多散乱.努力中. + +### 2013-11-12 +- 参话头不究竟 本自清净 参个话头也是妄想 + +### 2013-11-28 +- 盘腿静坐非常享受，停在清净心上更是前所未有的享受，但时间很短，正在努力使这段时间变长，以后行立坐卧都停在清净心就更好了。 + +### 2014-06-07 +- 《圆觉经》知幻即离，不假方便。离幻即觉，本无次第。 +- 菩提者觉也 +- 《圆觉经》居一切时不起妄想，于一切时妄心亦不息 +- 南怀瑾 - 秋风落叶乱为堆，扫尽还来千百回,一笑罢休闲处坐，任它落地自成灰。 +- 道家 开口神气散，意动火功寒 +- 《永嘉集》 + +### 2014-06-08 +- 疑参，破定，执着，起用 +- 若要长生胃里常空，若要不死肠里无屎。 + +### 2014-07-10 +- 清靈 與 昏沉 怎麼區分？ + +### 2014-07-16 +- 持名唸佛號念不下去時觀想明點. +- 觀想一個白點,比較粗和模糊.全身心都投入進去,身體和精神會放鬆,身體有錢輕靈,經常打斷,無法定在明點中,舍不掉身見. +- 修行兩個法門,1.有分別影像所緣作意,2.無分別映像所緣作意 +- 1.持名唸佛 唸咒 觀佛 +- 2.止 修明點 觀一個水晶球的反光點 不在內不在外 + +### 2014-07-22 +- 時刻檢查自己的初心 + +### 2014-9-22 +- 打坐是这最快乐的事情 +- 居一切时不起妄念 于诸忘心亦不息灭 住妄想竟不加了知 于无了知 不辨真实 +- 发心 尽于虚空 一切众生 我皆令入究竟圆觉 于圆觉中无取觉者 除彼我人一切诸相 +- 念佛三昧 + +### 2014-10-06 +- 所观不同,能观的那个是相同的,观念头还是观佛像,能观的那个是一样的. +- 每次上坐前先拜佛,差不多心不乱跑后坐好.念发愿忏悔文同时观想自己在很多佛前发愿忏悔,然后马上回向功德福报给众生.然后开始出入息+念佛,金刚念,念到念不下去停下后开始观想,念头多就观念头,念头少不乱想就观自己身体里有个佛像,一会念头多了继续观念头.这样搞大概45-60分钟过去了,起坐后马上拜佛. + +### 2014-10-09 +- 时刻检查初心,用当初一念发心修行成佛度众生的愿来时刻检查自己,反省自己. +- 圆觉发心修行,今天心突然有些打开,得欢喜. +- 至今还不能双盘,从现在开始发狠心,我就不信搞不出双盘,和这双腿杠上了.看看他倔还是我倔. + +### 2014-10-16 +- 今晚第一次感受到了肩膀也开始呼吸 需要更多的练习 + +### 2014-10-31 +- 止观为因 定慧为果.观想观世音菩萨,目前只能短暂的做到,要在行住坐卧中年年观. + +### 2014-12-30 +- 不光念佛时可以金刚念，平时说话也可练习。 + +### 2015-02-05 +- 打坐是一生中最重要的事 + +### 2015-02-26 +- 光厚和尚：疑参破定，执着启用。 + +### 2015-04-xx +- 皈依索巴上师 + +### 2015-04-27 +- 宗科巴大师祈祷文 6991 + +### 2015-11-3 一周前 +- 身见重 观身不动，体冲胀，身稍正畅，感体病，外音清，转念既失。境过身初醒。 + +### 2015-11-3 早 +- 妄如奔腾野马 身如怠锈轮机 +- 双盘腿少痛 屁痛难忍 + +### 2015-11-4 +- 观身欲起 火观对之 恐幻又起 漫漫修路 行九曲桥 + +### 2015-11-5 +- 欲起 放逸 懊恼 + +### 2015-11-6 +- 悔多食 +- 理不通 观不明 +- 色观色 何解？ + +### 2015-11-18 +- 虚云：大道无难亦无易，由来难易不相干，等闲坐断千差路，魔佛难将正眼观。 + +### 2015-11-26 +- 想左脚大拇指白骨发光 无法旧停 大拇指发麻 涨热 +- 复而脖子肩膀痛 想自身肿胀化瘀 出虫 发臭 身稍安 + +### 2016-4-5 +- 21點一坐觀左腳大拇指 剛吃完 肚子難受 犯困下坐睡覺 + +### 2016-4-6 +- 5點兩坐 不凈觀後煩躁不安下坐 + +### 2016-5-5 +- 早一坐 大明咒 身稍輕 雙盤實 +- 日間觀左腳掌白骨 麻 漲 稍清晰 心歡喜 + +### 2016-5-6 +- 施食 晚一次 使人生更快樂的另一種方式 + +### 2016-10-21 +- 从白骨观转到观音法门 死守幽静 法尘分别影事也不容易 + +### 2016-10-24 +- 清净之中似有行 + +### 2017-3-29 +- 鼻塞打坐后流鼻血 观左脚拇指白骨后稍通 平日关心法门容易心松活跃 身舒 + +### 2017-7-28 +- diff --git a/doc/tech/mac.md b/doc/mac.md similarity index 100% rename from doc/tech/mac.md rename to doc/mac.md diff --git a/doc/tech/mysql_add_user.md b/doc/mysql_add_user.md similarity index 100% rename from doc/tech/mysql_add_user.md rename to doc/mysql_add_user.md diff --git a/doc/tech/pptp.md b/doc/pptp.md similarity index 100% rename from doc/tech/pptp.md rename to doc/pptp.md diff --git a/doc/tech/ssh.md b/doc/ssh.md similarity index 100% rename from doc/tech/ssh.md rename to doc/ssh.md diff --git a/doc/team.sh b/doc/team.sh deleted file mode 100644 index e473180..0000000 --- a/doc/team.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# 获取坐标位置 /Applications/Genymotion.app/Contents/MacOS/tools/adb shell getevent | grep -e "0035" -e "0036" -# 转换为１０进制 -while [ true ]; do - # dps create team - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560 shell input tap 850 61 - sleep 1 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560 shell input tap 1086 675 - sleep 1 - - # 更多按钮 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1600 80 - sleep 1 - # 好友按钮 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1500 480 - sleep 1 - # 好友第一人 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1200 250 - sleep 1 - # 申请组队 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 800 400 - sleep 1 - # 关闭好友 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1830 110 - sleep 1 - - - # 第三个技能 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1450 1000 - sleep 1 - # 第四个技能 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1550 1000 - sleep 3 - # 第六个技能 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1800 1000 - sleep 1 - - - # 组队按钮 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1327 144 - sleep 1 - # 离开队伍 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 200 1000 - sleep 1 - # 离开队伍确认 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1000 600 - sleep 1 - - sleep 60 -done diff --git a/doc/tech/phpstore.settings.jar b/doc/tech/phpstore.settings.jar deleted file mode 100644 index 48dc6c0..0000000 Binary files a/doc/tech/phpstore.settings.jar and /dev/null differ diff --git a/doc/touch.sh b/doc/touch.sh deleted file mode 100644 index b44455e..0000000 --- a/doc/touch.sh +++ /dev/null @@ -1,6 +0,0 @@ -while [ true ]; do - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1132 720 - sleep 3 - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560_1 shell input tap 1200 720 - sleep $1 -done diff --git a/doc/touch1.sh b/doc/touch1.sh deleted file mode 100644 index 1df4607..0000000 --- a/doc/touch1.sh +++ /dev/null @@ -1,4 +0,0 @@ -while [ true ]; do - /Applications/Genymotion.app/Contents/MacOS/tools/adb -s model:Google_Nexus_6___6_0_0___API_23___1440x2560 shell input tap 942 700 - sleep $1 -done diff --git a/doc/tech/nginx/nginx_api_master.conf b/nginx/nginx_api_master.conf similarity index 100% rename from doc/tech/nginx/nginx_api_master.conf rename to nginx/nginx_api_master.conf diff --git a/doc/tech/nginx/nginx_api_slave.conf b/nginx/nginx_api_slave.conf similarity index 100% rename from doc/tech/nginx/nginx_api_slave.conf rename to nginx/nginx_api_slave.conf diff --git a/doc/tech/nginx/nginx_api_slave1.conf b/nginx/nginx_api_slave1.conf similarity index 100% rename from doc/tech/nginx/nginx_api_slave1.conf rename to nginx/nginx_api_slave1.conf diff --git a/doc/tech/nginx/nginx_master.conf b/nginx/nginx_master.conf similarity index 100% rename from doc/tech/nginx/nginx_master.conf rename to nginx/nginx_master.conf diff --git a/doc/tech/dnspod.py b/script/dnspod.py similarity index 100% rename from doc/tech/dnspod.py rename to script/dnspod.py diff --git a/doc/tech/proxy.sh b/script/proxy.sh similarity index 100% rename from doc/tech/proxy.sh rename to script/proxy.sh diff --git a/doc/tech/ubuntu_app_server.sh b/script/ubuntu_app_server.sh similarity index 100% rename from doc/tech/ubuntu_app_server.sh rename to script/ubuntu_app_server.sh