From dc467108fabc366f114e7803478f60808ab109e5 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 11 Sep 2017 22:53:25 +0200
Subject: [PATCH] shell/vim: change keyboard mappings

---
 shell.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/shell.nix b/shell.nix
index 1dca33c..15c8d17 100644
--- a/shell.nix
+++ b/shell.nix
@@ -45,6 +45,10 @@ in pkgs.stdenv.mkDerivation {
           " leader
           let mapleader = ','
 
+          " save on ctrl-s
+          nnoremap <c-s> :w<CR>
+          inoremap <c-s> <Esc>:w<CR>a
+
           set hidden
           syntax on
           set hlsearch
@@ -57,8 +61,15 @@ in pkgs.stdenv.mkDerivation {
           imap hhh <ESC>
           set scroll=11
 
+          " new scroll mappings
+          noremap <C-j> <C-f>
+          noremap <C-k> <C-u>
+
           noremap <C-n> :tabn<CR>
           noremap <C-p> :tabp<CR>
+          " TODO: get tab movement working with ctrl-alt-{n,p}
+          noremap <C-A-n> :tabm +1<CR>
+          noremap <C-A-p> :tabm -1<CR>
           let g:ctrlp_map = '<tab>'
           let g:ctrlp_custom_ignore = {
             \ 'dir':  '\v[\/]\.(git|hg|svn|)$$',