diff --git a/etc/conf/bashrc b/etc/conf/bashrc index e73d33ae..b22cc1af 100644 --- a/etc/conf/bashrc +++ b/etc/conf/bashrc @@ -1,11 +1,11 @@ #!/bin/sh -ISH_CONF_WORK=~/usr/local/work + +export GOPRIVATE=github.com +export GOPROXY=https://goproxy.cn,direct export ctx_dev=http://localhost:9020 -export ctx_dev=http://172.30.8.42:9020 + +ISH_CONF_WORK=~/usr/local/work if [ -f ~/.ish/plug.sh ] && source ~/.ish/plug.sh; then require conf.sh - - # require as miss github.com/shylinux/shell misc/miss/miss.sh fi - diff --git a/etc/conf/tmux-2.1.conf b/etc/conf/tmux-2.1.conf index 4898a0e1..8aac51a4 100644 --- a/etc/conf/tmux-2.1.conf +++ b/etc/conf/tmux-2.1.conf @@ -14,3 +14,13 @@ bind v split-window -h -c "#{pane_current_path}" bind U split-window -f -c "#{pane_current_path}" bind V split-window -f -h -c "#{pane_current_path}" +bind s choose-tree -u +jind m choose-tree -suw -c "swap-window -t %%" +bind -t vi-copy c copy-selection +bind -t vi-copy Space begin-selection + +bind -t vi-edit C-p history-up +bind -t vi-edit C-n history-down +bind -t vi-edit C-f cursor-right +bind -t vi-edit C-b cursor-left +bind -t vi-edit C-j enter diff --git a/etc/conf/tmux.conf b/etc/conf/tmux.conf index 6a7ccda8..cf65708b 100644 --- a/etc/conf/tmux.conf +++ b/etc/conf/tmux.conf @@ -40,7 +40,6 @@ set -gw window-status-current-format "#[bg=red fg=white]\ [#I:#W.#{pane_index}#F # }}} # 会话管理{{{ -bind s choose-tree -u bind q confirm-before "detach-client" # }}} # 窗口管理{{{ @@ -48,7 +47,6 @@ bind b break-pane bind c new-window bind e command-prompt -p "window new name:" "rename-window '%%'" bind B command-prompt -p "target window:" "join-pane -v -t %%" -bind m choose-tree -suw -c "swap-window -t %%" bind p previous-window bind n next-window @@ -83,18 +81,11 @@ bind \; paste-buffer bind r choose-buffer bind a paste-buffer -bind -t vi-copy c copy-selection -bind -t vi-copy Space begin-selection # }}} # 命令管理{{{ bind Space command-prompt -bind -t vi-edit C-p history-up -bind -t vi-edit C-n history-down -bind -t vi-edit C-f cursor-right -bind -t vi-edit C-b cursor-left -bind -t vi-edit C-j enter # }}} if-shell "[ -e ~/.tmux_local ]" "source-file ~/.tmux_local" diff --git a/etc/miss.sh b/etc/miss.sh index ba535e09..8c21c87b 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -3,26 +3,17 @@ [ -f ~/.ish/plug.sh ] || [ -f ./.ish/plug.sh ] || git clone https://github.com/shylinux/intshell ./.ish [ "$ISH_CONF_PRE" != "" ] || source ./.ish/plug.sh || source ~/.ish/plug.sh - -require show.sh -require help.sh require miss.sh -# ish_miss_prepare_compile -# ish_miss_prepare_install -# ish_miss_prepare_develop -ish_miss_prepare_session miss +ish_miss_prepare_compile +ish_miss_prepare_install ish_miss_prepare_volcanos ish_miss_prepare learning ish_miss_prepare_icebergs ish_miss_prepare toolkits -ish_log_debug "require as ctx github.com/shylinux/intshell" ish_miss_prepare_intshell -ish_log_debug "require as ctx github.com/shylinux/contexts" -git pull -pwd - +ish_miss_prepare_contexts # ish_miss_prepare wubi-dict # ish_miss_prepare word-dict @@ -34,11 +25,34 @@ ish_miss_prepare redis-story ish_miss_prepare mysql-story ish_miss_prepare_vim() { + ish_miss_create_link ~/.vimrc $PWD/etc/conf/vimrc + ish_miss_create_link ~/.auto.vim $PWD/usr/publish/auto.vim + + mkdir -p ~/.vim/autoload + ish_miss_create_link ~/.vim/autoload/plug.vim $PWD/etc/conf/plug.vim + mkdir -p ~/.vim/syntax - [ -f ~/.vim/syntax/sh.vim ] || ln etc/conf/sh.vim ~/.vim/syntax/sh.vim - [ -f ~/.vim/syntax/shy.vim ] || ln etc/conf/shy.vim ~/.vim/syntax/shy.vim - [ -f ~/.vim/syntax/go.vim ] || ln etc/conf/go.vim ~/.vim/syntax/go.vim - [ -f ~/.vim/syntax/javascript.vim ] || ln etc/conf/javascript.vim ~/.vim/syntax/javascript.vim + ish_miss_create_link ~/.vim/syntax/sh.vim $PWD/etc/conf/sh.vim + ish_miss_create_link ~/.vim/syntax/shy.vim $PWD/etc/conf/shy.vim + ish_miss_create_link ~/.vim/syntax/go.vim $PWD/etc/conf/go.vim + ish_miss_create_link ~/.vim/syntax/javascript.vim $PWD/etc/conf/javascript.vim } +ish_miss_prepare_git() { + git --global config alias.s status + git --global config alias.b branch +} +ish_miss_prepare_tmux() { + ish_miss_create_link ~/.tmux.conf $PWD/etc/conf/tmux.conf +} +ish_miss_prepare_bash() { + ish_miss_create_link ~/.bashrc $PWD/etc/conf/bashrc + ish_miss_create_link ~/.ish $PWD/.ish +} + +ish_miss_prepare_bash +ish_miss_prepare_tmux +ish_miss_prepare_git ish_miss_prepare_vim +ish_miss_prepare_develop +ish_miss_prepare_session miss diff --git a/src/main.go b/src/main.go index fbd9daec..4c2887bc 100644 --- a/src/main.go +++ b/src/main.go @@ -11,7 +11,6 @@ import ( _ "github.com/shylinux/icebergs/misc/input" _ "github.com/shylinux/icebergs/misc/totp" - _ "github.com/shylinux/icebergs/misc/es" _ "github.com/shylinux/icebergs/misc/lark" _ "github.com/shylinux/icebergs/misc/mp" _ "github.com/shylinux/icebergs/misc/wx" @@ -20,24 +19,23 @@ import ( _ "github.com/shylinux/golang-story/src/project" _ "github.com/shylinux/golang-story/src/runtime" - _ "github.com/shylinux/linux-story/src/android" - _ "github.com/shylinux/linux-story/src/centos" - _ "github.com/shylinux/linux-story/src/context" - _ "github.com/shylinux/linux-story/src/ubuntu" - + _ "github.com/shylinux/linux-story/iso/android" + _ "github.com/shylinux/linux-story/iso/centos" + _ "github.com/shylinux/linux-story/iso/context" + _ "github.com/shylinux/linux-story/iso/ubuntu" + _ "github.com/shylinux/linux-story/src/busybox" _ "github.com/shylinux/linux-story/src/gcc" _ "github.com/shylinux/linux-story/src/gdb" _ "github.com/shylinux/linux-story/src/glibc" - - _ "github.com/shylinux/linux-story/src/busybox" _ "github.com/shylinux/linux-story/src/kernel" _ "github.com/shylinux/linux-story/src/qemu" - - _ "github.com/shylinux/mysql-story/src/client" - _ "github.com/shylinux/mysql-story/src/server" _ "github.com/shylinux/nginx-story/src/server" _ "github.com/shylinux/redis-story/src/client" _ "github.com/shylinux/redis-story/src/server" + + _ "github.com/shylinux/mysql-story/src/client" + _ "github.com/shylinux/mysql-story/src/search" + _ "github.com/shylinux/mysql-story/src/server" ) func main() { ice.Run() }