diff --git a/home/vim/init.lua b/home/vim/init.lua
index 13886f2b..5f11b937 100644
--- a/home/vim/init.lua
+++ b/home/vim/init.lua
@@ -165,9 +165,18 @@ api.nvim_set_keymap('n', '<leader>fb', '<cmd>Telescope buffers<cr>', { noremap =
 api.nvim_set_keymap('n', '<leader>fh', '<cmd>Telescope help_tags<cr>', { noremap = true, silent = true })
 
 -- hop
-require'hop'.setup()
+local hop = require'hop'.setup()
+local directions = require("hop.hint").HintDirection
 
-vim.api.nvim_set_keymap('', 'f', "<cmd>lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.AFTER_CURSOR, current_line_only = true })<cr>", {})
-vim.api.nvim_set_keymap('', 'F', "<cmd>lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, current_line_only = true })<cr>", {})
-vim.api.nvim_set_keymap('', 't', "<cmd>lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.AFTER_CURSOR, current_line_only = true, hint_offset = -1 })<cr>", {})
-vim.api.nvim_set_keymap('', 'T', "<cmd>lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, current_line_only = true, hint_offset = 1 })<cr>", {})
+vim.keymap.set("", "t", function()
+  hop.hint_words()
+end, {})
+vim.keymap.set("", "T", function()
+  hop.hint_lines_skip_whitespace()
+end, {remap=true})
+vim.keymap.set("", "f", function()
+  hop.hint_char1({ direction = directions.AFTER_CURSOR, current_line_only = true })
+end, {remap=true})
+vim.keymap.set("", "F", function()
+  hop.hint_char1({ direction = directions.BEFORE_CURSOR, current_line_only = true })
+end, {remap=true})