diff --git a/fish/config.fish b/fish/config.fish
index 7fdf52a..caf853a 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -8,4 +8,7 @@ if test -z "$FISH_SETUP_PATH"
 end
 
 set -x LANG sv_SE.UTF-8
-set -x LC_ALL sv_SE.UTF-8
\ No newline at end of file
+set -x LC_ALL sv_SE.UTF-8
+set -x EDITOR nvim
+
+alias v vim
\ No newline at end of file
diff --git a/init.vim b/init.vim
new file mode 100644
index 0000000..570f578
--- /dev/null
+++ b/init.vim
@@ -0,0 +1,32 @@
+set list
+set listchars=tab:→\ ,trail:␣,nbsp:⋅
+set noruler
+set laststatus=2
+
+set number
+set relativenumber
+
+set expandtab
+set tabstop=2
+set shiftwidth=2
+set softtabstop=2
+set smartindent
+
+nnoremap <c-h> <c-w>h
+nnoremap <c-j> <c-w>j
+nnoremap <c-k> <c-w>k
+nnoremap <c-l> <c-w>l
+
+nnoremap ö :
+
+set ignorecase
+set smartcase
+set incsearch
+set showmatch
+set hlsearch
+nnoremap <silent> <space> :noh<CR>
+noremap / /\v
+nnoremap * *N
+noh
+
+set hidden
\ No newline at end of file
diff --git a/install.sh b/install.sh
index b8d70fb..f142369 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 sudo -n apt-get update
-sudo -n DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends fish vim
+sudo -n DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+  fish \
+  neovim
 
 USER=`whoami`
 sudo -n chsh $USER -s $(which fish)
@@ -31,3 +33,5 @@ chmod 644 ~/.ssh/config
 
 mkdir -p ~/.config/
 ln -s ~/dotfiles/fish ~/.config/fish
+mkdir -p ~/.config/nvim/
+ln -s ~/dotfiles/init.vim ~/.config/nvim/init.vim