From b103278402322fc0af88aba812693f92af316027 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Tue, 21 Aug 2018 09:58:46 -0700
Subject: Remove sensible and move to vimrc file

---
 vim.nix | 33 +--------------------------------
 vimrc   | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 32 deletions(-)
 create mode 100644 vimrc

diff --git a/vim.nix b/vim.nix
index 356e901..ddc0b5a 100644
--- a/vim.nix
+++ b/vim.nix
@@ -3,7 +3,6 @@
 {
   enable = true;
   plugins = [
-    "sensible"
     "ctrlp"
     "fugitive"
     "editorconfig-vim"
@@ -16,35 +15,5 @@
     history = 1000;
     tabstop = 4;
   };
-  extraConfig = ''
-    set cc=80          " 80 column lines
-    set linebreak      " Break lines at word (requires Wrap lines)
-    set textwidth=80   " Line wrap (number of cols)
-    set showmatch      " Highlight matching brace
-    set visualbell     " Use visual bell (no beeping)
-    set hlsearch       " Highlight all search results
-    set smartcase      " Enable smart-case search
-    set shiftwidth=4   " Number of auto-indent spaces
-    set smartindent    " Enable smart-indent
-    set laststatus=1   " No status line
-
-    " Mappings
-    imap fd <Esc>
-    nnoremap ,s :r ~/sig.txt<cr>
-
-    " Easily find cursor with crosshair (\c)
-    :hi CursorLine   cterm=NONE term=reverse ctermbg=7 guibg=Grey90
-    :hi CursorColumn cterm=NONE term=reverse ctermbg=7 guibg=Grey90
-    :nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
-
-    " File browser
-    let g:netrw_banner=0       " Disable file browser banner
-    let g:netrw_liststyle=3    " Tree view
-
-    "" CTAGS shortcuts
-    " open definition in a new tab:
-    map <C-\> :tab split<CR>:exec("tag ".expand("<cword>"))<CR>
-    " open definition in a vertical split:
-    map <A-]> :vsp <CR>:exec("tag ".expand("<cword>"))<CR>
-  '';
+  extraConfig = builtins.readFile ./vimrc;
 }
diff --git a/vimrc b/vimrc
new file mode 100644
index 0000000..10884b8
--- /dev/null
+++ b/vimrc
@@ -0,0 +1,53 @@
+""" General settings
+set autoindent
+set backspace=indent,eol,start
+set cc=80            " 80 column lines
+set complete-=i      " Set the matches for insert mode completion
+set encoding=utf-8   " Set encoding
+set formatoptions+=j " Delete comment character when joining commented lines
+set hlsearch         " Highlight all search results
+set incsearch        " Incremental search
+set laststatus=1     " No status line
+set linebreak        " Break lines at word (requires Wrap lines)
+set ruler            " Show line & col number of cursor position
+set shiftwidth=4     " Number of auto-indent spaces
+set showmatch        " Highlight matching brace
+set smartcase        " Better searching
+set smartindent      " Autoindent when starting a new line
+set smarttab         " Tab insertion & deletion
+set textwidth=80     " Line wrap (number of cols)
+set visualbell       " Use visual bell (no beeping)
+set wildmenu         " Helpful completion menu
+
+" Strings to use in 'list' mode and for the :list command
+set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
+
+""" Enable syntax
+if has('syntax') && !exists('g:syntax_on')
+    syntax enable
+endif
+
+""" Mappings
+imap fd <Esc>
+nnoremap ,s :r ~/sig.txt<cr>
+
+" Use <C-L> to clear the highlighting of :set hlsearch.
+if maparg('<C-L>', 'n') ==# ''
+    nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
+endif
+
+""" Easily find cursor with crosshair (\c)
+:hi CursorLine   cterm=NONE term=reverse ctermbg=7 guibg=Grey90
+:hi CursorColumn cterm=NONE term=reverse ctermbg=7 guibg=Grey90
+:nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
+
+""" File browser
+let g:netrw_banner=0       " Disable file browser banner
+let g:netrw_liststyle=3    " Tree view
+
+""" CTAGS shortcuts
+" open definition in a new tab:
+map <C-\> :tab split<CR>:exec("tag ".expand("<cword>"))<CR>
+" open definition in a vertical split:
+map <A-]> :vsp <CR>:exec("tag ".expand("<cword>"))<CR>
+
-- 
cgit v1.2.3