Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidov committed Aug 11, 2014
1 parent 989f616 commit 39fefaf
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
8 changes: 7 additions & 1 deletion bash_aliases
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Navigation
alias -- -="cd -"

# Unix
alias ll='ls -lah'
alias ll='ls -lahF'
alias l='ls -F'
alias ln='ln -v'
alias mkdir='mkdir -p'
# alias pbcopy='xclip -selection clipboard'
Expand Down Expand Up @@ -31,3 +35,5 @@ alias sps='spin serve --push-results'
alias spp='spin push'

alias evrone='$HOME/scripts/evrone-shell.sh'

alias sml='rlwrap sml'
1 change: 0 additions & 1 deletion bash_exports
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export EDITOR="vim"
# export TERM="gnome-256color"
export XDG_CONFIG_HOME="/home/aleksey/.config";

# Larger bash history
Expand Down
4 changes: 2 additions & 2 deletions gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# log
lg = log --graph --full-history --all --color --date=short --pretty=tformat:"%x1b[31m%h%x09%x1b[32m%ad%x1b[32m%d%x1b[0m%x20%s%x20%x1b[33m(%an)%x1b[0m"
lb = for-each-ref --sort=-committerdate --format='%(authordate:relative) %(refname:short)' refs/heads
lb = for-each-ref --sort=-committerdate --format='%(authordate:relative) %(color:green)%(refname:short) %(color:reset)(%(authorname))' refs/heads
l = !git lg -n 20

# checkout
Expand Down Expand Up @@ -83,7 +83,7 @@
browser = open

[push]
default = current
default = simple

[color]
diff = true
Expand Down
2 changes: 1 addition & 1 deletion railsrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--skip-test-unit --old-style-hash --database postgresql
--skip-test-unit
9 changes: 5 additions & 4 deletions tmux.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
set -g default-terminal "screen-256color"
set -g xterm-keys on

# https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard
set-option -g default-command "reattach-to-user-namespace -l bash"
Expand Down Expand Up @@ -35,10 +36,10 @@ bind -r L resize-pane -R 5

# Smart pane switching with awareness of vim splits
# https://github.com/christoomey/vim-tmux-navigator#tmux-configuration
bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-h) || tmux select-pane -L"
bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-j) || tmux select-pane -D"
bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-k) || tmux select-pane -U"
bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-l) || tmux select-pane -R"
bind -n C-k run-shell 'tmux-vim-select-pane -U'
bind -n C-j run-shell 'tmux-vim-select-pane -D'
bind -n C-h run-shell 'tmux-vim-select-pane -L'
bind -n C-l run-shell 'tmux-vim-select-pane -R'

# Return back clear screen
bind C-l send-keys 'C-l'
Expand Down

0 comments on commit 39fefaf

Please sign in to comment.