aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--alias5
-rwxr-xr-xtools/install.sh1
-rw-r--r--zsh/_ww.sh (renamed from zsh/_wg.zsh)6
4 files changed, 10 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index e3c1d6c..d0f1e67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1.ONESHELL: 1.ONESHELL:
2.PHONY: * 2.PHONY: *
3 3
4all: git vim tig gpg 4all: git tig vim tig gpg
5 mkdir -p ~/git 5 mkdir -p ~/git
6 6
7git: 7git:
@@ -19,8 +19,7 @@ vim:
19 fi 19 fi
20 # vim-plug 20 # vim-plug
21 curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim 21 curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
22 rm -f ~/.vim_runtime/my_configs.vim 22 ln -sf `pwd`/vimrc ~/.vim_runtime/my_configs.vim
23 ln -s `pwd`/vimrc ~/.vim_runtime/my_configs.vim
24 23
25zsh: 24zsh:
26 curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | bash 25 curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | bash
@@ -71,4 +70,3 @@ pass:
71 if [ ! -d "$(HOME)/.password-store" ]; then 70 if [ ! -d "$(HOME)/.password-store" ]; then
72 git clone ssh://topo/~/.password-store ~/.password-store; 71 git clone ssh://topo/~/.password-store ~/.password-store;
73 fi 72 fi
74
diff --git a/alias b/alias
index d5c9562..210aae2 100644
--- a/alias
+++ b/alias
@@ -202,9 +202,12 @@ cdss() {
202# about vimwiki 202# about vimwiki
203alias cdw='cd ~/vimwiki' 203alias cdw='cd ~/vimwiki'
204alias chw='cd ~/vimwiki && tig --all' 204alias chw='cd ~/vimwiki && tig --all'
205wg() { 205ww() {
206 vim ~/vimwiki/${1%%.md}.md 206 vim ~/vimwiki/${1%%.md}.md
207} 207}
208wg() {
209 grep -r "$@" ~/vimwiki
210}
208wi() { 211wi() {
209 cat ~/vimwiki/${1%%.md}.md 212 cat ~/vimwiki/${1%%.md}.md
210} 213}
diff --git a/tools/install.sh b/tools/install.sh
index 2e265fa..86f13aa 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -19,6 +19,7 @@ fi
19# Write initial commands into .bashrc or .zshrc 19# Write initial commands into .bashrc or .zshrc
20sed -i'.bak' "\^# $REPO^, /^$/ d" $RCFILE 20sed -i'.bak' "\^# $REPO^, /^$/ d" $RCFILE
21cat >>$RCFILE <<EOF 21cat >>$RCFILE <<EOF
22
22# $REPO 23# $REPO
23export SETTING_DIR=$SETTING_DIR 24export SETTING_DIR=$SETTING_DIR
24source \$SETTING_DIR/tools/init/load-settings.sh 25source \$SETTING_DIR/tools/init/load-settings.sh
diff --git a/zsh/_wg.zsh b/zsh/_ww.sh
index e914092..76afae8 100644
--- a/zsh/_wg.zsh
+++ b/zsh/_ww.sh
@@ -1,7 +1,7 @@
1#compdef wg 1#compdef ww
2 2
3function _wg() { 3function _ww() {
4 compadd -S '' $(cd ~/vimwiki && ls ${words[2]}*) 4 compadd -S '' $(cd ~/vimwiki && ls ${words[2]}*)
5} 5}
6 6
7_wg 7_ww