From a9f269daaa79c63e10ac896179da9f862cadffa2 Mon Sep 17 00:00:00 2001
From: shylinux <shylinux@icloud.com>
Date: Mon, 31 Aug 2020 14:08:05 +0800
Subject: [PATCH] opt some

---
 etc/conf/zshrc | 101 +++++++------------------------------------------
 etc/miss.sh    |   8 ++++
 usr/word-dict  |   1 -
 usr/wubi-dict  |   1 -
 4 files changed, 21 insertions(+), 90 deletions(-)
 delete mode 120000 usr/word-dict
 delete mode 120000 usr/wubi-dict

diff --git a/etc/conf/zshrc b/etc/conf/zshrc
index 55bcc52a..cd40351e 100644
--- a/etc/conf/zshrc
+++ b/etc/conf/zshrc
@@ -1,105 +1,30 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+export ZSH=$HOME/.oh-my-zsh
 
-# Path to your oh-my-zsh installation.
-export ZSH=$HOME/.oh-my-zsh # {{{
-
-# Set name of the theme to load. Optionally, if you set this to "random"
-# it'll load a random theme each time that oh-my-zsh is loaded.
-# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
 ZSH_THEME="robbyrussell"
 
-# Uncomment the following line to use case-sensitive completion.
-# CASE_SENSITIVE="true"
-
-# Uncomment the following line to use hyphen-insensitive completion. Case
-# sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
-# Uncomment the following line to disable bi-weekly auto-update checks.
-# DISABLE_AUTO_UPDATE="true"
-
-# Uncomment the following line to change how often to auto-update (in days).
-# export UPDATE_ZSH_DAYS=13
-
-# Uncomment the following line to disable colors in ls.
-# DISABLE_LS_COLORS="true"
-
-# Uncomment the following line to disable auto-setting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment the following line to enable command auto-correction.
-# ENABLE_CORRECTION="true"
-
-# Uncomment the following line to display red dots whilst waiting for completion.
-# COMPLETION_WAITING_DOTS="true"
-
-# Uncomment the following line if you want to disable marking untracked files
-# under VCS as dirty. This makes repository status check for large repositories
-# much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# HIST_STAMPS="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
 plugins=(tmux git)
 
 source $ZSH/oh-my-zsh.sh
 source ~/.oh-my-zsh/plugins/z/z.sh
 
-# User configuration
-
-# export MANPATH="/usr/local/man:$MANPATH"
-
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# ssh
-# export SSH_KEY_PATH="~/.ssh/dsa_id"
-
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-# }}}
-
 export PROMPT=$LOCAL_PROMPT'%![%*]%c$ '
 export EDITOR=vim
 
-[ -f ~/.zsh_local ] && source ~/.zsh_local
-
-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
-
 bindkey -e
 bindkey jk accept-line
 bindkey "^N" down-line-or-beginning-search
 bindkey "^P" up-line-or-beginning-search
 bindkey -M vicmd j down-line-or-beginning-search
 bindkey -M vicmd k up-line-or-beginning-search
+
+export GOPRIVATE=github.com
+export GOPROXY=https://goproxy.cn,direct
+export ctx_dev=http://localhost:9020
+
+ISH_CONF_WORK=~/usr/local/work
+if [ -f ~/.ish/plug.sh ] && source ~/.ish/plug.sh; then
+    require conf.sh
+fi
+
+[ -f etc/local.sh ] && source etc/local.sh
+export PATH=$PWD/bin:$PATH
diff --git a/etc/miss.sh b/etc/miss.sh
index 79bcef66..12aaa759 100644
--- a/etc/miss.sh
+++ b/etc/miss.sh
@@ -46,6 +46,7 @@ ish_miss_prepare_tmux() {
 }
 ish_miss_prepare_bash() {
     ish_miss_create_link ~/.bashrc $PWD/etc/conf/bashrc
+    ish_miss_create_link ~/.zshrc $PWD/etc/conf/zshrc
     ish_miss_create_link ~/.ish $PWD/.ish
 
     if [ -z `cat ~/.bashrc |grep "source ~/.ish/plug.sh"` ]; then
@@ -53,6 +54,13 @@ ish_miss_prepare_bash() {
             echo -e "\nsource $PWD/etc/conf/bashrc\n" >> ~/.bashrc
         fi
     fi
+
+    if [ -z `cat ~/.zshrc |grep "source ~/.ish/plug.sh"` ]; then
+        if [ -z `cat ~/.zshrc |grep "source $PWD/etc/conf/zshrc"` ]; then
+            echo -e "\nsource $PWD/etc/conf/zshrc\n" >> ~/.zshrc
+        fi
+    fi
+
 }
 
 ish_miss_prepare_bash
diff --git a/usr/word-dict b/usr/word-dict
deleted file mode 120000
index 64577440..00000000
--- a/usr/word-dict
+++ /dev/null
@@ -1 +0,0 @@
-../.ish/pluged/github.com/shylinux/word-dict
\ No newline at end of file
diff --git a/usr/wubi-dict b/usr/wubi-dict
deleted file mode 120000
index 5019ff28..00000000
--- a/usr/wubi-dict
+++ /dev/null
@@ -1 +0,0 @@
-../.ish/pluged/github.com/shylinux/wubi-dict
\ No newline at end of file