diff --git a/init.lua b/init.lua
index a126cd5..ca6f6ba 100644
--- a/init.lua
+++ b/init.lua
@@ -50,6 +50,7 @@ utils.opt('o', 'splitbelow', true)
 utils.opt('o', 'splitright', true)
 utils.opt('o', 'list', true)
 utils.opt('o', 'updatetime', 300)
+utils.opt('o', 'wrap', true)
 
 -- Highlight on yank
 vim.cmd 'au TextYankPost * lua vim.highlight.on_yank {on_visual = false}'
diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 545d995..321ac18 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -33,3 +33,20 @@ utils.map('i', '<S-F2>', '<Esc>:split .<CR>')
 utils.map('n', '<C-S>', ':wa<CR>')
 
 
+-- Linewrap and jumping
+utils.map('n', 'k', 'gk')
+utils.map('n', 'j', 'gj')
+utils.map('n', '0', 'g0')
+utils.map('n', '$', 'g$')
+utils.map('n', '<Up>', 'gk')
+utils.map('n', '<Down>', 'gj')
+utils.map('n', '<Home>', 'g<Home>')
+utils.map('n', '<End>', 'g<End>')
+utils.map('v', 'k', 'gk')
+utils.map('v', 'j', 'gj')
+utils.map('v', '0', 'g0')
+utils.map('v', '$', 'g$')
+utils.map('v', '<Up>', 'gk')
+utils.map('v', '<Down>', 'gj')
+utils.map('v', '<Home>', 'g<Home>')
+utils.map('v', '<End>', 'g<End>')