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

This commit is contained in:
Mathieu Maret 2016-09-26 13:52:04 +02:00
commit 8150adf911
3 changed files with 8 additions and 2 deletions

View File

@ -288,6 +288,10 @@
<keybind key="W-Up"> <keybind key="W-Up">
<action name="GrowToEdgeNorth"/> <action name="GrowToEdgeNorth"/>
</keybind> </keybind>
<keybind key="W-S-Right"><action name="MoveToEdgeEast"/></keybind>
<keybind key="W-S-Left"><action name="MoveToEdgeWest"/></keybind>
<keybind key="W-S-Down"><action name="MoveToEdgeSouth"/></keybind>
<keybind key="W-S-Up"><action name="MoveToEdgeNorth"/></keybind>
<keybind key="A-F11"> <keybind key="A-F11">
<action name="ToggleFullscreen"/> <action name="ToggleFullscreen"/>
</keybind> </keybind>

2
.tigrc Normal file
View File

@ -0,0 +1,2 @@
bind main R !git rebase -i %(commit)^
bind diff R !git rebase -i %(commit)^

4
.vimrc
View File

@ -560,8 +560,8 @@ Plugin 'tmhedberg/matchit'
Plugin 'gregkh/kernel-coding-style.git' Plugin 'gregkh/kernel-coding-style.git'
" Web browsing " Web browsing
Plugin 'yuratomo/w3m.vim' "Plugin 'yuratomo/w3m.vim'
" Recognize Key in screen/tmux " Recognize Key in screen/tmux
Plugin 'drmikehenry/vim-fixkey' "Plugin 'drmikehenry/vim-fixkey'
call vundle#end() call vundle#end()