Fix vimdiff colorscheme

diff --git a/.config/bash/aliases b/.config/bash/aliases
index 82ed769c4fb257f241f795b02c09cdcb1f08d637..4d4129a19bcbd497f3933ecf7b3c070d621bce2a 100644 (file)
--- a/.config/bash/aliases
+++ b/.config/bash/aliases
@@ -24,16 +24,7 @@ if [ -e /usr/bin/vimx ]; then alias vim='/usr/bin/vimx'; fi
 
 # Shortcuts
 alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
-alias g='git'
 alias h='history'
-alias j='jobs'
-alias v='vim'
-alias q='exit'
-alias c='clear'
-alias cls='clear'
-
-alias edit="$EDITOR"
-alias pager="$PAGER"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."

diff --git a/.config/bash/environ b/.config/bash/environ
index 2e9aeb5f6f4704d3def1c87cbfbd3f77020eb74b..c09ed0ee648ded8ee63c33d99849dc31d5ca8684 100644 (file)
--- a/.config/bash/environ
+++ b/.config/bash/environ
@@ -63,6 +63,7 @@ export GRADLE_USER_HOME=$HOME/.cache/gradle
 #export CPPUNITDIR='c:/cppunit-1.12.1'
 #export CPPUNITDIR='c:/cppunit-1.13.2'
 export CPPUNITDIR_2013='c:/programs/cppunit_2013'
+export RTEGENERATEVSCODE=1
 
 export VIRTUALENVWRAPPER_PYTHON=/mingw64/bin/python3
 

diff --git a/.config/git/config b/.config/git/config
index 5c72ca7c00c04a4cf449fda17ae32c9c76c75a42..7736dce93634dbb8142db89563b73ba6918ca26e 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -67,7 +67,6 @@
 #      ctags = "!sh -c '[ -f .git/hooks/ctags ] || git init; .git/hooks/ctags' git-ctags"
 #      gtags = "!sh -c '[ -f .git/hooks/gtags ] || git init; .git/hooks/gtags' git-gtags"
 #      cscope = "!sh -c '[ -f .git/hooks/cscope ] || git init; .git/hooks/cscope' git-cscope"
-       mydiff = difftool --dir-diff --tool=bc --no-prompt
 
 [help]
        autocorrect = 10
@@ -82,8 +81,8 @@
 [push]
        default = simple
 [diff]
-#      tool = vimdiff
-       tool = bc
+       tool = vimdiff
+#      tool = bc
 [merge]
 #      tool = vimdiff
        tool = bc

diff --git a/.ssh/config b/.ssh/config
index 1c58d17320db2760d23b308b196f6e7b3d963048..a0d123c3e3719e85610083f66c4632afed387896 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -3,6 +3,8 @@
 
 # Global SSH configurations here will be applied to all hosts
 IdentityFile ~/.ssh/jira_wdc
+#IdentityFile ~/.ssh/id_rsa
+IdentityFile ~/.ssh/grundfos
 
 # override as per host
 Host grundfos
@@ -13,7 +15,7 @@ Host grundfos
 Host bitbucket
   Hostname bitbucket.org
   User jannikz
-  IdentityFile ~/.ssh/id_rsa
+  IdentityFile ~/.ssh/bitbucket
 
 Host jannik-nas
   Hostname 192.168.1.100

diff --git a/.vimrc b/.vimrc
index 1d21bcddc43278d8f15cdc7ad5500fce5675c717..81c1ef4abf4b8f2ec43db3a056730b3aefad5655 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -21,28 +21,30 @@ set runtimepath+=~/.cache/vim
 " section: plugins {{{1
 " ---------------------
 silent call plug#begin('~/.cache/vim/bundle')
-Plug 'tpope/vim-repeat'
-"Plug 'tpope/vim-fugitive'
+Plug 'easymotion/vim-easymotion'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-commentary'
-Plug 'tpope/vim-unimpaired'
-Plug 'tpope/vim-dispatch'
+Plug 'michaeljsmith/vim-indent-object'
+"Plug 'tpope/vim-unimpaired'
+"Plug 'tpope/vim-dispatch'
+"Plug 'tpope/vim-repeat'
+"Plug 'tpope/vim-fugitive'
 "Plug 'tpope/vim-vinager'
-Plug 'scrooloose/syntastic'
+"Plug 'scrooloose/syntastic'
 "Plug 'vim-airline/vim-airline'
-Plug 'airblade/vim-gitgutter'
-Plug 'majutsushi/tagbar'
-Plug 'fholgado/minibufexpl.vim'
+"Plug 'airblade/vim-gitgutter'
+"Plug 'majutsushi/tagbar'
+"Plug 'fholgado/minibufexpl.vim'
 "Plug 'brookhong/cscope.vim'
-Plug 'ctrlpvim/ctrlp.vim'
-Plug 'brandonbloom/csearch.vim'
-Plug 'mileszs/ack.vim'
-Plug 'jeetsukumaran/vim-filesearch'
-Plug 'haya14busa/incsearch.vim'
-"Plug 'altercation/vim-colors-solarized'
+"Plug 'ctrlpvim/ctrlp.vim'
+"Plug 'brandonbloom/csearch.vim'
+"Plug 'mileszs/ack.vim'
+"Plug 'jeetsukumaran/vim-filesearch'
+"Plug 'haya14busa/incsearch.vim'
+Plug 'altercation/vim-colors-solarized'
 Plug 'editorconfig/editorconfig-vim'
-Plug 'johnsyweb/vim-makeshift'
-Plug 'tfnico/vim-gradle'
+"Plug 'johnsyweb/vim-makeshift'
+"Plug 'tfnico/vim-gradle'
 "Plug 'a.vim'
 "Plug 'heaths/vim-msbuild'
 "Plug 'hdima/python-syntax'
@@ -52,11 +54,9 @@ call plug#end()
 
 " section: options {{{1
 " ---------------------
-
 "set autoindent
 set autoread
 set autowrite       " automatically save before commands like :next and :make
-set background=dark
 set backspace=2
 if exists('+breakindent')
   set breakindent showbreak=\ +
@@ -139,10 +139,8 @@ let g:netrw_liststyle=3
 let g:netrw_banner = 0
 let g:netrw_sort_sequence = '[\/]$,*'
 
-set t_Co=16
 
-"let g:solarized_termtrans=1
-"let g:solarized_menu=0
+
 "let g:markdown_fenced_languages = ['html', 'python', 'bash=sh']
 "let g:markdown_syntax_conceal = 0
 
@@ -162,8 +160,8 @@ else
   let g:editorconfig_core_mode = "python_builtin"
 endif
 
-set colorcolumn=80
-highlight ColorColumn ctermbg=9
+"set colorcolumn=80
+"highlight ColorColumn ctermbg=9
 
 " block cursor in normal mode
 let &t_ti.="\e[1 q"
@@ -343,6 +341,13 @@ if (&t_Co > 2 || has("gui_running")) && has("syntax")
     silent! colorscheme solarized
   endif
 endif
+
+colorscheme solarized
+let g:solarized_diffmode="high"
+let g:solarized_termtrans=1
+let g:solarized_menu=0
+set background=dark
+set t_Co=256
 " }}}1
 
 if filereadable(expand('~/.vimrc_local'))