From 0da9ba8b240eab1ff7fc0c28972e95d52f95a99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Wadstr=C3=B6m?= <patrick@weblab.se>
Date: Wed, 2 Sep 2020 20:54:47 +0200
Subject: [PATCH] Started merging vim config

---
 .vimrc | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/.vimrc b/.vimrc
index ccd2cef..323bb99 100644
--- a/.vimrc
+++ b/.vimrc
@@ -24,6 +24,8 @@ colorscheme monokai
 
 " Airline
 let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1
+let g:airline_theme='badwolf'
 
 " -- Buffer/Window Workflow
 " Allow hidden buffers
@@ -40,17 +42,59 @@ set mouse=a
 
 " Show tab characters
 set list
-set listchars=tab:>-
+set listchars=tab:▒░,trail:▓
 
-" Space-indentiation please
+" Space-indentation please
 set expandtab
 set shiftwidth=4
 set tabstop=4
 
+" Default to UTF-8 encoding
+set encoding=utf-8
+
+" We never use octals, but we do use zero-prefixed numbers.
+set nrformats-=octal
+
+" We are fast, don't get stuck in an old aborted command
+set ttimeout
+set ttimeoutlen=50
+
+" Always retain the status line
+set laststatus=2
+
+" Enable ruler to show column position
+set ruler
+
+" Retain last command in command line
+set showcmd
+
+" Give me a menu for completion in the command line
+set wildmenu
+
+" Stop asking me, just reload the changed file!
+set autoread
+
+" Quicky to exit insert mode
+inoremap <C-c> <Esc>
+
 " Smartcase search
 set ignorecase
 set smartcase
 
+" Incremental search
+set incsearch
+
+" Highlight search
+set hlsearch
+" Use <C-L> to clear the highlighting of :set hlsearch.
+if maparg('<C-L>', 'n') ==# ''
+  nnoremap <silent> <C-L> :nohlsearch<CR><C-L>
+endif
+
+"
+" Plugins config
+"
+
 " Ripgrep FZF
 function! RipgrepFzf(query, fullscreen)
     let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case %s || true'
@@ -75,3 +119,11 @@ let g:rustfmt_autosave = 1
 
 " Git Blame
 nnoremap <C-b> :<C-u>call gitblame#echo()<CR>
+
+" JSX
+let g:jsx_ext_required = 0
+
+" this machine config
+if filereadable(expand("~/.vimrc.local"))
+  source ~/.vimrc.local
+endif