diff --git a/roles/neovim/files/init.vim b/roles/neovim/files/init.vim
index 644797d..362f5e9 100644
--- a/roles/neovim/files/init.vim
+++ b/roles/neovim/files/init.vim
@@ -1,4 +1,7 @@
 lua require('transition')
+lua require('encoding')
+lua require('shortcuts')
+lua require('spacetabs')
 
 set runtimepath^=~/.vim runtimepath+=~/.vim/after
 let &packpath = &runtimepath
diff --git a/roles/neovim/files/lua/encoding.lua b/roles/neovim/files/lua/encoding.lua
new file mode 100644
index 0000000..39a351a
--- /dev/null
+++ b/roles/neovim/files/lua/encoding.lua
@@ -0,0 +1,4 @@
+-- ENCODING
+
+vim.opt.encoding = 'utf-8'
+vim.opt.fileencoding = 'utf-8'
diff --git a/roles/neovim/files/lua/shortcuts.lua b/roles/neovim/files/lua/shortcuts.lua
new file mode 100644
index 0000000..73e612d
--- /dev/null
+++ b/roles/neovim/files/lua/shortcuts.lua
@@ -0,0 +1,24 @@
+-- SHORTCUTS
+
+vim.g.mapleader = " "
+
+-- jk is escape
+vim.keymap.set('i', 'jk', '<Esc>')
+
+-- F2 to save file
+vim.keymap.set('n', '<F2>', '<cmd>w<CR>')
+vim.keymap.set('i', '<F2>', '<Esc><cmd>w<CR>i')
+
+-- global copy/paste
+vim.keymap.set('n', '<leader>y', '"*yy')
+vim.keymap.set('n', '<leader>p', '"*p')
+
+-- run make
+vim.keymap.set('n', '<leader>m', '<cmd>w<CR><cmd>!make<CR>')
+
+-- follow file in split window
+vim.keymap.set('n', '<leader>gf', '<cmd>split<CR>gf<CR>')
+vim.keymap.set('n', '<leader>vgf', '<cmd>vertical split<CR>gf<CR>')
+
+-- open terminal in split window
+vim.keymap.set('n', '<leader>t', '<cmd>below 10split<CR><cmd>terminal<CR>i')
diff --git a/roles/neovim/files/lua/spacetabs.lua b/roles/neovim/files/lua/spacetabs.lua
new file mode 100644
index 0000000..e59184e
--- /dev/null
+++ b/roles/neovim/files/lua/spacetabs.lua
@@ -0,0 +1,5 @@
+-- SPACES AND TABS
+
+vim.opt.expandtab = true -- expand tabs to spaces
+vim.opt.shiftwidth = 4
+vim.opt.softtabstop = 4 -- number of spaces in tab when editing
diff --git a/roles/neovim/files/transition.lua b/roles/neovim/files/lua/transition.lua
similarity index 100%
rename from roles/neovim/files/transition.lua
rename to roles/neovim/files/lua/transition.lua
diff --git a/roles/neovim/tasks/main.yml b/roles/neovim/tasks/main.yml
index 5324d15..9055210 100644
--- a/roles/neovim/tasks/main.yml
+++ b/roles/neovim/tasks/main.yml
@@ -64,7 +64,7 @@
     - {path: '~/.vim', mode: '0755'}
     - {path: '~/.vim/autoload', mode: '0750'}
     - {path: '~/.config/nvim', mode: '0755'}
-    - {path: '~/.config/nvim/lua', mode: '0755'}  # TODO: remove when transition is over
+    - {path: '~/.config/nvim/lua', mode: '0755'}
 
 - name: Check if colors is a symlink
   stat:
@@ -82,12 +82,16 @@
   copy: src={{ item.src }} dest={{ item.dest }} mode=0644
   with_items:
     - {src: 'init.vim', dest: '~/.config/nvim/init.vim'}
-    - {src: 'transition.lua', dest: '~/.config/nvim/lua/transition.lua'}
     - {src: 'flake8', dest: '~/.flake8'}
     - {src: 'pylintrc', dest: '~/.pylintrc'}
     - {src: 'vimrc', dest: '~/.vimrc'}
     - {src: 'colors', dest: '~/.vim/'}
 
+- name: Copy lua configs
+  copy:
+    src: lua
+    dest: ~/.config/nvim/
+
 - name: Check if vim-plug is installed
   stat:
     path: ~/.vim/autoload/plug.vim