소스 검색

remove shared history option

also tidy up RUNME script and remove extra space from theme
Weiyi Lou 13 년 전
부모
커밋
c34fe03c9b
3개의 변경된 파일31개의 추가작업 그리고 35개의 파일을 삭제
  1. 28 34
      RUNME
  2. 1 1
      zsh/oh-my-zsh-custom/cinaeco.zsh-theme
  3. 2 0
      zsh/zshrc

+ 28 - 34
RUNME

@@ -6,40 +6,34 @@
 # A lot of this extra knowledge courtesy of vimcasts.org!
 # A lot of this extra knowledge courtesy of vimcasts.org!
 
 
 # Make a known_hosts file if none, otherwise zsh throws an error for our .zshrc
 # Make a known_hosts file if none, otherwise zsh throws an error for our .zshrc
-echo "Checking for known_hosts:"
 if test -f ~/.ssh/known_hosts; then
 if test -f ~/.ssh/known_hosts; then
-  echo " -> Found"
+  echo "known_hosts found..."
 else
 else
-  echo " -> Not Found"
   mkdir -p ~/.ssh
   mkdir -p ~/.ssh
   touch ~/.ssh/known_hosts
   touch ~/.ssh/known_hosts
-  echo " -> Created ~/.ssh/known_hosts"
+  echo "known_hosts created (blank)..."
 fi
 fi
 
 
 # Ack for this user (perl 5.8.8 or higher on system)
 # Ack for this user (perl 5.8.8 or higher on system)
 # Curl may need to have proxy settings
 # Curl may need to have proxy settings
-echo "Checking for ack in ~/bin:"
 if test -f ~/bin/ack; then
 if test -f ~/bin/ack; then
-  echo " -> Found"
+  echo "ack found..."
 else
 else
-  echo " -> Not Found"
   mkdir -p ~/bin
   mkdir -p ~/bin
   curl http://betterthangrep.com/ack-standalone > ~/bin/ack
   curl http://betterthangrep.com/ack-standalone > ~/bin/ack
   chmod 0755 ~/bin/ack
   chmod 0755 ~/bin/ack
-  echo " -> Installed ~/bin/ack from betterthangrep.com"
+  echo "ack installed from betterthangrep.com..."
 fi
 fi
 
 
 # color for git! Some machines don't have it.
 # color for git! Some machines don't have it.
-echo "Setting up git colour and editor:"
 git config --global color.ui true
 git config --global color.ui true
 git config --global core.editor "vim"
 git config --global core.editor "vim"
-echo " -> Done"
+echo "git colour and editor setup..."
 
 
 # This repository has vim plugins as submodules, so initialise and clone them
 # This repository has vim plugins as submodules, so initialise and clone them
-echo "Getting dotfiles submodules:"
 git submodule init
 git submodule init
 git submodule update
 git submodule update
-echo " -> Done"
+echo "dotfiles submodules done..."
 
 
 # Add more vim plugins from this dotfiles directory, like so:
 # Add more vim plugins from this dotfiles directory, like so:
 #     git submodule add git://github.com/tpope/module.git vim/bundle/module
 #     git submodule add git://github.com/tpope/module.git vim/bundle/module
@@ -47,41 +41,41 @@ echo " -> Done"
 # Apart from updating plugins individually, you can update all submodules
 # Apart from updating plugins individually, you can update all submodules
 #     git submodule foreach git pull origin master
 #     git submodule foreach git pull origin master
 
 
-# SSH Config
-echo "Symlinking for ssh:"
-ln -s ../dotfiles/ssh/config ~/.ssh/config
-echo " -> Done"
 
 
-# Vim
-echo "Symlinking for vim:"
-if test -d ~/.vim; then
-  echo " -> .vim folder exists"
-else
-  ln -s dotfiles/vim/ ~/.vim
-fi
-ln -s dotfiles/vim/vimrc ~/.vimrc
-mkdir ~/.vimundo # persistent undo directory
-echo " -> Done"
+#
+# Thanks to: https://github.com/dangerous/dotfiles
+# for cleaner way of handling symlinking
+#
+BACKUP_DIR="/tmp/$(date)"
+mkdir "$BACKUP_DIR"
 
 
 # Zsh
 # Zsh
-echo "Symlinking for zsh:"
+mv ~/.zshrc "$BACKUP_DIR"
 ln -s dotfiles/zsh/zshrc ~/.zshrc
 ln -s dotfiles/zsh/zshrc ~/.zshrc
+mv ~/.zshenv "$BACKUP_DIR"
 ln -s dotfiles/zsh/zshenv ~/.zshenv
 ln -s dotfiles/zsh/zshenv ~/.zshenv
-echo " -> Done"
+
+# Vim
+mv ~/.vim "$BACKUP_DIR"
+ln -s dotfiles/vim ~/.vim
+mv ~/.vimrc "$BACKUP_DIR"
+ln -s dotfiles/vim/vimrc ~/.vimrc
+mkdir -p ~/.vimundo # persistent undo directory
+
+# SSH Config
+mv ~/.ssh/config "$BACKUP_DIR"
+ln -s ../dotfiles/ssh/config ~/.ssh/config
 
 
 # Pentadactyl
 # Pentadactyl
-echo "Symlinking for pentadactyl:"
+mv ~/.pentadactylrc "$BACKUP_DIR"
 ln -s dotfiles/pentadactyl/pentadactylrc ~/.pentadactylrc
 ln -s dotfiles/pentadactyl/pentadactylrc ~/.pentadactylrc
-echo " -> Done"
 
 
 # Screen
 # Screen
-echo "Symlinking for gnu screen:"
+mv ~/.screenrc "$BACKUP_DIR"
 ln -s dotfiles/screen/screenrc ~/.screenrc
 ln -s dotfiles/screen/screenrc ~/.screenrc
-echo " -> Done"
 
 
 # Nethack
 # Nethack
-echo "Symlinking for nethack:"
+mv ~/.nethackrc "$BACKUP_DIR"
 ln -s dotfiles/nethack/nethackrc ~/.nethackrc
 ln -s dotfiles/nethack/nethackrc ~/.nethackrc
-echo " -> Done"
 
 
 echo "Setup complete!"
 echo "Setup complete!"

+ 1 - 1
zsh/oh-my-zsh-custom/cinaeco.zsh-theme

@@ -68,7 +68,7 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}>%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}u%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}u%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[160]%}?%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[160]%}?%{$reset_color%}"
 
 
-# Using precmd instead of having a multiline prompt reduces the number of 
+# Using precmd instead of having a multiline prompt reduces the number of
 # `%{` and `%}` escape sequences needed. Actions like changing mode in vi-mode
 # `%{` and `%}` escape sequences needed. Actions like changing mode in vi-mode
 # and using tab completion need the escapes to know the right number of printed
 # and using tab completion need the escapes to know the right number of printed
 # characters in the prompt or rprompt, otherwise, they will offset displayed
 # characters in the prompt or rprompt, otherwise, they will offset displayed

+ 2 - 0
zsh/zshrc

@@ -40,6 +40,8 @@ source $ZSH/oh-my-zsh.sh
 alias h='history'
 alias h='history'
 ## don't show expansions, just execute, e.g. for !! and !$
 ## don't show expansions, just execute, e.g. for !! and !$
 setopt nohistverify
 setopt nohistverify
+## don't have the same history across tabs/windows
+setopt nosharehistory
 
 
 ## common typos
 ## common typos
 alias vf='cd'
 alias vf='cd'