tmux and vim

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/tmux.conf b/tmux.conf
index 1e5b57d..f44bc54 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -3,9 +3,10 @@
 set  -g default-terminal screen-256color
 set  -g history-limit 100000
 set  -g mouse-select-pane on
-setw -g mode-mouse on
+set -wg mode-mouse on
+set -wg xterm-keys       1
 set  -g status-keys     vi
-setw -g mode-keys       vi
+set -wg mode-keys       vi
 set  -s escape-time    100
 
 unbind C-b
@@ -14,11 +15,14 @@ bind g   send-prefix
 bind C-g send-prefix
 
 bind -n F5 source ~/.tmux.conf
-bind -n F9 set status
 bind -n M-x command-prompt
 
 bind d detach
 bind -n C-\ detach
+bind -n C-up    resize-pane -U
+bind -n C-down  resize-pane -D
+bind -n C-left  resize-pane -L
+bind -n C-right resize-pane -R
 
 bind n   next-window
 bind C-n next-window
@@ -36,8 +40,10 @@ bind x confirm-before kill-pane
 bind ! command-prompt -p Man: "split-window 'man %%'"
 bind o break-pane
 
-bind k up-pane
-bind j down-pane
+bind h select-pane -L
+bind k select-pane -U
+bind j select-pane -D
+bind l select-pane -R
 bind K swap-pane -U
 bind J swap-pane -D
 bind i display-message \; display-panes
@@ -84,7 +90,7 @@ bind -c -t vi-edit |      start-of-line
 set  -g visual-activity  on
 set  -g visual-bell      off
 set  -g bell-action      any
-setw -g monitor-activity off
+set -wg monitor-activity off
 
 ##############################################################################
 # Theme
@@ -104,12 +110,12 @@ set -g message-bg   red
 set -g message-attr bright
 
 # default window title colors
-setw -g window-status-fg   white
-setw -g window-status-bg   default
-setw -g window-status-attr dim
+set -wg window-status-fg   white
+set -wg window-status-bg   default
+set -wg window-status-attr dim
 
-setw -g window-status-format         '#I #W#F'
-setw -g window-status-current-format '#[fg=red,nobold][#[fg=white,bold]#I #W#F#[fg=red,nobold]]'
+set -wg window-status-format         '#I #W#F'
+set -wg window-status-current-format '#[fg=red,nobold][#[fg=white,bold]#I #W#F#[fg=red,nobold]]'
 
 set -g pane-border-bg default
 set -g pane-border-fg default
@@ -117,6 +123,6 @@ set -g pane-active-border-bg default
 set -g pane-active-border-fg red
 
 # active window title colors
-setw -g window-status-current-fg   white
-setw -g window-status-current-bg   default
-setw -g window-status-current-attr bright
+set -wg window-status-current-fg   white
+set -wg window-status-current-bg   default
+set -wg window-status-current-attr bright

diff --git a/vim/filetype.vim b/vim/filetype.vim
index 0cb4c21..cb25802 100644 (file)
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -9,6 +9,7 @@ augroup filetypedetect
   au BufRead,BufNewFile *.hx               setf haxe
 
   au BufRead,BufNewFile *.tpl              setf xhtml
+  au BufRead,BufNewFile *.blk              setf c
 
   au BufRead,BufNewFile massif.*.txt       setf massif
 

diff --git a/vim/syntax/c.vim b/vim/syntax/c.vim
index 734f156..81c24f8 100644 (file)
--- a/vim/syntax/c.vim
+++ b/vim/syntax/c.vim
@@ -8,7 +8,6 @@ syn keyword isGlobal   _G
 syn match   isGlobal "\<[a-zA-Z_][a-zA-Z0-9_]*_g\>"
 
 syn keyword cType byte
-syn match cType "\<[a-zA-Z_][a-zA-Z0-9_]*_\(array\|vector\|htbl\|ring\|set\)\>"
 syn match cFunction "\<\([a-z][a-zA-Z0-9_]*\|[a-zA-Z_][a-zA-Z0-9_]*[a-z][a-zA-Z0-9_]*\)\> *("me=e-1
 syn match Function "\$\<\([a-z][a-zA-Z0-9_]*\|[a-zA-Z_][a-zA-Z0-9_]*[a-z][a-zA-Z0-9_]*\)\> *[({]"me=e-1
 syn match cType "\<[a-zA-Z_][a-zA-Z0-9_]*_[ft]\>"