From 5a8c497baca1a8f625e53135dbbaf5d8d21ea065 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Wed, 25 May 2016 14:44:02 +0200 Subject: [PATCH 1/7] [openbox]shortcut to reload configuration --- .config/openbox/rc.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml index 9812f4b..df99322 100644 --- a/.config/openbox/rc.xml +++ b/.config/openbox/rc.xml @@ -232,6 +232,9 @@ 4 + + + @@ -320,12 +323,12 @@ - amixer -c1 set Master 5+ unmute + amixer -c0 set Master 5+ unmute - amixer -c1 set Master 5- unmute + amixer -c0 set Master 5- unmute From 0d693713bc34a9edcc22ae427fc58f5e3d03a49b Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Fri, 3 Jun 2016 11:02:06 +0200 Subject: [PATCH 2/7] Add w3m plugin --- .vimrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.vimrc b/.vimrc index d5a275d..6d4f8cd 100644 --- a/.vimrc +++ b/.vimrc @@ -433,6 +433,10 @@ if filereadable(expand('~/.vimrc.local')) source ~/.vimrc.local endif +"""""""""" +" W3m +"""""""""" +let g:w3m#external_browser = 'firefox' """""""""" " Debug @@ -534,4 +538,7 @@ Plugin 'tmhedberg/matchit' " Kernel Formatting Plugin 'gregkh/kernel-coding-style.git' + +" Web browsing +Plugin 'yuratomo/w3m.vim' call vundle#end() From f942b8785a74fa5f9c4cd18eb0c5a249952be4fd Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Sat, 20 Aug 2016 00:33:37 +0200 Subject: [PATCH 3/7] [zsh]zebulon :Remove JAVA_HOME --- .zsh/host:zebulon/Environment.zsh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.zsh/host:zebulon/Environment.zsh b/.zsh/host:zebulon/Environment.zsh index 40feda5..5d9f29a 100755 --- a/.zsh/host:zebulon/Environment.zsh +++ b/.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 From 79290b1c2480567468fe44d7ff253c552b9df97c Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Mon, 29 Aug 2016 18:22:37 +0200 Subject: [PATCH 4/7] [vim]Correct plugin indent And get inspiration from defaults.vim --- .vimrc | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/.vimrc b/.vimrc index 6d4f8cd..b797c6c 100644 --- a/.vimrc +++ b/.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 " show current changes with F10 command! DiffOrig \ vert new | set bt=nofile | r # | 0d_ | diffthis | wincmd p | diffthis + \ | wincmd p | diffthis map :DiffOrig + imap a " show git diff when committing let g:git_diff_spawn_mode = 1 From 26252ad6e8125222d2fc03f52c87ec720e718be9 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Tue, 30 Aug 2016 14:46:11 +0200 Subject: [PATCH 5/7] [vim]update Vundle version --- .vim/bundle/Vundle.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim index 8db3bcb..4984767 160000 --- a/.vim/bundle/Vundle.vim +++ b/.vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5 +Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45 From e7d09a7879e4d60fb93bdd941f71f52102f5302e Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Wed, 31 Aug 2016 14:02:32 +0200 Subject: [PATCH 6/7] [vim]clean multiple declaration --- .vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/.vimrc b/.vimrc index b797c6c..5936f65 100644 --- a/.vimrc +++ b/.vimrc @@ -394,12 +394,9 @@ nmap zo """""""""""""""""""""""""""""""""""""""""""""""""" "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 . From 6f5d14f372783feb7bee89cf57856ffadb206518 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Thu, 1 Sep 2016 10:11:55 +0200 Subject: [PATCH 7/7] [vim/tmux]works together --- .tmux.conf | 2 ++ .vimrc | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.tmux.conf b/.tmux.conf index 1c37a0f..b74c010 100644 --- a/.tmux.conf +++ b/.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 diff --git a/.vimrc b/.vimrc index 5936f65..f9d0659 100644 --- a/.vimrc +++ b/.vimrc @@ -561,4 +561,7 @@ Plugin 'gregkh/kernel-coding-style.git' " Web browsing Plugin 'yuratomo/w3m.vim' + +" Recognize Key in screen/tmux +Plugin 'drmikehenry/vim-fixkey' call vundle#end()