Merge branch 'master' of https://git.mgrote.net/mg/dotfiles
This commit is contained in:
commit
3e12a9379c
2 changed files with 28 additions and 10 deletions
|
@ -13,3 +13,5 @@
|
||||||
remote = remote -v
|
remote = remote -v
|
||||||
fetchp = fetch --prune
|
fetchp = fetch --prune
|
||||||
cline = clone
|
cline = clone
|
||||||
|
stagep = stage -p
|
||||||
|
staus = status
|
||||||
|
|
36
.vimrc
36
.vimrc
|
@ -1,3 +1,5 @@
|
||||||
|
" leader key
|
||||||
|
:let mapleader = ","
|
||||||
" vim statusline - kein plugin
|
" vim statusline - kein plugin
|
||||||
" https://shapeshed.com/vim-statuslines/
|
" https://shapeshed.com/vim-statuslines/
|
||||||
function! GitBranch()
|
function! GitBranch()
|
||||||
|
@ -31,18 +33,15 @@ set rtp+=~/.vim/bundle/Vundle.vim
|
||||||
" Download plug-ins to the ~/.vim/plugged/ directory
|
" Download plug-ins to the ~/.vim/plugged/ directory
|
||||||
call vundle#begin('~/.vim/plugged')
|
call vundle#begin('~/.vim/plugged')
|
||||||
" Let Vundle manage Vundle
|
" Let Vundle manage Vundle
|
||||||
Plugin 'VundleVim/Vundle.vim'
|
Plugin 'VundleVim/Vundle.vim' "muss immer der erste eintrag sein
|
||||||
"Plugin 'vim-airline/vim-airline'
|
|
||||||
"Plugin 'vim-airline/vim-airline-themes'
|
|
||||||
"Plugin 'matze/vim-move'
|
|
||||||
Plugin 'sheerun/vim-polyglot'
|
Plugin 'sheerun/vim-polyglot'
|
||||||
Plugin 'Xuyuanp/nerdtree-git-plugin'
|
Plugin 'Xuyuanp/nerdtree-git-plugin'
|
||||||
|
Plugin 'jeetsukumaran/vim-buffergator'
|
||||||
Plugin 'mhinz/vim-signify'
|
Plugin 'mhinz/vim-signify'
|
||||||
Plugin 'ctrlpvim/ctrlp.vim'
|
Plugin 'ctrlpvim/ctrlp.vim'
|
||||||
Plugin 'lifepillar/vim-solarized8'
|
Plugin 'lifepillar/vim-solarized8'
|
||||||
Plugin 'Yggdroot/indentLine'
|
Plugin 'Yggdroot/indentLine'
|
||||||
Plugin 'tpope/vim-fugitive'
|
Plugin 'tpope/vim-fugitive'
|
||||||
"Plugin 'ryanoasis/vim-devicons'
|
|
||||||
Plugin 'jiangmiao/auto-pairs'
|
Plugin 'jiangmiao/auto-pairs'
|
||||||
Plugin 'preservim/nerdtree'
|
Plugin 'preservim/nerdtree'
|
||||||
Plugin 'unkiwii/vim-nerdtree-sync'
|
Plugin 'unkiwii/vim-nerdtree-sync'
|
||||||
|
@ -76,9 +75,30 @@ autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTr
|
||||||
\ quit | endif
|
\ quit | endif
|
||||||
"
|
"
|
||||||
" Tastenkürzel
|
" Tastenkürzel
|
||||||
nmap <C-t> :tabnew<CR>:NERDTreeFind<CR>
|
" nmap <C-t> :tabnew<CR>:NERDTreeFind<CR>
|
||||||
" erstellt neuen tab und öffnet den open-dialog
|
" erstellt neuen tab und öffnet den open-dialog
|
||||||
"
|
"
|
||||||
|
" buffers
|
||||||
|
" https://joshldavis.com/2014/04/05/vim-tab-madness-buffers-vs-tabs/
|
||||||
|
"
|
||||||
|
" This allows buffers to be hidden if you've modified a buffer.
|
||||||
|
" " This is almost a must if you wish to use buffers in this way.
|
||||||
|
set hidden
|
||||||
|
"
|
||||||
|
" To open a new empty buffer
|
||||||
|
" This replaces :tabnew which I used to bind to this mapping
|
||||||
|
nmap <C-t> :enew<cr>
|
||||||
|
"
|
||||||
|
"" Move to the next buffer
|
||||||
|
nmap <C-l> :bnext<CR>
|
||||||
|
|
||||||
|
" Move to the previous buffer
|
||||||
|
nmap <C-h> :bprevious<CR>
|
||||||
|
"
|
||||||
|
" Close the current buffer and move to the previous one
|
||||||
|
" This replicates the idea of closing a tab
|
||||||
|
nmap <C-q> :bp <BAR> bd #<CR>
|
||||||
|
"
|
||||||
" nerdtree-git-plugin
|
" nerdtree-git-plugin
|
||||||
let g:NERDTreeGitStatusIndicatorMapCustom = {
|
let g:NERDTreeGitStatusIndicatorMapCustom = {
|
||||||
\ 'Modified' :'*',
|
\ 'Modified' :'*',
|
||||||
|
@ -99,9 +119,7 @@ let g:NERDTreeGitStatusIndicatorMapCustom = {
|
||||||
filetype plugin indent on
|
filetype plugin indent on
|
||||||
"
|
"
|
||||||
" allgemeine Optionen
|
" allgemeine Optionen
|
||||||
set number
|
|
||||||
set showcmd
|
set showcmd
|
||||||
set showtabline=2 " zeigt immer die 'tabline'
|
|
||||||
set showbreak=+++
|
set showbreak=+++
|
||||||
set textwidth=100
|
set textwidth=100
|
||||||
set showmatch
|
set showmatch
|
||||||
|
@ -145,8 +163,6 @@ let g:ctrlp_map = '<c-f>' "aufruf mit strg+f
|
||||||
" https://github.com/ctrlpvim/ctrlp.vim
|
" https://github.com/ctrlpvim/ctrlp.vim
|
||||||
set wildignore+=*/tmp/*,*.so,*.swp,*.zip " MacOSX/Linux
|
set wildignore+=*/tmp/*,*.so,*.swp,*.zip " MacOSX/Linux
|
||||||
set wildignore+=*\\tmp\\*,*.swp,*.zip,*.exe " Windows
|
set wildignore+=*\\tmp\\*,*.swp,*.zip,*.exe " Windows
|
||||||
" airline
|
|
||||||
let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue