From 1cdd7ff9ec1a6e7253dcdc314e050d7f0345f3b3 Mon Sep 17 00:00:00 2001 From: Yan Pritzker Date: Sun, 15 Dec 2013 14:56:36 -0600 Subject: [PATCH] Clean up tmux conf --- README.md | 19 +++++++++---------- tmux/tmux.conf | 5 ----- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index b11cb2b..a5f1c8a 100644 --- a/README.md +++ b/README.md @@ -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') 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 Think of Zsh as a more awesome bash without having to learn anything new. Automatic spell correction for your commands, syntax highlighting, and more. We've also provided lots of enhancements: -* Vim mode and bash style Ctrl-R for reverse history finder -* Ctrl-x,Ctrl-l to insert output of last command +* Vim mode and bash style `Ctrl-R` for reverse history finder +* `Ctrl-x,Ctrl-l` to insert output of last command * 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. * [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) -### 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`. -### Git Customizations: - * `git l` or `gl`- a much more usable git log * `git b` or `gb`- a list of branches with summary of last commit * `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 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? * [Navigation - NERDTree, EasyMotion, CtrlP and more](doc/vim/navigation.md) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 2f4963c..778d0eb 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -3,9 +3,6 @@ set -g bell-action any # Default termtype. If the rcfile sets $TERM, that overrides this value. 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 bind-key ^D detach-client @@ -51,8 +48,6 @@ set -g message-bg colour221 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 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]⮀" # Patch for OS X pbpaste and pbcopy under tmux.