diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index a5a5d77..a23d76a --- a/install.sh +++ b/install.sh @@ -1,11 +1,24 @@ #!/bin/bash +INSTALL_ROOT=~/.oh-my-terminal + # tmux -ln -s -f ~/.oh-my-terminal/tmux/.tmux.conf ~/.tmux.conf -ln -s -f ~/.oh-my-terminal/tmux/.tmux.conf.local ~/.tmux.conf.local +ln -s -f $INSTALL_ROOT/tmux/.tmux.conf ~/.tmux.conf +cp $INSTALL_ROOT/tmux/.tmux.conf.local ~/.tmux.conf.local # vim -ln -s -f ~/.oh-my-terminal/vim/basic.vim ~/.vimrc +vim_config="~/.vimrc" +if [ -f $vim_config ]; then + cp $vim_config "$vim_config".orig +fi +ln -s -f $INSTALL_ROOT/vim/basic.vim ~/.vimrc # zsh -ln -s -f ~/.oh-my-terminal/zsh/templates/zshrc.zsh-template ~/.zshrc +# 备份 +zsh_config=~/.zshrc +if [ -f "$zsh_config" ]; then + cp $zsh_config "$zsh_config".bak +fi + +cp $INSTALL_ROOT/zsh/templates/zshrc.zsh-template ~/.zshrc +chsh -s /bin/zsh diff --git a/tmux/LICENSE.MIT b/tmux/LICENSE.MIT deleted file mode 100644 index cbda5cd..0000000 --- a/tmux/LICENSE.MIT +++ /dev/null @@ -1,18 +0,0 @@ -Copyright 2012— Gregory Pakosz - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/tmux/LICENSE.WTFPLv2 b/tmux/LICENSE.WTFPLv2 deleted file mode 100644 index c6c7def..0000000 --- a/tmux/LICENSE.WTFPLv2 +++ /dev/null @@ -1,13 +0,0 @@ - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2004 Sam Hocevar - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/tmux/README.md b/tmux/README.md index a635c76..60e477d 100644 --- a/tmux/README.md +++ b/tmux/README.md @@ -1,18 +1,6 @@ -.tmux -===== -Self-contained, pretty and versatile `.tmux.conf` configuration file. -![Screenshot](https://cloud.githubusercontent.com/assets/553208/19740585/85596a5a-9bbf-11e6-8aa1-7c8d9829c008.gif) -Installation ------------- - -Requirements: - - - tmux **`>= 2.1`** running inside Linux, Mac, OpenBSD, Cygwin or WSL (Bash on - Ubuntu on Windows) - - outside of tmux, `$TERM` must be set to `xterm-256color` To install, run the following from your terminal: (you may want to backup your existing `~/.tmux.conf` first) diff --git a/vim/basic.vim b/vim/basic.vim index 8fb344e..e491cde 100644 --- a/vim/basic.vim +++ b/vim/basic.vim @@ -93,7 +93,7 @@ endif set ruler "Show line numbers" -set nu +" set nu " Height of the command bar set cmdheight=2