Clean up tmux conf

This commit is contained in:
Yan Pritzker 2013-12-15 14:56:36 -06:00 committed by Yan Pritzker
parent 287b3eff2b
commit 1cdd7ff9ec
2 changed files with 9 additions and 15 deletions

View File

@ -66,18 +66,14 @@ Homebrew is _the missing package manager for OSX_. Installed automatically.
We automatically install a few useful packages including ctags, git, and hub, and the silver searcher ('ag') We automatically install a few useful packages including ctags, git, and hub, and the silver searcher ('ag')
You can install macvim from brew as well, or download it from their website. You can install macvim from brew as well, or download it from their website.
### Github Issues: [ghi gem](https://github.com/stephencelis/ghi)
We include the `ghi` command. Try `ghi list` and have fun managing issues from command line!
### ZSH ### ZSH
Think of Zsh as a more awesome bash without having to learn anything new. Think of Zsh as a more awesome bash without having to learn anything new.
Automatic spell correction for your commands, syntax highlighting, and more. Automatic spell correction for your commands, syntax highlighting, and more.
We've also provided lots of enhancements: We've also provided lots of enhancements:
* Vim mode and bash style Ctrl-R for reverse history finder * Vim mode and bash style `Ctrl-R` for reverse history finder
* Ctrl-x,Ctrl-l to insert output of last command * `Ctrl-x,Ctrl-l` to insert output of last command
* Fuzzy matching - if you mistype a directory name, tab completion will fix it * Fuzzy matching - if you mistype a directory name, tab completion will fix it
* [fasd](https://github.com/clvv/fasd) integration - hit `z` and partial match for recently used directory. Tab completion enabled. * [fasd](https://github.com/clvv/fasd) integration - hit `z` and partial match for recently used directory. Tab completion enabled.
* [Prezto - the power behind YADR's zsh](http://github.com/sorin-ionescu/prezto) * [Prezto - the power behind YADR's zsh](http://github.com/sorin-ionescu/prezto)
@ -99,14 +95,12 @@ as an actual debugger by installing [pry-nav](https://github.com/nixme/pry-nav).
[Learn more about YADR's pry customizations and how to install](doc/pry.md) [Learn more about YADR's pry customizations and how to install](doc/pry.md)
### Git Configuration ### Git Customizations:
You can customize the standard Git configuration in `~/.gitconfig.user`. Any configuration in this file will override the default configuration. YADR will take over your `~/.gitconfig`, so if you want to store your usernames, please put them into `~/.gitconfig.user`
It is recommended to use this file to set your user info. Alternately, you can set the appropriate environment variables in your `~/.secrets`. It is recommended to use this file to set your user info. Alternately, you can set the appropriate environment variables in your `~/.secrets`.
### Git Customizations:
* `git l` or `gl`- a much more usable git log * `git l` or `gl`- a much more usable git log
* `git b` or `gb`- a list of branches with summary of last commit * `git b` or `gb`- a list of branches with summary of last commit
* `git r` - a list of remotes with info * `git r` - a list of remotes with info
@ -133,6 +127,11 @@ You can customize the configuration in `~/.tmux.conf.user`.
The provided inputrc and editrc will turn your various command line tools like mysql and irb into vim prompts. There's The provided inputrc and editrc will turn your various command line tools like mysql and irb into vim prompts. There's
also an included Ctrl-R reverse history search feature in editrc, very useful in irb, postgres command line, and etc. also an included Ctrl-R reverse history search feature in editrc, very useful in irb, postgres command line, and etc.
### Github Issues: [ghi gem](https://github.com/stephencelis/ghi)
We include the `ghi` command. Try `ghi list` and have fun managing issues from command line!
## Vim - What's included? ## Vim - What's included?
* [Navigation - NERDTree, EasyMotion, CtrlP and more](doc/vim/navigation.md) * [Navigation - NERDTree, EasyMotion, CtrlP and more](doc/vim/navigation.md)

View File

@ -3,9 +3,6 @@ set -g bell-action any
# Default termtype. If the rcfile sets $TERM, that overrides this value. # Default termtype. If the rcfile sets $TERM, that overrides this value.
set -g default-terminal screen-256color set -g default-terminal screen-256color
# set -g default-terminal "screen-256color"
set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
# Keep your finger on ctrl, or don't # Keep your finger on ctrl, or don't
bind-key ^D detach-client bind-key ^D detach-client
@ -51,8 +48,6 @@ set -g message-bg colour221
set -g message-attr bold set -g message-attr bold
set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]⮀' set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]⮀'
set -g window-status-format "#[fg=colour235,bg=colour252,bold] #I #W " set -g window-status-format "#[fg=colour235,bg=colour252,bold] #I #W "
#set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour25,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"
#set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=black,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"
set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]⮀" set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]⮀"
# Patch for OS X pbpaste and pbcopy under tmux. # Patch for OS X pbpaste and pbcopy under tmux.