Merge branch 'master' of gitlab.mathux.org:Mathieu/config

.config/openbox/rc.xml

@@ -232,6 +232,9 @@
         <desktop>4</desktop>
       </action>
     </keybind>
+    <keybind key="W-F12">
+      <action name="Reconfigure"/>
+    </keybind>
     <keybind key="W-d">
       <action name="ToggleShowDesktop"/>
     </keybind>
@@ -320,12 +323,12 @@
     <!-- Find the sound card id by looking into /proc/asound/cards and pass it by using the -c option-->
     <keybind key="XF86AudioRaiseVolume">
       <action name="Execute">
-        <execute>amixer -c1 set Master 5+ unmute</execute>
+        <execute>amixer -c0 set Master 5+ unmute</execute>
       </action>
     </keybind>
     <keybind key="XF86AudioLowerVolume">
       <action name="Execute">
-        <execute>amixer -c1 set Master 5- unmute</execute>
+        <execute>amixer -c0 set Master 5- unmute</execute>
       </action>
     </keybind>
     <keybind key="C-A-l">

.tmux.conf

@@ -51,6 +51,8 @@ set-option -g visual-bell on
 #bind-key -t vi-copy PPage page-up
 #bind-key -t vi-copy NPage page-down
 
+set-window-option -g xterm-keys on
+
 set -g mouse on
 bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'"
 bind -n WheelDownPane select-pane -t= \; send-keys -M

.vim/bundle/Vundle.vim

@@ -1 +1 @@
-Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5
+Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45

.vimrc

@@ -36,8 +36,21 @@
 """""""""""
 " disable vi-compatible mode
 set nocompatible
-syntax on
+
+" Switch syntax highlighting on when the terminal has colors or when using the
+" GUI (which always has colors).
+if &t_Co > 2 || has("gui_running")
+  " Revert with ":syntax off".
+  syntax on
+
+  " I like highlighting strings inside C comments.
+  " Revert with ":unlet c_comment_strings".
+  let c_comment_strings=1
+endif
+
 filetype plugin on
+" enable file type detection and do language-dependent indenting
+filetype plugin indent on
 "set clipboard=unnamed
 """"""""
 " SAVE "
@@ -46,15 +59,23 @@ filetype plugin on
 set nobackup
 " save before compilation
 set autowrite
-" jump to last known position when reopening a file
-if has("autocmd")
-        autocmd BufReadPost *
-                \ if line("'\"") > 0 && line("'\"") <= line("$") |
-                \   execute "normal! g`\"" |
-                \ endif
-endif
+" Put these in an autocmd group, so that you can revert them with:
+" ":augroup vimStartup | au! | augroup END"
+augroup vimStartup
+  au!
+
+  " When editing a file, always jump to the last known cursor position.
+  " Don't do it when the position is invalid or when inside an event handler
+  " (happens when dropping a file on gvim).
+  autocmd BufReadPost *
+    \ if line("'\"") >= 1 && line("'\"") <= line("$") |
+    \   exe "normal! g`\"" |
+    \ endif
+
+augroup END
+
 " command line history
-set history=50
+set history=200
 
 " Check that file have not been changed
 " CursorHold : after cursor move
@@ -98,6 +119,8 @@ set number
 set statusline=%<%f\ %h%w%m%r%3.(\ %)%{fugitive#statusline()}%=%([%{Tlist_Get_Tagname_By_Line()}]%)%3.(\ %)%-14.(%l,%c%V%)\ %P
 " always display status line
 set laststatus=2
+set showcmd		" display incomplete commands
+set wildmenu		" display completion matches in a status line
 
 " show bad white spaces
 let c_space_errors = 1
@@ -158,8 +181,6 @@ augroup Binary
 augroup END
 
 if has("autocmd")
-        " enable file type detection and do language-dependent indenting
-        " filetype plugin indent on
         " detect indentation see http://www.freehackers.org/Indent_Finder
         if has('python')
                 autocmd BufReadPost /* execute system ('python2 ~/.vim/indent_finder/indent_finder.py --vim-output "' . expand('%') . '"' )
@@ -335,7 +356,9 @@ imap <M-S-F1> <Esc><M-S-F1>
 " show current changes with F10
 command! DiffOrig
         \ vert new | set bt=nofile | r # | 0d_ | diffthis | wincmd p | diffthis
+        \ | wincmd p | diffthis
 map <M-F10> :DiffOrig<CR>
+
 imap <M-F10> <ESC><M-F10>a
 " show git diff when committing
 let g:git_diff_spawn_mode = 1
@@ -371,12 +394,9 @@ nmap <S-F10> zo<CR><CR>
 """"""""""""""""""""""""""""""""""""""""""""""""""
 "Omni-completion par CTRL-X_CTRL-O
 """""""""""""""""""""""""""""""""""""""""""""""""""
-filetype plugin on
 set omnifunc=syntaxcomplete#Complete
 
 " Enable omnicppcompletion
-set nocp
-filetype plugin on
 let OmniCpp_ShowAccess = 0
 let OmniCpp_LocalSearchDecl=1
 let OmniCpp_MayCompleteDot = 1 " autocomplete after .
@@ -433,6 +453,10 @@ if filereadable(expand('~/.vimrc.local'))
   source ~/.vimrc.local
 endif
 
+""""""""""
+" W3m
+""""""""""
+let g:w3m#external_browser = 'firefox'
 
 """"""""""
 " Debug
@@ -534,4 +558,10 @@ Plugin 'tmhedberg/matchit'
 
 " Kernel Formatting
 Plugin 'gregkh/kernel-coding-style.git'
+
+" Web browsing
+Plugin 'yuratomo/w3m.vim'
+
+" Recognize Key in screen/tmux
+Plugin 'drmikehenry/vim-fixkey'
 call vundle#end()

.zsh/host:zebulon/Environment.zsh

@@ -18,10 +18,7 @@ export ANDROID_DIR=/home/mathieu/android/android-sdk-linux_x86-1.5_r1
 export ANDROID_SKD=/opt/android-sdk/platforms/android-4
 export ANDROID_NDK=/opt/android-ndk
 #export PATH=$ANDROID_DIR/tools:$PATH
-#export JAVA_HOME=/usr/lib/jvm/java-6-sun
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-export CATALINA_HOME=/usr/share/tomcat6
-export PATH=$JAVA_HOME/bin:$ANDROID_HOME/tools:$ANDROID_SKD/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK:$ECLIPSE_HOME:$PATH
+export PATH=$ANDROID_HOME/tools:$ANDROID_SKD/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK:$ECLIPSE_HOME:$PATH