From 92dcc256157ae8f6301fae0b663bb3c911c315f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Tue, 24 Sep 2013 18:40:40 +0200
Subject: [PATCH] Various changes.

---
 i3/i3/config.d/netbook.config |  2 +-
 setup/list                    |  2 ++
 terminator/terminator/config  |  2 +-
 vim/vimrc                     | 34 ++++++++++++++++++++++++++++++----
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/i3/i3/config.d/netbook.config b/i3/i3/config.d/netbook.config
index 454d4e6..7dfa79a 100644
--- a/i3/i3/config.d/netbook.config
+++ b/i3/i3/config.d/netbook.config
@@ -37,5 +37,5 @@ bar {
     }
 
     i3bar_command i3bar
-    status_command i3status --config $path_i3status_config
+    status_command conky --config ~/.i3/conky/netbook.conky
 }
diff --git a/setup/list b/setup/list
index e727331..601ce91 100644
--- a/setup/list
+++ b/setup/list
@@ -52,6 +52,8 @@ thunar-media-tags-plugin
 docky
 conky
 dzen2
+# color pickers
+gcolor2
 
 ### documents
 # pdf reader
diff --git a/terminator/terminator/config b/terminator/terminator/config
index 37d0d70..0957020 100644
--- a/terminator/terminator/config
+++ b/terminator/terminator/config
@@ -6,7 +6,7 @@
   [[default]]
     scrollbar_position = hidden
     palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
-    font = Deja Vu Sans Mono 10
+    font = Consolas 11
     background_image = None
     background_darkness = 0.9
     urgent_bell = True
diff --git a/vim/vimrc b/vim/vimrc
index 3858fc4..dbc14be 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -93,7 +93,9 @@ set nobackup                        " do not create a backup
 set nowritebackup
 
 
-set showmode                        " show the current mode
+set noshowmode                      " do not show the current mode, as this
+                                    " will be handled by vim-airline in the
+                                    " statusline
 set cursorline                      " highlight the current line
 set number                          " enable linenumbers
 set numberwidth=2                   " only use as many columns for the line
@@ -105,6 +107,7 @@ set relativenumber                  " show file numbers relative to the current
 set showmatch                       " show matching brackets/parentheses
 set incsearch                       " show matches while typing in a search
 set hlsearch                        " highlight matches in a search
+set wrapscan                        " wrap searches at the end of the file
 
 set ignorecase                      " ignore case when only searching for
                                     " lowercase
@@ -150,6 +153,7 @@ set autoindent                      " copy indent from current line when
 set smartindent                     " smart indenting for C-like languages
 set smarttab                        " use shiftwidth when tabbing in front of
                                     " a line instead of tabsstop/softtabstop
+set shiftround                      " round indent to multiples of shiftwidth
 
 set undofile                        " use an undo file
 set undodir=~/.vim/undo             " store undo files in a fixed directory
@@ -179,14 +183,33 @@ set wildmode=list:longest           " automatically complete up to the level
 set autochdir                       " automatically change to the directory that
                                     " contains the file that is edited
 
+set matchpairs="(:),{:},[:]"        " matching pairs for the '%'-command
+
+set notildeop                       " do not make '~' behave like an operator
+
+set virtualedit="block"             " allow moving the cursor where there is no
+                                    " actual character in virtual block mode
+
+set wildignore=*.swp,*.bak,*.pyc    " files to ignore when expanding wildcards
+
+set noerrorbells                    " do not beep on errors
+
+set list                            " show specific spectial characters
+set listchars=trail:~               " trailing whitespace as '~'
+
 let mapleader = ","
 
-"nnoremap / /\v
-"vnoremap / /\v
-nnoremap <leader><space> :noh<cr>
+" enable 'very-magic' in regex
+nnoremap / /\v
+vnoremap / /\v
+
+nnoremap <leader><space> :nohlsearch<CR>
 nnoremap <tab> %
 vnoremap <tab> %
 
+" make Y behave like other capitals, otherwise Y would work like yy
+nnoremap Y y$
+
 nnoremap j gj
 nnoremap k gk
 
@@ -194,6 +217,9 @@ function! TrimWhiteSpace()
      %s/\s\+$//e
      endfunction
 
+" automatically reload .vimrc when it's saved
+autocmd BufWritePost .vimrc source ~/.vimrc
+
 autocmd FileWritePre    * :call TrimWhiteSpace()
 autocmd FileAppendPre   * :call TrimWhiteSpace()
 autocmd FilterWritePre  * :call TrimWhiteSpace()