From 3c2961a0d7c16407428b1f8bdae3f9810ebf2049 Mon Sep 17 00:00:00 2001
From: Blubber <f2005278@mvrht.com>
Date: Mon, 10 Oct 2016 00:29:44 +0200
Subject: tmux changes prefix to C-s; vim changed leader to 'S' (capital s)

---
 .bashrc.files/settings       |  5 +++++
 .gitconfig                   |  2 ++
 .tmux.conf                   |  6 +++---
 .vim/vimrc_files/keymaps.vim | 31 +++++++++++++++++++------------
 .vim/vimrc_files/vundle.vim  |  2 ++
 5 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 .bashrc.files/settings

diff --git a/.bashrc.files/settings b/.bashrc.files/settings
new file mode 100644
index 0000000..ad9c4ad
--- /dev/null
+++ b/.bashrc.files/settings
@@ -0,0 +1,5 @@
+# dotfiles -- .bashrc/settings
+# author: johannst
+
+# disable sticky mode
+stty -ixon
diff --git a/.gitconfig b/.gitconfig
index 3faff9c..e4dca34 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,3 +8,5 @@
    editor = vim
 [diff]
    tool = vimdiff
+[difftool]
+	prompt = false
diff --git a/.tmux.conf b/.tmux.conf
index 93b92cc..30528ef 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,7 +1,7 @@
 ### Basic Settings
 
 # re-map prefix key
-set -g prefix C-x
+set -g prefix C-s
 bind-key a send-prefix # for nested tmux sessions
 # re-source tmux.conf
 bind-key r source-file ~/.tmux.conf
@@ -18,8 +18,8 @@ setw -g mouse on
 # default TERM
 set -g default-terminal "screen-256color"
 # split settings
-bind-key s split-window -h
-bind-key h split-window 
+bind-key v split-window -h
+bind-key s split-window 
 # move between splits 
 bind-key k select-pane -U
 bind-key j select-pane -D
diff --git a/.vim/vimrc_files/keymaps.vim b/.vim/vimrc_files/keymaps.vim
index f61663f..d520ad7 100644
--- a/.vim/vimrc_files/keymaps.vim
+++ b/.vim/vimrc_files/keymaps.vim
@@ -2,7 +2,8 @@
 " author: johannst
 
 " set leader key
-let mapleader=","
+"execute "set <M-s>=\es"
+let mapleader="S"
 
 " re-source .vimrc
 map <leader>v :source ~/.vimrc<CR>
@@ -20,33 +21,39 @@ noremap <leader>q :q<CR>
 map <leader>f mzgg=G`z
 
 " navigate between different splits 
-map <C-Down>  <c-w>j
-map <C-Up>    <c-w>k
-map <C-Right> <c-w>l
-map <C-Left>  <c-w>h
+map <C-Down>  <C-w>j
+map <C-Up>    <C-w>k
+map <C-Right> <C-w>l
+map <C-Left>  <C-w>h
+map <C-j>     <C-w>j
+map <C-k>     <C-w>k
+map <C-l>     <C-w>l
+map <C-h>     <C-w>h
 
 " resize splits
-map <C-j>     <C-w>5-
-map <C-k>     <C-w>5+
-map <C-l>     <C-w>5<
-map <C-h>     <C-w>5>
+"map <C-j>     <C-w>5-
+"map <C-k>     <C-w>5+
+"map <C-l>     <C-w>5<
+"map <C-h>     <C-w>5>
 
 " navigate between different buffers 
 nnoremap <S-Left>  :bprevious<CR>
 nnoremap <S-Right> :bnext<CR>
+nnoremap <S-h>  :bprevious<CR>
+nnoremap <S-l>  :bnext<CR>
 
 " ctrl-ae jump to line start/end 
 nnoremap <C-a> 0
 nnoremap <C-e> $
-inoremap <C-a> <c-o>0
-inoremap <C-e> <c-o>$
+inoremap <C-a> <C-o>0
+inoremap <C-e> <C-o>$
 vnoremap <C-a> 0
 vnoremap <C-e> $
 cnoremap <C-a> <Home>
 cnoremap <C-e> <End>
 
 " Shortcut to toggle relative numbering mode
-nnoremap <c-n> :call ToggleRelativeNumber()<CR>
+nnoremap <C-n> :call ToggleRelativeNumber()<CR>
 
 " add a marker fold snippet (for C/C++)
 nnoremap <C-f> o//{{{ <Esc>o//}}}<Esc><Up>A
diff --git a/.vim/vimrc_files/vundle.vim b/.vim/vimrc_files/vundle.vim
index eb568ef..6b8b21a 100644
--- a/.vim/vimrc_files/vundle.vim
+++ b/.vim/vimrc_files/vundle.vim
@@ -18,6 +18,8 @@ Plugin 'vim-airline/vim-airline-themes'
 
 Plugin 'majutsushi/tagbar'
 
+Plugin 'kien/ctrlp.vim'
+
 " c++ modifief headers: http://www.vim.org/scripts/script.php?script_id=2358
 "Plugin 'vim-scripts/OmniCppComplete'
 
-- 
cgit v1.2.3