Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update

  • Loading branch information...
commit 9a21d3878212adc98222ba8c423f1ffb4e037e86 1 parent a8fbb3e
Alexis Metaireau authored
Showing with 31 additions and 13 deletions.
  1. +1 −0  .aliases
  2. +2 −2 .functions
  3. +27 −10 .tmux.conf
  4. +1 −1  .vimrc
1  .aliases
View
@@ -4,3 +4,4 @@ alias i="sudo aptitude install"
alias s="aptitude search"
alias p="aptitude show"
alias zamboni_tests="python manage.py test --noinput -s --logging-clear-handlers --with-progressive"
+alias flash2vlc="vlc /tmp/Flash*"
4 .functions
View
@@ -33,8 +33,8 @@ function merge_pull_request() {
echo $1
git remote add $1 git://github.com/$1/$2.git
git fetch $1
- git checkout $3
+ git checkout $1/$3
git rebase master
git checkout master
- git merge $3
+ git merge $1/$3
}
37 .tmux.conf
View
@@ -5,13 +5,13 @@ set-window-option -g utf8 on
# Set 256-colour terminal
set -g default-terminal "screen-256color"
-# Number of lines held in window history
+# I need to have a lot of history, so here it is.
set -g history-limit 100000
# Default session
-new -d -s "yeah"
setw -g aggressive-resize on
+# I prefer to use C-a as a prefix, I binded this to capslock in my OS.
unbind C-b
set -g prefix C-a
@@ -26,7 +26,7 @@ set-option -g status-right '#[bold]#(whoami) ● #H#[default] '
set-option -g status-right-length 60
set-option -g status-left-length 60
-## highlight active window
+## highlight the active window
set-window-option -g window-status-current-bg colour166
set-window-option -g window-status-current-fg colour15
set-window-option -g window-status-current-attr bold
@@ -36,31 +36,48 @@ set-window-option -g window-status-current-format ' #I #W '
set-option -g visual-activity off
set-option -g visual-content off
set-window-option -g monitor-activity off
+
+# We don't want to rename the window each time we're checking a different pane
set-window-option -g automatic-rename off
-## tmux window titling for X
+# tmux window titling for X
set-option -g set-titles on
set-option -g set-titles-string '[#I] #W'
set-window-option -g automatic-rename on
set-window-option -g window-status-format ' #I #W '
set-window-option -g window-status-attr bold
-# starts windows at 1 not 0
+
+# starts windows at 1 not 0, we're humans, not computers.
set-option -g base-index 1
-## enable mouse
+# disable mouse to select and resize panes, since it's not possible to copy if
+# it's on.
set-option -g mouse-select-pane off
+set-option -g mouse-resize-pane off
+set-option -g mouse-select-window off
+
set-window-option -g mode-keys vi
set-window-option -g mode-mouse off
-# set-window-option -g monitor-activity off
-# set-window-option -g monitor-content off
-# set-option -g status-keys vi
-## pane border and colors
+# pane border and colors
set-option -g pane-active-border-fg yellow
set-option -g pane-border-fg white
+# Allow to split the panes with | and -
bind-key | split-window -h
bind-key - split-window -v
+
+# navigate the pans with h and l
bind-key h prev
bind-key l next
+bind-key k kill-window
+
+# resize the pans with vim key bindings.
+set-option -g repeat-time 500
+bind-key M-h resize-pane -L 5
+bind-key M-l resize-pane -R 5
+bind-key M-j resize-pane -D 5
+bind-key M-k resize-pane -U 5
+
+# easy reload of these settings with r
bind-key r source-file ~/.tmux.conf
2  .vimrc
View
@@ -6,7 +6,7 @@ set nowritebackup
"" default values """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-colorscheme slate " peachpuff is good too
+colorscheme peachpuff "slate
"set mouse=a
syntax on " syntax highlighting
filetype off " to consider filetypes
Please sign in to comment.
Something went wrong with that request. Please try again.