diff options
| -rw-r--r-- | .gitconfig | 10 | ||||
| -rwxr-xr-x | .vim/colors/buddy.vim | 13 | ||||
| -rw-r--r-- | .vim/vimrc_files/highlights.vim | 3 | ||||
| -rw-r--r-- | .vimrc | 58 |
4 files changed, 53 insertions, 31 deletions
diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..3faff9c --- /dev/null +++ b/.gitconfig @@ -0,0 +1,10 @@ +[alias] + lol = log --graph --decorate --pretty=oneline --abbrev-commit --all + d = difftool +[user] + email = stoelp@eit.uni-kl.de + name = johannst +[core] + editor = vim +[diff] + tool = vimdiff diff --git a/.vim/colors/buddy.vim b/.vim/colors/buddy.vim index 42f1478..925fae8 100755 --- a/.vim/colors/buddy.vim +++ b/.vim/colors/buddy.vim @@ -55,7 +55,16 @@ hi Include guifg=#c25643 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE hi Float guifg=#e66450 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE hi StatusLineNC guifg=#9f9385 guibg=#444444 guisp=#444444 gui=NONE ctermfg=144 ctermbg=238 cterm=NONE hi NonText guifg=#9a9a9a guibg=#303030 guisp=#303030 gui=NONE ctermfg=247 ctermbg=236 cterm=NONE -hi DiffText guifg=NONE guibg=#575757 guisp=#575757 gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE + +"hi DiffText guifg=NONE guibg=#575757 guisp=#575757 gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE +"hi DiffChange guifg=NONE guibg=#575757 guisp=#575757 gui=NONE ctermfg=NONE ctermbg=DarkMagenta cterm=NONE +"hi DiffAdd guifg=NONE guibg=#5b802c guisp=#5b802c gui=NONE ctermfg=NONE ctermbg=2 cterm=NONE +"hi DiffDelete guifg=NONE guibg=#8a3636 guisp=#8a3636 gui=NONE ctermfg=NONE ctermbg=95 cterm=NONE +hi DiffChange cterm=NONE ctermfg=10 ctermbg=17 +hi DiffText cterm=NONE ctermfg=10 ctermbg=88 +hi DiffAdd cterm=NONE ctermfg=10 ctermbg=17 +hi DiffDelete cterm=NONE ctermfg=10 ctermbg=17 + hi Debug guifg=#f0ffe2 guibg=NONE guisp=NONE gui=NONE ctermfg=194 ctermbg=NONE cterm=NONE hi PMenuSbar guifg=NONE guibg=#000000 guisp=#000000 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi Identifier guifg=#f3cf64 guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE @@ -76,7 +85,6 @@ hi Number guifg=#e66450 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE hi Boolean guifg=#fff200 guibg=NONE guisp=NONE gui=NONE ctermfg=11 ctermbg=NONE cterm=NONE hi Operator guifg=#fff200 guibg=NONE guisp=NONE gui=NONE ctermfg=11 ctermbg=NONE cterm=NONE hi CursorLine guifg=NONE guibg=#2d2d2d guisp=#2d2d2d gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE -hi DiffDelete guifg=NONE guibg=#8a3636 guisp=#8a3636 gui=NONE ctermfg=NONE ctermbg=95 cterm=NONE hi CursorColumn guifg=NONE guibg=#2d2d2d guisp=#2d2d2d gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE hi Define guifg=#c25643 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE hi Function guifg=#f0811f guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE @@ -97,4 +105,3 @@ hi MatchParen guifg=#fffcf0 guibg=#857b6f guisp=#857b6f gui=bold ctermfg=230 cte hi Repeat guifg=#fff200 guibg=NONE guisp=NONE gui=NONE ctermfg=11 ctermbg=NONE cterm=NONE hi Structure guifg=#ffb700 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE hi Macro guifg=#c25643 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE -hi DiffAdd guifg=NONE guibg=#5b802c guisp=#5b802c gui=NONE ctermfg=NONE ctermbg=2 cterm=NONE diff --git a/.vim/vimrc_files/highlights.vim b/.vim/vimrc_files/highlights.vim index 61c349a..6d1f7d2 100644 --- a/.vim/vimrc_files/highlights.vim +++ b/.vim/vimrc_files/highlights.vim @@ -18,4 +18,5 @@ hi StatusLine ctermbg=38 ctermfg=0 cterm=NONE term=NONE gui=NONE " matching brackets "hi MatchParen cterm=underline ctermbg=141 ctermfg=yellow -hi MatchParen cterm=underline ctermbg=141 ctermfg=yellow +hi MatchParen cterm=underline ctermbg=89 ctermfg=208 +"hi MatchParen cterm=underline ctermbg=DarkMagenta ctermfg=12 @@ -17,53 +17,57 @@ colorscheme buddy " | Basic Settings | " +----------------------------+ set timeoutlen=1000 " time in ms until keymap interpreted -set ttimeoutlen=100 " time in ms for key code delay, NEVER USE 0 again!!! +set ttimeoutlen=100 " time in ms for key code delay, NEVER USE 0 again!!! if random numbers/letters occur, maybe change this value filetype plugin indent on " enable loading indent file for filetype -set ffs=unix,dos,mac " Try recognizing dos, unix, and mac line endings. +set ffs=unix,dos,mac " try recognizing dos, unix, and mac line endings. +set encoding=utf-8 " set default encoding to UTF-8. +" Basic settings +set title " show title in console title bar +set confirm " prompt if closing with unsaved changes. +set laststatus=2 " always show status line +set shortmess+=a " Use [+]/[RO]/[w] for modified/readonly/written. +set showcmd " show command in status line. +set mouse=a " enable mouse usage (all modes) +set history=1000 " sets how many lines of history VIM has to remember +set tabpagemax=100 " sets how many tabs will be opened +set scrolloff=3 " set vertical scroll distance to 7 lines +set backspace=2 " had some issues with BS on empty line didn't deleted line +set noautowrite " never write a file unless I request it. +set noautowriteall " NEVER. +set noautoread " don't automatically re-read changed files. + +" Line/Column settings set number " Display line numbers set relativenumber " Display relative line numbers -set title " show title in console title bar +set ruler " display cursor position set cursorline " cursor line highlighting set cursorcolumn " cursor column highlighting -set confirm " Y-N-C prompt if closing with unsaved changes. -set ruler " display cursor position -set laststatus=2 " always show status line -set shortmess+=a " Use [+]/[RO]/[w] for modified/readonly/written. -set showcmd " Show (partial) command in status line. -set mouse=a " Enable mouse usage (all modes) -set encoding=utf-8 " Set default encoding to UTF-8. -set history=1000 " Sets how many lines of history VIM has to remember -set tabpagemax=100 " Sets how many tabs will be opened -set scrolloff=3 " set vertical scroll distance to 7 lines +" buffer settings +set hidden " do not unload abandoned buffers -" Tab/Indentation settings +" Tab settings set expandtab " expand tabs to spaces set tabstop=8 " number of columns a tab counts set shiftwidth=3 " number of columns text is indented set softtabstop=3 " number of columns tab counts in insert mode set shiftround " rounds indent to a multiple of shiftwidth "set smarttab " Handle tabs more intelligently -set autoindent " Copy indent from current line when starting a new line -set smartindent " use smart indent if there is no indent file -"set list " show invisible character -set listchars=tab:>-,eol:$,trail:-,precedes:<,extends:> +" Fold settings +set foldmethod=marker " set fold method -set backspace=2 +" Indentation settings +set autoindent " copy indent from current line when starting a new line +set smartindent " use smart indent if there is no indent file autocmd BufRead,BufNewFile *.h,*.hh,*.hpp,*.c,*.cc,*.cpp set cinoptions=:1,=2,g1,h2 " switch-case/class-lable indentation -"autocmd BufRead,BufNewFile *.h,*.hh,*.hpp,*.c,*.cc,*.cpp setlocal formatoptions=ql " disable auto-comment autocmd BufRead,BufNewFile * setlocal formatoptions-=cro " disable auto-comment -set foldmethod=marker " set fold method - -set hidden " do not unload abandoned buffers -set nowrap " don't wrap text -set noautowrite " Never write a file unless I request it. -set noautowriteall " NEVER. -set noautoread " Don't automatically re-read changed files. +" Invisible character settings +"set list " show invisible character +set listchars=tab:>-,eol:$,trail:-,precedes:<,extends:> " Search settings set ignorecase " case insensitive matching |