summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gitconfig2
-rw-r--r--vimrc17
2 files changed, 18 insertions, 1 deletions
diff --git a/gitconfig b/gitconfig
index 5f97391..64ec836 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,7 +10,7 @@
prompt = false
[alias]
lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
- d = difftool
+ vimdiff = difftool
[core]
editor = vim
[color]
diff --git a/vimrc b/vimrc
index 04c66b1..01efae0 100644
--- a/vimrc
+++ b/vimrc
@@ -70,6 +70,11 @@ if index(s:gEnabledPlugins, 'majutsushi/tagbar')!=-1
augroup aug:TagbarKeymaps
autocmd!
autocmd FileType c,cpp nnoremap <buffer> <leader>tb :TagbarToggle<CR>
+ autocmd FileType tagbar nnoremap <buffer> <leader>tb :TagbarToggle<CR>
+ autocmd FileType tagbar nnoremap <buffer> <S-Left> <NOP>
+ autocmd FileType tagbar nnoremap <buffer> <S-Right> <NOP>
+ autocmd FileType tagbar nnoremap <buffer> <S-h> <NOP>
+ autocmd FileType tagbar nnoremap <buffer> <S-l> <NOP>
augroup end
else
echom "[vimrc]: ctags not detected, please link to " g:tagbar_ctags_bin
@@ -154,6 +159,11 @@ set listchars=tab:>-,eol:$,trail:-,precedes:<,extends:>
"}}}
"{{{ Basic Movement
+augroup aug:HelpPageKeyMaps
+ autocmd!
+ autocmd FileType help nnoremap <buffer> <CR> <C-]>
+augroup end
+
" ctrl-ae jump to line start/end
nnoremap <C-a> 0
nnoremap <C-e> $
@@ -501,6 +511,13 @@ endif
let s:sandbox_enable = 1
if s:sandbox_enable
+
+" TODO: backup file creation
+" when opening file (of given filetype? maybe start with c/c++) create copy in this file in file_path/.bak/file_name
+" filter file creation somehow, that it does not try to create backups when opening for example /usr/include/*.h
+
endif
"}}}
+
+"% vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1