tmux configuration

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

diff --git a/caffrc b/caffrc
index e0f5221..352af12 100644 (file)
--- a/caffrc
+++ b/caffrc
@@ -3,5 +3,5 @@
 
 $CONFIG{'owner'}       = 'Pierre habouzit';
 $CONFIG{'email'}       = 'madcoder@debian.org';
-$CONFIG{'keyid'}       = [ qw{BC6AFB5BA1EE761C} ];
-$CONFIG{'keyserver'}   = 'pgpkeys.mit.edu';
+$CONFIG{'keyid'}       = [ qw{BC6AFB5BA1EE761C E34B6A5AFE3AF15F} ];
+$CONFIG{'keyserver'}   = 'the.earth.li';

diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf
index 9e4d17d..2bd114d 100644 (file)
--- a/gnupg/gpg.conf
+++ b/gnupg/gpg.conf
@@ -1,6 +1,6 @@
 #keyserver keyring.debian.org
 #keyserver-options auto-key-retrieve
-keyserver subkeys.pgp.net
+keyserver the.earth.li
 
 use-agent
 
@@ -14,3 +14,7 @@ utf8-strings
 
 default-key  A1EE761C
 encrypt-to  A1EE761C
+
+personal-digest-preferences SHA256
+cert-digest-algo SHA256
+default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed

diff --git a/tmux.conf b/tmux.conf
new file mode 100644 (file)
index 0000000..25a38e5
--- /dev/null
+++ b/tmux.conf
@@ -0,0 +1,106 @@
+# set the prefix to ^G
+
+set -g history-limit 100000
+
+set  -g mouse-select-pane on
+setw -g mode-mouse on
+set  -g status-keys    vi
+setw -g mode-keys      vi
+
+unbind C-b
+set -g prefix C-g
+bind g   send-prefix
+bind C-g send-prefix
+
+bind -n F5 source ~/.tmux.conf
+bind -n M-x command-prompt
+
+bind n next-window
+bind p previous-window
+bind s command-prompt "split-window -v '%%'"
+bind S command-prompt "split-window -v '%%'"
+bind v command-prompt "split-window -h '%%'"
+bind C-v command-prompt "split-window -h '%%'"
+
+bind Enter new-window
+bind c confirm-before kill-pane
+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 K swap-pane -U
+bind J swap-pane -D
+bind i display-message \; display-panes
+set  -g display-panes-time 1500
+set  -g display-time       1500
+
+set  -g base-index 1
+bind Tab choose-window
+bind 1 select-window -t 1
+bind 2 select-window -t 2
+bind 3 select-window -t 3
+bind 4 select-window -t 4
+bind 5 select-window -t 5
+bind 6 select-window -t 6
+bind 7 select-window -t 7
+bind 8 select-window -t 8
+bind 9 select-window -t 9
+bind 0 select-window -t 10
+
+##############################################################################
+# Copy Mode
+bind Escape copy-mode
+bind C-' ' copy-mode
+bind    -t vi-copy C-u    page-up
+bind    -t vi-copy C-d    page-down
+bind    -t vi-copy G      bottom-line
+bind -n -t vi-copy Escape cancel
+
+##############################################################################
+# Edit mode
+bind -n -t vi-edit Escape switch-mode
+bind -n -t vi-edit Up     history-up
+bind -n -t vi-edit Down   history-down
+bind -n -t vi-edit Left   cursor-left
+bind -n -t vi-edit Right  cursor-right
+bind -n -t vi-edit C-u    delete-line
+bind -n -t vi-edit C-k    delete-end-of-line
+
+bind -c -t vi-edit Escape cancel
+bind -c -t vi-edit |      start-of-line
+
+##############################################################################
+# Bells
+set  -g visual-activity on
+set  -g visual-bell     off
+set  -g bell-action     any
+setw -g monitor-activity on
+
+##############################################################################
+# Theme
+set  -g status         on
+set  -g status-attr    default
+set  -g status-fg      white
+set  -g status-bg      default
+set  -g status-justify centre
+set  -g status-utf8    on
+
+set  -g status-left    "#[fg=green][ #[fg=blue,bold]%H:%M #[fg=green,nobold]]["
+set  -g status-right   "#[fg=green]][ #[fg=blue,bold]#(cut -d' ' -f1-3 /proc/loadavg) #[fg=green,nobold]]"
+
+# command/message line colors
+set -g message-fg   white
+set -g message-bg   red
+set -g message-attr bright
+
+# default window title colors
+setw -g window-status-fg   cyan
+setw -g window-status-bg   default
+setw -g window-status-attr dim
+
+# 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

diff --git a/vim/ftplugin/gitcommit.vim b/vim/ftplugin/gitcommit.vim
index 86880fa..2df4af7 100644 (file)
--- a/vim/ftplugin/gitcommit.vim
+++ b/vim/ftplugin/gitcommit.vim
@@ -57,7 +57,7 @@ noremap <buffer> <Leader>ghd :call Git_diff_windows(0, 0)<cr>
 noremap <buffer> <Leader>gvd :call Git_diff_windows(1, 0)<cr>
 
 if !exists("g:git_diff_opts")
-    let g:git_diff_opts = "-C -C"
+    let g:git_diff_opts = "-B -C -M"
 endif
 if exists("g:git_diff_spawn_mode")
     if g:git_diff_spawn_mode == 1

diff --git a/vimrc b/vimrc
index 70cbe61..64eb1c5 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -245,7 +245,7 @@ if has("autocmd")
 
     let ocaml_noindent_let=1
     let git_diff_spawn_mode=2
-    let git_diff_opts = "--patience -C -C -M"
+    let git_diff_opts = "--no-renames --summary -C -M"
     let c_gnu=1
     let c_space_errors=1
     let c_no_curly_error=1

diff --git a/xsessionrc b/xsessionrc
index 1731f06..f7ac710 100755 (executable)
--- a/xsessionrc
+++ b/xsessionrc
@@ -1,3 +1,7 @@
 #! /bin/zsh
 
 . "$HOME/.config/zsh/20_environment"
+
+if which synclient &>/dev/null; then
+    synclient TapButton1=1 FastTaps=1 VertEdgeScroll=1 HorizEdgeScroll=1
+fi