Browse Source

Merge branch 'master' of github.com:10sr/dotfiles

pull/1/head
10sr 12 years ago
parent
commit
aab7a0e3e1
2 changed files with 9 additions and 1 deletions
  1. +7
    -0
      bashrc
  2. +2
    -1
      tmux.conf

+ 7
- 0
bashrc View File

@@ -72,6 +72,10 @@ if iswindows; then
export USER=$USERNAME export USER=$USERNAME
fi fi


_tmux_prefs(){
null type tmux || return 1
tmux set -g mode-keys vi
}


####################### #######################


@@ -94,6 +98,9 @@ echo
( ! with_coreutils && isdarwin ) || iswindows || _timeoption=" --time-style=long-iso" ( ! with_coreutils && isdarwin ) || iswindows || _timeoption=" --time-style=long-iso"
( ! with_coreutils && isdarwin ) || _hideoption=" --hide=[A-Z]*" # do not use ( ! with_coreutils && isdarwin ) || _hideoption=" --hide=[A-Z]*" # do not use


_timeformat_iso="%Y-%m-%dT%H:%M:%S%z"
_timeformat_rfc2822="%a, %d %b %Y %T %z"

alias ls="ls -hCF${_coloroption}${_timeoption}" alias ls="ls -hCF${_coloroption}${_timeoption}"
# export GREP_OPTIONS="" # export GREP_OPTIONS=""
alias grep="grep -n${_coloroption}" alias grep="grep -n${_coloroption}"


+ 2
- 1
tmux.conf View File

@@ -4,7 +4,8 @@ unbind C-b
set -g prefix C-z set -g prefix C-z
bind-key C-z send-prefix bind-key C-z send-prefix
bind-key C command-prompt "new-window '%%'" bind-key C command-prompt "new-window '%%'"
#setw -g mode-keys vi

setw -g mode-keys vi


set -g default-command /bin/bash set -g default-command /bin/bash
#set -g default-terminal screen-256color #set -g default-terminal screen-256color


Loading…
Cancel
Save