移除tmux

增加neovim
zsh theme 调整为 simple
vim 不再指定zh_cn.utf8

README.md

@@ -6,19 +6,18 @@
 
     * oh-my-zsh 开启插件plugins: vi-mode git jump mvn gradle brew osx tmux zsh_reload colored-man-pages sudo
     * vim 日常配置
-    * tmux 键绑定，让tmux用起来更像是screen 
 
 
 ## 日常软件安装
 
 Debian
 ```shell
-apt install vim tmux screen zsh git
+apt install nvim screen zsh git
 ```
 
 FreeBSD 
 ```shell
-sudo pkg install vim tmux screen zsh git
+sudo pkg install nvim screen zsh git
 ```
 
 

init.sh

@@ -2,8 +2,6 @@
 #############################################################
 #
 #	iconf-pub script	
-#	magic.hualong@gmail.com
-#
 #
 #############################################################
 
@@ -13,9 +11,6 @@ ICONF_DIR=~/.iconf-pub
 echo 'init zsh config'
 ln -sf $ICONF_DIR/zsh.conf/zshrc ~/.zshrc
 
-echo 'init tmux config'
-ln -sf $ICONF_DIR/tmux.conf/tmux.conf ~/.tmux.conf
-
 echo 'init vim config'
 ln -sf $ICONF_DIR/vim.conf/vimrc ~/.vimrc
 
@@ -25,14 +20,7 @@ ln -sf $ICONF_DIR/vim.conf/vimrc ~/.config/nvim/init.vim
 
 # data part
 
-## oh-my-zsh & themes
+## install oh-my-zsh
 git clone https://github.com/robbyrussell/oh-my-zsh ~/.oh-my-zsh
-git clone https://github.com/jeremyFreeAgent/oh-my-zsh-powerline-theme ~/.oh-my-zsh-powerline-theme
-cp ~/.oh-my-zsh-powerline-theme/powerline.zsh-theme ~/.oh-my-zsh/themes/
 git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
 
-# clone vundle
-git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
-
-
-

vim.conf/vimrc

@@ -14,15 +14,15 @@ set softtabstop=4
 set expandtab
 
 "开启文件类型侦测 vundle需要关闭这2项
-"filetype on
-"filetype plugin on
+filetype on
+filetype plugin on
 
 "设置多编码处理
 "set fileencoding=utf-8
 "set encoding=utf-8
 "set tenc=utf-8
 "set fileencodings=ucs-bom,utf-8,cp936,gb18030,big5,euc-jp,euc-kr,latin1
-language message zh_CN.UTF-8
+"language message zh_CN.UTF-8
 
 "设置文件格式
 "set fileformats=mac,unix,dos
@@ -41,39 +41,7 @@ set mouse=v
 set laststatus=2
 set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]
 
-
-" Dvorak remap
-" 1 - Movement keys htns -> hjkl
-"   (gj and gk move by visual lines, if the line is wrapped for instance)
-"noremap h h
-"noremap t gj
-"noremap n gk
-"noremap s l
-
-
 "Lokaltog/vim-powerline config
 let g:Powerline_symbols = 'fancy'
 set laststatus=2
 
-
-" Vundle
-" -----------------------------------------------------------
-set nocompatible              " be iMproved, required
-filetype off                  " required
-
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-Plugin 'VundleVim/Vundle.vim' " let Vundle manage Vundle, required
-Plugin 'Lokaltog/vim-powerline'
-
-call vundle#end()            " required
-filetype plugin indent on    " required
-filetype plugin on
-" :PluginList       - lists configured plugins
-" :PluginInstall    - installs plugins; append `!` to update or just
-" :PluginUpdate
-" :PluginSearch foo - searches for foo; append `!` to refresh local cache
-" :PluginClean      - confirms removal of unused plugins; append `!` to
-" -----------------------------------------------------------
-

zsh.conf/zshrc

@@ -86,12 +86,7 @@ SAVEHIST=10000
 # 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="powerline"
-#ZSH_THEME="kardan"
-#ZSH_THEME="norm"
-#ZSH_THEME="risto"
-#ZSH_THEME="simple"
+ZSH_THEME="simple"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -173,22 +168,22 @@ source $ZSH/oh-my-zsh.sh
 #
 
 # 别名绑定
+#
+# vim 绑定
+alias vi='nvim'
+alias vim='nvim'
+alias vimdiff='nvim -d'
+export EDITOR=nvim
+
 #命令绑定
-#alias vi='vim'
-#alias vim='vim'
-#alias vim='nvim'
 alias grep='grep --color=auto'
 alias ll='ls -l'
 alias lm='l | more'
 alias rmrf='rm -rf'
 alias tail100='tail -n100 -f '
 
-
 alias vizsh='vim ~/.zshrc'
 alias sozsh='source ~/.zshrc'
-alias data='cd /data'
-alias work='cd ~/work'
-alias pwgen30='pwgen 30 -y'
 
 # gradle
 alias gradleinitjava='gradle init --type java-library'
@@ -266,10 +261,10 @@ alias javapverbose='javap -verbose '
 alias ping1='ping 192.168.1.1'
 
 #扩展名绑定
-alias -s conf=nvim
-alias -s json=nvim
-alias -s html=nvim
-alias -s md=nvim
+#alias -s conf=vim
+#alias -s json=vim
+#alias -s html=vim
+#alias -s md=vim
 
 #tmux_init() { }
 # 判断是否已有开启的tmux会话，没有则开启